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

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

src/cocoa/combobox.mm

@@ -81,6 +81,7 @@
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/ObjcPose.h"
@@ -159,7 +160,6 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
 
 @end // implementation wxPoserNSComboBox
 
-#include "wx/app.h"
 #include "wx/combobox.h"
 
 #include "wx/cocoa/autorelease.h"

src/cocoa/main.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/main.cpp
+// Name:        src/cocoa/main.cpp
 // Purpose:     Entry point
 // Author:      David Elliott
 // Modified by:
@@ -10,10 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 /* DFE: ^^^^^ Was that really necessary :-) */
 
-#include "wx/app.h"
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
 
 WXDLLEXPORT int main(int argc, char* argv[])
 {
     return wxEntry(argc, argv);
 }
-

src/cocoa/utils.cpp

@@ -12,7 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/apptrait.h"
 #include "wx/display.h"
 

src/common/config.cpp

@@ -29,13 +29,13 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #include "wx/arrstr.h"
 
 #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
 
-#include "wx/app.h"
 #include "wx/file.h"
 #include "wx/utils.h"
 #include "wx/math.h"

src/common/cshelp.cpp

@@ -27,10 +27,10 @@
 #if wxUSE_HELP
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
 #endif
 
 #include "wx/tipwin.h"
-#include "wx/app.h"
 #include "wx/module.h"
 #include "wx/cshelp.h"
 

src/common/db.cpp

@@ -35,6 +35,7 @@
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #ifdef DBDEBUG_CONSOLE
@@ -53,7 +54,6 @@
 #include "wx/db.h"
 
 // DLL options compatibility check:
-#include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxODBC")
 
 WXDLLIMPEXP_DATA_ODBC(wxDbList*) PtrBegDbList = 0;

src/common/dbgrid.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dbgrid.cpp
+// Name:        src/common/dbgrid.cpp
 // Purpose:     Displays a wxDbTable in a wxGrid.
 // Author:      Roger Gammans, Paul Gammans
 // Modified by:
@@ -17,20 +17,18 @@
     #pragma hdrstop
 #endif
 
-
+#if wxUSE_ODBC && wxUSE_GRID
-#if wxUSE_ODBC
-#if wxUSE_GRID
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
     #include "wx/dc.h"
+    #include "wx/app.h"
 #endif // WX_PRECOMP
 
 #include "wx/generic/gridctrl.h"
 #include "wx/dbgrid.h"
 
 // DLL options compatibility check:
-#include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxDbGrid")
 
 
@@ -725,6 +723,4 @@ bool wxDbGridTableBase::Writeback() const
 
 WX_DEFINE_EXPORTED_OBJARRAY(keyarray)
 
-#endif  // #if wxUSE_GRID
+#endif  // wxUSE_GRID && wxUSE_ODBC
-#endif  // #if wxUSE_ODBC
-

src/common/dynlib.cpp

@@ -34,12 +34,12 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #include "wx/filefn.h"
 #include "wx/utils.h"
 #include "wx/filename.h"        // for SplitPath()
-#include "wx/app.h"
 #include "wx/apptrait.h"
 
 #include "wx/arrimpl.cpp"

src/common/evtloopcmn.cpp

@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif //WX_PRECOMP
 
 // ----------------------------------------------------------------------------
 // globals

src/common/fileconf.cpp

@@ -28,9 +28,9 @@
     #include  "wx/string.h"
     #include  "wx/intl.h"
     #include  "wx/log.h"
+    #include  "wx/app.h"
 #endif  //WX_PRECOMP
 
-#include  "wx/app.h"
 #include  "wx/file.h"
 #include  "wx/textfile.h"
 #include  "wx/memtext.h"
@@ -1902,20 +1902,20 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
 
 int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
 {
-  #if wxCONFIG_CASE_SENSITIVE
+#if wxCONFIG_CASE_SENSITIVE
     return wxStrcmp(p1->Name(), p2->Name());
-  #else
+#else
     return wxStricmp(p1->Name(), p2->Name());
-  #endif
+#endif
 }
 
 int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
 {
-  #if wxCONFIG_CASE_SENSITIVE
+#if wxCONFIG_CASE_SENSITIVE
     return wxStrcmp(p1->Name(), p2->Name());
-  #else
+#else
     return wxStricmp(p1->Name(), p2->Name());
-  #endif
+#endif
 }
 
 // ----------------------------------------------------------------------------

src/common/gdicmn.cpp

@@ -17,7 +17,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/gdicmn.h"
@@ -25,6 +25,7 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/brush.h"
@@ -34,7 +35,6 @@
 #include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/palette.h"
-#include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/utils.h"
 #include "wx/settings.h"

src/common/http.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        http.cpp
+// Name:        src/common/http.cpp
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
 // Modified by: Simo Virokannas (authentication, Dec 2005)
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 
 #ifndef WX_PRECOMP
-#include "wx/string.h"
+    #include "wx/string.h"
-#include "wx/app.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/tokenzr.h"
@@ -126,7 +126,7 @@ wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass)
 
     toencode.Printf(wxT("%s:%s"),user.c_str(),pass.c_str());
 
-    size_t len = toencode.Length();
+    size_t len = toencode.length();
     const wxChar *from = toencode.c_str();
     while (len >= 3) { // encode full blocks first
         buf << wxString::Format(wxT("%c%c"), base64[(from[0] >> 2) & 0x3f], base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)]);
@@ -180,7 +180,7 @@ bool wxHTTP::ParseHeaders()
         if (m_perr != wxPROTO_NOERR)
             return false;
 
