From 1832043f93af07af3f4891d9a95c4d4e1f70eec5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 13 Jun 2006 20:44:51 +0000 Subject: [PATCH] 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 | 1 + src/cocoa/toplevel.mm | 4 +++- src/common/toplvcmn.cpp | 3 ++- src/gtk/settings.cpp | 2 +- src/gtk1/settings.cpp | 2 +- src/mac/carbon/dcclient.cpp | 2 +- src/mac/carbon/dnd.cpp | 4 ++-- src/mac/carbon/listbox.cpp | 3 +-- src/mac/carbon/renderer.cpp | 2 +- src/mac/carbon/statbrma.cpp | 2 +- src/mac/carbon/textctrl.cpp | 6 +++--- src/mac/carbon/toplevel.cpp | 3 ++- src/mac/carbon/uma.cpp | 13 ++++++++----- src/mac/carbon/utils.cpp | 4 +++- src/mac/classic/dcclient.cpp | 2 +- src/mac/classic/dnd.cpp | 2 +- src/mac/classic/listbox.cpp | 3 +-- src/mac/classic/textctrl.cpp | 4 ++-- src/mac/classic/toplevel.cpp | 3 ++- src/mgl/toplevel.cpp | 3 ++- src/msw/toplevel.cpp | 3 ++- src/os2/toplevel.cpp | 3 ++- src/palmos/control.cpp | 2 +- src/palmos/slider.cpp | 3 +-- src/palmos/toplevel.cpp | 3 ++- src/univ/statusbr.cpp | 3 +-- src/univ/themes/gtk.cpp | 2 +- src/univ/themes/metal.cpp | 2 +- src/univ/themes/win32.cpp | 2 +- src/univ/topluniv.cpp | 5 +++-- src/x11/toplevel.cpp | 3 ++- 31 files changed, 56 insertions(+), 43 deletions(-) diff --git a/include/wx/wx.h b/include/wx/wx.h index 22cc188d52..2ce5db4d08 100644 --- 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 97f32f8387..842251756b 100644 --- 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 bf2742a04e..a6c9133dbd 100644 --- 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 bc6ee6a3c8..dd756beec0 100644 --- 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 a5348ebaad..b7b1283e83 100644 --- 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 #include diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 6621fbe33b..23d159b764 100644 --- 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 ab82e4c481..456a2a90b8 100644 --- 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 54393ffdf3..5a0858ee35 100644 --- 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 6735b1f62b..8bc466e488 100644 --- 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 1ac0683501..ccecc33a58 100644 --- 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 93c0feae07..7e06fb7eda 100644 --- 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 0211fa1a4a..7c57eeed86 100644 --- 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 d5f59cef31..91b3ed5f7b 100644 --- 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 +# include #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 a0ccab3f28..5b715f598e 100644 --- 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 diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp index bd31dd9744..d5aeff7bbb 100644 --- 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 43cc599f1a..1265d89eae 100644 --- 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 9916e92bae..613d60912c 100644 --- 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 aebb686c12..b43752efb9 100644 --- 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 7879d27791..aa5bc6892d 100644 --- 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 1ec5da6c11..65a6371dbd 100644 --- 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 40a506ca96..15e7729302 100644 --- 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 afa7e6754b..2da126aed0 100644 --- 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 78f94c3182..45f5e2a571 100644 --- 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 diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index 7598d4f846..fc4ab1a954 100644 --- 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 #include diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp index cc98629ee9..da36ee828f 100644 --- 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 3c4e447a3b..07d4b25a75 100644 --- 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 e385744196..3329917772 100644 --- 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 14ca8f8495..39647e7eac 100644 --- 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 130c5e4ced..6c87d6b894 100644 --- 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 2588071b42..b4bede1c71 100644 --- 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 044a835c7a..58248bf16f 100644 --- 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" -- 2.45.2