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

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

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"

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
 #endif
 
-#include "wx/dynarray.h"
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif //WX_PRECOMP
+
 #include "wx/intl.h"
 
 #include <stdlib.h>

src/common/fileconf.cpp

@@ -14,6 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
+// For compilers that support precompilation, includes "wx.h".
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
@@ -23,12 +24,12 @@
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
 
 #ifndef   WX_PRECOMP
+    #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"

src/common/filename.cpp

@@ -68,9 +68,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/intl.h"
+    #include "wx/dynarray.h"
-#include "wx/log.h"
+    #include "wx/intl.h"
-#include "wx/file.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 ;

src/common/intl.cpp

@@ -39,28 +39,26 @@
 
 #if wxUSE_INTL
 
-// standard headers
-
-#ifndef __WXWINCE__
-#include <locale.h>
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_LANGINFO_H
-  #include <langinfo.h>
-#endif
-
-// wxWidgets
 #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"
-    #include "wx/dynarray.h"
 #endif // WX_PRECOMP
 
+#ifndef __WXWINCE__
+    #include <locale.h>
+#endif
+
+// standard headers
+#include <ctype.h>
+#include <stdlib.h>
+#ifdef HAVE_LANGINFO_H
+  #include <langinfo.h>
+#endif
+
 #ifdef __WIN32__
     #include "wx/msw/private.h"
 #elif defined(__UNIX_LIKE__)

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
 

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,6 +28,7 @@
 #if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
 #endif //WX_PRECOMP
 
@@ -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"

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"

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

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>

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"

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"
 

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"
 

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>
 

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__

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"

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"

src/mac/carbon/mimetmac.cpp

@@ -33,6 +33,7 @@
 #if wxUSE_MIMETYPE
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
 
     #if wxUSE_GUI
@@ -43,7 +44,6 @@
 #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"

src/mac/carbon/timer.cpp

@@ -11,16 +11,18 @@
 
 #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)

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"

src/mac/classic/mimetmac.cpp

@@ -17,6 +17,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
     #include "wx/string.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
@@ -27,7 +28,6 @@
 #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;
 }
-

src/mac/classic/timer.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        src/mac/classic/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,6 +9,13 @@
 // 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;
@@ -67,7 +72,6 @@ static void wxProcessTimer( unsigned long event , void *data )
         {
             PrimeTime( (QElemPtr)  &timer->m_info->m_task , timer->GetInterval() ) ;
         }
-    
     }
 }
 
@@ -105,8 +109,8 @@ 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_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_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 ) ;
 }
-
-
-

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

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"
 

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"

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 ;

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"

src/msw/display.cpp

@@ -28,8 +28,8 @@
 #if wxUSE_DISPLAY
 
 #ifndef WX_PRECOMP
-   #include "wx/app.h"
     #include "wx/dynarray.h"
+    #include "wx/app.h"
     #include "wx/frame.h"
 #endif
 

src/msw/iniconf.cpp

@@ -13,10 +13,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+// Doesn't yet compile in Unicode mode
+
+#if wxUSE_CONFIG && !wxUSE_UNICODE
+
 #ifndef   WX_PRECOMP
+    #include  "wx/dynarray.h"
     #include  "wx/string.h"
     #include  "wx/intl.h"
     #include  "wx/event.h"
@@ -24,11 +29,6 @@
     #include  "wx/utils.h"
 #endif  //WX_PRECOMP
 
-// Doesn't yet compile in Unicode mode
-
-#if wxUSE_CONFIG && !wxUSE_UNICODE
-
-#include  "wx/dynarray.h"
 #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;

src/msw/listbox.cpp

@@ -19,12 +19,13 @@
 #if wxUSE_LISTBOX
 
 #ifndef WX_PRECOMP
-#include "wx/listbox.h"
+    #include "wx/dynarray.h"
-#include "wx/settings.h"
+    #include "wx/listbox.h"
-#include "wx/brush.h"
+    #include "wx/settings.h"
-#include "wx/font.h"
+    #include "wx/brush.h"
-#include "wx/dc.h"
+    #include "wx/font.h"
-#include "wx/utils.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

src/msw/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"
@@ -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__

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
-

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"

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__)

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,9 +260,7 @@ const char*                         CANTREGISTERCLASS = " Can't register Class "
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 
-bool wxApp::RegisterWindowClasses(
+bool wxApp::RegisterWindowClasses( HAB vHab )
-  HAB                               vHab
-)
 {
     ERRORID vError = 0L;
     wxString sError;
@@ -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);
@@ -434,7 +432,7 @@ bool wxApp::OnInitGui()
     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(
+void wxApp::OnIdle( wxIdleEvent& rEvent )
-  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(
+void wxApp::OnQueryEndSession( wxCloseEvent& rEvent )
-  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,7 +534,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( _T("wxYield() called recursively") );
         }
 
-        return FALSE;
+        return false;
     }
 
     HAB vHab = 0;
@@ -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;
+    s_inYield = false;
-    return TRUE;
+    return true;
 } // end of wxYield
 
 int wxApp::AddSocketHandler(int handle, int mask,

src/os2/iniconf.cpp

@@ -12,7 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_CONFIG
+
 #ifndef   WX_PRECOMP
+    #include  "wx/dynarray.h"
     #include  "wx/string.h"
     #include  "wx/intl.h"
     #include  "wx/event.h"
@@ -20,11 +23,9 @@
     #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"
 

src/os2/listbox.cpp

@@ -14,24 +14,24 @@
 
 #if wxUSE_LISTBOX
 
+#ifndef WX_PRECOMP
+    #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"
 
-#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"
-#endif
-
 #define INCL_M
 #include <os2.h>
 
-#include "wx/dynarray.h"
 #include "wx/log.h"
 
 #if wxUSE_OWNER_DRAWN

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"
 
-#define INCL_DOS
+#if wxUSE_MIMETYPE
-#define INCL_GPI
-#define INCL_WIN
-#include <os2.h>
 
 #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>
+
 #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

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"

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"

src/palmos/listbox.cpp

@@ -19,18 +19,18 @@
 #if wxUSE_LISTBOX
 
 #ifndef WX_PRECOMP
-#include "wx/listbox.h"
+    #include "wx/dynarray.h"
-#include "wx/settings.h"
+    #include "wx/listbox.h"
-#include "wx/brush.h"
+    #include "wx/settings.h"
-#include "wx/font.h"
+    #include "wx/brush.h"
-#include "wx/dc.h"
+    #include "wx/font.h"
-#include "wx/utils.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

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
-

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
-

src/unix/displayx11.cpp

@@ -24,10 +24,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/display.h"
+#if wxUSE_DISPLAY
-#include "wx/display_impl.h"
-#include "wx/intl.h"
-#include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
@@ -36,7 +33,10 @@
     #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.  */

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"

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"

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_shouldBeJoined = false;
-        m_isDetached = TRUE;
+        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
+    // set to true only when the thread starts waiting on m_semSuspend
-    m_isPaused = FALSE;
+    m_isPaused = false;
 
     // defaults for joinable threads
-    m_shouldBeJoined = TRUE;
+    m_shouldBeJoined = true;
-    m_isDetached = FALSE;
+    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
-