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

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

diff --git a/src/cocoa/settings.mm b/src/cocoa/settings.mm
index 192911f6826f57b4f859b0b35b97aedc1440c76b..618486478b1fcd62956e27628a76ab1e417badef 100644 (file)
--- a/src/cocoa/settings.mm
+++ b/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"

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index c735d825dbb0e095b11be63c28482cd85047437a..bf68eb47403ada6d2f35bd2cd90ce368d6f2b2e4 100644 (file)
--- a/src/common/effects.cpp
+++ b/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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index a4820ae1470a8e0a622ca17c040ee354d3b92b22..161eb134d1f1a41fddf89049799bb60179c20b06 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/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>

diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 77e7e67f53e2acbfd1b714873c3159fb04ed88a7..ce3cc6f755e05387823dfb8aa710dda4fe0aea17 100644 (file)
--- a/src/common/settcmn.cpp
+++ b/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
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 894a190d7bdf496a3eb09c9c96b5ddc0c5e0419d..0b918a134435d37cb0831eaebc269783450ce5a4 100644 (file)
--- a/src/common/sizer.cpp
+++ b/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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index b67f6544a544b5fb57a503dd630dc6ed0bbee642..54878f1ebdf6722042fbe26771c4762dd6223877 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/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
 
 // ----------------------------------------------------------------------------

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index 98b1b160a7f974126d6d1801987ac7183b5441a9..49e3210bb9b96dbb4939e545de6b7b61eef4b71a 100644 (file)
--- a/src/generic/buttonbar.cpp
+++ b/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

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 88ba5ac95716ffbd129486c04963cb13145def82..143115bca6e287fef43ee17aa60a5c375f1b7bce 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/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"
 
 // ----------------------------------------------------------------------------

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 808f61b18e7b29326e230737ecd3a8bbf749c4a2..c9ca4db621cfc51f9e1a0ade0363547e85efddaf 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/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"

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 30d47e3ea4d271af86eda683e08d83739a3389a8..fc98942d444f47600ffa1e633e8168b00fa46ef1 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/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"

diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index b65f21ffc4ab55e087ddd6655af5724f16f45dd0..797ac68cbb8d039b900daa8bf2003de22b066784 100644 (file)
--- a/src/generic/fdrepdlg.cpp
+++ b/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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 6792366e6b65650f2fccefb3de426e48dc22f772..4c7f965cd924fcb6e99b986828cc866f8411a54d 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/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...

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 425df815424f36514bbab2b542719a5bd9722ccc..2647cde02b541be37a5eb1e2013e48de196f67b3 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/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"

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index f7f480980c6fa9cda29cf8864c74e6cec3c9ee2d..d3b9771817618d5c41a57d0a941bd3187cbd641a 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/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
@@ -303,7 +307,7 @@ wxListbook::InsertPage(size_t n,
     InvalidateBestSize();
     // GetListView()->InvalidateBestSize();
     GetListView()->Arrange();
-    
+
     if (GetPageCount() == 1)
     {
         wxSizeEvent sz(GetSize(), GetId());
@@ -354,12 +358,12 @@ bool wxListbook::DeleteAllPages()
     GetListView()->DeleteAllItems();
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
-    
+
     m_selection = -1;
 
     wxSizeEvent sz(GetSize(), GetId());
     ProcessEvent(sz);
-    
+
     return true;
 }
 

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 869cb97c4d14931acd26377d5a3d841340ff7d1a..0ef3d052f39ad592897661df80df5dcd770a2103 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/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__)
-

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index c9d8269869161cc2d5098f281bf5d9dd3d901dfa..3bfba64f2a3425b31254fbb4b651af052376a9af 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/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"
 

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index c261d63be45df5eac446c180fa214d1935fdad83..91d6bec43c487d6dc612eb847579aff23ae65506 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        progdlgg.h
+// Name:        src/generic/progdlgg.cpp
 // Purpose:     wxProgressDialog class
 // Author:      Karsten Ballü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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 0a4a4391d540b2f40eca89dba5833f11d16d93fc..817dd01986f07abee00454b65e18b46ea1511f22 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/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"

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 213e7185dc69ea8e80d37d0e782f0b54a03d33b3..599d310fe967fd55b3d20176cf8d4fa3122082a9 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/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"
 

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 1dd67eafb333a8fd930b490aee3e9dcbbe9c66c6..36dd8b550a987929eefb378f933cf769c67c179e 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 4f57582b0cdac4948fea8698e9358888e0365da4..4bce15eca2d56f6a54e79f49cb080c0837fa9e98 100644 (file)
--- a/src/generic/treebkg.cpp
+++ b/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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 3c7a235235b42612f427bbd42eb05cc5ed108ca7..fa66da1ac62bfca5ace5b41e6e6b61f92a0df88e 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/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"
 

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 4690af5eae481185ba1c66dadfd2a2137a373617..9db99cdbfb70e2ec674b0ac01d4e9c5a4416ca40 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/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"
 

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d7261c946572402266211f16c841f53b4273bff1..f235b57a3b5796e3af2e9a72c47332bd5339654e 100644 (file)
--- a/src/gtk/app.cpp
+++ b/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"

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 382b52a18eb8bd582d993c530c461fe87ceb039b..e2d7b48e247888938cbf7e3d39f92f7e66f98400 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index cc203cb5613a29e85eb29d10ba4ce7594aae9705..613ed139fa1c74732b1d4eac2d6cf122cf6dcc15 100644 (file)
--- a/src/gtk/control.cpp
+++ b/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,

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 67d91827656a0200be1966e8e89c49a584ca607b..b88103b6712881df22c5e4720c4160adab9fa193 100644 (file)
--- a/src/gtk/font.cpp
+++ b/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>
 

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index a8d8ab56454205c459f6b221aec20f361a9c0835..e20ebc219e1ab137e996f5191ccbffe945798f83 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/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"
 

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index ef18a5417091760e6c8927ea16cb5219cddcf6b6..a16251eaf7450be0260e3c6a65efd02358b483a2 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 7deb4d6ff79f5fa4bbcc63979a0ce2e712267e44..4417e2c99c84b3fbe66b941ea9a8d5414e3c6214 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/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(
-               widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
 }
 
 static void
 gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 {
-       handle_text_clipboard_callback(
-               widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
 }
 
 static void
 gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 {
-       handle_text_clipboard_callback(
-               widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
 }
 }
 

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 862dbacbab52e14c110a1a4ff1a1ab13c8893be8..8b2891e46d3abf86ff20080b8ed845fdc9c6cd42 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/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>

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d9f4559a47b73cde46e8d351228394b84166db64..72ee7a2c0271743e653925a04d2ad991d99e60bc 100644 (file)
--- a/src/gtk/window.cpp
+++ b/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__

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 7efcd849f4292ef6fa9dd747e259f844abc942ad..e8ea46b89008f01697be7503c4267568fedc20d8 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/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"

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 67dd579b36c636bb0cd0f9f32974825537588af6..f7b8681ccad1658eec2858b1a6c33655589ba74e 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index d77a65f4e8b37acaeddb54de970beb43ff3767ad..f0c279a7f0be6b8d8f20cc43c0fe7d9abd0b26a8 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/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,

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 4014c067a6e54dd421bb564bcdbdeec34fa43a72..32c0aa064526437ddafdcc60e93464616aeb4dc6 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/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() )
     {

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index ab51f39ea58a24eeeb5c8935561d260894dc369c..38eee5c8d36693b0edbb5ff1d47022d15e561c19 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 69f49709902b9f2908a732cf45150d96563d4bc2..eda1665baf70ec6366931574f2c145d518368d5d 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/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())
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index c2ee360fb782d10ff084bfa10f95cec75f1ac5d3..50cd4d41505ff30d390a97702e6e0ecb94db7093 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/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>

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 0b6dcb13bbc465c6ce9608eff2e864859f8cae11..fe8f36be4290369333b82becadb3fc42fabd374f 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/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__

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index c5c2847bfc8232fac3f4006b8cc834cea973b81c..3d7e6db098f33c91f175edc109748613d6b4ffda 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/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)
 

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index b78fc0f7959e9dc34ab7be73bcfa17666c8c2780..e1b0b5228bc0c4253b97b294138e0b216fd9bec4 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index ace347c57a0e7e0fb619503a150fedd91efe4b36..10154cb387c546a455810935c1af2c0e3cd9c9ea 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/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>

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 360a1e646b904bdf1005dbf2da7f3b9e9ebc5ba4..4d2327bd4931a5372d3034ea5f8498e926ecf8cf 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/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"

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index df13c1897454c139cbce0be2a1abff429154d79c..af75193c5a3ea782e2f8acc3172cbd8a9354c85e 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/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"
 
 
 //--------------------------------------------------------------------------------

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index c3ff5cd2c514fe11f0356d4a97692e33b515488a..6c7d8dab0fca30297258d71cc6dd89ab126b688c 100644 (file)
--- a/src/html/winpars.cpp
+++ b/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"
 
 

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index e0450205976d25ec1754817814180a1b553733b2..6621fbe33b6733196ea62ccc8a4202836a0270b0 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/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"
 
