From 9eddec696f06d65a80e7339b2fae14fcb55f8383 Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Wed, 24 May 2006 07:16:32 +0000
Subject: [PATCH] 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 | 3 ++-
src/common/effects.cpp | 2 +-
src/common/gdicmn.cpp | 2 +-
src/common/settcmn.cpp | 3 ++-
src/common/sizer.cpp | 2 +-
src/common/tbarbase.cpp | 2 +-
src/generic/buttonbar.cpp | 2 +-
src/generic/choicbkg.cpp | 8 ++++++--
src/generic/datavgen.cpp | 2 +-
src/generic/dirctrlg.cpp | 2 +-
src/generic/fdrepdlg.cpp | 2 +-
src/generic/filedlgg.cpp | 2 +-
src/generic/fontdlgg.cpp | 2 +-
src/generic/listbkg.cpp | 14 +++++++++-----
src/generic/msgdlgg.cpp | 5 ++---
src/generic/notebook.cpp | 2 +-
src/generic/progdlgg.cpp | 4 ++--
src/generic/renderg.cpp | 2 +-
src/generic/tipdlg.cpp | 2 +-
src/generic/tipwin.cpp | 3 +--
src/generic/treebkg.cpp | 6 +++++-
src/generic/treectlg.cpp | 2 +-
src/generic/wizard.cpp | 2 +-
src/gtk/app.cpp | 2 +-
src/gtk/combobox.cpp | 2 +-
src/gtk/control.cpp | 4 ++--
src/gtk/font.cpp | 2 +-
src/gtk/listbox.cpp | 2 +-
src/gtk/renderer.cpp | 3 +--
src/gtk/textctrl.cpp | 18 +++++++++---------
src/gtk/toplevel.cpp | 2 +-
src/gtk/window.cpp | 5 +++--
src/gtk1/app.cpp | 2 +-
src/gtk1/combobox.cpp | 2 +-
src/gtk1/control.cpp | 4 ++--
src/gtk1/font.cpp | 22 +++++++++++-----------
src/gtk1/listbox.cpp | 2 +-
src/gtk1/textctrl.cpp | 2 +-
src/gtk1/toplevel.cpp | 2 +-
src/gtk1/window.cpp | 2 +-
src/html/helpfrm.cpp | 2 +-
src/html/helpwnd.cpp | 2 +-
src/html/htmlcell.cpp | 2 +-
src/html/htmlwin.cpp | 2 +-
src/html/htmprint.cpp | 2 +-
src/html/winpars.cpp | 2 +-
src/mac/carbon/dcclient.cpp | 4 ++--
src/mac/carbon/dialog.cpp | 3 +--
src/mac/carbon/frame.cpp | 2 +-
src/mac/carbon/glcanvas.cpp | 7 +++----
src/mac/carbon/listbox.cpp | 2 +-
src/mac/carbon/scrolbar.cpp | 4 ++--
src/mac/carbon/stattext.cpp | 2 +-
src/mac/carbon/textctrl.cpp | 34 +++++++++++++++++-----------------
src/mac/carbon/window.cpp | 2 +-
src/mac/classic/dialog.cpp | 3 +--
src/mac/classic/frame.cpp | 2 +-
src/mac/classic/glcanvas.cpp | 3 +--
src/mac/classic/listbox.cpp | 2 +-
src/mac/classic/mdi.cpp | 3 +--
src/mac/classic/stattext.cpp | 2 +-
src/mac/classic/textctrl.cpp | 2 +-
src/mac/classic/window.cpp | 2 +-
src/mgl/font.cpp | 2 +-
src/motif/dcmemory.cpp | 5 +----
src/motif/dialog.cpp | 2 +-
src/motif/filedlg.cpp | 2 +-
src/motif/font.cpp | 2 +-
src/motif/frame.cpp | 2 +-
src/motif/listbox.cpp | 2 +-
src/motif/mdi.cpp | 3 +--
src/motif/menu.cpp | 2 +-
src/motif/msgdlg.cpp | 2 +-
src/motif/textctrl.cpp | 2 +-
src/motif/toolbar.cpp | 3 +--
src/motif/window.cpp | 2 +-
src/msw/ownerdrw.cpp | 2 +-
src/msw/renderer.cpp | 2 +-
src/msw/scrolbar.cpp | 2 +-
src/msw/settings.cpp | 8 ++++----
src/msw/treectrl.cpp | 2 +-
src/os2/checklst.cpp | 2 +-
src/os2/ownerdrw.cpp | 4 ++--
src/os2/settings.cpp | 2 +-
src/os2/treectrl.cpp | 2 +-
src/palmos/ownerdrw.cpp | 2 +-
src/palmos/scrolbar.cpp | 2 +-
src/palmos/settings.cpp | 3 ++-
src/palmos/treectrl.cpp | 2 +-
src/richtext/richtextctrl.cpp | 6 +++---
src/univ/colschem.cpp | 6 ++----
src/univ/themes/metal.cpp | 2 +-
src/univ/themes/win32.cpp | 8 ++++----
src/x11/dcmemory.cpp | 3 +--
src/x11/font.cpp | 2 +-
src/x11/popupwin.cpp | 3 +--
src/x11/settings.cpp | 32 ++++++++++++++++++--------------
src/x11/textctrl.cpp | 2 +-
src/x11/toplevel.cpp | 2 +-
src/x11/window.cpp | 4 ++--
src/xrc/xmlres.cpp | 2 +-
101 files changed, 193 insertions(+), 190 deletions(-)
diff --git a/src/cocoa/settings.mm b/src/cocoa/settings.mm
index 192911f682..618486478b 100644
--- 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 c735d825db..bf68eb4740 100644
--- 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 a4820ae147..161eb134d1 100644
--- 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 77e7e67f53..ce3cc6f755 100644
--- 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 894a190d7b..0b918a1344 100644
--- 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 b67f6544a5..54878f1ebd 100644
--- 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 98b1b160a7..49e3210bb9 100644
--- 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 88ba5ac957..143115bca6 100644
--- 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 808f61b18e..c9ca4db621 100644
--- 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 30d47e3ea4..fc98942d44 100644
--- 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 b65f21ffc4..797ac68cbb 100644
--- 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 6792366e6b..4c7f965cd9 100644
--- 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 425df81542..2647cde02b 100644
--- 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 f7f480980c..d3b9771817 100644
--- 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 869cb97c4d..0ef3d052f3 100644
--- 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 c9d8269869..3bfba64f2a 100644
--- 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 c261d63be4..91d6bec43c 100644
--- 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 0a4a4391d5..817dd01986 100644
--- 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 213e7185dc..599d310fe9 100644
--- 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 1dd67eafb3..36dd8b550a 100644
--- 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 4f57582b0c..4bce15eca2 100644
--- 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 3c7a235235..fa66da1ac6 100644
--- 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 4690af5eae..9db99cdbfb 100644
--- 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 d7261c9465..f235b57a3b 100644
--- 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 382b52a18e..e2d7b48e24 100644
--- 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 cc203cb561..613ed139fa 100644
--- 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 67d9182765..b88103b671 100644
--- 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 a8d8ab5645..e20ebc219e 100644
--- 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 ef18a54170..a16251eaf7 100644
--- 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 7deb4d6ff7..4417e2c99c 100644
--- 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 862dbacbab..8b2891e46d 100644
--- 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 d9f4559a47..72ee7a2c02 100644
--- 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 7efcd849f4..e8ea46b890 100644
--- 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 67dd579b36..f7b8681cca 100644
--- 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 d77a65f4e8..f0c279a7f0 100644
--- 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 4014c067a6..32c0aa0645 100644
--- 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 ab51f39ea5..38eee5c8d3 100644
--- 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 69f4970990..eda1665baf 100644
--- 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 c2ee360fb7..50cd4d4150 100644
--- 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 0b6dcb13bb..fe8f36be42 100644
--- 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 c5c2847bfc..3d7e6db098 100644
--- 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 b78fc0f795..e1b0b5228b 100644
--- 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 ace347c57a..10154cb387 100644
--- 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 360a1e646b..4d2327bd49 100644
--- 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 df13c18974..af75193c5a 100644
--- 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 c3ff5cd2c5..6c7d8dab0f 100644
--- 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 e045020597..6621fbe33b 100644
--- 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 dee3c9239f..ee4ded5dba 100644
--- 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 d4462b59b0..d9868a8728 100644
--- 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 f5e7c59eb0..bc395ae484 100644
--- 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 f161278ef1..bbe19045df 100644
--- 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 92ed3abb33..02e3d04bef 100644
--- 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 1aea449abc..7c45e73eab 100644
--- 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 e1aad6cff3..70bbef2d7a 100644
--- 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 7b0f9018f2..53905b4949 100644
--- 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 669c65e713..f4f2a537fc 100644
--- 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 7bd22bb4dc..42e12a8a11 100644
--- 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 e7e8c3f4ab..7fcfd05309 100644
--- 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 bf6bbdf7cc..9916e92bae 100644
--- 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 99298939e1..5a7d9416a4 100644
--- 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 3038c7733f..a249f3bd58 100644
--- 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 5c028e05f2..57fc901cab 100644
--- 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 9898f482d9..949b1ee701 100644
--- 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 7c4f8903ab..1798b69d06 100644
--- 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 41eeaccfff..20da633054 100644
--- 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 22dc5a65f8..f7950934e3 100644
--- 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 bc9f15ccfa..0411d9d54a 100644
--- 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 2d0c35bc64..08f6720b64 100644
--- 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 b72dbe20f3..bb28dc5223 100644
--- 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 8b956b96ef..9845531ed1 100644
--- 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 5314c53dae..09894eea98 100644
--- 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 52a8343fff..d40bdc74bf 100644
--- 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 aa820bafc4..fe8e598e30 100644
--- 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 8ab3add39f..0abcaf8a70 100644
--- 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 770e1bfcd0..dce201528d 100644
--- 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 8e7eb18ab8..88508d610d 100644
--- 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 7711d8113e..94eca7820c 100644
--- 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 25f91fc306..0ec34ab54c 100644
--- 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 f46ad2fa57..ea7ab3a869 100644
--- 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 97c7d9f9eb..bee65992b7 100644
--- 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 27dfeadcd0..932ae78390 100644
--- 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 8896782c02..4be739ef63 100644
--- 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 ee24483af6..609253e30a 100644
--- 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 a190d277d0..f828647041 100644
--- 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 071a1f83e8..42ec46e572 100644
--- 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 60cb581412..414718895a 100644
--- 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 62dbd23f43..3b3e2d1023 100644
--- 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 ef2e8e315e..a93fcf006e 100644
--- 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 0c77b78c30..821620c2ae 100644
--- 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 f09732ccd2..b414fa7bb5 100644
--- 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 c596227657..05868880ae 100644
--- 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 0b88fbed9a..14ca8f8495 100644
--- 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 823d14827b..5db2714dce 100644
--- 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 810e55f83e..0b2f67aad7 100644
--- 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 1dc91a3ba1..7215b89230 100644
--- 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 0bd02ab6ba..754367abf2 100644
--- 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 9b5564524d..3dc76f3a75 100644
--- 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 1fb326f439..dcce680aa2 100644
--- 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 89d0f13189..044a835c7a 100644
--- 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 6113d64164..6a2b1af217 100644
--- 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 bdf49556c5..d85ca8d459 100644
--- 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"
--
2.47.2