From: Włodzimierz Skiba Date: Tue, 30 May 2006 07:34:30 +0000 (+0000) Subject: Include wx/choice.h according to precompiled headers of wx/wx.h (with other minor... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b36e08d0867cf3f6a5a286ce145c0fb80746c290 Include wx/choice.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/cocoa/choice.mm b/src/cocoa/choice.mm index 266a2bdbbc..0da0563835 100644 --- a/src/cocoa/choice.mm +++ b/src/cocoa/choice.mm @@ -13,10 +13,11 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" - #include "wx/choice.h" #include "wx/arrstr.h" #endif //WX_PRECOMP diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index 5a77d70f82..db5fea5e20 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/choiccmn.cpp +// Name: src/common/choiccmn.cpp // Purpose: common (to all ports) wxChoice functions // Author: Vadim Zeitlin // Modified by: @@ -26,8 +26,9 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #endif const wxChar wxChoiceNameStr[] = wxT("choice"); @@ -52,4 +53,3 @@ void wxChoiceBase::Command(wxCommandEvent& event) } #endif // wxUSE_CHOICE - diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index 143115bca6..8b48216dad 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -30,9 +30,9 @@ #ifndef WX_PRECOMP #include "wx/settings.h" + #include "wx/choice.h" #endif -#include "wx/choice.h" #include "wx/imaglist.h" #include "wx/sizer.h" diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 06deb834d5..cdcaa582a4 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -30,6 +30,7 @@ #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/cmndata.h" + #include "wx/choice.h" #endif #include "wx/module.h" @@ -45,7 +46,6 @@ #include "wx/artprov.h" #include "wx/mimetype.h" #include "wx/image.h" -#include "wx/choice.h" #if wxUSE_STATLINE #include "wx/statline.h" @@ -283,7 +283,7 @@ bool wxIsDriveAvailable(const wxString& dirName) #ifdef __WATCOMC__ wxUnusedVar(dirName); #else - if ( dirName.Len() == 3 && dirName[1u] == wxT(':') ) + if ( dirName.length() == 3 && dirName[1u] == wxT(':') ) { wxString dirNameLower(dirName.Lower()); // VS: always return true for removable media, since Win95 doesn't @@ -343,7 +343,7 @@ bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName)) // Check if this is a root directory and if so, // whether the drive is available. - if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':')) + if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':')) { wxString dirNameLower(dirName.Lower()); #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1) @@ -988,12 +988,12 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& childPath.MakeLower(); #endif - if (childPath.Len() <= path2.Len()) + if (childPath.length() <= path2.length()) { - wxString path3 = path2.Mid(0, childPath.Len()); + wxString path3 = path2.Mid(0, childPath.length()); if (childPath == path3) { - if (path3.Len() == path2.Len()) + if (path3.length() == path2.length()) done = true; else done = false; diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 2bbe652c8d..a7999e037b 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -31,10 +31,10 @@ #include "wx/msgdlg.h" #include "wx/bmpbuttn.h" #include "wx/checkbox.h" + #include "wx/choice.h" #endif #include "wx/textctrl.h" -#include "wx/choice.h" #include "wx/stattext.h" #include "wx/longlong.h" #include "wx/sizer.h" @@ -733,7 +733,7 @@ void wxFileCtrl::GoToParentDir() { if (!IsTopMostDir(m_dirName)) { - size_t len = m_dirName.Len(); + size_t len = m_dirName.length(); if (wxEndsWithPathSeparator(m_dirName)) m_dirName.Remove( len-1, 1 ); wxString fname( wxFileNameFromPath(m_dirName) ); @@ -1027,7 +1027,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent, m_dir = wxFILE_SEP_PATH; } - size_t len = m_dir.Len(); + size_t len = m_dir.length(); if ((len > 1) && (wxEndsWithPathSeparator(m_dir))) m_dir.Remove( len-1, 1 ); diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 3dcb4aa42a..80cc353d68 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -26,8 +26,9 @@ #if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #include "wx/utils.h" #include "wx/log.h" #include "wx/brush.h" diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp index 36b29d1027..e3f933106d 100644 --- a/src/msw/wince/choicece.cpp +++ b/src/msw/wince/choicece.cpp @@ -26,8 +26,9 @@ #if wxUSE_CHOICE && defined(__SMARTPHONE__) && defined(__WXWINCE__) +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #include #include "wx/msw/missing.h" #include "wx/msw/winundef.h" diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp index b8940322b3..50551d72a2 100644 --- a/src/os2/choice.cpp +++ b/src/os2/choice.cpp @@ -14,8 +14,9 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #include "wx/utils.h" #include "wx/log.h" #include "wx/settings.h" diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp index e0b31045ce..d9ba679dd6 100644 --- a/src/palmos/choice.cpp +++ b/src/palmos/choice.cpp @@ -25,8 +25,9 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #include "wx/utils.h" #include "wx/log.h" #include "wx/brush.h" diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index 9115f4de78..e8237fef8f 100644 --- a/src/univ/choice.cpp +++ b/src/univ/choice.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/choice.cpp +// Name: src/univ/choice.cpp // Purpose: wxChoice implementation // Author: Vadim Zeitlin // Modified by: @@ -25,8 +25,9 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #include "wx/arrstr.h" #endif diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index a3903f7836..c26bf71eea 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -15,16 +15,15 @@ #pragma hdrstop #endif -#if wxUSE_XRC +#if wxUSE_XRC && wxUSE_CHOICE #include "wx/xrc/xh_choic.h" #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/choice.h" #endif -#include "wx/choice.h" - IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) wxChoiceXmlHandler::wxChoiceXmlHandler() @@ -96,4 +95,4 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_CHOICE