@@ -78,7 +78,7 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
             if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )
 #if wxUSE_TAB_DIALOG
                  || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )
-#endif // wxUSE_TAB_DIALOG 
+#endif // wxUSE_TAB_DIALOG
                 )
             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index dee3c9239f2a90bdff7f5855f5a2cc2f253d4fa8..ee4ded5dba1ed6a1f7cde1d3d571a27e554b43cf 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/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"
 
 

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index d4462b59b0268f7cf59d43f73c8eb79cf6dbc831..d9868a8728dcce5cda037a7b0e7ed2cbe6360161 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index f5e7c59eb0cfef51ae5e015b444a85b098f19eaa..bc395ae484690429b78df15ef8cd681e0678c58c 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/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()

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index f161278ef13b8463f36e9f6782e96299177138ab..bbe19045df17e912f0d7b15c989172e4a45ff3df 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/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)

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 92ed3abb33321a7324fc8b99bca546b73360b36c..02e3d04beff968e83f91496f2db76d98797f67b7 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/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"
 
@@ -238,5 +238,5 @@ wxSize wxScrollBar::DoGetBestSize() const
 
     wxSize best(w, h);
     CacheBestSize(best);
-    return best;  
+    return best;
 }

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 1aea449abc2eea13e80dee149cd4c8b2c606f0b9..7c45e73eabbb9871705d96ab31c8c6d43466c19a 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index e1aad6cff33592f2d0c3a53870808e8f9d2ee769..70bbef2d7a5d4c419c4ed530048cac8eba262134 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/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"
 
@@ -202,7 +202,7 @@ public :
 
     virtual bool SetupCursor( const wxPoint& pt )
     { return false ; }
-    
+
     virtual void Clear() ;
     virtual bool CanUndo() const;
     virtual void Undo() ;
@@ -307,7 +307,7 @@ public :
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacMLTEHIViewControl() ;
-    
+
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
     virtual void SetBackground( const wxBrush &brush) ;
@@ -1382,7 +1382,7 @@ static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerC
     OSStatus result = eventNotHandledErr ;
     wxMacUnicodeTextControl* focus = (wxMacUnicodeTextControl*) data ;
     wxMacCarbonEvent cEvent( event ) ;
-    
+
     switch ( GetEventKind( event ) )
     {
         case kEventControlSetFocusPart :
@@ -1404,20 +1404,20 @@ static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerC
         default:
             break ;
     }
-    
+
     return result ;
 }
 
 static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
-    
+
     switch ( GetEventClass( event ) )
     {
         case kEventClassControl :
             result = wxMacUnicodeTextControlControlEventHandler( handler , event , data ) ;
             break ;
-            
+
         default :
             break ;
     }
@@ -1539,7 +1539,7 @@ void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const
         verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
     else
         sel = m_selection ;
-    
+
     if ( from )
         *from = sel.selStart ;
     if ( to )
@@ -1561,7 +1561,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     if ((from == -1) && (to == -1))
     {
         from = 0 ;
-        to = textLength ; 
+        to = textLength ;
     }
     else
     {
@@ -1855,7 +1855,7 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
                 | kTXNSupportSpellCheckCommandUpdating
                 | kTXNSupportFontCommandProcessing
                 | kTXNSupportFontCommandUpdating;
-            
+
             TXNSetCommandEventSupport( m_txn , options ) ;
         }
     }