-        if (line.Length() == 0)
+        if (line.length() == 0)
             break;
 
         wxString left_str = line.BeforeFirst(':');
@@ -261,7 +261,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
     // Send authentication information
-    if (m_username.Length()>0 || m_password.Length()>0) {
+    if (!m_username.empty() || !m_password.empty()) {
         SetHeader(wxT("Authorization"), GenerateAuthString(m_username, m_password));
     }
 
@@ -420,4 +420,3 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 }
 
 #endif // wxUSE_PROTOCOL_HTTP
-

src/common/intl.cpp

@@ -46,6 +46,7 @@
     #include "wx/log.h"
     #include "wx/debug.h"
     #include "wx/utils.h"
+    #include "wx/app.h"
 #endif // WX_PRECOMP
 
 #ifndef __WXWINCE__
@@ -73,7 +74,6 @@
 #include "wx/encconv.h"
 #include "wx/hashmap.h"
 #include "wx/ptr_scpd.h"
-#include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
 

src/common/popupcmn.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/popupcmn.cpp
+// Name:        src/common/popupcmn.cpp
 // Purpose:     implementation of wxPopupTransientWindow
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -32,7 +32,6 @@
     #include "wx/combobox.h"        // wxComboControl
     #include "wx/app.h"             // wxPostEvent
     #include "wx/log.h"
-    #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #ifdef __WXUNIVERSAL__
@@ -570,4 +569,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
 }
 
 #endif // wxUSE_POPUPWIN
-

src/common/socket.cpp

@@ -30,9 +30,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/timer.h"
 #include "wx/utils.h"

src/generic/dcpsg.cpp

@@ -22,11 +22,11 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif // WX_PRECOMP
 
 #include "wx/dcmemory.h"
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/image.h"
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"

src/gtk/cursor.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.cpp
+// Name:        src/gtk/cursor.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,8 +11,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/utils.h"
-#include "wx/app.h"
 
 #include "wx/gtk/private.h" //for idle stuff
 

src/gtk/dataobj.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
@@ -239,7 +239,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 
-    return TRUE;
+    return true;
 }
 
 size_t wxFileDataObject::GetDataSize() const
@@ -303,7 +303,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
@@ -348,12 +348,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
-        return FALSE;
+        return false;
     }
 
     memcpy(buf, m_pngData, m_pngSize);
 
-    return TRUE;
+    return true;
 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)
@@ -361,7 +361,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     Clear();
 
     wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
-                 FALSE, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
+                 false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
@@ -372,7 +372,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxImage image;
     if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
     {
-        return FALSE;
+        return false;
     }
 
     m_bitmap = wxBitmap(image);

src/gtk/dialog.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.cpp
+// Name:        src/gtk/dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,8 +11,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 

src/gtk/dnd.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/window.h"
-#include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 
@@ -338,7 +338,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     else
     {
-        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") );
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
 
 #if wxUSE_THREADS
         /* disable GUI threads */
@@ -416,7 +416,7 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
-        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") );
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );
 
         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );

src/gtk/evtloop.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/evtloop.cpp
+// Name:        src/gtk/evtloop.cpp
 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
 
@@ -106,10 +109,9 @@ bool wxEventLoop::Pending() const
 
 bool wxEventLoop::Dispatch()
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
     gtk_main_iteration();
 
-    return TRUE;
+    return true;
 }
-

src/gtk/frame.cpp

@@ -19,9 +19,13 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/dialog.h"
 #include "wx/control.h"
-#include "wx/app.h"
 #include "wx/menu.h"
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"

src/gtk/glcanvas.cpp

@@ -16,10 +16,13 @@
 
 #include "wx/glcanvas.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
 #include "wx/colour.h"
 #include "wx/module.h"
-#include "wx/app.h"
 
 extern "C"
 {
@@ -216,7 +219,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
 
-        win->m_exposed = FALSE;
+        win->m_exposed = false;
         win->GetUpdateRegion().Clear();
     }
 
@@ -235,7 +238,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    win->m_exposed = TRUE;
+    win->m_exposed = true;
 
     win->GetUpdateRegion().Union( gdk_event->area.x,
                                   gdk_event->area.y,
@@ -318,9 +321,9 @@ bool wxGLCanvas::Create( wxWindow *parent,
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 
-    m_exposed = FALSE;
+    m_exposed = false;
-    m_noExpose = TRUE;
+    m_noExpose = true;
-    m_nativeSizeEvent = TRUE;
+    m_nativeSizeEvent = true;
     m_fbc = NULL;
     m_vi = NULL;
 
@@ -334,22 +337,22 @@ bool wxGLCanvas::Create( wxWindow *parent,
         if (wxTheApp->m_glFBCInfo != NULL)
         {
             fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo;
-            m_canFreeFBC = FALSE; // owned by wxTheApp - don't free upon destruction
+            m_canFreeFBC = false; // owned by wxTheApp - don't free upon destruction
         }
         else
         {
             fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList);
-            m_canFreeFBC = TRUE;
+            m_canFreeFBC = true;
         }
         m_fbc = fbc;  // save for later use
-        wxCHECK_MSG( m_fbc, FALSE, _T("required FBConfig couldn't be found") );
+        wxCHECK_MSG( m_fbc, false, _T("required FBConfig couldn't be found") );
     }
 
     XVisualInfo *vi = NULL;
     if (wxTheApp->m_glVisualInfo != NULL)
     {
         vi = (XVisualInfo *)wxTheApp->m_glVisualInfo;
-        m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction
+        m_canFreeVi = false; // owned by wxTheApp - don't free upon destruction
     }
     else
     {
@@ -360,12 +363,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
             // GLX <= 1.2
             vi = (XVisualInfo *) ChooseGLVisual(attribList);
 
-        m_canFreeVi = TRUE;
+        m_canFreeVi = true;
     }
 
     m_vi = vi;  // save for later use
 
-    wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") );
+    wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") );
     GdkVisual *visual;
     GdkColormap *colormap;
 
@@ -432,7 +435,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
     if (GTK_WIDGET_MAPPED(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );
 
-    return TRUE;
+    return true;
 }
 
 wxGLCanvas::~wxGLCanvas()
@@ -630,7 +633,7 @@ void wxGLCanvas::OnInternalIdle()
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );
 
