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

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

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index 12012e680708bd2092ffac0a1850254578bfb95d..dd154cbaeed91e366278377b91836cc87025b811 100644 (file)
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/cmdline.cpp
+// Name:        src/common/cmdline.cpp
 // Purpose:     wxCmdLineParser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -24,18 +24,18 @@
     #pragma hdrstop
 #endif
 
-#include "wx/cmdline.h"
-
-#if wxUSE_CMDLINE_PARSER
-
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/app.h"
-    #include "wx/dynarray.h"
 #endif //WX_PRECOMP
 
+#include "wx/cmdline.h"
+
+#if wxUSE_CMDLINE_PARSER
+
 #include <ctype.h>
 
 #include "wx/datetime.h"

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 4fc0f8ce40d65314f62adfac9c873517039ce452..ead8099c32aa42ca7be372d89d46b4487de4a1ce 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dynarray.cpp
+// Name:        src/common/dynarray.cpp
 // Purpose:     implementation of wxBaseArray class
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -13,13 +13,17 @@
 // headers
 // ============================================================================
 
+// For compilers that support precompilation, includes "wx.h".
 #include  "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/dynarray.h"
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif //WX_PRECOMP
+
 #include "wx/intl.h"
 
 #include <stdlib.h>

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 385b76df94279ac0194b2184894c92c638239652..2e4468252f2ebe63e57aa318e7a38718ef3db1ba 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -14,21 +14,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
+// For compilers that support precompilation, includes "wx.h".
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif  //__BORLANDC__
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
 
 #ifndef   WX_PRECOMP
-  #include  "wx/string.h"
-  #include  "wx/intl.h"
+    #include  "wx/dynarray.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
 #endif  //WX_PRECOMP
 
 #include  "wx/app.h"
-#include  "wx/dynarray.h"
 #include  "wx/file.h"
 #include  "wx/log.h"
 #include  "wx/textfile.h"

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 959224c908482fe8f464e90118022929e8fd7f52..c776d48846f5737f3417f844c6e135798262f4ad 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -68,9 +68,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/file.h"
+    #include "wx/dynarray.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/file.h"
 #endif
 
 #include "wx/filename.h"
@@ -2047,7 +2048,6 @@ public :
   OSType m_creator ;
 }  ;
 
-#include "wx/dynarray.h"
 WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ;
 
 bool gMacDefaultExtensionsInited = false ;

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 443c1b0c6758c6244ce7aceb7b60252039203952..7556b41fb2420c9a4c45139c9a33813ab38a3ede 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -39,28 +39,26 @@
 
 #if wxUSE_INTL
 
-// standard headers
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/debug.h"
+    #include "wx/utils.h"
+#endif // WX_PRECOMP
 
 #ifndef __WXWINCE__
-#include <locale.h>
+    #include <locale.h>
 #endif
 
+// standard headers
 #include <ctype.h>
 #include <stdlib.h>
 #ifdef HAVE_LANGINFO_H
   #include <langinfo.h>
 #endif
 
-// wxWidgets
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/debug.h"
-    #include "wx/utils.h"
-    #include "wx/dynarray.h"
-#endif // WX_PRECOMP
-
 #ifdef __WIN32__
     #include "wx/msw/private.h"
 #elif defined(__UNIX_LIKE__)

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 02d5c94b8125d3cf1e94f4c0d7c5b5c36d754e18..6350c107f29b0a2b6adf95d69daa7e21facb0d9b 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -27,8 +27,8 @@
 #if wxUSE_LISTBOX
 
 #ifndef WX_PRECOMP
-    #include "wx/listbox.h"
     #include "wx/dynarray.h"
+    #include "wx/listbox.h"
     #include "wx/arrstr.h"
 #endif
 

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 104285eac58797eeac8c28177d0b971b94882e07..326eefa0af26ce3b81554f1d63d094b400926e79 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/mimecmn.cpp
+// Name:        src/common/mimecmn.cpp
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -28,7 +28,8 @@
 #if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
-  #include "wx/string.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
 #endif //WX_PRECOMP
 
 #include "wx/module.h"
@@ -36,7 +37,6 @@
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #include "wx/mimetype.h"
@@ -459,7 +459,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 
 wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
 
-/* static */ 
+/* static */
 void wxMimeTypesManagerFactory::SetFactory( wxMimeTypesManagerFactory *factory )
 {
     if (wxMimeTypesManagerFactory::m_factory)
@@ -468,7 +468,7 @@ void wxMimeTypesManagerFactory::SetFactory( wxMimeTypesManagerFactory *factory )
     wxMimeTypesManagerFactory::m_factory = factory;
 }
 
-/* static */ 
+/* static */
 wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::GetFactory()
 {
     if (!wxMimeTypesManagerFactory::m_factory)

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 46c0a4cbb7902c92566e7901132e8fcb2e9d7b7f..3d77628f4a9ae81312f60ae97fb0144865615120 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -19,9 +19,9 @@
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/choice.h"
     #include "wx/combobox.h"
     #include "wx/radiobox.h"
@@ -39,13 +39,13 @@
 #include "wx/spinctrl.h"
 
 #if wxUSE_SPINBTN
-  #include "wx/spinbutt.h"
+    #include "wx/spinbutt.h"
 #endif
 #if wxUSE_CHECKLISTBOX
-  #include "wx/checklst.h"
+    #include "wx/checklst.h"
 #endif
 #if wxUSE_TOGGLEBTN
-  #include "wx/tglbtn.h"
+    #include "wx/tglbtn.h"
 #endif
 
 #include "wx/valgen.h"

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 924faa76154b6d0e9e0331636cd58e79a12cf2cb..99b530c7d72e1cb22929b705d057ed3244f53ac6 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -24,8 +24,8 @@
 #if wxUSE_LISTCTRL
 
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
     #include "wx/dynarray.h"
+    #include "wx/app.h"
     #include "wx/dcscreen.h"
     #include "wx/textctrl.h"
 #endif

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index a0d65e54010ede4254116fd562fecb2d25c07487..cc241866a7df76d25770104ee3b5f4b40fd3ede2 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -13,8 +13,11 @@
 
 #if wxUSE_LISTBOX
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/listbox.h"
-#include "wx/dynarray.h"
 #include "wx/arrstr.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
@@ -25,7 +28,7 @@
 #include "wx/gtk/treeentry_gtk.h"
 
 #if wxUSE_TOOLTIPS
-#include "wx/tooltip.h"
+    #include "wx/tooltip.h"
 #endif
 
 #include <gdk/gdk.h>

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index ebfe1b76cbfe2c19dd2ca86cafbbb0a8ab87f778..4648ad6b988858dc34fc98c6139fc2c48dea152d 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -12,8 +12,11 @@
 
 #if wxUSE_LISTBOX
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/listbox.h"
-#include "wx/dynarray.h"
 #include "wx/arrstr.h"
 #include "wx/utils.h"
 #include "wx/intl.h"

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 250f7f2e8c963bd61a39b3bf8773b3b1b8a961b4..8c016573cd70b8ec18e5993286315f75b36a1a6d 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WXPRECOMP
     #include "wx/object.h"
+    #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 
@@ -53,7 +54,6 @@
 #include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
-#include "wx/dynarray.h"
 #include "wx/choicdlg.h"
 #include "wx/settings.h"
 

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 317df03cc4a1d6e2d89b5d1050a8ab0ca190622f..bb2aaafd71145ff5919dc180919c6ab02d586a4f 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WXPRECOMP
     #include "wx/object.h"
+    #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 
@@ -54,7 +55,6 @@
 #include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
-#include "wx/dynarray.h"
 #include "wx/choicdlg.h"
 #include "wx/settings.h"
 

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 8f4f0f50c076c164044f375928e13382da1d276f..ace347c57a0e7e0fb619503a150fedd91efe4b36 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -16,6 +16,7 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
+    #include "wx/dynarray.h"
     #include "wx/brush.h"
     #include "wx/colour.h"
     #include "wx/dc.h"
@@ -25,7 +26,6 @@
 #include "wx/html/htmlwin.h"
 #include "wx/settings.h"
 #include "wx/module.h"
-#include "wx/dynarray.h"
 
 #include <stdlib.h>
 

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index b5feaccbf19a354dfe51466f807a17566399153f..0abe5400ddc3ae4a86e76bcaa93a1f6a11da6961 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -16,6 +16,7 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
+    #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif
@@ -26,7 +27,6 @@
 #include "wx/fontmap.h"
 #include "wx/html/htmldefs.h"
 #include "wx/html/htmlpars.h"
-#include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 
 #ifdef __WXWINCE__

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 59881ad023c4c55b75c7343be025faf69c724fc6..a81f2c102319928943b2441b926190c7094ed15b 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -16,6 +16,7 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
+    #include "wx/dynarray.h"
     #include "wx/dc.h"
     #include "wx/scrolwin.h"
     #include "wx/timer.h"
@@ -28,7 +29,6 @@
 
 #include "wx/image.h"
 #include "wx/gifdecod.h"
-#include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/artprov.h"
 #include "wx/math.h"

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index d6bad4945efe950b41a98b669047ff920c61e21c..d5af1de13a75c47c734ea9a25e2560a010dfc02c 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -26,8 +26,8 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
-   #include "wx/dynarray.h"
-   #include "wx/log.h"
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
 #endif
 
 #ifdef __DARWIN__

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 5b7ef94b2245bf3ebdfc66a0090fe28ed4f60999..3d6eac95daaecba9e9f15dcbe3d2a6e99b1e768d 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,12 +13,15 @@
 
 #if wxUSE_LISTBOX
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
-#include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
@@ -29,8 +32,8 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"
-#include  "wx/dynarray.h"
-#include  "wx/arrstr.h"
+#include "wx/dynarray.h"
+#include "wx/arrstr.h"
 
 // ============================================================================
 // list box control implementation
@@ -57,9 +60,9 @@ bool wxListBox::Create(
         style, validator, name );
 }
 
