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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 99314edecfe45aca9859a4598bcd24e9a7625d68..454f5dc1d86537e33914c0f7276ba0cbcf9097f5 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -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();
 }
-

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 69c534470d66f62a03d8b6e492b6c79f99471e32..442efe3f838407f88706d4b10cd7a59177954be2 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 38938182da7c9a0975d506ce9d5a0c74b79d62d5..34dd2bf59dba8d76414e88094fc2b3622e0a811c 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -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 );

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 73b66c7677224d26495339124451e738f0a54ffc..2b60a1a8f67d4e6f096580a23a8a11678eadbf52 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -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())
 

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 2d8998bbe16112f365242b0413b603ded5e860d0..a1e152cbe36a36c0280e020829c390262f19e6c7 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -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 );

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 59dc8c06906de3118fbc813bff36c4b7e0ef07dc..69f49709902b9f2908a732cf45150d96563d4bc2 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -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())
 

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index e69b3e3e6c18909ca87278c9dc46b86d6457fb70..c5a3f521bdb67a90f8a1f707c512a0f05eb6a0e5 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -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;
 }
-

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index d059e9d917cb97ab71e7008917d0ff90e2110a9b..8fe91d84df49c828c06e4c1f907523631c4bda82 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -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"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 6093f5494ea068870812b44dd11a7ce34e091ccd..fedd13db5f2d07be11fcd3a91e00b2703bb4a6c8 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -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"

diff --git a/src/mac/classic/button.cpp b/src/mac/classic/button.cpp
index 12864683c98d46497d957874a618204afebd191b..a12aa3a9b9e3212bb4131b9cc0d9cd8ca8910414 100644 (file)
--- a/src/mac/classic/button.cpp
+++ b/src/mac/classic/button.cpp
@@ -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;
 

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 8f7ee77cfb87b9f965fc4f8baaa4841e7bb43641..5d178b452fdc63e17e3f0d5136670dd2b5bc38c2 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -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"

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index c18d278e5ba7804a5c48fff8139e7d53acd2dff6..9e75de3d418c2a48850b987f8deff2c9144a70b7 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -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"

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 2c00c7cdf35634abd30d4398844e511e86ef68ec..13b8146af7117f15044a8e3bd7a549e5c4fc6a63 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -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

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 75a799c5b1e7b7356dad87c74cb9b790bc62e25b..a7e36d04043cb7c1dec591eea6f9cfc67f972c0b 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -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"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index bbc7c1d7b277554de196c27b08b392d6256e084b..064f6ee64c889023fea9a27c3b000b7e5e602828 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -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"

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index 6247d0600c354904404b08f7017297c335a81bca..1fceadd851726eefa3025f94002f9eee615681b1 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -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)

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 8d6d219261edeab9bf5bdca44c65a8321e4efcf8..ca8f089f9175929e96ebfc26b0c02d21b0ff02b6 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -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"
 
 

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index 144e3a4c003278cff74d5a49f1e2221647e2dd34..953aa35f12003a06e72be7dcb54df5bcd139f460 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index ea902a5407763cb467c002890556dba5897765f8..3fedc644687164b25ac93e8ed0523f6845a0378a 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -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"