-        m_exposed = FALSE;
+        m_exposed = false;
         GetUpdateRegion().Clear();
     }
 

src/gtk/menu.cpp

@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/bitmap.h"
 
 #if wxUSE_ACCEL
@@ -151,7 +151,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
     // the parent window is known after wxFrame::SetMenu()
-    m_needParent = FALSE;
+    m_needParent = false;
     m_style = style;
     m_invokingWindow = (wxWindow*) NULL;
 
@@ -286,7 +286,7 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     if ( !wxMenuBarBase::Append( menu, title ) )
-        return FALSE;
+        return false;
 
     return GtkAppend(menu, title);
 }
@@ -332,20 +332,20 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
             frame->UpdateMenuBarSize();
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
-        return FALSE;
+        return false;
 
     // TODO
 
     if ( !GtkAppend(menu, title, (int)pos) )
-        return FALSE;
+        return false;
 
-    return TRUE;
+    return true;
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
@@ -884,9 +884,9 @@ void wxMenuItem::Enable( bool enable )
 
 bool wxMenuItem::IsChecked() const
 {
-    wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
+    wxCHECK_MSG( m_menuItem, false, wxT("invalid menu item") );
 
-    wxCHECK_MSG( IsCheckable(), FALSE,
+    wxCHECK_MSG( IsCheckable(), false,
                  wxT("can't get state of uncheckable item!") );
 
     return ((GtkCheckMenuItem*)m_menuItem)->active != 0;
@@ -1086,7 +1086,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
         // gtk_widget_lock_accelerators(mitem->GetMenuItem());
     }
 
-    return TRUE;
+    return true;
 }
 
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
@@ -1415,7 +1415,7 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 extern "C" WXDLLIMPEXP_CORE
 void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )
 {
-    *is_waiting = FALSE;
+    *is_waiting = false;
 }
 
 WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win )

src/gtk/popupwin.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        src/gtk/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -13,8 +13,12 @@
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>
@@ -165,13 +169,13 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
-    m_needParent = FALSE;
+    m_needParent = false;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
     // Unlike windows, top level windows are created hidden by default.
@@ -216,7 +220,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     g_signal_connect (m_widget, "button_press_event",
                       G_CALLBACK (gtk_popup_button_press), this);
 
-    return TRUE;
+    return true;
 }
 
 void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
@@ -230,7 +234,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 
     if (m_resizing) return; /* I don't like recursions */
-    m_resizing = TRUE;
+    m_resizing = true;
 
     int old_x = m_x;
     int old_y = m_y;
@@ -292,11 +296,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
 
         /* actual resizing is deferred to GtkOnSize in idle time and
            when showing the dialog */
-        m_sizeSet = FALSE;
+        m_sizeSet = false;
 
     }
 
-    m_resizing = FALSE;
+    m_resizing = false;
 }
 
 void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -330,7 +334,7 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
                                    (GdkWindowHints) flag );
 
 
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );

src/gtk/toplevel.cpp

@@ -26,11 +26,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/dialog.h"
 #include "wx/control.h"
-#include "wx/app.h"
 #include "wx/dcclient.h"
 #include "wx/gtk/private.h"
 #include "wx/timer.h"

src/gtk/utilsres.cpp

@@ -16,10 +16,10 @@
     #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/config.h"
-#include "wx/app.h"
 
 //-----------------------------------------------------------------------------
 // resource functions

src/gtk/window.cpp

@@ -19,11 +19,11 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/dcclient.h"
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/layout.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"

src/gtk1/bitmap.cpp

@@ -11,12 +11,16 @@
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/palette.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/dcmemory.h"
-#include "wx/app.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>

src/gtk1/cursor.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.cpp
+// Name:        src/gtk1/cursor.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,8 +11,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/utils.h"
-#include "wx/app.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>

src/gtk1/dataobj.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/debug.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
@@ -227,7 +227,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 
-    return TRUE;
+    return true;
 }
 
 size_t wxFileDataObject::GetDataSize() const
@@ -291,7 +291,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
@@ -336,12 +336,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
-        return FALSE;
+        return false;
     }
 
     memcpy(buf, m_pngData, m_pngSize);
 
-    return TRUE;
+    return true;
 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)
@@ -349,7 +349,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     Clear();
 
     wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
-                 FALSE, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
+                 false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
@@ -360,7 +360,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxImage image;
     if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
     {
-        return FALSE;
+        return false;
     }
 
     m_bitmap = wxBitmap(image);

src/gtk1/dialog.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.cpp
+// Name:        src/gtk1/dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,8 +11,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 

src/gtk1/dnd.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/window.h"
-#include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 

src/gtk1/evtloop.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/evtloop.cpp
+// Name:        src/gtk1/evtloop.cpp
 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
 