-wxMacListControl* wxListBox::GetPeer() const 
-{ 
-    return dynamic_cast<wxMacListControl*>(m_peer); 
+wxMacListControl* wxListBox::GetPeer() const
+{
+    return dynamic_cast<wxMacListControl*>(m_peer);
 }
 
 bool wxListBox::Create(
@@ -80,7 +83,7 @@ bool wxListBox::Create(
 
     if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
         return false;
-    
+
     wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style );
     control->SetClientDataType( m_clientDataItemsType );
     m_peer = control;
@@ -133,7 +136,7 @@ int wxListBox::DoAppend(const wxString& item)
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 {
     Clear();
-    
+
     unsigned int n = choices.GetCount();
 
     for ( size_t i = 0; i < n; ++i )
@@ -450,22 +453,22 @@ wxMacListBoxItem::~wxMacListBoxItem()
 {
 }
 
-void wxMacListBoxItem::SetOrder( SInt32 order ) 
+void wxMacListBoxItem::SetOrder( SInt32 order )
 {
     m_order = order;
 }
 
-SInt32 wxMacListBoxItem::GetOrder() const 
+SInt32 wxMacListBoxItem::GetOrder() const
 {
     return m_order;
 }
 
-void wxMacListBoxItem::SetData( void* data) 
+void wxMacListBoxItem::SetData( void* data)
 {
     m_data = data;
 }
 
-void* wxMacListBoxItem::GetData() const 
+void* wxMacListBoxItem::GetData() const
 {
     return m_data;
 }
@@ -481,8 +484,8 @@ const wxString& wxMacListBoxItem::GetLabel() const
     return m_label;
 }
 
-bool wxMacListBoxItem::IsLessThan(wxMacDataItemBrowserControl *owner , 
-    const wxMacDataItem* rhs, 
+bool wxMacListBoxItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
+    const wxMacDataItem* rhs,
     DataBrowserPropertyID sortProperty) const
 {
     const wxMacListBoxItem* otherItem = dynamic_cast<const wxMacListBoxItem*>(rhs);
@@ -507,7 +510,7 @@ bool wxMacListBoxItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
 OSStatus wxMacListBoxItem::GetSetData( wxMacDataItemBrowserControl *owner ,
     DataBrowserPropertyID property,
     DataBrowserItemDataRef itemData,
-    bool changeValue ) 
+    bool changeValue )
 {
     OSStatus err = errDataBrowserPropertyNotSupported;
     wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
@@ -545,14 +548,14 @@ OSStatus wxMacListBoxItem::GetSetData( wxMacDataItemBrowserControl *owner ,
     return err;
 }
 
-void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner , 
+void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
     DataBrowserItemNotification message,
     DataBrowserItemDataRef itemData ) const
 {
     wxMacDataBrowserListControl *lb = dynamic_cast<wxMacDataBrowserListControl*>(owner);
 
     // we want to depend on as little as possible to make sure tear-down of controls is safe
-            
+
     if ( message == kDataBrowserItemRemoved)
     {
         if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )
@@ -563,7 +566,7 @@ void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
         delete this;
         return;
     }
-    
+
     wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));
 
@@ -612,7 +615,7 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const
     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     m_stringSorted = style & wxLB_SORT;
-    
+
     DataBrowserSelectionFlags  options = kDataBrowserDragSelect;
     if ( style & wxLB_MULTIPLE )
     {
@@ -628,7 +631,7 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxListBox *peer, const
     }
     err = SetSelectionFlags( options );
     verify_noerr( err );
-    
+
     DataBrowserListViewColumnDesc columnDesc;
     columnDesc.headerBtnDesc.titleOffset = 0;
     columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
@@ -693,26 +696,26 @@ wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
 }
 
 
-wxMacListBoxItem* wxMacDataBrowserListControl::CreateItem() 
+wxMacListBoxItem* wxMacDataBrowserListControl::CreateItem()
 {
     return new wxMacListBoxItem();
 }
 
 wxListBox * wxMacDataBrowserListControl::GetPeer() const
-{ 
-    return wxDynamicCast( wxMacControl::GetPeer() , wxListBox ); 
+{
+    return wxDynamicCast( wxMacControl::GetPeer() , wxListBox );
 }
 
-wxClientDataType wxMacDataBrowserListControl::GetClientDataType() const 
+wxClientDataType wxMacDataBrowserListControl::GetClientDataType() const
 {
      return m_clientDataItemsType;
 }
-void wxMacDataBrowserListControl::SetClientDataType(wxClientDataType clientDataItemsType) 
+void wxMacDataBrowserListControl::SetClientDataType(wxClientDataType clientDataItemsType)
 {
     m_clientDataItemsType = clientDataItemsType;
 }
 
-unsigned int wxMacDataBrowserListControl::MacGetCount() const 
+unsigned int wxMacDataBrowserListControl::MacGetCount() const
 {
     return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemNoState);
 }
@@ -737,7 +740,7 @@ void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxString& tex
             wxMacListBoxItem* iter = (wxMacListBoxItem*) GetItemFromLine(i);
             iter->SetOrder( iter->GetOrder() + 1 );
         }
-        
+
         SInt32 frontLineOrder = 0;
         if ( n > 0 )
         {
@@ -746,7 +749,7 @@ void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxString& tex
         }
         newItem->SetOrder( frontLineOrder + 1 );
     }
-    
+
     AddItem( wxMacDataBrowserRootContainer, newItem );
 }
 
