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

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

src/cocoa/settings.mm

@@ -11,11 +11,12 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/settings.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/gdicmn.h"
 
 #include "wx/cocoa/autorelease.h"

src/common/effects.cpp

@@ -21,10 +21,10 @@
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
     #include "wx/pen.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.h"
-#include "wx/settings.h"
 
 /*
  * wxEffects: various 3D effects

src/common/gdicmn.cpp

@@ -33,11 +33,11 @@
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/bitmap.h"
 #include "wx/font.h"
-#include "wx/settings.h"
 #include "wx/hashmap.h"
 
 #include <string.h>

src/common/settcmn.cpp

@@ -22,9 +22,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/settings.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
-    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 // ----------------------------------------------------------------------------

src/common/sizer.cpp

@@ -22,11 +22,11 @@
     #include "wx/intl.h"
     #include "wx/math.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"
 #include "wx/statbox.h"
-#include "wx/settings.h"
 #include "wx/listimpl.cpp"
 
 #if WXWIN_COMPATIBILITY_2_4

src/common/tbarbase.cpp

@@ -31,11 +31,11 @@
 #ifndef WX_PRECOMP
     #include "wx/control.h"
     #include "wx/frame.h"
+    #include "wx/settings.h"
 #endif
 
 #if wxUSE_IMAGE
     #include "wx/image.h"
-    #include "wx/settings.h"
 #endif // wxUSE_IMAGE
 
 // ----------------------------------------------------------------------------

src/generic/buttonbar.cpp

@@ -36,10 +36,10 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/image.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // wxButtonToolBarTool: our implementation of wxToolBarToolBase

src/generic/choicbkg.cpp

@@ -26,10 +26,14 @@
 
 #if wxUSE_CHOICEBOOK
 
-#include "wx/choice.h"
 #include "wx/choicebk.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+#endif
+
+#include "wx/choice.h"
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 #include "wx/sizer.h"
 
 // ----------------------------------------------------------------------------

src/generic/datavgen.cpp

@@ -25,13 +25,13 @@
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"
-#include "wx/settings.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"

src/generic/dirctrlg.cpp

@@ -27,6 +27,7 @@
     #include "wx/utils.h"
     #include "wx/button.h"
     #include "wx/icon.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/module.h"
@@ -41,7 +42,6 @@
 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
-#include "wx/settings.h"
 #include "wx/artprov.h"
 #include "wx/mimetype.h"
 #include "wx/image.h"

src/generic/fdrepdlg.cpp

@@ -37,10 +37,10 @@
     #include "wx/radiobox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fdrepdlg.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // constants

src/generic/filedlgg.cpp

@@ -26,6 +26,7 @@
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/intl.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/checkbox.h"
@@ -44,7 +45,6 @@
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
-#include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/filedlg.h"     // wxOPEN, wxSAVE...

src/generic/fontdlgg.cpp

@@ -30,6 +30,7 @@
     #include "wx/choice.h"
     #include "wx/checkbox.h"
     #include "wx/intl.h"
+    #include "wx/settings.h"
 #endif
 
 #include <string.h>
@@ -39,7 +40,6 @@
 #include "wx/sizer.h"
 #include "wx/fontdlg.h"
 #include "wx/generic/fontdlgg.h"
-#include "wx/settings.h"
 
 #if USE_SPINCTRL_FOR_POINT_SIZE
 #include "wx/spinctrl.h"

src/generic/listbkg.cpp

@@ -26,11 +26,15 @@
 
 #if wxUSE_LISTBOOK
 
+#include "wx/listbook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+#endif
+
 #include "wx/listctrl.h"
 #include "wx/statline.h"
-#include "wx/listbook.h"
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros

src/generic/msgdlgg.cpp

@@ -29,6 +29,7 @@
     #include "wx/icon.h"
     #include "wx/sizer.h"
     #include "wx/app.h"
+    #include "wx/settings.h"
 #endif
 
 #include <stdio.h>
@@ -37,10 +38,9 @@
 #define __WX_COMPILING_MSGDLGG_CPP__ 1
 #include "wx/msgdlg.h"
 #include "wx/artprov.h"
-#include "wx/settings.h"
 
 #if wxUSE_STATLINE
-  #include "wx/statline.h"
+    #include "wx/statline.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -156,4 +156,3 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 }
 
 #endif // wxUSE_MSGDLG && !defined(__WXGTK20__)
-

src/generic/notebook.cpp

@@ -32,9 +32,9 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include  "wx/dcclient.h"
+    #include  "wx/settings.h"
 #endif
 
-#include  "wx/settings.h"
 #include  "wx/generic/imaglist.h"
 #include  "wx/generic/tabg.h"
 

src/generic/progdlgg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        progdlgg.h
+// Name:        src/generic/progdlgg.cpp
 // Purpose:     wxProgressDialog class
 // Author:      Karsten Ball<6C>der
 // Modified by:
@@ -37,10 +37,10 @@
     #include "wx/intl.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/generic/progdlgg.h"
-#include "wx/settings.h"
 
 // ---------------------------------------------------------------------------
 // macros

src/generic/renderg.cpp

@@ -29,11 +29,11 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/dc.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 #include "wx/gdicmn.h"
 
-#include "wx/settings.h"
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 #include "wx/module.h"

src/generic/tipdlg.cpp

@@ -37,11 +37,11 @@
     #include "wx/statbmp.h"
     #include "wx/stattext.h"
     #include "wx/sizer.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"
 #include "wx/artprov.h"
-#include "wx/settings.h"
 
 #include "wx/tipdlg.h"
 

src/generic/tipwin.cpp

@@ -31,14 +31,13 @@
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
 #endif
 
-#include "wx/settings.h"
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

src/generic/treebkg.cpp

@@ -27,8 +27,12 @@
 #if wxUSE_TREEBOOK
 
 #include "wx/treebook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+#endif
+
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros

src/generic/treectlg.cpp

@@ -31,12 +31,12 @@
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/generic/treectlg.h"
 #include "wx/textctrl.h"
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 
 #include "wx/renderer.h"
 

src/generic/wizard.cpp

@@ -35,11 +35,11 @@
     #include "wx/intl.h"
     #include "wx/statbmp.h"
     #include "wx/button.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 #include "wx/statline.h"
 #include "wx/sizer.h"
-#include "wx/settings.h"
 
 #include "wx/wizard.h"
 

src/gtk/app.cpp

@@ -23,12 +23,12 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/memory.h"
 #include "wx/font.h"
-#include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/file.h"
 #include "wx/filename.h"

src/gtk/combobox.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/arrstr.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED

src/gtk/control.cpp

@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/settings.h"
 #include "wx/gtk/private.h"
 
 // ============================================================================
@@ -34,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 }
 
 bool wxControl::Create( wxWindow *parent,

src/gtk/font.cpp

@@ -23,13 +23,13 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 
 #include <strings.h>
 

src/gtk/listbox.cpp

@@ -20,11 +20,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/arrstr.h"
 #include "wx/checklst.h"
-#include "wx/settings.h"
 #include "wx/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 

src/gtk/renderer.cpp

@@ -30,13 +30,12 @@
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
 #endif
 
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
-#include "wx/settings.h"
-
 // RR: After a correction to the orientation of the sash
 //     this doesn't seem to be required anymore and it
 //     seems to confuse some themes so USE_ERASE_RECT=0

src/gtk/textctrl.cpp

@@ -17,10 +17,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/math.h"
-#include "wx/settings.h"
 #include "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
@@ -470,7 +470,7 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 // common part of the event handlers below
 static void
 handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
-								wxEventType eventType, const gchar * signal_name)
+                                wxEventType eventType, const gchar * signal_name)
 {
     wxClipboardTextEvent event( eventType, win->GetId() );
     event.SetEventObject( win );
@@ -478,7 +478,7 @@ handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
     {
         // don't let the default processing to take place if we did something
         // ourselves in the event handler
-    	g_signal_stop_emission_by_name (widget, signal_name);
+        g_signal_stop_emission_by_name (widget, signal_name);
     }
 }
 
@@ -486,22 +486,22 @@ extern "C" {
 static void
 gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 {
-	handle_text_clipboard_callback(
+    handle_text_clipboard_callback(
-		widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
+        widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
 }
 
 static void
 gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 {
-	handle_text_clipboard_callback(
+    handle_text_clipboard_callback(
-		widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
+        widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
 }
 
 static void
 gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 {
-	handle_text_clipboard_callback(
+    handle_text_clipboard_callback(
-		widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
+        widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
 }
 }
 

src/gtk/toplevel.cpp

@@ -30,11 +30,11 @@
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/control.h"
 #include "wx/gtk/private.h"
-#include "wx/settings.h"
 #include "wx/evtloop.h"
 
 #include <glib.h>

src/gtk/window.cpp

@@ -25,14 +25,16 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/combobox.h"
+
 #if wxUSE_TOOLBAR_NATIVE
-#include "wx/toolbar.h"
+    #include "wx/toolbar.h"
 #endif
 
 #if wxUSE_DRAG_AND_DROP
@@ -52,7 +54,6 @@
 #endif
 
 #include "wx/statusbr.h"
-#include "wx/settings.h"
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

src/gtk1/app.cpp

@@ -23,12 +23,12 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/memory.h"
 #include "wx/font.h"
-#include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/file.h"
 #include "wx/filename.h"

src/gtk1/combobox.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/arrstr.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED

src/gtk1/control.cpp

@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/settings.h"
 #include "wx/gtk1/private.h"
 
 // ============================================================================
@@ -34,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 }
 
 bool wxControl::Create( wxWindow *parent,

src/gtk1/font.cpp

@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fontutil.h"
@@ -29,7 +30,6 @@
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 
 #include <strings.h>
 
@@ -62,7 +62,7 @@ public:
                   int family = wxFONTFAMILY_DEFAULT,
                   int style = wxFONTSTYLE_NORMAL,
                   int weight = wxFONTWEIGHT_NORMAL,
-                  bool underlined = FALSE,
+                  bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -91,7 +91,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
@@ -182,12 +182,12 @@ void wxFontRefData::Init(int pointSize,
     m_underlined = underlined;
     m_encoding = encoding;
 
-    m_noAA = FALSE;
+    m_noAA = false;
 }
 
 void wxFontRefData::InitFromNative()
 {
-    m_noAA = FALSE;
+    m_noAA = false;
 
     // get the font parameters from the XLFD
     // -------------------------------------
@@ -254,7 +254,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // X fonts are never underlined...
-    m_underlined = FALSE;
+    m_underlined = false;
 
     // deal with font encoding
     wxString
@@ -496,7 +496,7 @@ bool wxFont::Create( int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 
-    return TRUE;
+    return true;
 }
 
 bool wxFont::Create(const wxString& fontname)
@@ -506,12 +506,12 @@ bool wxFont::Create(const wxString& fontname)
     {
         *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
-        return TRUE;
+        return true;
     }
 
     m_refData = new wxFontRefData(fontname);
 
-    return TRUE;
+    return true;
 }
 
 void wxFont::Unshare()
@@ -605,7 +605,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;
 }
@@ -642,7 +642,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 
 bool wxFont::IsFixedWidth() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
     if ( M_FONTDATA->HasNativeFont() )
     {

src/gtk1/listbox.cpp

@@ -18,11 +18,11 @@
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/arrstr.h"
 #include "wx/checklst.h"
-#include "wx/settings.h"
 #include "wx/gtk1/private.h"
 
 #if wxUSE_TOOLTIPS

src/gtk1/textctrl.cpp

@@ -17,10 +17,10 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/math.h"
-#include "wx/settings.h"
 #include "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 

src/gtk1/toplevel.cpp

@@ -30,11 +30,11 @@
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/control.h"
 #include "wx/gtk1/private.h"
-#include "wx/settings.h"
 #include "wx/evtloop.h"
 
 #include <glib.h>

src/gtk1/window.cpp

@@ -25,6 +25,7 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
@@ -49,7 +50,6 @@
 #endif
 
 #include "wx/statusbr.h"
-#include "wx/settings.h"
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__

src/html/helpfrm.cpp

@@ -34,6 +34,7 @@
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif // WXPRECOMP
 
 #ifdef __WXMAC__
@@ -57,7 +58,6 @@
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
 #include "wx/choicdlg.h"
-#include "wx/settings.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 

src/html/helpwnd.cpp

@@ -34,6 +34,7 @@
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif // WXPRECOMP
 
 #ifdef __WXMAC__
@@ -58,7 +59,6 @@
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
 #include "wx/choicdlg.h"
-#include "wx/settings.h"
 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100

src/html/htmlcell.cpp

@@ -20,11 +20,11 @@
     #include "wx/brush.h"
     #include "wx/colour.h"
     #include "wx/dc.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
-#include "wx/settings.h"
 #include "wx/module.h"
 
 #include <stdlib.h>

src/html/htmlwin.cpp

@@ -23,13 +23,13 @@
     #include "wx/frame.h"
     #include "wx/dcmemory.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
-#include "wx/settings.h"
 
 #include "wx/arrimpl.cpp"
 #include "wx/listimpl.cpp"

src/html/htmprint.cpp

@@ -21,6 +21,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/dc.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/print.h"
@@ -29,7 +30,6 @@
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
-#include "wx/settings.h"
 
 
 //--------------------------------------------------------------------------------

src/html/winpars.cpp

@@ -19,13 +19,13 @@
     #include "wx/intl.h"
     #include "wx/dc.h"
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/html/htmldefs.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlwin.h"
 #include "wx/fontmap.h"
-#include "wx/settings.h"
 #include "wx/uri.h"
 
 

src/mac/carbon/dcclient.cpp

@@ -17,11 +17,11 @@
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/region.h"
 #include "wx/toplevel.h"
-#include "wx/settings.h"
 #include "wx/math.h"
 #include "wx/mac/private.h"
 

src/mac/carbon/dialog.cpp

@@ -17,10 +17,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
-#include "wx/settings.h"
-
 #include "wx/mac/uma.h"
 
 

src/mac/carbon/frame.cpp

@@ -18,12 +18,12 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"
-#include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 

src/mac/carbon/glcanvas.cpp

@@ -22,10 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #include "wx/mac/uma.h"
 
 // DLL options compatibility check:
@@ -316,7 +315,7 @@ void wxGLCanvas::SetColour(const wxChar *colour)
 bool wxGLCanvas::Show(bool show)
 {
     if ( !wxWindow::Show( show ) )
-        return FALSE ;
+        return false ;
 /*
     if ( !show )
     {
@@ -335,7 +334,7 @@ bool wxGLCanvas::Show(bool show)
         }
     }
 */
