wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

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

src/mgl/data.cpp

@@ -14,7 +14,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
 #include "wx/cursor.h"
 
 /* Current cursor, in order to hang on to

src/mgl/dirmgl.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mgl/dir.cpp
+// Name:        src/mgl/dir.cpp
 // Purpose:     wxDir implementation for MGL
 // Author:      Vaclav Slavik, Vadim Zeitlin
 // Modified by:
@@ -10,14 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -25,7 +17,13 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 #ifndef __UNIX__
 
@@ -272,4 +270,3 @@ bool wxDir::GetNext(wxString *filename) const
 }
 
 #endif // !__UNIX__
-

src/mgl/fontenum.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/unix/fontenum.cpp
+// Name:        src/mgl/fontenum.cpp
 // Purpose:     wxFontEnumerator class for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -15,14 +22,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/utils.h"
@@ -45,7 +44,7 @@
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
-    bool found = FALSE;
+    bool found = false;
     wxMGLFontFamilyList *list = wxTheFontsManager->GetFamilyList();
     wxMGLFontFamilyList::Node *node;
     wxMGLFontFamily *f = NULL;
@@ -61,9 +60,9 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
         if ( (!fixedWidthOnly || f->GetInfo()->isFixed) &&
              (encoding == wxFONTENCODING_SYSTEM || wxTestFontEncoding(info)) )
         {
-            found = TRUE;
+            found = true;
             if ( !OnFacename(f->GetName()) )
-                return TRUE;
+                return true;
         }
     }
 
@@ -141,5 +140,5 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
             break;
     }
 
-    return TRUE;
+    return true;
 }

src/mgl/toplevel.cpp

@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -15,15 +22,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/toplevel.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP

src/motif/bmpbuttn.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbuttn.cpp
+// Name:        src/motif/bmpbuttn.cpp
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtScreen XTSCREEN
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__
@@ -265,4 +263,3 @@ wxSize wxBitmapButton::DoGetBestSize() const
 
     return ret;
 }
-

src/motif/bmpmotif.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/motif/bmpmotif.cpp
 // Purpose:     wxBitmap
 // Author:      Julian Smart, originally in bitmap.cpp
 // Modified by:
@@ -17,7 +17,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
 #include "wx/motif/bmpmotif.h"
 
 #ifdef __VMS__

src/motif/button.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.cpp
+// Name:        src/motif/button.cpp
 // Purpose:     wxButton
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/button.h"
 
 #ifdef __VMS__

src/motif/checkbox.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.cpp
+// Name:        src/motif/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/checkbox.h"
 #include "wx/tglbtn.h"
 #include "wx/utils.h"

src/motif/checklst.cpp

@@ -18,8 +18,6 @@
 
 #if wxUSE_CHECKLISTBOX
 
-#include "wx/defs.h"
-
 #include "wx/checklst.h"
 #include "wx/arrstr.h"
 

src/motif/clipbrd.cpp

@@ -21,8 +21,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_CLIPBOARD
 
 #include "wx/app.h"

src/motif/control.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/motif/control.cpp
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/utils.h"

src/motif/dataobj.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dataobj.cpp
+// Name:        src/motif/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Id:          $Id$
@@ -10,8 +10,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_CLIPBOARD
 
 #include "wx/dataobj.h"

src/motif/dc.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.cpp
+// Name:        src/motif/dc.cpp
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
@@ -14,9 +14,8 @@
 
 #include "wx/dc.h"
 #include "wx/dcmemory.h"
-#include "wx/defs.h"
 
-    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 //-----------------------------------------------------------------------------
 // wxDC
@@ -212,4 +211,3 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }
-

src/motif/filedlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.cpp
+// Name:        src/motif/filedlg.cpp
 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
@@ -18,7 +18,6 @@
 #define XtWindow XTWINDOW
 #endif
 
-#include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"

src/motif/font.cpp

@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
@@ -434,7 +432,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->m_faceName ;
 }
@@ -478,7 +476,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
-    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
+    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty())
         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);

src/motif/menu.cpp

@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
@@ -731,4 +729,3 @@ bool wxMenuBar::SetFont(const wxFont& font)
 
     return true;
 }
-

src/motif/menuitem.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/motif/menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Julian Smart
 // Modified by:
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/utils.h"
@@ -171,7 +169,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar,
             (wxStripMenuCodes(m_text),
             xmLabelGadgetClass, (Widget) menu, NULL);
     }
-    else if ((!m_text.IsNull() && m_text != "") && (!m_subMenu))
+    else if (!m_text.empty() && !m_subMenu)
     {
         wxString strName = wxStripMenuCodes(m_text);
         if (IsCheckable())
@@ -258,7 +256,7 @@ void wxMenuItem::DestroyItem(bool full)
         ;      // Nothing
 
     }
-    else if ((!m_text.IsNull() && (m_text != "")) && !m_subMenu)
+    else if (!m_text.empty() && !m_subMenu)
     {
         if (m_buttonWidget)
         {
@@ -412,4 +410,3 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData,
         }
     }
 }
-

src/motif/msgdlg.cpp

@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #pragma message disable nosimpint

src/motif/radiobut.cpp

@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/radiobut.h"
 #include "wx/utils.h"
 

src/motif/scrolbar.cpp

@@ -12,7 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
 #include "wx/scrolbar.h"
 
 #ifdef __VMS__

src/motif/slider.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        src/motif/slider.cpp
 // Purpose:     wxSlider
 // Author:      Julian Smart
 // Modified by:
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_SLIDER
 
 #include "wx/slider.h"

src/motif/spinbutt.cpp

@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"

src/motif/statbmp.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/motif/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:
@@ -12,8 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/statbmp.h"
 
 #ifdef __VMS__
@@ -156,4 +154,3 @@ void wxStaticBitmap::ChangeForegroundColour()
     m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }
-

src/motif/statbox.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.cpp
+// Name:        src/motif/statbox.cpp
 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #include "wx/statbox.h"
 #include "wx/utils.h"
 
@@ -101,8 +99,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
             // XmNshadowType, XmSHADOW_IN,
             NULL);
 
-    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
+    if (!label.empty())
-    if (hasLabel)
     {
         wxString label1(wxStripMenuCodes(label));
         wxXmString text(label1);

src/motif/stattext.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/motif/stattext.cpp
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:
@@ -16,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"

src/motif/textctrl.cpp

@@ -24,8 +24,6 @@
 #define XtParent XTPARENT
 #endif
 
-#include "wx/defs.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -488,7 +486,7 @@ void wxTextCtrl::ShowPosition(long pos)
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);
-    return (int) str.Length();
+    return (int) str.length();
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const

src/msdos/mimetype.cpp

@@ -16,9 +16,7 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
+#if wxUSE_MIMETYPE
-  #include "wx/defs.h"
-#endif
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
@@ -27,8 +25,6 @@
     #endif
 #endif //WX_PRECOMP
 
-#if wxUSE_MIMETYPE
-
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"

src/msw/colordlg.cpp

@@ -26,7 +26,6 @@
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
-    #include "wx/defs.h"
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"

src/msw/fontdlg.cpp

@@ -27,7 +27,6 @@
 #if wxUSE_FONTDLG
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #endif

src/msw/gauge95.cpp

@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
 #if wxUSE_GAUGE
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/gauge.h"
 #include "wx/msw/private.h"
 

src/msw/helpbest.cpp

@@ -17,11 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/filefn.h"
-#include "wx/log.h"
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP \
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)

src/msw/helpwin.cpp

@@ -13,15 +13,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
 #if wxUSE_HELP
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/filefn.h"
 #include "wx/msw/helpwin.h"
 
@@ -53,14 +52,14 @@ bool wxWinHelpController::Initialize(const wxString& filename)
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
-    if (!file.IsEmpty())
+    if (!file.empty())
         m_helpFile = file;
     return true;
 }
 
 bool wxWinHelpController::DisplayContents(void)
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -70,7 +69,7 @@ bool wxWinHelpController::DisplayContents(void)
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -79,7 +78,7 @@ bool wxWinHelpController::DisplaySection(int section)
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -95,7 +94,7 @@ bool wxWinHelpController::DisplayBlock(long block)
 bool wxWinHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {
-    if (m_helpFile.IsEmpty()) return false;
+    if (m_helpFile.empty()) return false;
 
     wxString str = GetValidFilename(m_helpFile);
 
@@ -115,7 +114,7 @@ wxString wxWinHelpController::GetValidFilename(const wxString& file) const
     wxSplitPath(file, & path, & name, & ext);
 
     wxString fullName;
-    if (path.IsEmpty())
+    if (path.empty())
         fullName = name + wxT(".hlp");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".hlp");

src/msw/icon.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/icon.cpp
+// Name:        src/msw/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
@@ -151,4 +151,3 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
-

src/msw/msgdlg.cpp

@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
@@ -126,4 +125,3 @@ int wxMessageDialog::ShowModal()
     }
     return ans;
 }
-

src/msw/mslu.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/mslu.cpp
+// Name:        src/msw/mslu.cpp
 // Purpose:     Fixes for bugs in MSLU
 // Author:      Vaclav Slavik
 // Modified by:
@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
-#include <dir.h>
+    #include <dir.h>
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
 #endif
 

src/msw/ole/automtn.cpp

@@ -13,11 +13,9 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Watcom C++ gives a linker error if this is compiled in.
 // With Borland C++, all samples crash if this is compiled in.
 #if wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)

src/msw/popupwin.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/popupwin.cpp
+// Name:        src/msw/popupwin.cpp
 // Purpose:     implements wxPopupWindow for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif //WX_PRECOMP
-
 #if wxUSE_POPUPWIN
 
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
 #include "wx/popupwin.h"
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
@@ -112,4 +111,3 @@ bool wxPopupWindow::Show(bool show)
 }
 
 #endif // #if wxUSE_POPUPWIN
-

src/msw/printwin.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printwin.cpp
+// Name:        src/msw/printwin.cpp
 // Purpose:     wxWindowsPrinter framework
 // Author:      Julian Smart
 // Modified by:
@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Don't use the Windows printer if we're in wxUniv mode and using
 // the PostScript architecture
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

src/msw/taskbar.cpp

@@ -14,15 +14,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include "wx/window.h"
-#include "wx/window.h"
+    #include "wx/frame.h"
-#include "wx/frame.h"
+    #include "wx/utils.h"
-#include "wx/utils.h"
+    #include "wx/menu.h"
-#include "wx/menu.h"
 #endif
 
 #include "wx/msw/private.h"

src/msw/wince/filefnwce.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filefn.cpp
+// Name:        src/msw/wince/filefn.cpp
 // Purpose:     File- and directory-related functions
 // Author:      Julian Smart
 // Modified by:
@@ -19,13 +19,13 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/defs.h"
-#include "wx/file.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#include "wx/file.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

src/os2/combobox.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/os2/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:
@@ -12,13 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_COMBOBOX
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/settings.h"
 #endif
 
-#if wxUSE_COMBOBOX
-
 #include "wx/combobox.h"
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"

src/os2/dataobj.cpp

@@ -20,14 +20,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_DATAOBJ
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 
-#if wxUSE_DATAOBJ
-
 #include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/image.h"

src/os2/dirdlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dirdlg.cpp
+// Name:        src/os2/dirdlg.cpp
 // Purpose:     wxDirDialog
 // Author:      David Webster
 // Modified by:
@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
+    #include <stdio.h>
-#include "wx/defs.h"
+    #include "wx/utils.h"
-#include "wx/utils.h"
+    #include "wx/dialog.h"
-#include "wx/dialog.h"
+    #include "wx/dirdlg.h"
-#include "wx/dirdlg.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -46,4 +45,3 @@ int wxDirDialog::ShowModal()
     // TODO
     return wxID_CANCEL;
 }
-

src/os2/fontdlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.cpp
+// Name:        src/os2/fontdlg.cpp
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      David Webster
@@ -14,11 +14,10 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
+    #include <stdio.h>
-#include "wx/defs.h"
+    #include "wx/utils.h"
-#include "wx/utils.h"
+    #include "wx/dialog.h"
-#include "wx/dialog.h"
+    #include "wx/math.h"
-#include "wx/math.h"
 #endif
 
 #include "wx/fontdlg.h"
@@ -98,4 +97,3 @@ int wxFontDialog::ShowModal()
     }
     return wxID_CANCEL;
 } // end of wxFontDialg::ShowModal
-

src/os2/frame.cpp

@@ -13,7 +13,6 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/list.h"

src/os2/gauge.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.cpp
+// Name:        src/os2/gauge.cpp
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
@@ -12,9 +12,8 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include "wx/utils.h"
-#include "wx/utils.h"
+    #include "wx/scrolwin.h"
-#include "wx/scrolwin.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -241,12 +240,10 @@ int wxGauge::GetValue() const
     return m_nGaugePos;
 } // end of wxGauge::GetValue
 
-bool wxGauge::SetBackgroundColour(
+bool wxGauge::SetBackgroundColour( const wxColour& rColour )
-  const wxColour&                   rColour
-)
 {
     if (!wxControl::SetBackgroundColour(rColour))
-        return FALSE;
+        return false;
 
     LONG                            lColor = (LONG)rColour.GetPixel();
 
@@ -255,7 +252,7 @@ bool wxGauge::SetBackgroundColour(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
-    return TRUE;
+    return true;
 } // end of wxGauge::SetBackgroundColour
 
 void wxGauge::SetBezelFace(
@@ -264,12 +261,10 @@ void wxGauge::SetBezelFace(
 {
 } // end of wxGauge::SetBezelFace
 
-bool wxGauge::SetForegroundColour(
+bool wxGauge::SetForegroundColour( const wxColour& rColour )
-  const wxColour&                   rColour
-)
 {
     if (!wxControl::SetForegroundColour(rColour))
-        return FALSE;
+        return false;
 
     LONG lColor = (LONG)rColour.GetPixel();
 
@@ -279,7 +274,7 @@ bool wxGauge::SetForegroundColour(
                       ,(PVOID)&lColor
                      );
 
-    return TRUE;
+    return true;
 } // end of wxGauge::SetForegroundColour
 
 void wxGauge::SetRange(

src/os2/gsockpm.cpp

@@ -9,8 +9,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_SOCKETS
 
 #include <stdlib.h>

src/os2/helpwin.cpp

@@ -12,13 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_HELP
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
 #include "wx/os2/helpwin.h"
 
-#if wxUSE_HELP
 #include <time.h>
 
 #include "wx/os2/private.h"
@@ -150,4 +150,5 @@ bool wxWinHelpController::Quit()
 void wxWinHelpController::OnQuit()
 {
 }
+
 #endif // wxUSE_HELP

src/os2/icon.cpp

@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

src/os2/joystick.cpp

@@ -14,8 +14,6 @@
 //
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
 #include "wx/string.h"

src/os2/msgdlg.cpp

@@ -13,13 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
+    #include <stdio.h>
-#include "wx/defs.h"
+    #include "wx/utils.h"
-#include "wx/utils.h"
+    #include "wx/dialog.h"
-#include "wx/dialog.h"
+    #include "wx/app.h"
-#include "wx/app.h"
+    #include "wx/msgdlg.h"
-#include "wx/msgdlg.h"
+    #include "wx/math.h"
-#include "wx/math.h"
 #endif
 
 #include "wx/os2/private.h"

src/os2/palette.cpp

@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
+    #include <stdio.h>
-#include "wx/defs.h"
+    #include "wx/string.h"
-#include "wx/string.h"
+    #include "wx/os2/private.h"
-#include "wx/os2/private.h"
+    #include "wx/palette.h"
-#include "wx/palette.h"
+    #include "wx/app.h"
-#include "wx/app.h"
 #endif
 
 #define INCL_PM

src/os2/settings.cpp

@@ -13,11 +13,10 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
+    #include <stdio.h>
-#include "wx/defs.h"
+    #include "wx/pen.h"
-#include "wx/pen.h"
+    #include "wx/brush.h"
-#include "wx/brush.h"
+    #include "wx/gdicmn.h"
-#include "wx/gdicmn.h"
 #endif
 
 #include "wx/module.h"

src/palmos/colordlg.cpp

@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/intl.h"
 #endif
 

src/palmos/fontdlg.cpp

@@ -27,7 +27,6 @@
 #if wxUSE_FONTDLG
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/math.h"

src/palmos/gauge.cpp

@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-#endif
-
 #if wxUSE_GAUGE
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/gauge.h"
 #include "wx/palmos/private.h"
 

src/palmos/help.cpp

@@ -16,12 +16,11 @@
 #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
-
 #if wxUSE_HELP
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/filefn.h"
 
 #include <time.h>

src/palmos/icon.cpp

@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -90,4 +89,3 @@ bool wxIcon::LoadFile(const wxString& filename,
 {
     return false;
 }
-

src/palmos/msgdlg.cpp

@@ -13,12 +13,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
@@ -149,4 +148,3 @@ int wxMessageDialog::ShowModal()
 
     return wxResult;
 }
-

src/palmos/popupwin.cpp

@@ -24,12 +24,11 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif //WX_PRECOMP
-
 #if wxUSE_POPUPWIN
 
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
 #include "wx/popupwin.h"
 
 #include "wx/palmos/private.h"     // for GetDesktopWindow()
@@ -65,4 +64,3 @@ bool wxPopupWindow::Show(bool show)
 }
 
 #endif // #if wxUSE_POPUPWIN
-

src/palmos/printpalm.cpp

@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Don't use the Windows printer if we're in wxUniv mode and using
 // the PostScript architecture
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

src/palmos/taskbar.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// File:        taskbar.cpp
+// File:        src/palmos/taskbar.cpp
 // Purpose:     Implements wxTaskBarIcon class for manipulating icons on
 //              the task bar.
 // Author:      Julian Smart
@@ -14,15 +14,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include "wx/window.h"
-#include "wx/window.h"
+    #include "wx/frame.h"
-#include "wx/frame.h"
+    #include "wx/utils.h"
-#include "wx/utils.h"
+    #include "wx/menu.h"
-#include "wx/menu.h"
 #endif
 
 #if defined(__WIN95__)
@@ -107,4 +106,3 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
 }
 
 #endif // __WIN95__
-

src/unix/dialup.cpp

@@ -15,10 +15,9 @@
 #if wxUSE_DIALUP_MANAGER
 
 #ifndef  WX_PRECOMP
-#   include "wx/defs.h"
+    #include "wx/string.h"
 #endif // !PCH
 
-#include "wx/string.h"
 #include "wx/event.h"
 #include "wx/dialup.h"
 #include "wx/timer.h"

src/unix/joystick.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/unix/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      Ported to Linux by Guilhem Lavaux
 // Modified by:
@@ -12,8 +12,6 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
 #include "wx/joystick.h"
@@ -489,4 +487,3 @@ bool wxJoystick::ReleaseCapture()
     return false;
 }
 #endif  // wxUSE_JOYSTICK
-

src/unix/mimetype.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        unix/mimetype.cpp
+// Name:        src/unix/mimetype.cpp
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -36,10 +36,6 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-
 #if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE
 
 #ifndef WX_PRECOMP
@@ -2703,4 +2699,3 @@ static bool IsKnownUnimportantField(const wxString& fieldAll)
 
 #endif
   // wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE
-

src/unix/utilsunx.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        unix/utilsunx.cpp
+// Name:        src/unix/utilsunx.cpp
 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$
@@ -18,8 +18,9 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#ifndef WX_PRECOMP
-#include "wx/string.h"
+    #include "wx/string.h"
+#endif
 
 #include "wx/intl.h"
 #include "wx/log.h"
@@ -280,7 +281,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     // split the command line in arguments
     do
     {
-        argument=wxT("");
+        argument = wxEmptyString;
         quotechar = wxT('\0');
 
         // eat leading whitespace:
@@ -884,7 +885,7 @@ wxString wxGetOsDescription()
         return wxString::FromAscii( buf );
     }
     wxFAIL_MSG( _T("uname failed") );
-    return _T("");
+    return wxEmptyString;
 }
 
 #endif // !__WXMAC__

src/x11/dataobj.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dataobj.cpp
+// Name:        src/x11/dataobj.cpp
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Id:          $Id$
@@ -7,7 +7,8 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_DATAOBJ
 
@@ -196,7 +197,7 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
 
-    return TRUE;
+    return true;
 }
 
 size_t wxFileDataObject::GetDataSize() const
@@ -278,7 +279,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
     }
 #endif // 0/1
 
-    return TRUE;
+    return true;
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
@@ -323,12 +324,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)
@@ -346,14 +347,14 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxPNGHandler handler;
     if ( !handler.LoadFile( &image, mstream ) )
     {
-        return FALSE;
+        return false;
     }
 
     m_bitmap = image;
 
     return m_bitmap.Ok();
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -378,4 +379,3 @@ void wxBitmapDataObject::DoConvertToPng()
 }
 
 #endif // wxUSE_DATAOBJ
-

src/x11/dc.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.cpp
+// Name:        src/x11/dc.cpp
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
@@ -9,9 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/dc.h"
 #include "wx/dcmemory.h"
-#include "wx/defs.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
@@ -21,7 +23,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 wxDC::wxDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
 
 #if 1
     m_mm_to_pix_x = 1.0;
@@ -33,8 +35,8 @@ wxDC::wxDC()
                     (double)wxGetDisplaySizeMM().GetHeight();
 #endif
 
-    m_needComputeScaleX = FALSE; /* not used yet */
+    m_needComputeScaleX = false; /* not used yet */
-    m_needComputeScaleY = FALSE; /* not used yet */
+    m_needComputeScaleY = false; /* not used yet */
 
     m_logicalFunction = wxCOPY;
 