@@ -1881,7 +1881,7 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
     if ( style.HasFont() )
     {
         const wxFont &font = style.GetFont() ;
-                
+
 #if 0 // old version
         Str255 fontName = "\pMonaco" ;
         SInt16 fontSize = 12 ;
@@ -3012,7 +3012,7 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 // tiger multi-line textcontrols with no CR in the entire content
-// don't scroll automatically, so we need a hack. 
+// don't scroll automatically, so we need a hack.
 // This attempt only works 'before' the key (ie before CallNextEventHandler)
 // is processed, thus the scrolling always occurs one character too late, but
 // better than nothing ...
@@ -3021,12 +3021,12 @@ static const EventTypeSpec eventList[] =
 {
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 } ;
-    
+
 static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
     wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ;
-    
+
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
@@ -3044,20 +3044,20 @@ static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler
         default:
             break ;
     }
-    
+
     return result ;
 }
 
 static pascal OSStatus wxMacTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
-    
+
     switch ( GetEventClass( event ) )
     {
         case kEventClassTextInput :
             result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
             break ;
-            
+
         default :
             break ;
     }

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 7b0f9018f2ba22273d6455f041d98f30ac71db2b..53905b4949afb273f7a7bb8fe05e7f074f293b43 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/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"

diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index 669c65e7139e5f113ba0784b5a2e30925b1c51de..f4f2a537fc7518da3c3a6ec08dd1faf0195998f1 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/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

diff --git a/src/mac/classic/frame.cpp b/src/mac/classic/frame.cpp
index 7bd22bb4dc5465f966b62bb10d6b562716aa60c8..42e12a8a11f37360a3d7df1753e17d547329e300 100644 (file)
--- a/src/mac/classic/frame.cpp
+++ b/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"
 

diff --git a/src/mac/classic/glcanvas.cpp b/src/mac/classic/glcanvas.cpp
index e7e8c3f4abd6a6ae71c10996da25d16ba186d0d4..7fcfd05309c9839481173a18c672f680d88fa9db 100644 (file)
--- a/src/mac/classic/glcanvas.cpp
+++ b/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:

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index bf6bbdf7ccf9a241f3a5f07130a2b34ddaf2f718..9916e92baef988247e9b15b8d43ad1ba3eef9812 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/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)

diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp
index 99298939e1f9ce614441e8fb92cfc10e495c7df2..5a7d9416a4bb8f2fa238129a1d383f1525b60f87 100644 (file)
--- a/src/mac/classic/mdi.cpp
+++ b/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"
 

diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index 3038c7733f369ab1f13b94856a1c7b5dd7db9435..a249f3bd58b6b1f9aabd0a9242e4d69d78819293 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/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>
 

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index 5c028e05f26ce02434ab5f49095354b186f1d260..57fc901cab8c2a021b06288e25ebd498331f93d8 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/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__)

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 9898f482d91049930f39a0eb23ce357c55b1d9ad..949b1ee70196c16ca240ef674d1aa2b049075f0a 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/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"

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index 7c4f8903ab44d5f3a7553cdac8127f3f6fcf9d0f..1798b69d062456a1ca6307bf27799616ea4e9b57 100644 (file)
--- a/src/mgl/font.cpp
+++ b/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"
 
 // ----------------------------------------------------------------------------

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 41eeaccfff279923184f7b0e4b500994ea893741..20da63305481e7a592cd9f2182dbd1f2be2d7af5 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/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;
     };
 }