@@ -106,10 +109,9 @@ bool wxEventLoop::Pending() const
 
 bool wxEventLoop::Dispatch()
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
     gtk_main_iteration();
 
-    return TRUE;
+    return true;
 }
-

src/gtk1/frame.cpp

@@ -19,9 +19,13 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/dialog.h"
 #include "wx/control.h"
-#include "wx/app.h"
 #include "wx/menu.h"
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"

src/gtk1/glcanvas.cpp

@@ -16,10 +16,13 @@
 
 #include "wx/glcanvas.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
 #include "wx/colour.h"
 #include "wx/module.h"
-#include "wx/app.h"
 
 extern "C"
 {
@@ -221,7 +224,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
 
-        win->m_exposed = FALSE;
+        win->m_exposed = false;
         win->GetUpdateRegion().Clear();
     }
 
@@ -240,7 +243,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    win->m_exposed = TRUE;
+    win->m_exposed = true;
 
     win->GetUpdateRegion().Union( gdk_event->area.x,
                                   gdk_event->area.y,
@@ -260,7 +263,7 @@ gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxG
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    win->m_exposed = TRUE;
+    win->m_exposed = true;
 
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
@@ -341,9 +344,9 @@ bool wxGLCanvas::Create( wxWindow *parent,
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 
-    m_exposed = FALSE;
+    m_exposed = false;
-    m_noExpose = TRUE;
+    m_noExpose = true;
-    m_nativeSizeEvent = TRUE;
+    m_nativeSizeEvent = true;
     m_fbc = NULL;
     m_vi = NULL;
 
@@ -357,22 +360,22 @@ bool wxGLCanvas::Create( wxWindow *parent,
         if (wxTheApp->m_glFBCInfo != NULL)
         {
             fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo;
-            m_canFreeFBC = FALSE; // owned by wxTheApp - don't free upon destruction
+            m_canFreeFBC = false; // owned by wxTheApp - don't free upon destruction
         }
         else
         {
             fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList);
-            m_canFreeFBC = TRUE;
+            m_canFreeFBC = true;
         }
         m_fbc = fbc;  // save for later use
-        wxCHECK_MSG( m_fbc, FALSE, _T("required FBConfig couldn't be found") );
+        wxCHECK_MSG( m_fbc, false, _T("required FBConfig couldn't be found") );
     }
 
     XVisualInfo *vi = NULL;
     if (wxTheApp->m_glVisualInfo != NULL)
     {
         vi = (XVisualInfo *)wxTheApp->m_glVisualInfo;
-        m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction
+        m_canFreeVi = false; // owned by wxTheApp - don't free upon destruction
     }
     else
     {
@@ -383,12 +386,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
             // GLX <= 1.2
             vi = (XVisualInfo *) ChooseGLVisual(attribList);
 
-        m_canFreeVi = TRUE;
+        m_canFreeVi = true;
     }
 
     m_vi = vi;  // save for later use
 
-    wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") );
+    wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") );
     GdkVisual *visual;
     GdkColormap *colormap;
 
@@ -454,7 +457,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
     if (GTK_WIDGET_MAPPED(m_wxwindow))
         gtk_glwindow_map_callback( m_wxwindow, this );
 
-    return TRUE;
+    return true;
 }
 
 wxGLCanvas::~wxGLCanvas()
@@ -652,7 +655,7 @@ void wxGLCanvas::OnInternalIdle()
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );
 
-        m_exposed = FALSE;
+        m_exposed = false;
         GetUpdateRegion().Clear();
     }
 

src/gtk1/menu.cpp

@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/bitmap.h"
 
 #if wxUSE_ACCEL
@@ -1450,7 +1450,7 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 extern "C" WXDLLIMPEXP_CORE
 void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )
 {
-    *is_waiting = FALSE;
+    *is_waiting = false;
 }
 
 WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win )

src/gtk1/popupwin.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        src/gtk1/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -13,8 +13,12 @@
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>
@@ -168,13 +172,13 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
-    m_needParent = FALSE;
+    m_needParent = false;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
     // Unlike windows, top level windows are created hidden by default.
@@ -231,7 +235,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 
     if (m_resizing) return; /* I don't like recursions */
-    m_resizing = TRUE;
+    m_resizing = true;
 
     int old_x = m_x;
     int old_y = m_y;
@@ -292,11 +296,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
 
         /* actual resizing is deferred to GtkOnSize in idle time and
            when showing the dialog */
-        m_sizeSet = FALSE;
+        m_sizeSet = false;
 
     }
 
-    m_resizing = FALSE;
+    m_resizing = false;
 }
 
 void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -330,7 +334,7 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
                                    (GdkWindowHints) flag );
 
 
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );

src/gtk1/toplevel.cpp

@@ -26,11 +26,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/dialog.h"
 #include "wx/control.h"
-#include "wx/app.h"
 #include "wx/dcclient.h"
 #include "wx/gtk1/private.h"
 #include "wx/timer.h"

src/gtk1/utilsres.cpp

@@ -16,10 +16,10 @@
     #include "wx/list.h"
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/config.h"
-#include "wx/app.h"
 
 //-----------------------------------------------------------------------------
 // resource functions

src/gtk1/window.cpp

@@ -19,11 +19,11 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/dcclient.h"
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/layout.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"

src/html/htmlpars.cpp

@@ -19,6 +19,7 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/tokenzr.h"
@@ -34,7 +35,6 @@
 #endif
 
 // DLL options compatibility check:
-#include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxHTML")
 
 const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");

src/mac/carbon/cfsocket.cpp