@@ -755,9 +758,9 @@ void wxMacDataBrowserListControl::MacInsert( unsigned int n, const wxArrayString
     size_t itemsCount = items.GetCount();
     if ( itemsCount == 0 )
         return;
-    
+
     SInt32 frontLineOrder = 0;
-    
+
     if ( !m_stringSorted )
     {
         // increase the order of the lines to be shifted
@@ -887,17 +890,17 @@ wxString wxMacDataBrowserListControl::MacGetString( unsigned int n ) const
     return item->GetLabel();
 }
 
-void wxMacDataBrowserListControl::MacSetClientData( unsigned int n, void * data) 
+void wxMacDataBrowserListControl::MacSetClientData( unsigned int n, void * data)
 {
     wxMacListBoxItem* item = (wxMacListBoxItem*) GetItemFromLine( n);
     item->SetData( data );
     // not displayed, therefore no Update infos to DataBrowser
 }
 
-void * wxMacDataBrowserListControl::MacGetClientData( unsigned int n) const 
+void * wxMacDataBrowserListControl::MacGetClientData( unsigned int n) const
 {
     wxMacListBoxItem * item = (wxMacListBoxItem*) GetItemFromLine( n );
-    return item->GetData();    
+    return item->GetData();
 }
 
 void wxMacDataBrowserListControl::MacScrollTo( unsigned int n )

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index e53d77111fdc8d34443b977f4d91b703244c3965..f0bc4917907b618182c1e1c62627e9e14dfbe50e 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -27,23 +27,23 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
-  #include "wx/string.h"
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
 
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+    #if wxUSE_GUI
+        #include "wx/icon.h"
+    #endif
 #endif
 
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #include "wx/mac/mimetype.h"

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 1fa8fb492cd965b3610b78b27985a50be3211b52..c17eb429fc7a694927488702df3c135d1b184bd6 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -6,21 +6,23 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/timer.h"
 
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+    #include "wx/mac/private.h"
 #endif
 
-#include "wx/dynarray.h"
-
 #ifndef __DARWIN__
-#include <Timer.h>
+    #include <Timer.h>
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

diff --git a/src/mac/classic/display.cpp b/src/mac/classic/display.cpp
index 069570e5d104fba134d95741a8674d4830ba52f1..9798492bc9e0959eecaaad92207691dfd57a2f03 100644 (file)
--- a/src/mac/classic/display.cpp
+++ b/src/mac/classic/display.cpp
@@ -27,8 +27,8 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
-   #include "wx/dynarray.h"
-   #include "wx/log.h"
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
 #endif
 
 #ifdef __DARWIN__

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 02f93f5c8d4de7e9105785073d5dc8e3b4383a23..0289796b703c80ab638be5f28f5c0d5a4340ed9e 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -13,12 +13,15 @@
 
 #if wxUSE_LISTBOX
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
-#include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"

diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp
index 7a99856444574d0a24b6c82369fd5c750cdb783c..40dd00318d843b35ccd5d22b70153dcd5f1d29f2 100644 (file)
--- a/src/mac/classic/mimetmac.cpp
+++ b/src/mac/classic/mimetmac.cpp
@@ -13,21 +13,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-  #include "wx/string.h"
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #if wxUSE_GUI
+        #include "wx/icon.h"
+    #endif
 #endif //WX_PRECOMP
 
 
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #include "wx/mac/mimetype.h"
@@ -61,7 +61,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 {
-    if ( m_strFileType.Length() > 0 )
+    if ( !m_strFileType.empty() )
     {
         *mimeType = m_strFileType ;
         return true ;
@@ -217,4 +217,3 @@ wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {
     return false;
 }
-

diff --git a/src/mac/classic/timer.cpp b/src/mac/classic/timer.cpp
index 0e55f1cf0e33277347cab8ca17eb78550ab722d3..34e288bcdbb1313b81112fc4aaa07601a63ab80d 100644 (file)
--- a/src/mac/classic/timer.cpp
+++ b/src/mac/classic/timer.cpp
@@ -1,14 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        src/mac/classic/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/timer.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
@@ -20,8 +27,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 #include <Timer.h>
 #endif
 
-#include "wx/dynarray.h"
-
 typedef struct MacTimerInfo
 {
     TMTask m_task;
@@ -38,7 +43,7 @@ static pascal void MacTimerProc( TMTask * t )
 }
 
 // we need this array to track timers that are being deleted within the Notify procedure
-// adding the timer before the Notify call and checking after whether it still is in there 
+// adding the timer before the Notify call and checking after whether it still is in there
 // as the destructor would have removed it from the array
 
 wxArrayPtrVoid gTimersInProcess ;
@@ -47,27 +52,26 @@ static void wxProcessTimer( unsigned long event , void *data )
 {
     if ( !data )
         return ;
-        
+
     wxTimer* timer = (wxTimer*) data ;
-    
+
     if ( timer->IsOneShot() )
         timer->Stop() ;
-        
+
     gTimersInProcess.Add( timer ) ;
-     
+
     timer->Notify();
 
     int index = gTimersInProcess.Index( timer ) ;
-    
+
     if ( index != wxNOT_FOUND )
     {
         gTimersInProcess.RemoveAt( index ) ;
-        
+
         if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
         {
             PrimeTime( (QElemPtr)  &timer->m_info->m_task , timer->GetInterval() ) ;
         }
-    
     }
 }
 
@@ -82,7 +86,7 @@ void wxTimer::Init()
     m_info->m_timer = this ;
 }
 
-bool wxTimer::IsRunning() const 
+bool wxTimer::IsRunning() const
 {
     // as the qType may already indicate it is elapsed, but it
     // was not handled internally yet
@@ -98,15 +102,15 @@ wxTimer::~wxTimer()
     }
     int index = gTimersInProcess.Index( this ) ;
     if ( index != wxNOT_FOUND )
-        gTimersInProcess.RemoveAt( index ) ;  
+        gTimersInProcess.RemoveAt( index ) ;
 }
 
 bool wxTimer::Start(int milliseconds,bool mode)
 {
     (void)wxTimerBase::Start(milliseconds, mode);
 
-    wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeout") );
-    wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
+    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
+    wxCHECK_MSG( m_info->m_task.tmAddr == NULL , false, wxT("attempting to restart a timer") );
 
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
     m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
@@ -119,7 +123,7 @@ bool wxTimer::Start(int milliseconds,bool mode)
     m_info->m_timer = this ;
     InsXTime((QElemPtr) &m_info->m_task ) ;
     PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ;
-    return TRUE;
+    return true;
 }
 
 void wxTimer::Stop()
@@ -132,6 +136,3 @@ void wxTimer::Stop()
     }
     wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
 }
-
-
-

diff --git a/src/mac/corefoundation/hid.cpp b/src/mac/corefoundation/hid.cpp
index 3717bcaefea77cb0e21ded7b869e0fa363c021d5..276571c883f166d8ff9b342f6f5aee13ebad88a5 100644 (file)
--- a/src/mac/corefoundation/hid.cpp
+++ b/src/mac/corefoundation/hid.cpp
@@ -27,6 +27,10 @@
 //DARWIN _ONLY_
 #ifdef __DARWIN__
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/mac/corefoundation/hid.h"
 #include "wx/string.h"
 #include "wx/log.h"
@@ -34,7 +38,6 @@
 
 #include "wx/utils.h"
 #include "wx/module.h"
-#include "wx/dynarray.h"
 
 // ============================================================================
 // implementation
@@ -49,12 +52,12 @@
 // ----------------------------------------------------------------------------
 // wxHIDDevice::Create
 //
-//  nClass is the HID Page such as 
+//  nClass is the HID Page such as
 //      kHIDPage_GenericDesktop
 //  nType is the HID Usage such as
 //      kHIDUsage_GD_Joystick,kHIDUsage_GD_Mouse,kHIDUsage_GD_Keyboard
 //  nDev is the device number to use