-
-

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 22dc5a65f8f57defabeb0cc3159dcd804801569f..f7950934e3311e7ba9bf939573155fdde4899bfa 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/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__

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index bc9f15ccfa573e586d7f263010da20bcafdb2b47..0411d9d54a818f8581f57b5d88948beb63235e05 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/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"
 

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 2d0c35bc643cacf986414a8d7418e0c25916be00..08f6720b64581a30f2303c061a3fac77d465261d 100644 (file)
--- a/src/motif/font.cpp
+++ b/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)

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index b72dbe20f38f694cfcaed6a327311e45066e8672..bb28dc522380cd32f9b0527ca6eee2d28bdc31dc 100644 (file)
--- a/src/motif/frame.cpp
+++ b/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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 8b956b96efb24e3d01bb4489e7dc05438332630b..9845531ed1cb394cccf2a6517534f2d09a71b42c 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/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__

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 5314c53dae255b17461c842bba856c12679e1fc5..09894eea98dfcd3f726b9d0e898bb98ab22bd1f9 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 52a8343fff1b2a6a878d854b750e5586d0dba367..d40bdc74bffe38ef7d2287640a52857c37bb28d5 100644 (file)
--- a/src/motif/menu.cpp
+++ b/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

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index aa820bafc490fa1107ff3b473d4e3799130d3330..fe8e598e308a115f6ed1835b7d9d84105dac1582 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 8ab3add39ff8005d4a6d8fe091c259e2db28b524..0abcaf8a70bc214219d82d2bd7f1fbe2c7d67083 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/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__

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index 770e1bfcd0fe749731c0924c08fe2c1b226c76a8..dce201528dd20fc637f18d182ef956ed16f0fad0 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 8e7eb18ab85d2e55c0ae014bbf7a5eb9494b4cd2..88508d610ddee15b5951727d689ba6e2048e315c 100644 (file)
--- a/src/motif/window.cpp
+++ b/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"

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 7711d8113e240060f6584f9370b8049229c43827..94eca7820cb06e7ed7e3c99c2315bea638295ff0 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/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"

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 25f91fc306f8f8640b455150f0499873a79256ae..0ec34ab54c752c1953cd142dbd52ddc2c9e07ac7 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/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"
 

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index f46ad2fa5740645ec364a1fe49c0f0c2a266fd44..ea7ab3a86967699bff09b0e86a761fcb0ead5257 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/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 )

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 97c7d9f9ebfe0eb63110d68cccf40f750ecc4f78..bee65992b7a4510ee1ceb5816fb5cf8be3075295 100644 (file)
--- a/src/msw/settings.cpp
+++ b/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,

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 27dfeadcd02a948a466f4de934e98873792795c3..932ae78390c8fec95e81371a87e1847adc711ee0 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 8896782c0272efba60f6f36405c9c9ae757661af..4be739ef637c8f5340c548aa996909cb39a00f33 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/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>

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index ee24483af6d77789bc443f3b574ce5361ebbf584..609253e30abae7c95372375cc225d30cc59fc844 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/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)

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index a190d277d0a96b789e6c30c8c11e024ef1db4919..f828647041c929921677bed98876f37beb73872b 100644 (file)
--- a/src/os2/settings.cpp
+++ b/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

diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp
index 071a1f83e840af58de820ec97d9776db051d04df..42ec46e5724ecf41da5669bb7017a4e830f6bb41 100644 (file)
--- a/src/os2/treectrl.cpp
+++ b/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)

diff --git a/src/palmos/ownerdrw.cpp b/src/palmos/ownerdrw.cpp
index 60cb581412d04acdde1b8d8d8fdaedeb0578c349..414718895ae10f414f5fee94ac6e57deab9151e4 100644 (file)
--- a/src/palmos/ownerdrw.cpp
+++ b/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"

diff --git a/src/palmos/scrolbar.cpp b/src/palmos/scrolbar.cpp
index 62dbd23f43370f8a19054f3f03261d223485ead6..3b3e2d1023816b4bb2ae19c52926d91f2d31b067 100644 (file)
--- a/src/palmos/scrolbar.cpp
+++ b/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 )

diff --git a/src/palmos/settings.cpp b/src/palmos/settings.cpp
index ef2e8e315ed8d54dad150a4869c22c9f8b10b513..a93fcf006ee20eec5771f05e5eb0b5e07b8aab64 100644 (file)
--- a/src/palmos/settings.cpp
+++ b/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"
 

diff --git a/src/palmos/treectrl.cpp b/src/palmos/treectrl.cpp
index 0c77b78c309e5b7a8fc354f09419bcd6f8b9bf23..821620c2aec7b5a7fd3d16cd2a9dbbf33ea3ff4a 100644 (file)
--- a/src/palmos/treectrl.cpp
+++ b/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
 // --------------------------------

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index f09732ccd2322a7caa8eec86aa2dbc6e88129dba..b414fa7bb5f6cd270715fb77c9434d27ff3dfb7f 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/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"

diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index c59622765708512f56c4013828b948e9f4255c8f..05868880ae863af4babff05351f99773bef717df 100644 (file)
--- a/src/univ/colschem.cpp
+++ b/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);
 }
-