@@ -44,12 +46,12 @@ wxDC::wxDC()
 
     m_backgroundMode = wxTRANSPARENT;
 
-    m_isInteractive = FALSE;  // ???
+    m_isInteractive = false;  // ???
 }
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
-    m_clipping = TRUE;
+    m_clipping = true;
     m_clipX1 = x;
     m_clipY1 = y;
     m_clipX2 = x + width;
@@ -97,8 +99,8 @@ void wxDC::SetMapMode( int mode )
     }
     if (mode != wxMM_TEXT)
     {
-        m_needComputeScaleX = TRUE;
+        m_needComputeScaleX = true;
-        m_needComputeScaleY = TRUE;
+        m_needComputeScaleY = true;
     }
 }
 
@@ -185,4 +187,3 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }
-

src/x11/font.cpp

@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -26,7 +29,6 @@
 #pragma message enable nosimpint
 #endif
 
-#include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
@@ -95,7 +97,7 @@ public:
                   int family = wxDEFAULT,
                   int style = wxDEFAULT,
                   int weight = wxDEFAULT,
-                  bool underlined = FALSE,
+                  bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -118,7 +120,7 @@ public:
     void SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 
-    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+    void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
     bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields
@@ -213,7 +215,7 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::InitFromNative()
 {
-    m_noAA = FALSE;
+    m_noAA = false;
 
 #if wxUSE_UNICODE
     // Get native info
@@ -273,7 +275,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // Pango description are never underlined (?)
-    m_underlined = FALSE;
+    m_underlined = false;
 
     // Cannot we choose that
     m_encoding = wxFONTENCODING_SYSTEM;
@@ -343,7 +345,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // X fonts are never underlined...
-    m_underlined = FALSE;
+    m_underlined = false;
 
     // deal with font encoding
     wxString
@@ -550,7 +552,7 @@ bool wxFont::Create(int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 
-    return TRUE;
+    return true;
 }
 
 #if !wxUSE_UNICODE
@@ -560,7 +562,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     if( !fontname )
     {
         *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
-        return TRUE;
+        return true;
     }
 
     m_refData = new wxFontRefData();
@@ -653,9 +655,9 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         }
         //else: unknown encoding - may be give a warning here?
         else
-            return FALSE;
+            return false;
     }
-    return TRUE;
+    return true;
 }
 #endif // !wxUSE_UNICODE
 
@@ -695,7 +697,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->m_faceName;
 }
@@ -723,7 +725,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
     return M_FONTDATA->m_underlined;
 }
@@ -757,13 +759,13 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 bool wxFont::IsFixedWidth() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
 #if wxUSE_UNICODE
    return wxFontBase::IsFixedWidth();
 #else
     // Robert, is this right? HasNativeFont doesn't exist.
-    if ( TRUE )
+    if ( true )
     //    if ( M_FONTDATA->HasNativeFont() )
     {
         // the monospace fonts are supposed to have "M" in the spacing field

src/x11/popupwin.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        srx/x11/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,11 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+// for compilers that support precompilation, includes "wx.h".
-#include "wx/log.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_POPUPWIN
 
+#include "wx/log.h"
+
 #include "wx/popupwin.h"
 #include "wx/app.h"
 #include "wx/settings.h"
@@ -36,7 +38,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     if (!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
     // All dialogs should really have this style
@@ -61,7 +63,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     bool need_two_windows =
         ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
 #else
-    bool need_two_windows = FALSE;
+    bool need_two_windows = false;
 #endif
 
 #if wxUSE_NANOX
@@ -161,7 +163,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
         m_clientWindow = (WXWindow) xwindow;
         wxAddClientWindowToTable( xwindow, (wxWindow*) this );
 
-        m_isShown = FALSE;
+        m_isShown = false;
         XMapWindow( xdisplay, xwindow );
     }
     else
@@ -194,7 +196,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
         m_clientWindow = (WXWindow) xwindow;
         wxAddWindowToTable( xwindow, (wxWindow*) this );
 
-        m_isShown = FALSE;
+        m_isShown = false;
         // XMapWindow( xdisplay, xwindow );
     }
 
@@ -211,7 +213,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     XSetWMHints( xdisplay, (Window) m_mainWindow, &wm_hints);
 #endif
 
-    return TRUE;
+    return true;
 }
 
 void wxPopupWindow::DoMoveWindow(int x, int y, int width, int height )