@@ -25,9 +25,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/apptrait.h"
 #include "wx/timer.h"
 #include "wx/utils.h"

src/mac/carbon/clipbrd.cpp

@@ -19,9 +19,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/utils.h"

src/mac/carbon/control.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/mac/carbon/control.cpp
 // Purpose:     wxControl class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,8 +12,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/control.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/panel.h"
-#include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/notebook.h"
@@ -91,4 +95,3 @@ void  wxControl::OnKeyDown( wxKeyEvent &event )
 
     m_peer->HandleKey( keyCode, charCode, modifiers );
 }
-

src/mac/carbon/cursor.cpp

@@ -11,8 +11,12 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/app.h"
 #include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"

src/mac/carbon/dc.cpp

@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"

src/mac/carbon/dccg.cpp

@@ -17,9 +17,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"

src/mac/carbon/dialog.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.cpp
+// Name:        src/mac/carbon/dialog.cpp
 // Purpose:     wxDialog class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,9 +12,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/utils.h"
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"
@@ -270,4 +274,3 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
   SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }
-

src/mac/carbon/dnd.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dnd.cpp
+// Name:        src/mac/carbon/dnd.cpp
 // Purpose:     wxDropTarget, wxDropSource implementations
 // Author:      Stefan Csomor
 // Modified by:
@@ -14,9 +14,13 @@
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dnd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/window.h"
 #include "wx/toplevel.h"
-#include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
@@ -265,7 +269,7 @@ bool wxDropTarget::GetData()
                                 HFSFlavor* theFile = (HFSFlavor*)theData;
                                 wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec );
 
-                                if (!name.IsEmpty())
+                                if (!name.empty())
                                     filenamesPassed += name + wxT("\n");
                             }
                             break;

src/mac/carbon/evtloop.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        mac/carbon/evtloop.cpp
+// Name:        src/mac/carbon/evtloop.cpp
 // Purpose:     implementation of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
 
 #ifdef __DARWIN__
     #include <Carbon/Carbon.h>
@@ -104,4 +107,3 @@ bool wxEventLoop::Dispatch()
     wxTheApp->MacDoOneEvent();
     return true;
 }
-

src/mac/carbon/filedlg.cpp

@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/tokenzr.h"

src/mac/carbon/frame.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.cpp
+// Name:        src/mac/carbon/frame.cpp
 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,6 +12,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"
@@ -19,7 +24,6 @@
 #include "wx/dcclient.h"
 #include "wx/dialog.h"
 #include "wx/settings.h"
-#include "wx/app.h"
 
 #include "wx/mac/uma.h"
 
@@ -398,4 +402,3 @@ void wxFrame::PositionBars()
 }
 
 #endif
-

src/mac/carbon/listbox.cpp

@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"

src/mac/carbon/menu.cpp

@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/log.h"

src/mac/carbon/menuitem.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/mac/carbon/menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Stefan Csomor
 // Modified by:
@@ -11,10 +11,14 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/app.h"
-#include "wx/menu.h"
 #include "wx/menuitem.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
+#include "wx/menu.h"
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

src/mac/carbon/msgdlg.cpp

@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/mac/uma.h"
 
 

src/mac/carbon/notebmac.cpp

@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/string.h"
 #include "wx/imaglist.h"
 #include "wx/image.h"

src/mac/carbon/printmac.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printwin.cpp
+// Name:        src/mac/carbon/printwin.cpp
 // Purpose:     wxMacPrinter framework
 // Author:      Julian Smart
 // Modified by:
@@ -15,14 +15,14 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
+    #include "wx/utils.h"
-#include "wx/dc.h"
+    #include "wx/dc.h"
-#include "wx/app.h"
+    #include "wx/app.h"
-#include "wx/msgdlg.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #include "wx/math.h"
@@ -134,7 +134,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
         kPMLandscape : kPMPortrait , false ) ;
     // collate cannot be set
 #if 0 // not yet tested
-    if ( m_printerName.Length() > 0 )
+    if ( !m_printerName.empty() )
         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     PMColorMode color ;

src/mac/carbon/stattext.cpp

@@ -13,8 +13,12 @@
 
 #if wxUSE_STATTEXT
 
-#include "wx/app.h"
 #include "wx/stattext.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dc.h"
