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

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 266a2bdbbc424349ec8339ef87613bfdad0385a0..0da0563835ee64d5c96a43b0809a51ab51f8f550 100644 (file)
--- 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 5a77d70f826db3a88cba89ab6508ebcfc83c8fd5..db5fea5e20adcd11e8c5a4c1a3ce2876297d4aab 100644 (file)
--- 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 143115bca6e287fef43ee17aa60a5c375f1b7bce..8b48216dad5dbae1bce3e3d18944f9cee1b02851 100644 (file)
--- 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 06deb834d5c645dab387704e6320603878bc25da..cdcaa582a4905e3cdd1c1da78091e5fe91c19165 100644 (file)
--- 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 2bbe652c8da4eed31e05852ef30b1a233afa5254..a7999e037b5f1bc785dfc1fc2bf3d4d7b7919cab 100644 (file)
--- 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 3dcb4aa42abc2af7a3997da271200bd98c1e7fa7..80cc353d68e1a53b49b23bf77ce1baefdaee01a8 100644 (file)
--- 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 36b29d1027c920c198562fc42fc6f760aed7ec39..e3f933106d70bd7d0c0fb586ef21eb9c4d9a27f8 100644 (file)
--- 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 <commctrl.h>
     #include "wx/msw/missing.h"
     #include "wx/msw/winundef.h"

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index b8940322b37ee4e5900101b8780052c3417e9b23..50551d72a2e732c83ff4f338826eedd445c3c4d7 100644 (file)
--- 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 e0b31045ce33a58484b73bb9878456ef8459def3..d9ba679dd68e36d95279d1cc0ae48d68a90032e7 100644 (file)
--- 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 9115f4de787f791d8ced8f80e52f2982a118a93c..e8237fef8f742a6a56f1441b054d2e09564101b5 100644 (file)
--- 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 a3903f78368a641aefc2159d372b2857d455a924..c26bf71eea695b6e33abbf4a39a62568dc058b32 100644 (file)
--- 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