-// 
+//
 // ----------------------------------------------------------------------------
 bool wxHIDDevice::Create (int nClass, int nType, int nDev)
 {
@@ -97,13 +100,13 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
 
     //Now get the maching services
     io_iterator_t pIterator;
-    if( IOServiceGetMatchingServices(m_pPort, 
+    if( IOServiceGetMatchingServices(m_pPort,
                         pDictionary, &pIterator) != kIOReturnSuccess )
     {
         wxLogSysError(_T("No Matching HID Services"));
         return false;
     }
-    
+
     //Were there any devices matched?
     if(pIterator == 0)
         return false; // No devices found
@@ -134,15 +137,15 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
         //
 
         //Get [product] name
-        CFStringRef cfsProduct = (CFStringRef) 
+        CFStringRef cfsProduct = (CFStringRef)
             CFDictionaryGetValue(pDictionary, CFSTR(kIOHIDProductKey));
-        m_szProductName = 
-            wxMacCFStringHolder( cfsProduct, 
-                                    false 
+        m_szProductName =
+            wxMacCFStringHolder( cfsProduct,
+                                    false
                                ).AsString();
 
         //Get the Product ID Key
-        CFNumberRef cfnProductId = (CFNumberRef) 
+        CFNumberRef cfnProductId = (CFNumberRef)
             CFDictionaryGetValue(pDictionary, CFSTR(kIOHIDProductIDKey));
         if (cfnProductId)
         {
@@ -150,7 +153,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
         }
 
         //Get the Vendor ID Key
-        CFNumberRef cfnVendorId = (CFNumberRef) 
+        CFNumberRef cfnVendorId = (CFNumberRef)
             CFDictionaryGetValue(pDictionary, CFSTR(kIOHIDVendorIDKey));
         if (cfnVendorId)
         {
@@ -164,9 +167,9 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
         //Create the interface (good grief - long function names!)
         SInt32 nScore;
         IOCFPlugInInterface** ppPlugin;
-        if(IOCreatePlugInInterfaceForService(pObject, 
+        if(IOCreatePlugInInterfaceForService(pObject,
                                              kIOHIDDeviceUserClientTypeID,
-                                             kIOCFPlugInInterfaceID, &ppPlugin, 
+                                             kIOCFPlugInInterfaceID, &ppPlugin,
                                              &nScore) !=  kIOReturnSuccess)
         {
             wxLogSysError(wxT("Could not create HID Interface for product"));
@@ -179,7 +182,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
 
         //Get the HID interface from the plugin to the mach port
         if((*ppPlugin)->QueryInterface(ppPlugin,
-                               CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), 
+                               CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID),
                                (void**) &m_ppDevice) != S_OK)
         {
             wxLogSysError(wxT("Could not get device interface from HID interface"));
@@ -194,12 +197,12 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
             wxLogDebug(_T("HID device: open failed"));
 
         //
-        //Now the hard part - in order to scan things we need "cookies" 
+        //Now the hard part - in order to scan things we need "cookies"
         //
-        CFArrayRef cfaCookies = (CFArrayRef)CFDictionaryGetValue(pDictionary, 
+        CFArrayRef cfaCookies = (CFArrayRef)CFDictionaryGetValue(pDictionary,
                                  CFSTR(kIOHIDElementKey));
         BuildCookies(cfaCookies);
-        
+
         //cleanup
         CFRelease(pDictionary);
         IOObjectRelease(pObject);
@@ -209,7 +212,7 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
 
         return true;
     }
-    
+
     //iterator cleanup
     IOObjectRelease(pIterator);
 
@@ -231,7 +234,7 @@ size_t wxHIDDevice::GetCount (int nClass, int nType)
         wxLogSysError(wxT("Could not create mach port"));
         return false;
     }
-    
+
     //Dictionary that will hold first
     //the matching dictionary for determining which kind of devices we want,
     //then later some registry properties from an iterator (see below)
@@ -260,14 +263,14 @@ size_t wxHIDDevice::GetCount (int nClass, int nType)
 
     //Now get the maching services
     io_iterator_t pIterator;
-    if( IOServiceGetMatchingServices(pPort, 
+    if( IOServiceGetMatchingServices(pPort,
                                      pDictionary, &pIterator) != kIOReturnSuccess )
     {
         wxLogSysError(_T("No Matching HID Services"));
         return false;
     }
-    
-    //If the iterator doesn't exist there are no devices :)    
+
+    //If the iterator doesn't exist there are no devices :)
     if ( !pIterator )
         return 0;
 
@@ -279,11 +282,11 @@ size_t wxHIDDevice::GetCount (int nClass, int nType)
         ++nCount;
         IOObjectRelease(pObject);
     }
-    
+
     //cleanup
     IOObjectRelease(pIterator);
     mach_port_deallocate(mach_task_self(), pPort);
-    
+
     return nCount;
 }//end Create()
 
@@ -341,7 +344,7 @@ void wxHIDDevice::InitCookies(size_t dwSize, bool bQueue)
             wxLogDebug(_T("HID device: create failed"));
         }
     }
-    
+
     //make sure that cookie array is clear
     memset(m_pCookies, 0, sizeof(*m_pCookies) * dwSize);
 }
@@ -361,7 +364,7 @@ bool wxHIDDevice::IsActive(int nIndex)
         //check here
         return false;
     }
-    
+
     IOHIDEventStruct Event;
     (*m_ppDevice)->getElementValue(m_ppDevice, m_pCookies[nIndex], &Event);
     return !!Event.value;
@@ -426,7 +429,7 @@ enum
 // ----------------------------------------------------------------------------
 int wxHIDKeyboard::GetCount()
 {
-    return wxHIDDevice::GetCount(kHIDPage_GenericDesktop, 
+    return wxHIDDevice::GetCount(kHIDPage_GenericDesktop,
                                kHIDUsage_GD_Keyboard);
 }
 
@@ -437,7 +440,7 @@ int wxHIDKeyboard::GetCount()
 // ----------------------------------------------------------------------------
 bool wxHIDKeyboard::Create(int nDev /* = 1*/)
 {
-    return wxHIDDevice::Create(kHIDPage_GenericDesktop, 
+    return wxHIDDevice::Create(kHIDPage_GenericDesktop,
                                kHIDUsage_GD_Keyboard,
                                nDev);
 }
@@ -445,7 +448,7 @@ bool wxHIDKeyboard::Create(int nDev /* = 1*/)
 // ----------------------------------------------------------------------------
 // wxHIDKeyboard::AddCookie
 //
-// Overloaded version of wxHIDDevice::AddCookie that simply does not 
+// Overloaded version of wxHIDDevice::AddCookie that simply does not
 // add a cookie if a duplicate is found
 // ----------------------------------------------------------------------------
 void wxHIDKeyboard::AddCookie(CFTypeRef Data, int i)
@@ -462,9 +465,9 @@ void wxHIDKeyboard::AddCookie(CFTypeRef Data, int i)
 // ----------------------------------------------------------------------------
 void wxHIDKeyboard::BuildCookies(CFArrayRef Array)
 {
-    //Create internal cookie array 
+    //Create internal cookie array
     InitCookies(500);
-    
+
     //Begin recursing in array
     DoBuildCookies(Array);
 }
@@ -478,7 +481,7 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
     for (i = 0; i < CFArrayGetCount(Array); ++i)
     {
         const void* ref = CFDictionaryGetValue(
-                (CFDictionaryRef)CFArrayGetValueAtIndex(Array, i), 
+                (CFDictionaryRef)CFArrayGetValueAtIndex(Array, i),
                 CFSTR(kIOHIDElementKey)
                                               );
 
@@ -493,17 +496,17 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
             // Get the usage #
             //
         CFNumberGetValue(
-                (CFNumberRef) 
-                    CFDictionaryGetValue((CFDictionaryRef) 
-                        CFArrayGetValueAtIndex(Array, i), 
+                (CFNumberRef)
+                    CFDictionaryGetValue((CFDictionaryRef)
+                        CFArrayGetValueAtIndex(Array, i),
                         CFSTR(kIOHIDElementUsageKey)
                                         ),
-                              kCFNumberLongType, 
+                              kCFNumberLongType,
                               &nUsage);
 
             //
             // Now translate the usage # into a wx keycode
-            // 
+            //
 
         //
         // OK, this is strange - basically this kind of strange -
@@ -524,7 +527,7 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
         //    bEOTriggered = true;
         //}
         //Instead of that though we now just don't add duplicate keys
-            
+
         if (nUsage >= kHIDUsage_KeyboardA && nUsage <= kHIDUsage_KeyboardZ)
             AddCookie(CFArrayGetValueAtIndex(Array, i), 'A' + (nUsage - kHIDUsage_KeyboardA) );
         else if (nUsage >= kHIDUsage_Keyboard1 && nUsage <= kHIDUsage_Keyboard9)
@@ -670,7 +673,7 @@ bool wxGetKeyState (wxKeyCode key)
     if (wxHIDModule::sm_keyboards.GetCount() == 0)
     {
         int nKeyboards = wxHIDKeyboard::GetCount();
-        
+
         for(int i = 1; i <= nKeyboards; ++i)
         {
             wxHIDKeyboard* keyboard = new wxHIDKeyboard();
@@ -693,7 +696,7 @@ bool wxGetKeyState (wxKeyCode key)
     {
         wxHIDKeyboard* keyboard = (wxHIDKeyboard*)
                                 wxHIDModule::sm_keyboards[i];
-        
+
     switch(key)
     {
     case WXK_SHIFT:
@@ -732,7 +735,7 @@ bool wxGetKeyState (wxKeyCode key)
         break;
     }
     }
-    
+
     return false; //not down/error
 }
 

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index 58866a8120d024b0cf4ed0c874cf00921357167e..2bc8300d3315c39c9e50e7736bc61d66c06214c3 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -22,7 +22,10 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/dynarray.h"
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/string.h"
 #include "wx/utils.h"
 

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index cc73babadf8faa5cf63d15769bb1d53bb27661d7..23bd09861269691be5cbb21ee6c2107b7c73e3db 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -14,14 +14,17 @@
 
 #if wxUSE_LISTBOX
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
 #endif
 
-# include "wx/listbox.h"
+#include "wx/listbox.h"
 #include "wx/settings.h"
-#include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/arrstr.h"

diff --git a/src/msdos/mimetype.cpp b/src/msdos/mimetype.cpp
index 2966f22f658f7df30095a4a4f5f67b9a6023080b..d3aaab0001048d3e5c6f9034b0a976610c304da1 100644 (file)
--- a/src/msdos/mimetype.cpp
+++ b/src/msdos/mimetype.cpp
@@ -19,6 +19,7 @@
 #if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
@@ -28,7 +29,6 @@
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #include "wx/msdos/mimetype.h"
@@ -65,7 +65,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& WXUNUSED(extensions))
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 {
-    if ( m_strFileType.Length() > 0 )
+    if ( !m_strFileType.empty() )
     {
         *mimeType = m_strFileType ;
         return true ;

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index e7733b748c73dd2b5a3688b72d95213d0788904c..6ba5c68d00ec3b3091f1aa28e14bfc6b985d602d 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
@@ -38,7 +39,6 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"
     #include "wx/log.h"
@@ -313,7 +313,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // fails to find a device.
     SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
 #endif
-    
+
     wxOleInitialize();
 
     RegisterWindowClasses();
@@ -591,7 +591,7 @@ int wxApp::GetComCtl32Version()
 
         // we're prepared to handle the errors
         wxLogNull noLog;
-        
+
 #if wxUSE_DYNLIB_CLASS
         // do we have it?
         wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
@@ -650,7 +650,7 @@ int wxApp::GetComCtl32Version()
                 }
             }
         }
-#endif        
+#endif
     }
 
     return s_verComCtl32;

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 2dd19b26f270f4b4a0b2af8f5b6c09f9897fd797..9266bf1b7303370b9274ecc3e649374560e59650 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -28,9 +28,9 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
-   #include "wx/app.h"
-   #include "wx/dynarray.h"
-   #include "wx/frame.h"
+    #include "wx/dynarray.h"
+    #include "wx/app.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dynload.h"
@@ -69,7 +69,7 @@
         #define MONITOR_DEFAULTTONULL       0x00000000
         #define MONITOR_DEFAULTTOPRIMARY    0x00000001
         #define MONITOR_DEFAULTTONEAREST    0x00000002
-        #define MONITORINFOF_PRIMARY        0x00000001        
+        #define MONITORINFOF_PRIMARY        0x00000001
         #define HMONITOR_DECLARED
     #endif
 #endif // !__WXWINCE__

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index a84b90756a01b1f0ceeeeecf9313b2581551b0d8..5761d72e1990f9ce3f43c378417bd09f2257529e 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -13,22 +13,22 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef   WX_PRECOMP
-  #include  "wx/string.h"
-  #include  "wx/intl.h"
-  #include  "wx/event.h"
-  #include  "wx/app.h"
-  #include  "wx/utils.h"
-#endif  //WX_PRECOMP
-
 // Doesn't yet compile in Unicode mode
 
 #if wxUSE_CONFIG && !wxUSE_UNICODE
 
-#include  "wx/dynarray.h"
+#ifndef   WX_PRECOMP
+    #include  "wx/dynarray.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/event.h"
+    #include  "wx/app.h"
+    #include  "wx/utils.h"
+#endif  //WX_PRECOMP
+
 #include  "wx/log.h"
 #include  "wx/config.h"
 #include  "wx/file.h"
@@ -64,21 +64,21 @@ wxIniConfig::wxIniConfig(const wxString& strAppName,
            : wxConfigBase(strAppName, strVendor, localFilename, globalFilename, style)
 
 #if 0 // This is too complex for some compilers, e.g. BC++ 5.01
-           : wxConfigBase((strAppName.IsEmpty() && wxTheApp) ? wxTheApp->GetAppName()
+           : wxConfigBase((strAppName.empty() && wxTheApp) ? wxTheApp->GetAppName()
                                                : strAppName,
-                          strVendor.IsEmpty() ? (wxTheApp ? wxTheApp->GetVendorName()
+                          strVendor.empty() ? (wxTheApp ? wxTheApp->GetVendorName()
                                                   : strAppName)
                                       : strVendor,
                           localFilename, globalFilename, style)
 #endif
 {
-    if (strAppName.IsEmpty() && wxTheApp)
+    if (strAppName.empty() && wxTheApp)
         SetAppName(wxTheApp->GetAppName());
-    if (strVendor.IsEmpty() && wxTheApp)
+    if (strVendor.empty() && wxTheApp)
         SetVendorName(wxTheApp->GetVendorName());
 
     m_strLocalFilename = localFilename;
-    if (m_strLocalFilename.IsEmpty())
+    if (m_strLocalFilename.empty())
     {
         m_strLocalFilename = GetAppName() + wxT(".ini");
     }
@@ -107,7 +107,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
 {
   wxArrayString aParts;
 
-  if ( strPath.IsEmpty() ) {
+  if ( strPath.empty() ) {
     // nothing
   }
   else if ( strPath[0u] == wxCONFIG_PATH_SEPARATOR ) {
@@ -139,7 +139,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
 
   // other functions assume that all this is true, i.e. there are no trailing
   // underscores at the end except if the group is the root one
-  wxASSERT( (m_strPath.IsEmpty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
+  wxASSERT( (m_strPath.empty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
             (m_strGroup == wxString(PATH_SEP_REPLACE) ||
              m_strGroup.Last() != PATH_SEP_REPLACE) );
 }
@@ -156,7 +156,7 @@ const wxString& wxIniConfig::GetPath() const
   }
   else {
     s_str << m_strGroup;
-    if ( !m_strPath.IsEmpty() )
+    if ( !m_strPath.empty() )
       s_str << wxCONFIG_PATH_SEPARATOR;
     for ( const char *p = m_strPath; *p != '\0'; p++ ) {
       s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
@@ -170,7 +170,7 @@ wxString wxIniConfig::GetPrivateKeyName(const wxString& szKey) const
 {
   wxString strKey;
 
-  if ( !m_strPath.IsEmpty() )
+  if ( !m_strPath.empty() )
     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;
@@ -184,7 +184,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 
   if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
     strKey << m_strGroup << PATH_SEP_REPLACE;
-  if ( !m_strPath.IsEmpty() )
+  if ( !m_strPath.empty() )
     strKey << m_strPath << PATH_SEP_REPLACE;
 
   strKey << szKey;
@@ -199,30 +199,30 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 // not implemented
 bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return false;
+    return false;
 }
 
 bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return false;
+    return false;
 }
 
 bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return false;
+    return false;
 }
 
 bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return false;
+    return false;
 }
 
 // ----------------------------------------------------------------------------
@@ -232,47 +232,47 @@ bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex))
 // not implemented
 size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return (size_t)-1;
+    return (size_t)-1;
 }
 
 size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return (size_t)-1;
+    return (size_t)-1;
 }
 
 bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return false;
+    return false;
 }
 
 bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
 {
-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG("not implemented");
 
-  return false;
+    return false;
 }
 
 // is current group empty?
 bool wxIniConfig::IsEmpty() const
 {
-  char szBuf[1024];
+    char szBuf[1024];
 
-  GetPrivateProfileString(m_strGroup, NULL, "",
-                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
-  if ( !::IsEmpty(szBuf) )
-    return false;
+    GetPrivateProfileString(m_strGroup, NULL, "",
+                            szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
+    if ( !::IsEmpty(szBuf) )
+        return false;
 
-  GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
-  if ( !::IsEmpty(szBuf) )
-    return false;
+    GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
+    if ( !::IsEmpty(szBuf) )
+        return false;
 
-  return true;
+    return true;
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 578f993b1a78713498d28ea7b9e82242bb180770..f5c67dba298c448ec894a2b73cb113313a336176 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -19,12 +19,13 @@
 #if wxUSE_LISTBOX
 
 #ifndef WX_PRECOMP
-#include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
+    #include "wx/dynarray.h"
+    #include "wx/listbox.h"
+    #include "wx/settings.h"
+    #include "wx/brush.h"
+    #include "wx/font.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/window.h"
@@ -32,7 +33,6 @@
 
 #include <windowsx.h>
 
-#include "wx/dynarray.h"
 #include "wx/log.h"
 
 #if wxUSE_OWNER_DRAWN

diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp
index 0525d92b491d418f39b66669755b9904f35ab0b5..9dedef77d558df38749131d91f320dd250083a4e 100644 (file)
--- a/src/msw/mimetype.cpp
+++ b/src/msw/mimetype.cpp
@@ -13,12 +13,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
@@ -30,7 +31,6 @@
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #ifdef __WXMSW__

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 21a7755a457893365624ed03002d1ab2b841a1bf..b1fe59c5ead76bd365bd3562a252a74e2aaae85b 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/tbar95.cpp
+// Name:        src/msw/tbar95.cpp
 // Purpose:     wxToolBar
 // Author:      Julian Smart
 // Modified by:
@@ -24,19 +24,19 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
+
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"
 #endif
 
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
-
 #include "wx/toolbar.h"
 #include "wx/sysopt.h"
 #include "wx/image.h"
@@ -1659,4 +1659,3 @@ WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
 #endif // wxREMAP_BUTTON_COLOURS
 
 #endif // wxUSE_TOOLBAR
-

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 52c7d9f768b8ff6d747b2912208522fb181d77e6..b6d787a4a39c70db3c7f849aeeb8c196dfa0cec9 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -26,6 +26,10 @@
 
 #if wxUSE_TREECTRL
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/msw/private.h"
 
 // include <commctrl.h> "properly"
@@ -39,7 +43,6 @@
 
 #include "wx/app.h"
 #include "wx/log.h"
-#include "wx/dynarray.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"
 #include "wx/treectrl.h"

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 9d9cf88f7e3f9ba64a8ca3c273b04400b98fad51..5919c6a704ab87b28222794f35ec35daf402cc1e 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -24,21 +24,21 @@
     #pragma hdrstop
 #endif
 
+// Use the WinCE-specific toolbar only if we're either compiling
+// with a WinCE earlier than 4, or we wish to emulate a PocketPC-style UI
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
+
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"
 #endif
 
-// Use the WinCE-specific toolbar only if we're either compiling
-// with a WinCE earlier than 4, or we wish to emulate a PocketPC-style UI
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
-
 #include "wx/toolbar.h"
 
 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 55c540bcd58aeae0c2db31a31cdcf96432a2d1cb..050117d47f74a6f4be427a8bd6b71075be603736 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.cpp
+// Name:        src/os2/app.cpp
 // Purpose:     wxApp
 // Author:      David Webster
 // Modified by:
@@ -13,6 +13,7 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
@@ -26,7 +27,6 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"
     #include "wx/stdpaths.h"
@@ -122,7 +122,7 @@ struct GsocketCallbackInfo{
 
 void wxApp::HandleSockets()
 {
-    bool pendingEvent = FALSE;
+    bool pendingEvent = false;
 
     // Check whether it's time for Gsocket operation
     if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)
@@ -151,7 +151,7 @@ void wxApp::HandleSockets()
                     if (r < m_maxSocketHandles)
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
-                        pendingEvent = TRUE;
+                        pendingEvent = true;
                     }
                 }
                 if (FD_ISSET(i, &writefds))
@@ -164,7 +164,7 @@ void wxApp::HandleSockets()
                     if (r < m_maxSocketHandles)
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
-                        pendingEvent = TRUE;
+                        pendingEvent = true;
                     }
                 }
             }
@@ -228,7 +228,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         // TODO: at least give some error message here...
         wxAppBase::CleanUp();
 
-        return FALSE;
+        return false;
     }
 
     wxBuffer = new wxChar[1500]; // FIXME; why?
@@ -252,7 +252,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     RegisterWindowClasses(vHabmain);
 
-    return TRUE;
+    return true;
 } // end of wxApp::Initialize
 
 const char*                         CANTREGISTERCLASS = " Can't register Class ";
@@ -260,12 +260,10 @@ const char*                         CANTREGISTERCLASS = " Can't register Class "
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 
-bool wxApp::RegisterWindowClasses(
-  HAB                               vHab
-)
+bool wxApp::RegisterWindowClasses( HAB vHab )
 {
-    ERRORID                         vError = 0L;
-    wxString                        sError;
+    ERRORID vError = 0L;
+    wxString sError;
 
     if (!::WinRegisterClass( vHab
                             ,(PSZ)wxFrameClassName
@@ -277,7 +275,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -290,7 +288,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -303,7 +301,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -316,7 +314,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -329,7 +327,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -342,7 +340,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -355,7 +353,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
 
     if (!::WinRegisterClass( vHab
@@ -368,7 +366,7 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
     if (!::WinRegisterClass( vHab
                             ,(PSZ)wxCanvasClassNameNR
@@ -380,9 +378,9 @@ bool wxApp::RegisterWindowClasses(
         vError = ::WinGetLastError(vHab);
         sError = wxPMErrorToStr(vError);
         wxLogLastError(sError.c_str());
-        return FALSE;
+        return false;
     }
-    return TRUE;
+    return true;
 } // end of wxApp::RegisterWindowClasses
 
 //
@@ -397,7 +395,7 @@ void wxApp::CleanUp()
     // PM-SPECIFIC CLEANUP
     //
 
-    // wxSetKeyboardHook(FALSE);
+    // wxSetKeyboardHook(false);
 
     if (wxSTD_FRAME_ICON)
         ::WinFreeFileIcon(wxSTD_FRAME_ICON);
@@ -430,11 +428,11 @@ void wxApp::CleanUp()
 
 bool wxApp::OnInitGui()
 {
-    ERRORID                         vError;
-    wxString                        sError;
+    ERRORID vError;
+    wxString sError;
 
     if (!wxAppBase::OnInitGui())
-        return FALSE;
+        return false;
 
     m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
     if (!m_hMq)
@@ -442,10 +440,10 @@ bool wxApp::OnInitGui()
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogDebug(sError);
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 } // end of wxApp::OnInitGui
 
 wxApp::wxApp()
@@ -475,13 +473,10 @@ wxApp::~wxApp()
 #endif
 } // end of wxApp::~wxApp
 
-bool                                gbInOnIdle = FALSE;
+bool gbInOnIdle = false;
 
-void wxApp::OnIdle(
-  wxIdleEvent&                      rEvent
-)
+void wxApp::OnIdle( wxIdleEvent& rEvent )
 {
-
     //
     // Avoid recursion (via ProcessEvent default case)
     //
@@ -502,28 +497,26 @@ void wxApp::OnIdle(
         wxDC::ClearCache();
 #endif // wxUSE_DC_CACHEING
 
-    gbInOnIdle = FALSE;
+    gbInOnIdle = false;
 } // end of wxApp::OnIdle
 
 void wxApp::OnEndSession(
   wxCloseEvent&                     WXUNUSED(rEvent))
 {
     if (GetTopWindow())
-        GetTopWindow()->Close(TRUE);
+        GetTopWindow()->Close(true);
 } // end of wxApp::OnEndSession
 
 //
 // Default behaviour: close the application with prompts. The
 // user can veto the close, and therefore the end session.
 //
-void wxApp::OnQueryEndSession(
-  wxCloseEvent&                     rEvent
-)
+void wxApp::OnQueryEndSession( wxCloseEvent& rEvent )
 {
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!rEvent.CanVeto()))
-            rEvent.Veto(TRUE);
+            rEvent.Veto(true);
     }
 } // end of wxApp::OnQueryEndSession
 
@@ -532,7 +525,7 @@ void wxApp::OnQueryEndSession(
 //
 bool wxApp::Yield(bool onlyIfNeeded)
 {
-    static bool s_inYield = FALSE;
+    static bool s_inYield = false;
 
     if ( s_inYield )
     {
@@ -541,11 +534,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( _T("wxYield() called recursively") );
         }
 
-        return FALSE;
+        return false;
     }
 
-    HAB                             vHab = 0;
-    QMSG                            vMsg;
+    HAB vHab = 0;
+    QMSG vMsg;
 
     //
     // Disable log flushing from here because a call to wxYield() shouldn't
@@ -553,7 +546,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     //
     wxLog::Suspend();
 
-    s_inYield = TRUE;
+    s_inYield = true;
 
     //
     // We want to go back to the main message loop
@@ -578,8 +571,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
     // Let the logs be flashed again
     //
     wxLog::Resume();
-    s_inYield = FALSE;
-    return TRUE;
+    s_inYield = false;
+    return true;
 } // end of wxYield
 
 int wxApp::AddSocketHandler(int handle, int mask,

diff --git a/src/os2/iniconf.cpp b/src/os2/iniconf.cpp
index d5730815d09ac0dc0c25cb7d6eeccf902ee3ebd9..db81983a3a003ea68ab59d339c67d55cb6f3ee79 100644 (file)
--- a/src/os2/iniconf.cpp
+++ b/src/os2/iniconf.cpp
@@ -12,19 +12,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_CONFIG
+
 #ifndef   WX_PRECOMP
-  #include  "wx/string.h"
-  #include  "wx/intl.h"
-  #include  "wx/event.h"
-  #include  "wx/app.h"
-  #include  "wx/utils.h"
+    #include  "wx/dynarray.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/event.h"
+    #include  "wx/app.h"
+    #include  "wx/utils.h"
 #endif  //WX_PRECOMP
 
-#include  "wx/dynarray.h"
 #include  "wx/log.h"
 
 #include  "wx/config.h"
-#if wxUSE_CONFIG
 
 #include  "wx/os2/iniconf.h"
 

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 410fe754da284c7c55845b1c2cd4c77ac59bb4bd..eea8872b6b6186c873bf3b34983f8e0cd2d0c193 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -14,24 +14,24 @@
 
 #if wxUSE_LISTBOX
 
-#include "wx/window.h"
-#include "wx/os2/private.h"
-
 #ifndef WX_PRECOMP
-#include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/dc.h"
-#include "wx/dcscreen.h"
-#include "wx/utils.h"
-#include "wx/scrolwin.h"
+    #include "wx/dynarray.h"
+    #include "wx/listbox.h"
+    #include "wx/settings.h"
+    #include "wx/brush.h"
+    #include "wx/font.h"
+    #include "wx/dc.h"
+    #include "wx/dcscreen.h"
+    #include "wx/utils.h"
+    #include "wx/scrolwin.h"
 #endif
 
+#include "wx/window.h"
+#include "wx/os2/private.h"
+
 #define INCL_M
 #include <os2.h>
 
-#include "wx/dynarray.h"
 #include "wx/log.h"
 
 #if wxUSE_OWNER_DRAWN

diff --git a/src/os2/mimetype.cpp b/src/os2/mimetype.cpp
index 43d09ca0995ff99ccd311d03a0f60f81a9ce0424..7dbd51fc7477ca3111657fafe0214d27841575c5 100644 (file)
--- a/src/os2/mimetype.cpp
+++ b/src/os2/mimetype.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/mimetype.cpp
+// Name:        src/os2/mimetype.cpp
 // Purpose:     classes and functions to manage MIME types
 // Author:      David Webster
 // Modified by:
@@ -12,27 +12,27 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_MIMETYPE
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #if wxUSE_GUI
+        #include "wx/icon.h"
+    #endif
+#endif //WX_PRECOMP
+
 #define INCL_DOS
 #define INCL_GPI
 #define INCL_WIN
 #include <os2.h>
 
-#ifndef WX_PRECOMP
-  #include "wx/string.h"
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
-#endif //WX_PRECOMP
-
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
-#if wxUSE_MIMETYPE
-
 #include "wx/os2/mimetype.h"
 
 // other standard headers

diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index 2a3742d8a328ca155ebbf730cf9859520a427afd..da60f7a692466703edc33293709b928e8f095905 100644 (file)
--- a/src/os2/treectrl.cpp
+++ b/src/os2/treectrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/treectrl.cpp
+// Name:        src/os2/treectrl.cpp
 // Purpose:     wxTreeCtrl
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
@@ -26,11 +26,14 @@
 
 #if wxUSE_TREECTRL
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/os2/private.h"
 
 #include "wx/app.h"
 #include "wx/log.h"
-#include "wx/dynarray.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"
 #include "wx/os2/treectrl.h"

diff --git a/src/palmos/app.cpp b/src/palmos/app.cpp
index fb37d4eb44f4348f29a230b8b8bdde8041f60cca..508e073e875a6b487675c3a7a55ccc34261bbb3f 100644 (file)
--- a/src/palmos/app.cpp
+++ b/src/palmos/app.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
@@ -38,7 +39,6 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"
     #include "wx/log.h"

diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp
index 24f38de7a9118c97eaeaba37b919659511339344..a1655ba2ec1f93f8367edc8fdc624644252beb4c 100644 (file)
--- a/src/palmos/listbox.cpp
+++ b/src/palmos/listbox.cpp
@@ -19,18 +19,18 @@
 #if wxUSE_LISTBOX
 
 #ifndef WX_PRECOMP
-#include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
+    #include "wx/dynarray.h"
+    #include "wx/listbox.h"
+    #include "wx/settings.h"
+    #include "wx/brush.h"
+    #include "wx/font.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/window.h"
 #include "wx/palmos/private.h"
 
-#include "wx/dynarray.h"
 #include "wx/log.h"
 
 #if wxUSE_OWNER_DRAWN

diff --git a/src/palmos/toolbar.cpp b/src/palmos/toolbar.cpp
index df42ca989229f5c2c49bade5500180bc73afb2da..4eece9ff42cbb6e2e014b8ee86e78ff8be3dd4ff 100644 (file)
--- a/src/palmos/toolbar.cpp
+++ b/src/palmos/toolbar.cpp
@@ -24,19 +24,19 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
+
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
-    #include "wx/dynarray.h"
     #include "wx/settings.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"
 #endif
 
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
-
 #include "wx/toolbar.h"
 #include "wx/sysopt.h"
 
@@ -268,4 +268,3 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
 }
 
 #endif // wxUSE_TOOLBAR
-

diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp
index 41a4abbea154151f1316a223c9d02055919b1941..f8aa33d8a997cb75b1e5295838372f43c1fcb905 100644 (file)
--- a/src/palmos/treectrl.cpp
+++ b/src/palmos/treectrl.cpp
@@ -26,11 +26,14 @@
 
 #if wxUSE_TREECTRL
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/palmos/private.h"
 
 #include "wx/app.h"
 #include "wx/log.h"
-#include "wx/dynarray.h"
 #include "wx/imaglist.h"
 #include "wx/settings.h"
 
@@ -722,4 +725,3 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
 }
 
 #endif // wxUSE_TREECTRL
-

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 598fbad77f6b1a2792c4d8dc3cd0009c0bdd22db..b42d4462a0e02e85ae15aae18a2a0f9bb4e39b02 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -21,22 +21,22 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/display.h"
-#include "wx/display_impl.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+#if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
-  #include "wx/dynarray.h"
-  #include "wx/gdicmn.h"
-  #include "wx/string.h"
-  #include "wx/utils.h"
+    #include "wx/dynarray.h"
+    #include "wx/gdicmn.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
 #endif /* WX_PRECOMP */
 
-#if wxUSE_DISPLAY
+#include "wx/display.h"
+#include "wx/display_impl.h"
+#include "wx/intl.h"
+#include "wx/log.h"
 
 /* These must be included after the wx files.  Otherwise the Data macro in
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 0496afeeef74d1e2ec1ecc971a8203622759d4be..3f4f7ae079add0e63456c3a515a75bb660068c86 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -20,7 +20,10 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/dynarray.h"
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/string.h"
 #include "wx/regex.h"
 #include "wx/utils.h"

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 8a91d72f8263b6af722c23d1f34eafc45e1365fc..aa2d4f3d6303fd187ab151d81c7db369c97c6ccb 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -39,13 +39,13 @@
 #if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
 #endif
 
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/confbase.h"
 
 #include "wx/ffile.h"

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index d1a8b82f60e5bba27adf8fdc5be592782975541c..d7237bb4712ede0f7214211a5cfa53065ba6113c 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        threadpsx.cpp
+// Name:        src/unix/threadpsx.cpp
 // Purpose:     wxThread (Posix) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: K. S. Sreeram (2002): POSIXified wxCondition, added wxSemaphore
@@ -26,12 +26,15 @@
 
 #if wxUSE_THREADS
 
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/intl.h"
-#include "wx/dynarray.h"
 #include "wx/timer.h"
 #include "wx/stopwatch.h"
 
@@ -481,7 +484,7 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
     {
         wxFAIL_MSG( _T("wxSemaphore: invalid initial or maximal count") );
 
-        m_isOk = FALSE;
+        m_isOk = false;
     }
     else
     {
@@ -649,7 +652,7 @@ public:
     pthread_t GetId() const { return m_threadId; }
     pthread_t *GetIdPtr() { return &m_threadId; }
         // "cancelled" flag
-    void SetCancelFlag() { m_cancelled = TRUE; }
+    void SetCancelFlag() { m_cancelled = true; }
     bool WasCancelled() const { return m_cancelled; }
         // exit code
     void SetExitCode(wxThread::ExitCode exitcode) { m_exitcode = exitcode; }
@@ -664,8 +667,8 @@ public:
     {
         wxCriticalSectionLocker lock(m_csJoinFlag);
 
-        m_shouldBeJoined = FALSE;
-        m_isDetached = TRUE;
+        m_shouldBeJoined = false;
+        m_isDetached = true;
     }
 
 #ifdef wxHAVE_PTHREAD_CLEANUP
@@ -841,17 +844,17 @@ void wxThreadInternal::Cleanup(wxThread *thread)
 wxThreadInternal::wxThreadInternal()
 {
     m_state = STATE_NEW;
-    m_cancelled = FALSE;
+    m_cancelled = false;
     m_prio = WXTHREAD_DEFAULT_PRIORITY;
     m_threadId = 0;
     m_exitcode = 0;
 
-    // set to TRUE only when the thread starts waiting on m_semSuspend
-    m_isPaused = FALSE;
+    // set to true only when the thread starts waiting on m_semSuspend
+    m_isPaused = false;
 
     // defaults for joinable threads
-    m_shouldBeJoined = TRUE;
-    m_isDetached = FALSE;
+    m_shouldBeJoined = true;
+    m_isDetached = false;
 }
 
 wxThreadInternal::~wxThreadInternal()
@@ -904,7 +907,7 @@ void wxThreadInternal::Wait()
                 wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
             }
 
-            m_shouldBeJoined = FALSE;
+            m_shouldBeJoined = false;
         }
     }
 
@@ -943,7 +946,7 @@ void wxThreadInternal::Resume()
         m_semSuspend.Post();
 
         // reset the flag
-        SetReallyPaused(FALSE);
+        SetReallyPaused(false);
     }
     else
     {
@@ -1507,7 +1510,7 @@ bool wxThread::TestDestroy()
 
     if ( m_internal->GetState() == STATE_PAUSED )
     {
-        m_internal->SetReallyPaused(TRUE);
+        m_internal->SetReallyPaused(true);
 
         // leave the crit section or the other threads will stop too if they
         // try to call any of (seemingly harmless) IsXXX() functions while we
@@ -1566,10 +1569,10 @@ bool wxThread::IsAlive() const
     {
         case STATE_RUNNING:
         case STATE_PAUSED:
-            return TRUE;
+            return true;
 
         default:
-            return FALSE;
+            return false;
     }
 }
 
@@ -1603,7 +1606,7 @@ bool wxThreadModule::OnInit()
     {
         wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
 
-        return FALSE;
+        return false;
     }
 
     gs_tidMain = pthread_self();
@@ -1614,7 +1617,7 @@ bool wxThreadModule::OnInit()
     gs_mutexDeleteThread = new wxMutex();
     gs_condAllDeleted = new wxCondition( *gs_mutexDeleteThread );
 
-    return TRUE;
+    return true;
 }
 
 void wxThreadModule::OnExit()
@@ -1720,4 +1723,3 @@ void wxMutexGuiLeave()
 #include "wx/thrimpl.cpp"
 
 #endif // wxUSE_THREADS
-