@@ -81,7 +85,7 @@ wxSize wxStaticText::DoGetBestSize() const
     if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
     {
         err = GetThemeTextDimensions(
-            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
+            (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
             m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
     }
@@ -93,12 +97,12 @@ wxSize wxStaticText::DoGetBestSize() const
         ::TextFace( m_font.MacGetFontStyle() );
 
         err = GetThemeTextDimensions(
-            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
+            (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
             kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
     }
 
-    if ( m_label.Length() == 0 )
+    if ( m_label.empty() )
         bounds.h = 0;
 
     bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
@@ -145,4 +149,3 @@ bool wxStaticText::SetFont(const wxFont& font)
 }
 
 #endif //if wxUSE_STATTEXT
-

src/mac/carbon/textctrl.cpp

@@ -17,6 +17,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
 #ifdef __DARWIN__
@@ -36,7 +37,6 @@
     #endif
 #endif
 
-#include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"

src/mac/carbon/tooltip.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tooltip.cpp
+// Name:        src/mac/carbon/tooltip.cpp
 // Purpose:     wxToolTip implementation
 // Author:      Stefan Csomor
 // Id:          $Id$
@@ -11,10 +11,14 @@
 
 #if wxUSE_TOOLTIPS
 
-#include "wx/app.h"
+#include "wx/tooltip.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/dc.h"
 #include "wx/window.h"
-#include "wx/tooltip.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
@@ -228,7 +232,7 @@ const short kTipOffset = 5 ;
 
 void wxMacToolTip::Draw()
 {
-    if ( m_label.Length() == 0 )
+    if ( m_label.empty() )
         return ;
 
     if ( m_window == s_ToolTipWindowRef )
@@ -267,7 +271,7 @@ void wxMacToolTip::Draw()
         short height = 0 ;
 
         int i = 0 ;
-        int length = m_label.Length() ;
+        int length = m_label.length() ;
         int width = 0 ;
         int thiswidth = 0 ;
         int laststop = 0 ;
@@ -422,4 +426,3 @@ void wxMacToolTip::Clear()
 }
 
 #endif
-

src/mac/carbon/toplevel.cpp

@@ -38,7 +38,6 @@
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
-#include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 
@@ -1789,4 +1788,3 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16
 
     return 0;
 }
-

src/mac/carbon/utils.cpp

@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/apptrait.h"
 
 #if wxUSE_GUI

src/mac/carbon/window.cpp

@@ -15,13 +15,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"

src/mac/classic/clipbrd.cpp

@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/utils.h"
@@ -190,12 +190,12 @@ void wxClipboard::Clear()
 
 bool wxClipboard::Flush()
 {
-    return FALSE;
+    return false;
 }
 
 bool wxClipboard::Open()
 {
-    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );
     m_open = true ;
     return true ;
 }
@@ -207,9 +207,9 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
 
-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
 
     Clear();
     // as we can only store one wxDataObject, this is the same in this
@@ -219,9 +219,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
 
-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
 
     /* we can only store one wxDataObject */
     Clear();
@@ -318,11 +318,11 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
         {
             if (( err = GetScrapFlavorSize( scrapRef, dataFormat.GetFormatId(), &byteCount )) == noErr)
             {
-                return TRUE ;
+                return true ;
             }
         }
     }
-    return FALSE;
+    return false;
 
 #else
     long offset ;
@@ -338,7 +338,7 @@ bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
-    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
 
     size_t formatcount = data.GetFormatCount() + 1 ;
     wxDataFormat *array = new wxDataFormat[ formatcount  ];

src/mac/classic/control.cpp

@@ -16,8 +16,12 @@
 #endif
 
 #include "wx/control.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/panel.h"
-#include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/notebook.h"
@@ -435,13 +439,13 @@ void wxControl::MacAdjustControlRect()
         {
             if ( IsKindOf( CLASSINFO( wxButton ) ) )
             {
-                m_width = m_label.Length() * 8 + 12 ;
+                m_width = m_label.length() * 8 + 12 ;
                 if ( m_width < 70 )
                   m_width = 70 ;
             }
             else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
             {
-                m_width = m_label.Length() * 8 ;
+                m_width = m_label.length() * 8 ;
             }
             else
                 m_width = bestsize.right - bestsize.left ;

src/mac/classic/cursor.cpp

@@ -15,8 +15,12 @@
     #pragma hdrstop
 #endif
 
-#include "wx/app.h"
 #include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/icon.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"

src/mac/classic/dc.cpp

@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/mac/uma.h"
 #include "wx/dcmemory.h"
 #include "wx/dcprint.h"

src/mac/classic/dialog.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.cpp
+// Name:        src/mac/classic/dialog.cpp
 // Purpose:     wxDialog class
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,10 +9,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/utils.h"
 #include "wx/frame.h"
-#include "wx/app.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"
@@ -54,14 +60,14 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
+        return false;
 
     MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style) & ~(wxYES|wxOK|wxNO|wxCANCEL) , name ) ;
 
     m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
 
-    return TRUE;
+    return true;
 }
 
 void wxDialog::SetModal(bool flag)
@@ -85,8 +91,8 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
-    Show(FALSE);
+    Show(false);
 }
 
 // By default, pressing escape cancels the dialog , on mac command-stop does the same thing
@@ -124,7 +130,7 @@ bool wxDialog::Show(bool show)
     if ( !wxDialogBase::Show(show) )
     {
         // nothing to do
-        return FALSE;
+        return false;
     }
 
     if ( show )
@@ -141,13 +147,13 @@ bool wxDialog::Show(bool show)
         }
         else // end of modal dialog
         {
-            // this will cause IsModalShowing() return FALSE and our local
+            // this will cause IsModalShowing() return false and our local
             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 #if !TARGET_CARBON
@@ -182,15 +188,15 @@ void wxDialog::DoShowModal()
 }
 
 
-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
     if ( !IsModal() )
     {
-        SetModal(TRUE);
+        SetModal(true);
     }
 
-    Show(TRUE);
+    Show(true);
     return GetReturnCode();
 }
 
@@ -199,7 +205,7 @@ int wxDialog::ShowModal()
 void wxDialog::EndModal(int retCode)
 {
     SetReturnCode(retCode);
-  Show(FALSE);
+    Show(false);
 }
 
 // Standard buttons
@@ -258,4 +264,3 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
   SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }
-

src/mac/classic/dnd.cpp

@@ -18,9 +18,13 @@
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dnd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/window.h"
 #include "wx/toplevel.h"
-#include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/mac/private.h"
 
