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

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

include/wx/wx.h

@@ -31,6 +31,7 @@
 
 #include "wx/window.h"
 #include "wx/panel.h"
+#include "wx/toplevel.h"
 #include "wx/frame.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

src/cocoa/toplevel.mm

@@ -19,9 +19,11 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
-    #include "wx/toplevel.h"
     #include "wx/menuitem.h"
     #include "wx/frame.h"
     #include "wx/log.h"

src/common/toplvcmn.cpp

@@ -23,8 +23,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/toplevel.h"
     #include "wx/dcclient.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP

src/gtk/settings.cpp

@@ -15,10 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/cmndata.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/toplevel.h"
 
 // Using gtk_list_new, which is deprecated since GTK2
 // Using gtk_object_sink, which is deprecated since GTK+-2.9.0

src/gtk1/settings.cpp

@@ -15,10 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/cmndata.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/toplevel.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>

src/mac/carbon/dcclient.cpp

@@ -18,10 +18,10 @@
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/settings.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/region.h"
-#include "wx/toplevel.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"
 

src/mac/carbon/dnd.cpp

@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/toplevel.h"
 #endif // WX_PRECOMP
 
-#include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
@@ -286,7 +286,7 @@ bool wxDropTarget::GetData()
             }
         }
 
-        if (filenamesPassed.Len() > 0)
+        if (filenamesPassed.length() > 0)
         {
             wxCharBuffer buf = filenamesPassed.fn_str();
             m_dataObject->SetData( wxDataFormat(wxDF_FILENAME), strlen( buf ), (const char*)buf );

src/mac/carbon/listbox.cpp

@@ -24,10 +24,9 @@
     #include "wx/button.h"
     #include "wx/settings.h"
     #include "wx/arrstr.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/toplevel.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

src/mac/carbon/renderer.cpp

@@ -22,10 +22,10 @@
     #include "wx/bitmap.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/renderer.h"
-#include "wx/toplevel.h"
 #include "wx/mac/uma.h"
 
 

src/mac/carbon/statbrma.cpp

@@ -16,10 +16,10 @@
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/mac/private.h"
-#include "wx/toplevel.h"
 
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)

src/mac/carbon/textctrl.cpp

@@ -24,6 +24,7 @@
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/toplevel.h"
 #endif
 
 #ifdef __DARWIN__
@@ -41,7 +42,6 @@
     #endif
 #endif
 
-#include "wx/toplevel.h"
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 
@@ -1555,7 +1555,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     if ( value )
     {
         wxMacCFStringHolder cf(value) ;
-        textLength = cf.AsString().Length() ;
+        textLength = cf.AsString().length() ;
     }
 
     if ((from == -1) && (to == -1))
@@ -2210,7 +2210,7 @@ void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffse
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
-    size_t len = st.Len() ;
+    size_t len = st.length() ;
     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
 #else
     wxMBConvUTF16 converter ;

src/mac/carbon/toplevel.cpp

@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"

src/mac/carbon/uma.cpp

@@ -13,6 +13,12 @@
 
 #if wxUSE_GUI
 
+#ifndef WX_PRECOMP
+    #if TARGET_API_MAC_OSX
+        #include "wx/toplevel.h"
+    #endif
+#endif
+
 #include "wx/dc.h"
 
 #ifndef __DARWIN__
@@ -29,13 +35,10 @@
 #endif
 
 #ifndef __DARWIN__
-#include <Scrap.h>
+#  include <Scrap.h>
 #endif
-#include "wx/mac/uma.h"
 
-#if TARGET_API_MAC_OSX
+#include "wx/mac/uma.h"
-#include "wx/toplevel.h"
-#endif
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of

src/mac/carbon/utils.cpp

@@ -16,6 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
+    #if wxUSE_GUI
+        #include "wx/toplevel.h"
+    #endif
 #endif
 
 #include "wx/apptrait.h"
@@ -23,7 +26,6 @@
 #if wxUSE_GUI
     #include "wx/mac/uma.h"
     #include "wx/font.h"
-    #include "wx/toplevel.h"
 #endif
 
 #include <ctype.h>

src/mac/classic/dcclient.cpp

@@ -16,10 +16,10 @@
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/dcmemory.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/region.h"
-#include "wx/toplevel.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"
 

src/mac/classic/dnd.cpp

@@ -22,9 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h"
+    #include "wx/toplevel.h"
 #endif // WX_PRECOMP
 
-#include "wx/toplevel.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 

src/mac/classic/listbox.cpp

@@ -22,10 +22,9 @@
     #include "wx/utils.h"
     #include "wx/button.h"
     #include "wx/settings.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/toplevel.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

src/mac/classic/textctrl.cpp

@@ -26,6 +26,7 @@
     #include "wx/button.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/toplevel.h"
 #endif
 
 #ifdef __DARWIN__
@@ -43,7 +44,6 @@
     #endif
 #endif
 
-#include "wx/toplevel.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/filefn.h"
@@ -662,7 +662,7 @@ static void SetTXNData( TXNObject txn , const wxString& st , TXNOffset start , T
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
-    size_t len = st.Len() ;
+    size_t len = st.length() ;
     TXNSetData( txn , kTXNUnicodeTextData,  (void*)st.wc_str(), len * 2,
       start, end);
 #else

src/mac/classic/toplevel.cpp

@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"

src/mgl/toplevel.cpp

@@ -22,8 +22,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/toplevel.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP
 

src/msw/toplevel.cpp

@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"

src/os2/toplevel.cpp

@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"

src/palmos/control.cpp

@@ -38,9 +38,9 @@
     #include "wx/checkbox.h"
     #include "wx/radiobut.h"
     #include "wx/slider.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/toplevel.h"
 #include "wx/tglbtn.h"
 
 #include <Control.h>

src/palmos/slider.cpp

@@ -23,10 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/brush.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/toplevel.h"
-
 #include <Form.h>
 #include <Control.h>
 

src/palmos/toplevel.cpp

@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"

src/univ/statusbr.cpp

@@ -30,10 +30,9 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/toplevel.h"
-
 #include "wx/univ/renderer.h"
 
 // ============================================================================

src/univ/themes/gtk.cpp

@@ -45,11 +45,11 @@
     #include "wx/statusbr.h"
 
     #include "wx/settings.h"
+    #include "wx/toplevel.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
-#include "wx/toplevel.h"
 #include "wx/artprov.h"
 #include "wx/image.h"
 #ifdef wxUSE_TOGGLEBTN

src/univ/themes/metal.cpp

@@ -47,12 +47,12 @@
     #endif
     #include "wx/menu.h"
     #include "wx/settings.h"
+    #include "wx/toplevel.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/artprov.h"
-#include "wx/toplevel.h"
 
 #include "wx/univ/scrtimer.h"
 #include "wx/univ/renderer.h"

src/univ/themes/win32.cpp

@@ -49,12 +49,12 @@
     #endif
     #include "wx/menu.h"
     #include "wx/settings.h"
+    #include "wx/toplevel.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/artprov.h"
-#include "wx/toplevel.h"
 #include "wx/image.h"
 #ifdef wxUSE_TOGGLEBTN
 #include "wx/tglbtn.h"

src/univ/topluniv.cpp

@@ -18,15 +18,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
     #include "wx/settings.h"
 #endif
 
-#include "wx/toplevel.h"
 #include "wx/univ/renderer.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"

src/x11/toplevel.cpp

@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"