cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include wx/panel.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-05-04 18:10:27 +00:00
parent 4a851b11c2
commit 8e609c8259
19 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/panelg.cpp
View File

@ -30,10 +30,10 @@
#include "wx/colour.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/panel.h"
#endif
#include "wx/containr.h"
#include "wx/panel.h"
// ----------------------------------------------------------------------------
// wxWin macros
@ -179,4 +179,3 @@ void wxPanel::OnSize(wxSizeEvent& event)
event.Skip();
}

2
src/generic/scrlwing.cpp
View File

@ -33,11 +33,11 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/dcclient.h"
#include "wx/panel.h"
#if wxUSE_TIMER
#include "wx/timer.h"
#endif

4
src/gtk/notebook.cpp
View File

@ -18,9 +18,9 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/panel.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
@ -694,7 +694,7 @@ bool wxNotebook::InsertPage( size_t position,
/* set the label text */
nb_page->m_text = text;
if (nb_page->m_text.empty()) nb_page->m_text = wxT("");
if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );

2
src/gtk/textctrl.cpp
View File

@ -16,11 +16,11 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/math.h"
#include "wx/settings.h"
#include "wx/panel.h"
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())

4
src/gtk1/notebook.cpp
View File

@ -18,9 +18,9 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/panel.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
@ -692,7 +692,7 @@ bool wxNotebook::InsertPage( size_t position,
/* set the label text */
nb_page->m_text = text;
if (nb_page->m_text.empty()) nb_page->m_text = wxT("");
if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );

2
src/gtk1/textctrl.cpp
View File

@ -16,11 +16,11 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/math.h"
#include "wx/settings.h"
#include "wx/panel.h"
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())

21
src/mac/carbon/button.cpp
View File

@ -1,18 +1,22 @@
/////////////////////////////////////////////////////////////////////////////
// Name: button.cpp
// Name: src/mac/carbon/button.cpp
// Purpose: wxButton
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/button.h"
#include "wx/panel.h"
#ifndef WX_PRECOMP
#include "wx/panel.h"
#endif
#include "wx/stockitem.h"
#include "wx/mac/uma.h"
@ -143,11 +147,11 @@ wxSize wxButton::DoGetBestSize() const
Rect bestsize = { 0 , 0 , 0 , 0 } ;
m_peer->GetBestRect( &bestsize ) ;
int wBtn;
if ( EmptyRect( &bestsize ) )
{
wBtn = m_label.Length() * charspace + 12 ;
wBtn = m_label.length() * charspace + 12 ;
}
else
{
@ -155,7 +159,7 @@ wxSize wxButton::DoGetBestSize() const
sz.y = bestsize.bottom - bestsize.top ;
}
if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
sz.x = wBtn;
return sz ;
@ -163,7 +167,7 @@ wxSize wxButton::DoGetBestSize() const
wxSize wxButton::GetDefaultSize()
{
int wBtn = 70 ;
int wBtn = 70 ;
int hBtn = 20 ;
return wxSize(wBtn, hBtn);
@ -175,7 +179,7 @@ void wxButton::Command (wxCommandEvent & event)
ProcessCommand(event);
}
wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
event.SetEventObject(this);
@ -183,4 +187,3 @@ wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF
return noErr;
}

2
src/mac/carbon/control.cpp
View File

@ -15,9 +15,9 @@
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/panel.h"
#endif // WX_PRECOMP
#include "wx/panel.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/notebook.h"

2
src/mac/carbon/window.cpp
View File

@ -17,12 +17,12 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/scrolbar.h"

8
src/mac/classic/button.cpp
View File

@ -16,7 +16,11 @@
#endif
#include "wx/button.h"
#include "wx/panel.h"
#ifndef WX_PRECOMP
#include "wx/panel.h"
#endif
#include "wx/stockitem.h"
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
@ -90,7 +94,7 @@ wxSize wxButton::DoGetBestSize() const
{
wxSize sz = GetDefaultSize() ;
int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
int wBtn = m_label.length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
if (wBtn > sz.x) sz.x = wBtn;

2
src/mac/classic/control.cpp
View File

@ -19,9 +19,9 @@
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/panel.h"
#endif // WX_PRECOMP
#include "wx/panel.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/notebook.h"

2
src/mac/classic/window.cpp
View File

@ -17,12 +17,12 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/listbox.h"

3
src/motif/control.cpp
View File

@ -16,10 +16,9 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/panel.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif

2
src/x11/textctrl.cpp
View File

@ -16,10 +16,10 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/settings.h"
#include "wx/panel.h"
#include "wx/clipbrd.h"
#include "wx/tokenzr.h"
#include "wx/dcclient.h"

2
src/x11/window.cpp
View File

@ -31,12 +31,12 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/panel.h"
#endif
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/dialog.h"
#include "wx/listbox.h"

6
src/xrc/xh_panel.cpp
View File

@ -18,7 +18,11 @@
#if wxUSE_XRC
#include "wx/xrc/xh_panel.h"
#include "wx/panel.h"
#ifndef WX_PRECOMP
#include "wx/panel.h"
#endif
#include "wx/frame.h"
IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)

2
src/xrc/xh_sizer.cpp
View File

@ -21,13 +21,13 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/panel.h"
#endif
#include "wx/sizer.h"
#include "wx/gbsizer.h"
#include "wx/statbox.h"
#include "wx/notebook.h"
#include "wx/panel.h"
#include "wx/tokenzr.h"

2
src/xrc/xh_unkwn.cpp
View File

@ -22,10 +22,10 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/window.h"
#include "wx/panel.h"
#endif
#include "wx/sizer.h"
#include "wx/panel.h"
class wxUnknownControlContainer : public wxPanel

2
src/xrc/xmlres.cpp
View File

@ -22,6 +22,7 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/panel.h"
#endif
#ifndef __WXWINCE__
@ -29,7 +30,6 @@
#endif
#include "wx/dialog.h"
#include "wx/panel.h"
#include "wx/frame.h"
#include "wx/wfstream.h"
#include "wx/filesys.h"