@@ -207,7 +211,7 @@ bool wxDropTarget::GetData()
                         {
                             theData[dataSize]=0 ;
                             wxString convert( theData , wxConvLocal ) ;
-                            m_dataObject->SetData( format, convert.Length() * sizeof(wxChar), (const wxChar*) convert );
+                            m_dataObject->SetData( format, convert.length() * sizeof(wxChar), (const wxChar*) convert );
                         }
                         else if ( theType == kDragFlavorTypeHFS )
                         {

src/mac/classic/filedlg.cpp

@@ -19,9 +19,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/tokenzr.h"
@@ -320,7 +320,7 @@ pascal Boolean CrossPlatformFilterCallback (
                 wxString file = wxMacMakeStringFromPascal( spec.name ) ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }
- #if TARGET_CARBON
+#if TARGET_CARBON
             else if ( theItem->descriptorType == typeFSRef )
             {
                 FSRef fsref ;

src/mac/classic/frame.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.cpp
+// Name:        src/mac/classic/frame.cpp
 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,7 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"
@@ -17,7 +24,6 @@
 #include "wx/dcclient.h"
 #include "wx/dialog.h"
 #include "wx/settings.h"
-#include "wx/app.h"
 
 #include "wx/mac/uma.h"
 
@@ -49,7 +55,7 @@ void wxFrame::Init()
     m_frameStatusBar = NULL;
     m_winLastFocused = NULL ;
 
-    m_iconized = FALSE;
+    m_iconized = false;
 
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
@@ -92,7 +98,7 @@ bool wxFrame::Create(wxWindow *parent,
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
+        return false;
 
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
 
@@ -101,12 +107,12 @@ bool wxFrame::Create(wxWindow *parent,
 
     wxModelessWindows.Append(this);
 
-    return TRUE;
+    return true;
 }
 
 wxFrame::~wxFrame()
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
     DeleteAllBars();
 }
 
@@ -114,7 +120,7 @@ wxFrame::~wxFrame()
 bool wxFrame::Enable(bool enable)
 {
     if ( !wxWindow::Enable(enable) )
-        return FALSE;
+        return false;
 
     if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
     {
@@ -125,7 +131,7 @@ bool wxFrame::Enable(bool enable)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,

src/mac/classic/listbox.cpp

@@ -18,9 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"

src/mac/classic/menu.cpp

@@ -22,9 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/menuitem.h"
 #include "wx/window.h"
 #include "wx/utils.h"
@@ -64,7 +64,7 @@ short wxMenu::s_macNextMenuId = 2 ;
 
 void wxMenu::Init()
 {
-    m_doBreak = FALSE;
+    m_doBreak = false;
     m_startRadioGroup = -1;
 
     // create the menu
@@ -167,7 +167,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
         GetMenuBar()->Refresh();
     }
-    return TRUE ;
+    return true ;
 }
 
 void wxMenu::EndRadioGroup()
@@ -180,7 +180,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
     wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
 
-    bool check = FALSE;
+    bool check = false;
 
     if ( item->GetKind() == wxITEM_RADIO )
     {
@@ -196,7 +196,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
             item->SetRadioGroupEnd(m_startRadioGroup);
 
             // ensure that we have a checked item in the radio group
-            check = TRUE;
+            check = true;
         }
         else // extend the current radio group
         {
@@ -227,7 +227,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
     if ( check )
     {
         // check the item initially
-        item->Check(TRUE);
+        item->Check(true);
     }
 
     return item;
@@ -276,7 +276,7 @@ void wxMenu::SetTitle(const wxString& label)
 }
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
-    bool processed = FALSE;
+    bool processed = false;
 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
@@ -672,7 +672,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
     if ( !menuOld )
-        return FALSE;
+        return NULL;
     m_titles[pos] = title;
 
     if ( IsAttached() )
@@ -704,7 +704,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
-        return FALSE;
+        return false;
 
     m_titles.Insert(title, pos);
 
@@ -727,7 +727,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         Refresh();
     }
 
-    return TRUE;
+    return true;
 }
 
 wxMenu *wxMenuBar::Remove(size_t pos)
@@ -754,10 +754,10 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
 {
     WXHMENU submenu = menu ? menu->GetHMenu() : 0;
-    wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") );
+    wxCHECK_MSG( submenu, false, wxT("can't append invalid menu to menubar") );
 
     if ( !wxMenuBarBase::Append(menu, title) )
-        return FALSE;
+        return false;
 
     m_titles.Add(title);
 
@@ -778,7 +778,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if (m_invokingWindow)
         wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 
-    return TRUE;
+    return true;
 }
 
 static void wxMenubarUnsetInvokingWindow( wxMenu *menu )

src/mac/classic/menuitem.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/mac/classic/menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Stefan Csomor
 // Modified by:
@@ -13,10 +13,16 @@
 // headers & declarations
 // ============================================================================
 
-#include "wx/app.h"
+#include "wx/wxprec.h"
-#include "wx/menu.h"
+
 #include "wx/menuitem.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
+#include "wx/menu.h"
+
 #include "wx/mac/uma.h"
 // ============================================================================
 // implementation
@@ -55,7 +61,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
     }
 
     m_radioGroup.start = -1;
-    m_isRadioGroupStart = FALSE;
+    m_isRadioGroupStart = false;
 }
 
 wxMenuItem::~wxMenuItem()
@@ -241,7 +247,7 @@ void wxMenuItem::SetText(const wxString& text)
 
 void wxMenuItem::SetAsRadioGroupStart()
 {
-    m_isRadioGroupStart = TRUE;
+    m_isRadioGroupStart = true;
 }
 
 void wxMenuItem::SetRadioGroupStart(int start)

src/mac/classic/metafile.cpp

@@ -13,17 +13,18 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_METAFILE
 
