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

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

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();
 }
-

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

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 );

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())
 

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 );

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())
 

src/mac/carbon/button.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.cpp
+// Name:        src/mac/carbon/button.cpp
 // Purpose:     wxButton
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,7 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/button.h"
+
+#ifndef WX_PRECOMP
     #include "wx/panel.h"
+#endif
+
 #include "wx/stockitem.h"
 
 #include "wx/mac/uma.h"
@@ -147,7 +151,7 @@ wxSize wxButton::DoGetBestSize() const
     int wBtn;
     if ( EmptyRect( &bestsize ) )
     {
-        wBtn = m_label.Length() * charspace + 12 ;
+        wBtn = m_label.length() * charspace + 12 ;
     }
     else
     {
@@ -183,4 +187,3 @@ wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF
 
     return noErr;
 }
-

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"

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"

src/mac/classic/button.cpp

@@ -16,7 +16,11 @@
 #endif
 
 #include "wx/button.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;
 

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"

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"

src/motif/control.cpp

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

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"

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"

src/xrc/xh_panel.cpp

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

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"
 
 

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

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"