diff --git a/src/univ/themes/metal.cpp b/src/univ/themes/metal.cpp
index 0b88fbed9ad9827d5a4a9fdc4d06954a3d0b4f83..14ca8f84958f179f4c2a2c04cd798a663327d10d 100644 (file)
--- a/src/univ/themes/metal.cpp
+++ b/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"
 

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 823d14827b285326a6776596d3c45d5b605c9224..5db2714dce022b3a67e1f18cfc96dc54c781e1c8 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/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"
@@ -4345,12 +4345,12 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window)
     } else
 #endif // wxUSE_BMPBUTTON
 #if wxUSE_BUTTON || wxUSE_TOGGLEBTN
-    if ( 0 
+    if ( 0
 #  if wxUSE_BUTTON
-         || wxDynamicCast(window, wxButton) 
+         || wxDynamicCast(window, wxButton)
 #  endif // wxUSE_BUTTON
 #  if wxUSE_TOGGLEBTN
-         || wxDynamicCast(window, wxToggleButton) 
+         || wxDynamicCast(window, wxToggleButton)
 #  endif // wxUSE_TOGGLEBTN
         )
     {

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 810e55f83ea07d44e323eb8a1df7acc054d33184..0b2f67aad78f1a0aa43a897b8173ecad276f7e9e 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/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)

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 1dc91a3ba1db102b6d93c2973146f23e38b3fc28..7215b892302ec33845dba4edec1bb24aad616bbe 100644 (file)
--- a/src/x11/font.cpp
+++ b/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"
 

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 0bd02ab6ba1becde59537a4cecf18c14c4a786d1..754367abf23551aed2c4a793f5767abfc62cf87f 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/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"

diff --git a/src/x11/settings.cpp b/src/x11/settings.cpp
index 9b5564524d892e3410c51969a79d538bf17125a3..3dc76f3a754292c21f054253169463939fd3dabd 100644 (file)
--- a/src/x11/settings.cpp
+++ b/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"
 
@@ -23,11 +27,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     {
         case wxSYS_COLOUR_APPWORKSPACE:
             return wxColour( 0xc0c0c0 );
-            
+
         default:
             break;
     }
-    
+
     // Overridden mostly by wxSystemSettings::GetColour in wxUniversal
     return *wxWHITE;
 }
@@ -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:
@@ -79,13 +83,13 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_ICONSPACING_Y:
         // TODO case wxSYS_WINDOWMIN_X:
         // TODO case wxSYS_WINDOWMIN_Y:
-            
+
         case wxSYS_SCREEN_X:
             return DisplayWidth( wxGlobalDisplay(), 0 );
-            
+
         case wxSYS_SCREEN_Y:
             return DisplayHeight( wxGlobalDisplay(), 0 );
-            
+
         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
@@ -101,7 +105,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         // TODO case wxSYS_PENWINDOWS_PRESENT:
         // TODO case wxSYS_SHOW_SOUNDS:
         // TODO case wxSYS_SWAP_BUTTONS:
-            
+
         default:
             return -1;  // unsupported metric
     }
@@ -111,11 +115,11 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 {
     switch (index)
     {
-        case wxSYS_CAN_ICONIZE_FRAME: 
+        case wxSYS_CAN_ICONIZE_FRAME:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return TRUE;
-            
+            return true;
+
         default:
-            return FALSE;
+            return false;
     }
 }

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 1fb326f439e4e4f8c94a9c7dbb659f1373b361c5..dcce680aa28905e5b3e54c834b0f6d3b732a0850 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/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"
 

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 89d0f13189e4931f4c4f06a53ce4026a69b61442..044a835c7ae5b4ff733c91d0c562cccd9237987a 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/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"
 

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 6113d64164795d23fb0cbe35334581eb5dfccdb2..6a2b1af21795b0454c012938464b7a7817d23e8a 100644 (file)
--- a/src/x11/window.cpp
+++ b/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"

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index bdf49556c5bda26f937d332b7c4bfeadde3b6881..d85ca8d4598f9b6e404023f4cbcb3e2d86c4fb32 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -25,6 +25,7 @@
     #include "wx/panel.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
+    #include "wx/settings.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -41,7 +42,6 @@
 #include "wx/image.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"
-#include "wx/settings.h"
 
 #include "wx/xml/xml.h"