+#include "wx/metafile.h"
+
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
+    #include "wx/utils.h"
-#include "wx/app.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/metafile.h"
 #include "wx/clipbrd.h"
 
 #include "wx/mac/private.h"

src/mac/classic/msgdlg.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

src/mac/classic/notebmac.cpp

@@ -24,9 +24,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/imaglist.h"
 #include "wx/image.h"
 #include "wx/mac/uma.h"

src/mac/classic/stattext.cpp

@@ -9,8 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
+#include "wx/wxprec.h"
+
 #include "wx/stattext.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/dc.h"

src/mac/classic/textctrl.cpp

@@ -17,6 +17,12 @@
 
 #if wxUSE_TEXTCTRL
 
+#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #ifdef __DARWIN__
     #include <sys/types.h>
     #include <sys/stat.h>
@@ -34,11 +40,9 @@
     #endif
 #endif
 
-#include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"
-#include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/settings.h"

src/mac/classic/tooltip.cpp

@@ -15,10 +15,14 @@
 
 #if wxUSE_TOOLTIPS
 
-#include "wx/app.h"
+#include "wx/tooltip.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/dc.h"
 #include "wx/window.h"
-#include "wx/tooltip.h"
 #include "wx/timer.h"
 #include "wx/geometry.h"
 #include "wx/mac/uma.h"
@@ -217,7 +221,7 @@ const short kTipOffset = 5 ;
 
 void wxMacToolTip::Draw()
 {
-    if ( m_label.Length() == 0 )
+    if ( m_label.empty() )
         return ;
 
     if ( m_window == s_ToolTipWindowRef )
@@ -258,7 +262,7 @@ void wxMacToolTip::Draw()
         short height = 0 ;
 
         int i = 0 ;
-        int length = m_label.Length() ;
+        int length = m_label.length() ;
         int width = 0 ;
         int thiswidth = 0 ;
         int laststop = 0 ;

src/mac/classic/toplevel.cpp

@@ -35,7 +35,6 @@
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
-#include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 #if wxUSE_SYSTEM_OPTIONS
@@ -510,7 +509,7 @@ void wxTopLevelWindowMac::Init()
     m_macUsesCompositing = false ;
 #if TARGET_CARBON
     m_macEventHandler = NULL ;
- #endif
+#endif
 }
 
 class wxMacDeferredWindowDeleter : public wxObject

src/mac/classic/utils.cpp

@@ -15,9 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/apptrait.h"
 
 #if wxUSE_GUI

src/mac/classic/window.cpp

@@ -15,13 +15,13 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"

src/mgl/app.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.cpp
+// Name:        src/mgl/app.cpp
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
@@ -14,6 +14,7 @@
     #pragma hdrstop
 #endif
 
+#include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
@@ -23,7 +24,6 @@
     #include "wx/intl.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/evtloop.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"
@@ -329,4 +329,3 @@ void wxApp::CleanUp()
 
     wxModule::RegisterModule(new wxMGLFinalCleanup);
 }
-

src/motif/clipbrd.cpp

@@ -23,10 +23,14 @@
 
 #if wxUSE_CLIPBOARD
 
-#include "wx/app.h"
+#include "wx/clipbrd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/bitmap.h"
 #include "wx/utils.h"
-#include "wx/clipbrd.h"
 #include "wx/dataobj.h"
 #include "wx/ptr_scpd.h"
 

src/motif/colour.cpp

@@ -17,8 +17,11 @@
 
 #include "wx/colour.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/gdicmn.h"
-#include "wx/app.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/motif/cursor.cpp

@@ -17,7 +17,11 @@
 #endif
 
 #include "wx/cursor.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/utils.h"
 #include "wx/window.h"
 

src/motif/dataobj.cpp

@@ -13,7 +13,11 @@
 #if wxUSE_CLIPBOARD
 
 #include "wx/dataobj.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/utils.h"
 
 #ifdef __VMS__

src/motif/dcclient.cpp

@@ -43,11 +43,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/dcmemory.h"
 #include "wx/window.h"
-#include "wx/app.h"
 #include "wx/image.h"
 #include "wx/math.h"
 

src/motif/dialog.cpp

@@ -20,8 +20,12 @@
 #endif
 
 #include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/evtloop.h"
 

src/motif/dnd.cpp

@@ -17,10 +17,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/window.h"
-#include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 

src/motif/evtloop.cpp

@@ -27,10 +27,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/event.h"
+    #include "wx/app.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
 #include "wx/window.h"
 
 #ifdef __VMS__

src/motif/filedlg.cpp

@@ -22,10 +22,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"

src/motif/frame.cpp

@@ -30,6 +30,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/statusbr.h"
@@ -37,7 +38,6 @@
 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/icon.h"
 
 #ifdef __VMS__

src/motif/menu.cpp

@@ -24,11 +24,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/menuitem.h"
 #include "wx/utils.h"
-#include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/settings.h"
 

src/motif/msgdlg.cpp

@@ -37,9 +37,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/app.h"
 #include "wx/motif/private.h"
 #include "wx/settings.h"
 

src/motif/palette.cpp

@@ -38,8 +38,12 @@ not the functionality that wxPalette::Create() aims to provide.
 #include "wx/wxprec.h"
 
 #include "wx/palette.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
 #include "wx/window.h"
-#include "wx/app.h"
 #include "wx/utils.h"
 
 #ifdef __VMS__

src/motif/popupwin.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        src/motif/popupwin.cpp
 // Purpose:     wxPopupWindow implementation
 // Author:      Mattia barbon
 // Modified by:
@@ -13,7 +13,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/popupwin.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint