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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 22cc188d52b43ce6ebbd78985e3b81957c2e8127..2ce5db4d0883dfc4a81539d9028e3b26e8692b4f 100644 (file)
--- a/include/wx/wx.h
+++ b/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"

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 97f32f83877ee074cf195c9f13cc2fad651144d2..842251756bbb115b65e458decc623c2a738b1ac0 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/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"

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index bf2742a04ede00e8df7414473762532a728109d5..a6c9133dbdbf11b649a7d883bb339c4920df0620 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index bc6ee6a3c8911f3075879a4b70d9fcb680067e90..dd756beec056b9a30d747b4ed9d57632baa5f768 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/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

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index a5348ebaad86953ff7a1d6d98592b46e00f5a64f..b7b1283e83e33cd9bfa51091978b43b1f8b7437b 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/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>

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 6621fbe33b6733196ea62ccc8a4202836a0270b0..23d159b764ac581c9971c83fdaa07cf71f3c85ca 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index ab82e4c481ad8c3a746c986cb45ab78c682224d8..456a2a90b8b995e39db111d7b457e5a1b0008ff3 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/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 );

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 54393ffdf33bfcfc3ee86528022cb88d88460a06..5a0858ee35e58b7a9ce7ed322a9dce844f2a69cf 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/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)

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 6735b1f62b26a7aabab7337f40627617adddbcd4..8bc466e48861d844ea03d3fb923c9976e4b24d6a 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/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"
 
 

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 1ac06835016e2a9b73a6af387431f2f2d37951aa..ccecc33a58d86c59fa74d47abbe25db4030a0fbf 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/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)

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 93c0feae074c7e68c95f6848d7cd2704b188f559..7e06fb7eda1947fdf7148e9e8b3657b6d6b9679e 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/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 ;

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 0211fa1a4a68d38d48638426f888da9925bef51b..7c57eeed8674219a20f34283ca8df94ba120c0b6 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/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"

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index d5f59cef31745af5053a90363969c9130cd9f647..91b3ed5f7b68c15b5e3de654d2ebaeffda6bd8a3 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/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/toplevel.h"
-#endif
+#include "wx/mac/uma.h"
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index a0ccab3f282f1ef3916c6fca3dc774a124878253..5b715f598e6146b880f1a2fc81ffe1e30a24405c 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/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>

diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp
index bd31dd9744b88481e444b235462e312a1a94e2b2..d5aeff7bbb3b6472f0135475a2a6860c41d57526 100644 (file)
--- a/src/mac/classic/dcclient.cpp
+++ b/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"
 

diff --git a/src/mac/classic/dnd.cpp b/src/mac/classic/dnd.cpp
index 43cc599f1af61953e3de57692c20f2ee75f17941..1265d89eae193d5c7dd339d07255ed1061729107 100644 (file)
--- a/src/mac/classic/dnd.cpp
+++ b/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"
 

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 9916e92baef988247e9b15b8d43ad1ba3eef9812..613d60912c216609690f5996a19ab07afe171cc2 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/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)

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index aebb686c12dd0d0c382587588307c8b51dc1f27c..b43752efb9f31bb1cbe9fe94e2b08b72640ed116 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/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

diff --git a/src/mac/classic/toplevel.cpp b/src/mac/classic/toplevel.cpp
index 7879d277915235311385ed4c15bba9c2fd025453..aa5bc6892dc62db276adbd12d5aa676d6b8fe144 100644 (file)
--- a/src/mac/classic/toplevel.cpp
+++ b/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"

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index 1ec5da6c11091d9cc1804f17d1fc26b2f85a6dfc..65a6371dbd7b03330807bd50c2652d3b06514a90 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/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
 

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 40a506ca96e9201856471a162c542460fdb8d8fc..15e772930256e6496d05784aa08335ce91466fd9 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/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"

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index afa7e6754bb5dce3eae316d3fb34e11affc2f721..2da126aed0dbe7a55f6f14e8f8966ac3e9255004 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/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"

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index 78f94c3182b2fa2ebfef30404c68b2a917748aac..45f5e2a571c8ec89be8763979218ccaf25b560bd 100644 (file)
--- a/src/palmos/control.cpp
+++ b/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>

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 7598d4f846482f8c4f298f2c124d0b2b1ce74abf..fc4ab1a954b560da786fb4a9a53024ed1546e77a 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/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>
 

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index cc98629ee9ecec85632f497a6ea155e846f9ae23..da36ee828ff71cc144f8b10afdcac74c5a24a220 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/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"

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 3c4e447a3b83455a9e37acfb5efe4d3bf4dc0c9e..07d4b25a753f47807f91dfcf77db9c9f4426d5c8 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/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"
 
 // ============================================================================

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index e385744196aba7507769d7e6239830fe7a63cb58..33299177722ac7b79beecd9795f2efe06c70a66c 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/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

diff --git a/src/univ/themes/metal.cpp b/src/univ/themes/metal.cpp
index 14ca8f84958f179f4c2a2c04cd798a663327d10d..39647e7eac7b202b9289ec18d67909d1ddae71b3 100644 (file)
--- a/src/univ/themes/metal.cpp
+++ b/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"

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 130c5e4ced0dc34718b91c7f3e8c2d41532cfa2f..6c87d6b89493863dd942ae12032e4fcc13759025 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/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"

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index 2588071b42829aa19624c444a0c0b9273f3f552e..b4bede1c7196b7d6a767345ae5af1a16532a650b 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/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"

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 044a835c7ae5b4ff733c91d0c562cccd9237987a..58248bf16fd686b373b5423ec6f571cea0e18eba 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/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"