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

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 9d71b875206a5d73a70e5b7b813eee72d5efcc2a..22cc188d52b43ce6ebbd78985e3b81957c2e8127 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -18,6 +18,7 @@
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/string.h"
+#include "wx/arrstr.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/event.h"

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 2e1430356e94485980b2f345ebc5bc302c78a8f4..19885d4a39275cc9445b2c340946a49f279db263 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -31,10 +31,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/arrstr.h"
 #endif //WX_PRECOMP
 
-#include "wx/arrstr.h"
-
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
 #include "wx/file.h"
@@ -309,10 +308,10 @@ enum Bracket
 wxString wxExpandEnvVars(const wxString& str)
 {
   wxString strResult;
-  strResult.Alloc(str.Len());
+  strResult.Alloc(str.length());
 
   size_t m;
-  for ( size_t n = 0; n < str.Len(); n++ ) {
+  for ( size_t n = 0; n < str.length(); n++ ) {
     switch ( str[n] ) {
 #ifdef  __WXMSW__
       case wxT('%'):
@@ -325,7 +324,7 @@ wxString wxExpandEnvVars(const wxString& str)
               bracket = Bracket_Windows;
             else
           #endif  //WINDOWS
-          if ( n == str.Len() - 1 ) {
+          if ( n == str.length() - 1 ) {
             bracket = Bracket_None;
           }
           else {
@@ -347,7 +346,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           m = n + 1;
 
-          while ( m < str.Len() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
+          while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;
 
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
@@ -372,7 +371,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           // check the closing bracket
           if ( bracket != Bracket_None ) {
-            if ( m == str.Len() || str[m] != (wxChar)bracket ) {
+            if ( m == str.length() || str[m] != (wxChar)bracket ) {
               // under MSW it's common to have '%' characters in the registry
               // and it's annoying to have warnings about them each time, so
               // ignroe them silently if they are not used for env vars
@@ -398,7 +397,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
       case '\\':
         // backslash can be used to suppress special meaning of % and $
-        if ( n != str.Len() - 1 &&
+        if ( n != str.length() - 1 &&
                 (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
           strResult += str[++n];
 

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index a70624c27944101b56605113bae1688b455db256..9b385e5a188c62d23211bb01812802ae27ddcebb 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -29,9 +29,9 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/filefn.h"
+    #include "wx/arrstr.h"
 #endif //WX_PRECOMP
 
-#include "wx/arrstr.h"
 #include "wx/dir.h"
 
 // ============================================================================
@@ -236,4 +236,3 @@ size_t wxDir::GetAllFiles(const wxString& dirname,
 
     return nFiles;
 }
-

diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index a5967226a8b6108baf176dde454c0c02d3f6d5ce..cb3c3429bbc6f7bc7b63de8a2b6971d412ac5de3 100644 (file)
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -31,10 +31,9 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/string.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index f69e8e6a73f8a7a6d86e0db770db71a7023fbe12..5bdae9d7fbc5f34286608c4179b565b73428a1db 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tokenzr.cpp
+// Name:        src/common/tokenzr.cpp
 // Purpose:     String tokenizer
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin (almost full rewrite)
@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/tokenzr.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 // Required for wxIs... functions
 #include <ctype.h>

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 8c0789964d23ce688a1afc10a1d06cb04721c38b..a7f05f679afed006baec1e027f89a933723f5465 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -12,7 +12,10 @@
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 // FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in
 // favour of GtkComboBox.

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index f6147a9a79f7097fe85435ab8828ffbc790df943..6549733c33c8af19a978ff13aa89c5f4a4eb3aef 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -18,10 +18,9 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 // We use GtkCombo which has been deprecated since GTK+ 2.3.0
 // in favour of GtkComboBox for <GTK2.4 runtime
 // We also use GtkList

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index f0fba8492d31fc9a071e6f1496cecca3d2f06792..d27e0502adca825679efe3952104224302890fdf 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -22,9 +22,9 @@
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/checklst.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
 #include "wx/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index e1c2a36b50c1f8e4bcf6499b53d0cb9272288d94..1372a2398f68ad88e60674d6d74bea915134d057 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -12,7 +12,10 @@
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 #include "wx/gtk1/private.h"
 

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 7a579475c20b952dd83faea575f5dc8ffc5e9cbb..ea3d169aac8c1d4876b86f98663f4288117c57d2 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -18,10 +18,9 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index f9503fa3c436aa8dbe80c264f9e94adbcede8d80..ca9fb3016c39ab36b8d375114eed7b5bc34bfc9b 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -20,9 +20,9 @@
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/checklst.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
 #include "wx/gtk1/private.h"
 
 #if wxUSE_TOOLTIPS

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index dcaed50c21a6798b19f72295bd1d48ec8fd215c0..87906f151a18bb2bfa4516c3acbbe2d08d4ea718 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -17,7 +17,10 @@
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 #include "wx/mac/uma.h"
 
@@ -37,7 +40,7 @@ public:
     ~wxMacDataBrowserCheckListControl();
 
     virtual wxMacListBoxItem* CreateItem();
-    
+
     virtual bool            MacIsChecked(unsigned int n) const;
     virtual void            MacCheck(unsigned int n, bool bCheck = true);
 };
@@ -87,7 +90,7 @@ bool wxCheckListBox::Create(
 
     MacPostControlCreate(pos,size);
 
-       InsertItems( n , choices , 0 );
+    InsertItems( n , choices , 0 );
 
     // Needed because it is a wxControlWithItems
     SetBestSize( size );
@@ -119,9 +122,9 @@ void wxCheckListBox::Check(unsigned int item, bool check)
     }
 }
 
-wxMacCheckListControl* wxCheckListBox::GetPeer() const 
-{ 
-    return dynamic_cast<wxMacCheckListControl*>(m_peer); 
+wxMacCheckListControl* wxCheckListBox::GetPeer() const
+{
+    return dynamic_cast<wxMacCheckListControl*>(m_peer);
 }
 
 const short kCheckboxColumnId = 1026;
@@ -153,14 +156,14 @@ wxMacDataBrowserCheckListControl::wxMacDataBrowserCheckListControl( wxListBox *p
         kDataBrowserPropertyIsMutable
         | kDataBrowserTableViewSelectionColumn
         | kDataBrowserDefaultPropertyFlags;
-        
+
     err = AddColumn( &columnDesc, 0 );
     verify_noerr( err );
 }
 
 wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()
 {
-    
+
 }
 
 class wxMacCheckListBoxItem : public wxMacListBoxItem
@@ -170,15 +173,15 @@ public :
     {
         m_isChecked = false;
     }
-    
+
     ~wxMacCheckListBoxItem()
     {
     }
-    
+
     virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
         DataBrowserPropertyID property,
         DataBrowserItemDataRef itemData,
-        bool changeValue ) 
+        bool changeValue )
     {
         OSStatus err = errDataBrowserPropertyNotSupported;
 
@@ -218,7 +221,7 @@ public :
                     wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
                     event.SetInt( owner->GetLineFromItem( this ) );
                     event.SetEventObject( checklist );
-                    checklist->GetEventHandler()->ProcessEvent( event );               
+                    checklist->GetEventHandler()->ProcessEvent( event );
                 }
                 break;
 
@@ -233,35 +236,35 @@ public :
         return err;
     }
 
-    void Check( bool check ) 
+    void Check( bool check )
     {
         m_isChecked = check;
     }
-    bool IsChecked() const 
+    bool IsChecked() const
     {
-         return m_isChecked; 
+         return m_isChecked;
     }
 
 protected :
     bool        m_isChecked;
 };
 
-wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem() 
+wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem()
 {
     return new wxMacCheckListBoxItem();
 }
 
-void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck) 
+void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck)
 {
     wxMacCheckListBoxItem* item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n) );
     item->Check( bCheck);
     UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);
 }
 
-bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const 
+bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const
 {
     wxMacCheckListBoxItem * item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n ) );
-    return item->IsChecked();    
+    return item->IsChecked();
 }
 
 

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index bbe19045df17e912f0d7b15c989172e4a45ff3df..54393ffdf33bfcfc3ee86528022cb88d88460a06 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -23,6 +23,7 @@
     #include "wx/utils.h"
     #include "wx/button.h"
     #include "wx/settings.h"
+    #include "wx/arrstr.h"
 #endif
 
 #include "wx/toplevel.h"
@@ -34,7 +35,6 @@ END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"
 #include "wx/dynarray.h"
-#include "wx/arrstr.h"
 
 // ============================================================================
 // list box control implementation

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index fb9a2b6efc0693a1760f651ed4f4ae97d133a1a6..102bc58cbc531e1445ba4c7cc67fe0d02ea567db 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/radiobut.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

diff --git a/src/mac/classic/checklst.cpp b/src/mac/classic/checklst.cpp
index 96a18ed14303f4baf1ef89aef82c87fa9b15ddc0..184928c7df31ab792a3991dd4e2b4d02f67f1341 100644 (file)
--- a/src/mac/classic/checklst.cpp
+++ b/src/mac/classic/checklst.cpp
@@ -18,7 +18,10 @@
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 #include "wx/mac/uma.h"
 #include <Appearance.h>

diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp
index 35cba1fcbeaa9819b110dcfc81a5b4dcf368a3c0..e29ce47f4c25235b35656a4f2c8b7695d1018acb 100644 (file)
--- a/src/mac/classic/radiobox.cpp
+++ b/src/mac/classic/radiobox.cpp
@@ -21,9 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/radiobut.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index a7e8eacd04a92784e12f9e80b92cebdcab2e826d..ea21e7e19263a2ee00dfb436ace47dbce04876a4 100644 (file)
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -19,7 +19,10 @@
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 // ============================================================================
 // implementation

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index ba418a03e99f014d846ff7100ea802de8453f7bb..11153b562dd05bc8e7e5b6dbdbbdd410e3332842 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -23,10 +23,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 956dfd73392f1c4db3f5d5b7b46567d472870fef..de2b16e9b11252cd95407462bb3cc93b8764da7e 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -15,7 +15,10 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index f65ae3d8eadf91e0fd85950db28d6ddc29485ed5..107df40f0bf92fab9ec96389f7270b1a9eac5490 100644 (file)
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -15,7 +15,10 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 9845531ed1cb394cccf2a6517534f2d09a71b42c..d0cd48fdec4f89f0eef84f43eb5f5f3b96908775 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -21,6 +21,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
+    #include "wx/arrstr.h"
 #endif
 
 #ifdef __VMS
@@ -28,8 +29,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/arrstr.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 09b06715d1f81937d6003d77006dfdc1ca395db1..35faf81059772797b9ac610f83aee58dd4b09f78 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -22,10 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/palmos/volume.cpp b/src/palmos/volume.cpp
index 042acfd85b6b47b552ba1f24163d303599126e11..a73244f012432511b5cbfbf1cca5c922766f0974 100644 (file)
--- a/src/palmos/volume.cpp
+++ b/src/palmos/volume.cpp
@@ -32,9 +32,9 @@
         #include "wx/icon.h"
     #endif
     #include "wx/intl.h"
+    #include "wx/arrstr.h"
 #endif // WX_PRECOMP
 
-#include "wx/arrstr.h"
 #include "wx/hashmap.h"
 
 #include <VFSMgr.h>