-    return TRUE ;
+    return true ;
 }
 
 void wxGLCanvas::MacVisibilityChanged()

src/mac/carbon/listbox.cpp

@@ -22,9 +22,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/button.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/toplevel.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

src/mac/carbon/scrolbar.cpp

@@ -14,9 +14,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 

src/mac/carbon/stattext.cpp

@@ -20,11 +20,11 @@
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 

src/mac/carbon/textctrl.cpp

@@ -22,6 +22,7 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif
 
 #ifdef __DARWIN__
@@ -42,7 +43,6 @@
 #endif
 
 #include "wx/toplevel.h"
-#include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 

src/mac/carbon/window.cpp

@@ -24,12 +24,12 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
-#include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"

src/mac/classic/dialog.cpp

@@ -17,10 +17,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
-#include "wx/settings.h"
-
 #include "wx/mac/uma.h"
 
 // Lists to keep track of windows, so we can disable/enable them

src/mac/classic/frame.cpp

@@ -18,12 +18,12 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"
-#include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 

src/mac/classic/glcanvas.cpp

@@ -22,10 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #include "wx/mac/uma.h"
 
 // DLL options compatibility check:

src/mac/classic/listbox.cpp

@@ -21,9 +21,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/button.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/toplevel.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

src/mac/classic/mdi.cpp

@@ -16,10 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 

src/mac/classic/stattext.cpp

@@ -18,11 +18,11 @@
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/settings.h"
 
 #include <stdio.h>
 

src/mac/classic/textctrl.cpp

@@ -24,6 +24,7 @@
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/button.h"
+    #include "wx/settings.h"
 #endif
 
 #ifdef __DARWIN__
@@ -46,7 +47,6 @@
 #include "wx/toplevel.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/settings.h"
 #include "wx/filefn.h"
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)

src/mac/classic/window.cpp

@@ -24,13 +24,13 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
 #include "wx/scrolbar.h"
 #include "wx/statbox.h"
-#include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

src/mgl/font.cpp

@@ -26,13 +26,13 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
 #include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------

src/motif/dcmemory.cpp

@@ -16,10 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -139,5 +138,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     };
 }
-
-

src/motif/dialog.cpp

@@ -24,9 +24,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/evtloop.h"
 
 #ifdef __VMS__

src/motif/filedlg.cpp

@@ -24,9 +24,9 @@
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/tokenzr.h"
 #include "wx/stockitem.h"
 

src/motif/font.cpp

@@ -34,12 +34,12 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"       // for wxGetDisplay()
+    #include "wx/settings.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 #include "wx/motif/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

src/motif/frame.cpp

@@ -34,11 +34,11 @@
     #include "wx/utils.h"
     #include "wx/menu.h"
     #include "wx/icon.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
-#include "wx/settings.h"
 
 #ifdef __VMS__
     #pragma message disable nosimpint

src/motif/listbox.cpp

@@ -20,6 +20,7 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #ifdef __VMS
@@ -27,7 +28,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/settings.h"
 #include "wx/arrstr.h"
 
 #ifdef __VMS__

src/motif/mdi.cpp

@@ -22,10 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
     #include "wx/icon.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

src/motif/menu.cpp

@@ -27,10 +27,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/menuitem.h"
-#include "wx/settings.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/motif/msgdlg.cpp

@@ -38,10 +38,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/motif/private.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // macros

src/motif/textctrl.cpp

@@ -32,9 +32,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/filefn.h"
 
 #ifdef __VMS__

src/motif/toolbar.cpp

@@ -30,10 +30,9 @@
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

src/motif/window.cpp

@@ -36,10 +36,10 @@
     #include "wx/dcclient.h"
     #include "wx/button.h"
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
-#include "wx/settings.h"
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

src/msw/ownerdrw.cpp

@@ -24,9 +24,9 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 #include "wx/fontutil.h"

src/msw/renderer.cpp

@@ -28,11 +28,11 @@
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/dc.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/renderer.h"
-#include "wx/settings.h"
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 

src/msw/scrolbar.cpp

@@ -20,11 +20,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/scrolbar.h"
 #include "wx/msw/private.h"
-#include "wx/settings.h"
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )

src/msw/settings.cpp

@@ -24,13 +24,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/settings.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/settings.h"
-
 #include "wx/msw/private.h"
 
 #ifndef SPI_GETFLATMENU
@@ -310,10 +310,10 @@ static const int gs_metricsMap[] =
     SM_CXBORDER,
     SM_CYBORDER,
 #ifdef SM_CXCURSOR
-	SM_CXCURSOR,
+    SM_CXCURSOR,
     SM_CYCURSOR,
 #else
-	-1, -1,
+    -1, -1,
 #endif
     SM_CXDOUBLECLK,
     SM_CYDOUBLECLK,

src/msw/treectrl.cpp

@@ -32,6 +32,7 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -46,7 +47,6 @@
 #define wxUSE_COMCTL32_SAFELY 0
 
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 #include "wx/msw/dragimag.h"
 
 // macros to hide the cast ugliness

src/os2/checklst.cpp

@@ -26,6 +26,7 @@
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/dcscreen.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/colour.h"
@@ -33,7 +34,6 @@
 #include "wx/bitmap.h"
 #include "wx/listbox.h"
 #include "wx/ownerdrw.h"
-#include "wx/settings.h"
 
 #define INCL_PM
 #include <os2.h>

src/os2/ownerdrw.cpp

@@ -22,9 +22,9 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 
@@ -43,7 +43,7 @@ wxOwnerDrawn::wxOwnerDrawn( const wxString& rsStr,
 : m_strName(rsStr)
 {
     m_bCheckable   = bCheckable;
-    m_bOwnerDrawn  = FALSE;
+    m_bOwnerDrawn  = false;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     if (wxNORMAL_FONT)

src/os2/settings.cpp

@@ -18,10 +18,10 @@
     #include "wx/brush.h"
     #include "wx/gdicmn.h"
     #include "wx/window.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/settings.h"
 #include "wx/os2/private.h"
 
 // the module which is used to clean up wxSystemSettings data (this is a

src/os2/treectrl.cpp

@@ -32,12 +32,12 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/os2/private.h"
 
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 
 // a macro to hide the ugliness of nested casts
 #define HITEM(item)     (HTREEITEM)(WXHTREEITEM)(item)

src/palmos/ownerdrw.cpp

@@ -23,9 +23,9 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 #include "wx/fontutil.h"

src/palmos/scrolbar.cpp

@@ -20,11 +20,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/scrolbar.h"
 #include "wx/palmos/private.h"
-#include "wx/settings.h"
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxScrollBarStyle )

src/palmos/settings.cpp

@@ -24,12 +24,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/settings.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/module.h"
 #include "wx/fontutil.h"
 

src/palmos/treectrl.cpp

@@ -32,12 +32,12 @@
     #include "wx/dynarray.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/palmos/private.h"
 
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 
 // macros to hide the cast ugliness
 // --------------------------------

src/richtext/richtextctrl.cpp

@@ -13,7 +13,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_RICHTEXT
@@ -21,12 +21,12 @@
 #include "wx/richtext/richtextctrl.h"
 
 #ifndef WX_PRECOMP
-  #include "wx/wx.h"
+    #include "wx/wx.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/textfile.h"
 #include "wx/ffile.h"
-#include "wx/settings.h"
 #include "wx/filename.h"
 #include "wx/dcbuffer.h"
 #include "wx/arrimpl.cpp"

src/univ/colschem.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        univ/colschem.cpp
+// Name:        src/univ/colschem.cpp
 // Purpose:     (trivial) wxColourScheme implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,10 +25,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
-#include "wx/settings.h"
-
 #include "wx/univ/colschem.h"
 #include "wx/univ/theme.h"
 
@@ -93,4 +92,3 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
 
     return wxTheme::Get()->GetColourScheme()->Get(col);
 }
-

src/univ/themes/metal.cpp

@@ -46,11 +46,11 @@
         #include "wx/msw/private.h"
     #endif
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
-#include "wx/settings.h"
 #include "wx/artprov.h"
 #include "wx/toplevel.h"
 

src/univ/themes/win32.cpp

@@ -49,11 +49,11 @@
         #include "wx/msw/private.h"
     #endif
     #include "wx/menu.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
-#include "wx/settings.h"
 #include "wx/artprov.h"
 #include "wx/toplevel.h"
 #include "wx/image.h"

src/x11/dcmemory.cpp

@@ -16,10 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #include "wx/x11/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)

src/x11/font.cpp

@@ -34,12 +34,12 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"       // for wxGetDisplay()
+    #include "wx/settings.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 
 #include "wx/x11/private.h"
 

src/x11/popupwin.cpp

@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
-
 #include "wx/x11/private.h"
 #include "X11/Xatom.h"
 #include "X11/Xutil.h"

src/x11/settings.cpp

@@ -1,19 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        settings.cpp
+// Name:        src/x11/settings.cpp
 // Purpose:     wxSettings
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 // TODO: these settings should probably be configurable from some central or
 // per-user file, which can be edited using a Windows-control-panel clone.
 // Also they should be documented better. Some are very MS Windows-ish.
 
 #include "wx/settings.h"
+
 #include "wx/gdicmn.h"
 #include "wx/x11/private.h"
 
@@ -57,8 +61,8 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 // Get a system metric, e.g. scrollbar size
 int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
 {
-	switch ( index)
+    switch ( index)
-	{
+    {
         // TODO case wxSYS_MOUSE_BUTTONS:
         // TODO case wxSYS_BORDER_X:
         // TODO case wxSYS_BORDER_Y:
@@ -113,9 +117,9 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return TRUE;
+            return true;
 
         default:
-            return FALSE;
+            return false;
     }
 }

src/x11/textctrl.cpp

@@ -18,9 +18,9 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
 #endif
 
-#include "wx/settings.h"
 #include "wx/clipbrd.h"
 #include "wx/tokenzr.h"
 

src/x11/toplevel.cpp

@@ -33,9 +33,9 @@
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/statusbr.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
-#include "wx/settings.h"
 #include "wx/x11/private.h"
 #include "X11/Xutil.h"
 

src/x11/window.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/x11/windows.cpp
+// Name:        src/x11/window.cpp
 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Modified by:
@@ -39,11 +39,11 @@
     #include "wx/menu.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
-#include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/scrolwin.h"
 #include "wx/scrolbar.h"