From a756f210019dd5b51331b7181c816d3882146a30 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Tue, 8 Jan 2002 23:53:01 +0000
Subject: [PATCH] use the new wxSystemSettings API everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/common/effects.cpp | 10 +++++-----
src/common/gdicmn.cpp | 2 +-
src/common/prntbase.cpp | 4 ++--
src/common/resourc2.cpp | 6 +++---
src/common/resource.cpp | 6 +++---
src/common/wincmn.cpp | 6 +++---
src/generic/dragimgg.cpp | 2 +-
src/generic/grid.cpp | 8 ++++----
src/generic/gridg.cpp | 12 ++++++------
src/generic/listctrl.cpp | 16 ++++++++--------
src/generic/logg.cpp | 2 +-
src/generic/notebook.cpp | 2 +-
src/generic/panelg.cpp | 2 +-
src/generic/progdlgg.cpp | 2 +-
src/generic/sashwin.cpp | 10 +++++-----
src/generic/splitter.cpp | 10 +++++-----
src/generic/statusbr.cpp | 8 ++++----
src/generic/tabg.cpp | 4 ++--
src/generic/tipdlg.cpp | 2 +-
src/generic/tipwin.cpp | 4 ++--
src/generic/treectlg.cpp | 12 ++++++------
src/gtk/combobox.cpp | 2 +-
src/gtk/font.cpp | 4 ++--
src/gtk/listbox.cpp | 4 ++--
src/gtk/textctrl.cpp | 2 +-
src/gtk/window.cpp | 10 +++++-----
src/gtk1/combobox.cpp | 2 +-
src/gtk1/font.cpp | 4 ++--
src/gtk1/listbox.cpp | 4 ++--
src/gtk1/textctrl.cpp | 2 +-
src/gtk1/window.cpp | 10 +++++-----
src/mac/carbon/dialog.cpp | 6 +++---
src/mac/carbon/frame.cpp | 4 ++--
src/mac/carbon/listbox.cpp | 2 +-
src/mac/carbon/mdi.cpp | 2 +-
src/mac/carbon/stattext.cpp | 4 ++--
src/mac/carbon/window.cpp | 8 ++++----
src/mac/dialog.cpp | 6 +++---
src/mac/frame.cpp | 4 ++--
src/mac/listbox.cpp | 2 +-
src/mac/mdi.cpp | 2 +-
src/mac/stattext.cpp | 4 ++--
src/mac/window.cpp | 8 ++++----
src/mgl/settings.cpp | 2 +-
src/motif/dcmemory.cpp | 2 +-
src/motif/dialog.cpp | 8 ++++----
src/motif/filedlg.cpp | 2 +-
src/motif/font.cpp | 2 +-
src/motif/frame.cpp | 6 +++---
src/motif/listbox.cpp | 2 +-
src/motif/mdi.cpp | 6 +++---
src/motif/menu.cpp | 12 ++++++------
src/motif/textctrl.cpp | 2 +-
src/motif/toolbar.cpp | 2 +-
src/motif/window.cpp | 12 ++++++------
src/msw/button.cpp | 2 +-
src/msw/checkbox.cpp | 2 +-
src/msw/choice.cpp | 4 ++--
src/msw/combobox.cpp | 4 ++--
src/msw/dialog.cpp | 6 +++---
src/msw/dragimag.cpp | 2 +-
src/msw/frame.cpp | 4 ++--
src/msw/glcanvas.cpp | 12 ++++++------
src/msw/listbox.cpp | 4 ++--
src/msw/listctrl.cpp | 4 ++--
src/msw/mdi.cpp | 4 ++--
src/msw/menuitem.cpp | 2 +-
src/msw/ownerdrw.cpp | 4 ++--
src/msw/radiobox.cpp | 2 +-
src/msw/radiobut.cpp | 2 +-
src/msw/tbar95.cpp | 2 +-
src/msw/textctrl.cpp | 6 +++---
src/msw/treectrl.cpp | 6 +++---
src/msw/window.cpp | 2 +-
src/os2/button.cpp | 2 +-
src/os2/checkbox.cpp | 2 +-
src/os2/choice.cpp | 2 +-
src/os2/combobox.cpp | 2 +-
src/os2/dialog.cpp | 6 +++---
src/os2/frame.cpp | 4 ++--
src/os2/listbox.cpp | 2 +-
src/os2/mdi.cpp | 4 ++--
src/os2/menuitem.cpp | 2 +-
src/os2/textctrl.cpp | 6 +++---
src/os2/toolbar.cpp | 2 +-
src/os2/window.cpp | 2 +-
src/univ/menu.cpp | 10 +++++-----
src/univ/statusbr.cpp | 4 ++--
src/univ/themes/win32.cpp | 4 ++--
89 files changed, 206 insertions(+), 206 deletions(-)
diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index 965c5724ea..a5b2a828ea 100644
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -35,11 +35,11 @@ IMPLEMENT_CLASS(wxEffects, wxObject)
// Assume system colours
wxEffects::wxEffects()
{
- m_highlightColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT) ;
- m_lightShadow = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT) ;
- m_faceColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
- m_mediumShadow = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW) ;
- m_darkShadow = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW) ;
+ m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ;
+ m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ;
+ m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) ;
+ m_mediumShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
+ m_darkShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW) ;
}
// Going from lightest to darkest
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index b881532410..91cdb4ae8c 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -446,7 +446,7 @@ void wxInitializeStockObjects ()
static const int sizeFont = 12;
wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
#else
- wxNORMAL_FONT = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
static const int sizeFont = wxNORMAL_FONT->GetPointSize();
#endif
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 8e7e80b769..4521ba7b8f 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -183,7 +183,7 @@ wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
wxScrolledWindow(parent, -1, pos, size, style, name)
{
m_printPreview = preview;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
SetScrollbars(15, 18, 100, 100);
}
@@ -213,7 +213,7 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
// Responds to colour changes, and passes event on to children.
void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
// Propagate the event to the non-top-level children
diff --git a/src/common/resourc2.cpp b/src/common/resourc2.cpp
index 2321126dde..3b378ec002 100644
--- a/src/common/resourc2.cpp
+++ b/src/common/resourc2.cpp
@@ -1513,7 +1513,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
{
// No need to do this since it's done in wxPanel or wxDialog constructor.
- // SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ // SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
else
{
@@ -1525,9 +1525,9 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
// Should have some kind of font at this point
if (!GetFont().Ok())
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
if (!GetBackgroundColour().Ok())
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
// Only when we've created the window and set the font can we set the correct size,
// if based on dialog units.
diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 63151ab13b..a6446d9710 100644
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -3175,7 +3175,7 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
{
// No need to do this since it's done in wxPanel or wxDialog constructor.
- // SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ // SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
else
{
@@ -3187,9 +3187,9 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
// Should have some kind of font at this point
if (!GetFont().Ok())
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
if (!GetBackgroundColour().Ok())
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
// Only when we've created the window and set the font can we set the correct size,
// if based on dialog units.
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 5b677218c7..3a1fd0f2d8 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -124,14 +124,14 @@ void wxWindowBase::InitBase()
#endif // wxUSE_VALIDATORS
// use the system default colours
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE);
- m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+ m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
// don't set the font here for wxMSW as we don't call WM_SETFONT here and
// so the font is *not* really set - but calls to SetFont() later won't do
// anything because m_font appears to be already set!
#ifndef __WXMSW__
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
#endif // __WXMSW__
// the colours/fonts are default for now
diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index ac83bc99bd..e7632a737c 100644
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -130,7 +130,7 @@ bool wxGenericDragImage::Create(const wxIcon& image, const wxCursor& cursor)
// Create a drag image from a string and optional cursor
bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
{
- wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long w, h;
wxScreenDC dc;
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a5860c70d5..6387d6e676 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3636,9 +3636,9 @@ void wxGrid::Create()
m_defaultCellAttr->SetFont(GetFont());
m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
m_defaultCellAttr->SetTextColour(
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
+ wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
m_defaultCellAttr->SetBackgroundColour(
- wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
m_defaultCellAttr->SetRenderer(new wxGridCellStringRenderer);
m_defaultCellAttr->SetEditor(new wxGridCellTextEditor);
@@ -3810,8 +3810,8 @@ void wxGrid::Init()
m_selectingTopLeft = wxGridNoCellCoords;
m_selectingBottomRight = wxGridNoCellCoords;
- m_selectionBackground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
- m_selectionForeground = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ m_selectionBackground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+ m_selectionForeground = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
m_editable = TRUE; // default for whole grid
diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 3f28058a14..4c33a1a32a 100644
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -125,7 +125,7 @@ wxGenericGrid::wxGenericGrid()
m_cellBackgroundColour = *wxWHITE;
m_labelTextColour = *wxBLACK;
// m_labelBackgroundColour = *wxLIGHT_GREY;
- m_labelBackgroundColour = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ m_labelBackgroundColour = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
m_labelBackgroundBrush = wxNullBrush;
m_labelTextFont = wxNullFont;
m_cellTextFont = wxNullFont;
@@ -138,9 +138,9 @@ wxGenericGrid::wxGenericGrid()
m_inScroll = FALSE;
#if defined(__WIN95__)
- m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
#elif defined(__WXGTK__)
- m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
#else
m_scrollWidth = 16;
#endif
@@ -195,7 +195,7 @@ bool wxGenericGrid::Create(wxWindow *parent,
m_cellBackgroundColour = *wxWHITE;
m_labelTextColour = *wxBLACK;
// m_labelBackgroundColour = *wxLIGHT_GREY;
- m_labelBackgroundColour = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ m_labelBackgroundColour = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
m_labelBackgroundBrush = wxNullBrush;
m_labelTextFont = * wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxBOLD);
m_cellTextFont = * wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
@@ -206,9 +206,9 @@ bool wxGenericGrid::Create(wxWindow *parent,
m_inOnTextInPlace = FALSE;
m_inScroll = FALSE;
#if defined(__WIN95__)
- m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
#elif defined(__WXGTK__)
- m_scrollWidth = wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ m_scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
#else
m_scrollWidth = 16;
#endif
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 9f32c43da4..f61435dac0 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -827,7 +827,7 @@ protected:
#ifdef __WXMAC__
return *wxWHITE;
#else
- return wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT);
+ return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
#endif
}
@@ -1595,7 +1595,7 @@ bool wxListLineData::SetAttributes(wxDC *dc,
wxColour colText;
if ( highlighted )
{
- colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
}
else
{
@@ -1786,7 +1786,7 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win,
m_owner = owner;
m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
}
wxListHeaderWindow::~wxListHeaderWindow()
@@ -1811,7 +1811,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
dc->SetBrush( *wxTRANSPARENT_BRUSH );
- dc->SetPen( wxPen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
+ dc->SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ) , 1 , wxSOLID ) );
dc->DrawLine( x+w-m_corner+1, y, x+w, y+h ); // right (outer)
dc->DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer)
@@ -1835,7 +1835,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
dc->DrawLine( x+w-m_corner+1, y, x+w, y+h ); // right (outer)
dc->DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer)
- wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
+ wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
dc->SetPen( pen );
dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner)
@@ -2307,7 +2307,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
m_highlightBrush = new wxBrush
(
- wxSystemSettings::GetSystemColour
+ wxSystemSettings::GetColour
(
wxSYS_COLOUR_HIGHLIGHT
),
@@ -2316,7 +2316,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
m_highlightUnfocusedBrush = new wxBrush
(
- wxSystemSettings::GetSystemColour
+ wxSystemSettings::GetColour
(
wxSYS_COLOUR_BTNSHADOW
),
@@ -2329,7 +2329,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent,
InitScrolling();
SetScrollbars( m_xScroll, m_yScroll, 0, 0, 0, 0 );
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
}
wxListMainWindow::~wxListMainWindow()
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 5a071db228..8551727656 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -869,7 +869,7 @@ void wxLogDialog::CreateDetailsControls()
// if the height as computed from list items exceeds, together with the
// actual message & controls, the screen, make it smaller
int heightMax =
- (3*wxSystemSettings::GetSystemMetric(wxSYS_SCREEN_Y))/5 - GetSize().y;
+ (3*wxSystemSettings::GetMetric(wxSYS_SCREEN_Y))/5 - GetSize().y;
m_listctrl->SetSize(-1, wxMin(height, heightMax));
}
diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 94170c605e..5cb54f9c67 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -112,7 +112,7 @@ bool wxNotebook::Create(wxWindow *parent,
if (!wxWindow::Create(parent, id, pos, size, style|wxNO_BORDER, name))
return FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
SetTabView(new wxNotebookTabView(this));
diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 1b36dff649..a67f7da2e5 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -95,7 +95,7 @@ void wxPanel::InitDialog()
// Responds to colour changes, and passes event on to children.
void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
// Propagate the event to the non-top-level children
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 8f2fc1e404..0e4c493c43 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -126,7 +126,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
wxLayoutConstraints *c;
wxClientDC dc(this);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long widthText;
dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 8d679953df..90bc832b39 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -660,11 +660,11 @@ void wxSashWindow::InitColours()
{
// Shadow colours
#ifndef __WIN16__
- m_faceColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
- m_mediumShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW);
- m_darkShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW);
- m_lightShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT);
- m_hilightColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT);
+ m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ m_mediumShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+ m_darkShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW);
+ m_lightShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
+ m_hilightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT);
#else
m_faceColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY"));
diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 5d89066765..8205ca5e24 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -874,20 +874,20 @@ void wxSplitterWindow::InitColours()
// Shadow colours
#ifndef __WIN16__
- wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
m_facePen = new wxPen(faceColour, 1, wxSOLID);
m_faceBrush = new wxBrush(faceColour, wxSOLID);
- wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+ wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
- wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
+ wxColour darkShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW));
m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
- wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
+ wxColour lightShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT));
m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
- wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
+ wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
m_hilightPen = new wxPen(hilightColour, 1, wxSOLID);
#else
m_facePen = new wxPen("LIGHT GREY", 1, wxSOLID);
diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index c433a1dfde..fa7a9f0690 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -380,10 +380,10 @@ void wxStatusBarGeneric::InitColours()
{
// Shadow colours
#if defined(__WIN95__)
- wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+ wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
- wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
+ wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
#elif defined(__WXPM__)
m_mediumShadowPen = wxPen("LIGHT GREY", 1, wxSOLID);
@@ -393,8 +393,8 @@ void wxStatusBarGeneric::InitColours()
m_hilightPen = wxPen("WHITE", 1, wxSOLID);
#endif
- m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
// Responds to colour changes, and passes event on to children.
diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index bd0ba3d2eb..33119247e6 100644
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -528,8 +528,8 @@ wxTabView::wxTabView(long style)
m_shadowPen = wxGREY_PEN;
m_backgroundPen = wxLIGHT_GREY_PEN;
m_backgroundBrush = wxLIGHT_GREY_BRUSH;
- m_tabFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
- m_tabSelectedFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_window = (wxWindow *) NULL;
}
diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 417a093903..6f9ba6f7df 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -181,7 +181,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
text->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxBOLD));
#endif
//
-// text->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE));
+// text->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
m_text = new wxTextCtrl(this, -1, wxT(""),
wxDefaultPosition, wxSize(200, 160),
diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index f90be60652..01c0e5151e 100644
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -122,7 +122,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
SetForegroundColour(*wxBLACK);
#ifdef __WXMSW__
- wxColour bkCol(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_INFOBK));
+ wxColour bkCol(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
#else
wxColour bkCol(wxColour(255, 255, 225));
#endif
@@ -197,7 +197,7 @@ wxTipWindowView::wxTipWindowView(wxWindow *parent)
// set colours
SetForegroundColour(*wxBLACK);
#ifdef __WXMSW__
- wxColour bkCol(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_INFOBK));
+ wxColour bkCol(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
#else
wxColour bkCol(wxColour(255, 255, 225));
#endif
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 1994629da8..5fd8f5b4f2 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -669,7 +669,7 @@ void wxGenericTreeCtrl::Init()
m_hilightBrush = new wxBrush
(
- wxSystemSettings::GetSystemColour
+ wxSystemSettings::GetColour
(
wxSYS_COLOUR_HIGHLIGHT
),
@@ -678,7 +678,7 @@ void wxGenericTreeCtrl::Init()
m_hilightUnfocusedBrush = new wxBrush
(
- wxSystemSettings::GetSystemColour
+ wxSystemSettings::GetColour
(
wxSYS_COLOUR_BTNSHADOW
),
@@ -697,7 +697,7 @@ void wxGenericTreeCtrl::Init()
m_renameTimer = new wxTreeRenameTimer( this );
m_lastOnSame = FALSE;
- m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT );
+ m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
m_boldFont = wxFont( m_normalFont.GetPointSize(),
m_normalFont.GetFamily(),
m_normalFont.GetStyle(),
@@ -754,7 +754,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
SetValidator( validator );
#endif
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
// m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86
m_dottedPen = wxPen( wxT("grey"), 0, 0 );
@@ -2053,7 +2053,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
wxColour colText;
if ( item->IsSelected() )
{
- colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
}
else
{
@@ -2061,7 +2061,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
if (attr && attr->HasTextColour())
colText = attr->GetTextColour();
else
- colText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
+ colText = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
}
// prepare to draw
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index bd085bae0d..326381bcb4 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -186,7 +186,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
}
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 15909254a4..d1239aba25 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -186,7 +186,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
{
if( !fontname )
{
- *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
+ *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
return TRUE;
}
@@ -487,7 +487,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
}
else
{
- if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT))
+ if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
{
font = GtkGetDefaultGuiFont();
}
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 9cf8883c8e..de25cc767e 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -417,7 +417,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
PostCreation();
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
@@ -1046,7 +1046,7 @@ wxSize wxListBox::DoGetBestSize() const
}
// Add room for the scrollbar
- lbWidth += wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
// And just a bit more
int cx, cy;
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 0441064567..6c37c6636a 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1059,7 +1059,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
if (!m_widget->window)
return FALSE;
- wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
if (sysbg.Red() == colour.Red() &&
sysbg.Green() == colour.Green() &&
sysbg.Blue() == colour.Blue())
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 01d6e259a2..d3f6cf1e1c 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3536,7 +3536,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
if ((m_wxwindow) &&
(m_wxwindow->window) &&
- (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
+ (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)))
{
/* wxMSW doesn't clear the window here. I don't do that either to
provide compatibility. call Clear() to do the job. */
@@ -3632,7 +3632,7 @@ void wxWindowGTK::SetWidgetStyle()
GtkStyle *style = GetWidgetStyle();
- if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))
+ if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
@@ -3641,7 +3641,7 @@ void wxWindowGTK::SetWidgetStyle()
if (m_foregroundColour.Ok())
{
m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
- if (m_foregroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNTEXT))
+ if (m_foregroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT))
{
style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
@@ -3667,7 +3667,7 @@ void wxWindowGTK::SetWidgetStyle()
if (m_backgroundColour.Ok())
{
m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
- if (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE))
+ if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))
{
style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
@@ -3842,7 +3842,7 @@ bool wxWindowGTK::SetFont( const wxFont &font )
return FALSE;
}
- wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
if ( sysbg == m_backgroundColour )
{
m_backgroundColour = wxNullColour;
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index bd085bae0d..326381bcb4 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -186,7 +186,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
}
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 15909254a4..d1239aba25 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -186,7 +186,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
{
if( !fontname )
{
- *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
+ *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
return TRUE;
}
@@ -487,7 +487,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
}
else
{
- if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT))
+ if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
{
font = GtkGetDefaultGuiFont();
}
diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 9cf8883c8e..de25cc767e 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -417,7 +417,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
PostCreation();
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+ SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
@@ -1046,7 +1046,7 @@ wxSize wxListBox::DoGetBestSize() const
}
// Add room for the scrollbar
- lbWidth += wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+ lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
// And just a bit more
int cx, cy;
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 0441064567..6c37c6636a 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1059,7 +1059,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
if (!m_widget->window)
return FALSE;
- wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
if (sysbg.Red() == colour.Red() &&
sysbg.Green() == colour.Green() &&
sysbg.Blue() == colour.Blue())
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 01d6e259a2..d3f6cf1e1c 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -3536,7 +3536,7 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
if ((m_wxwindow) &&
(m_wxwindow->window) &&
- (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
+ (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)))
{
/* wxMSW doesn't clear the window here. I don't do that either to
provide compatibility. call Clear() to do the job. */
@@ -3632,7 +3632,7 @@ void wxWindowGTK::SetWidgetStyle()
GtkStyle *style = GetWidgetStyle();
- if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))
+ if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
@@ -3641,7 +3641,7 @@ void wxWindowGTK::SetWidgetStyle()
if (m_foregroundColour.Ok())
{
m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
- if (m_foregroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNTEXT))
+ if (m_foregroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT))
{
style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
@@ -3667,7 +3667,7 @@ void wxWindowGTK::SetWidgetStyle()
if (m_backgroundColour.Ok())
{
m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
- if (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE))
+ if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))
{
style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
@@ -3842,7 +3842,7 @@ bool wxWindowGTK::SetFont( const wxFont &font )
return FALSE;
}
- wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
if ( sysbg == m_backgroundColour )
{
m_backgroundColour = wxNullColour;
diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 8a066964ca..eed25f3fb7 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -47,7 +47,7 @@ END_EVENT_TABLE()
wxDialog::wxDialog()
{
m_isShown = FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -58,7 +58,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
@@ -268,7 +268,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
}
diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index adc15790af..990ba1a514 100644
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -101,7 +101,7 @@ bool wxFrame::Create(wxWindow *parent,
long style,
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
@@ -170,7 +170,7 @@ void wxFrame::PositionStatusBar()
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
if ( m_frameStatusBar )
diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 91595e5f38..a5ef8163b0 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -596,7 +596,7 @@ int wxListBox::GetCount() const
void wxListBox::SetupColours()
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
}
diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 6f7ff1e805..024c4fb6c7 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -300,7 +300,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
parent->AddChild(this);
}
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
wxModelessWindows.Append(this);
return TRUE;
diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 3b2476af40..2982b7c5c4 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -130,8 +130,8 @@ void wxStaticText::OnDraw( wxDC &dc )
return;
if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
- ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE )
- || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+ ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
+ || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
{
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
}
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index bd38b3ccd2..78b3c56ba7 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -859,11 +859,11 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos)
const wxBrush& wxWindowMac::MacGetBackgroundBrush()
{
- if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+ if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
}
- else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+ else if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
{
// on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
@@ -882,8 +882,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
}
{
- if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE )
- && parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+ if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
+ && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
// if we have any other colours in the hierarchy
m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;
diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 8a066964ca..eed25f3fb7 100644
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -47,7 +47,7 @@ END_EVENT_TABLE()
wxDialog::wxDialog()
{
m_isShown = FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -58,7 +58,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
@@ -268,7 +268,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
}
diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index adc15790af..990ba1a514 100644
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -101,7 +101,7 @@ bool wxFrame::Create(wxWindow *parent,
long style,
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
@@ -170,7 +170,7 @@ void wxFrame::PositionStatusBar()
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
if ( m_frameStatusBar )
diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 91595e5f38..a5ef8163b0 100644
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -596,7 +596,7 @@ int wxListBox::GetCount() const
void wxListBox::SetupColours()
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
}
diff --git a/src/mac/mdi.cpp b/src/mac/mdi.cpp
index 6f7ff1e805..024c4fb6c7 100644
--- a/src/mac/mdi.cpp
+++ b/src/mac/mdi.cpp
@@ -300,7 +300,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
parent->AddChild(this);
}
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
wxModelessWindows.Append(this);
return TRUE;
diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 3b2476af40..2982b7c5c4 100644
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -130,8 +130,8 @@ void wxStaticText::OnDraw( wxDC &dc )
return;
if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
- ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE )
- || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+ ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
+ || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
{
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
}
diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index bd38b3ccd2..78b3c56ba7 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -859,11 +859,11 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos)
const wxBrush& wxWindowMac::MacGetBackgroundBrush()
{
- if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+ if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
}
- else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+ else if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
{
// on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
@@ -882,8 +882,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
}
{
- if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE )
- && parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+ if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
+ && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
// if we have any other colours in the hierarchy
m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;
diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 8ad12fc890..d3b4828427 100644
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -95,7 +95,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
return 15;
break;
default:
- wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetSystemMetric not fully implemented"));
+ wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetMetric not fully implemented"));
return 0;
}
}
diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 46f6d29183..8694f0b6ec 100644
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -58,7 +58,7 @@ wxMemoryDC::wxMemoryDC(void)
m_oldFont = (WXFont) valReturn.font;
SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
};
wxMemoryDC::wxMemoryDC( wxDC* dc )
diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 7e8aaf5637..19a321cc02 100644
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -91,7 +91,7 @@ END_EVENT_TABLE()
wxDialog::wxDialog()
{
m_modalShowing = FALSE;
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
@@ -105,7 +105,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
m_modalShowing = FALSE;
m_dialogTitle = title;
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_foregroundColour = *wxBLACK;
SetName(name);
@@ -151,7 +151,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
XmStringFree(str);
}
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
ChangeFont(FALSE);
wxAddWindowToTable(dialogShell, this);
@@ -639,7 +639,7 @@ bool wxDialog::Destroy()
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
}
diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index afbaa2d710..91f301028c 100644
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -173,7 +173,7 @@ static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
/* TODO: should scrollbars be affected? Should probably have separate
* function to change them (by default, taken from wxSystemSettings)
*/
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
wxWindow::DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
wxWindow::DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index d5b995aa3b..acfc72ec82 100644
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -222,7 +222,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
{
if( !fontname )
{
- *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);
+ *this = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT);
return TRUE;
}
diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 5984fe2b59..14b660afe3 100644
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -149,9 +149,9 @@ bool wxFrame::Create(wxWindow *parent,
m_windowStyle = style;
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_foregroundColour = *wxBLACK;
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
if ( id > -1 )
m_windowId = id;
@@ -689,7 +689,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar)
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
if ( m_frameStatusBar )
diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 8b25c36f2a..3502c25afc 100644
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -760,7 +760,7 @@ void wxListBox::ChangeBackgroundColour()
/* TODO: should scrollbars be affected? Should probably have separate
* function to change them (by default, taken from wxSystemSettings)
*/
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index f8aa8af3f0..a62339fce3 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -335,9 +335,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
SetName(name);
SetWindowStyleFlag(style);
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_foregroundColour = *wxBLACK;
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
if ( id > -1 )
m_windowId = id;
@@ -621,7 +621,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
SetWindowStyleFlag(style);
// m_windowParent = parent;
- // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ // m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
if (success)
diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 05c0912007..84410f4f5f 100644
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -84,9 +84,9 @@ void wxMenu::Init()
AppendSeparator() ;
}
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
- m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+ m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
}
// The wxWindow destructor will take care of deleting the submenus.
@@ -201,9 +201,9 @@ void wxMenuBar::Init()
m_eventHandler = this;
m_menuBarFrame = NULL;
m_mainWidget = (WXWidget) NULL;
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU);
- m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
+ m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
+ m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
}
wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 3a66bd8ff8..fe72b88437 100644
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -665,7 +665,7 @@ void wxTextCtrl::ChangeBackgroundColour()
XmNhorizontalScrollBar, &hsb,
XmNverticalScrollBar, &vsb,
NULL);
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
if (hsb)
DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
if (vsb)
diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index b38f1c3929..a7faa4d42a 100644
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -196,7 +196,7 @@ bool wxToolBar::Create(wxWindow *parent,
m_windowId = id;
SetName(name);
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_foregroundColour = parent->GetForegroundColour();
m_windowStyle = style;
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index b2f4037d0e..30a1b00391 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -226,7 +226,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
parent->AddChild(this);
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_foregroundColour = *wxBLACK;
//// TODO: we should probably optimize by only creating a
@@ -357,7 +357,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
// Scrolled widget needs to have its colour changed or we get a little blue
// square where the scrollbars abutt
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE);
DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE);
@@ -376,7 +376,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
// Without this, the cursor may not be restored properly (e.g. in splitter
// sample).
SetCursor(*wxSTANDARD_CURSOR);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
SetSize(pos.x, pos.y, size.x, size.y);
return TRUE;
@@ -509,7 +509,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
m_hScrollBar = (WXWidget) hScrollBar;
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
XtRealizeWidget(hScrollBar);
@@ -544,7 +544,7 @@ void wxWindow::CreateScrollbar(wxOrientation orientation)
NULL);
m_vScrollBar = (WXWidget) vScrollBar;
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
XtRealizeWidget(vScrollBar);
@@ -2870,7 +2870,7 @@ void wxWindow::ChangeBackgroundColour()
DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour);
// Have to set the scrollbar colours back since
// the scrolled window seemed to change them
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
if (m_hScrollBar)
DoChangeBackgroundColour(m_hScrollBar, backgroundColour);
diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 24d5340b6e..62da82af8e 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -164,7 +164,7 @@ wxSize wxButtonBase::GetDefaultSize()
if ( s_sizeBtn.x == 0 )
{
wxScreenDC dc;
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// the size of a standard button in the dialog units is 50x14,
// translate this to pixels
diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 28773bbb36..8a5c375e22 100644
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -159,7 +159,7 @@ wxSize wxCheckBox::DoGetBestSize() const
if ( !s_checkSize )
{
wxScreenDC dc;
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
s_checkSize = dc.GetCharHeight();
}
diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 6c9206a796..8ef52dbcff 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -83,7 +83,7 @@ bool wxChoice::Create(wxWindow *parent,
// A choice/combobox normally has a white background (or other, depending
// on global settings) rather than inheriting the parent's background colour.
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
for ( int i = 0; i < n; i++ )
{
@@ -391,7 +391,7 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(
wxColour colBack = GetBackgroundColour();
if (!IsEnabled())
- colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 6d31e99dba..f7c97122e1 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -170,7 +170,7 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE
wxColour colBack = GetBackgroundColour();
if (!IsEnabled())
- colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
@@ -313,7 +313,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
// A choice/combobox normally has a white background (or other, depending
// on global settings) rather than inheriting the parent's background colour.
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
for ( int i = 0; i < n; i++ )
{
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index df6ccbf4f4..d528829c9d 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -98,7 +98,7 @@ void wxDialog::Init()
m_windowDisabler = (wxWindowDisabler *)NULL;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
}
bool wxDialog::Create(wxWindow *parent,
@@ -122,7 +122,7 @@ bool wxDialog::Create(wxWindow *parent,
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
}
@@ -389,7 +389,7 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
#if wxUSE_CTL3D
Ctl3dColorChange();
#else
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
#endif
}
diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index fcad2efdfd..ababd9e7cd 100644
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -192,7 +192,7 @@ bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor)
// Create a drag image from a string and optional cursor
bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
{
- wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
long w, h;
wxScreenDC dc;
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 814f3bd254..76370db434 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -128,7 +128,7 @@ bool wxFrame::Create(wxWindow *parent,
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
return FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this);
@@ -294,7 +294,7 @@ void wxFrame::InternalSetMenuBar()
// Responds to colour changes, and passes event on to children.
void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
#if wxUSE_STATUSBAR
diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index e06e74dc22..3b03757338 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -143,8 +143,8 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
if ( ret )
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
@@ -167,8 +167,8 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
if ( ret )
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
@@ -192,8 +192,8 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID i
if ( ret )
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index b024c65b07..9634d40062 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -238,7 +238,7 @@ wxListBox::~wxListBox()
void wxListBox::SetupColours()
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
}
@@ -741,7 +741,7 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
wxDC dc;
dc.SetHDC((WXHDC)hdc);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_ANSI_VAR_FONT));
pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
pStruct->itemWidth = dc.GetCharWidth();
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 6b4a882131..b21c61756c 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -280,7 +280,7 @@ bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
0, LVS_EX_FULLROWSELECT);
}
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
SubclassWin(m_hWnd);
@@ -2025,7 +2025,7 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
if ((GetWindowStyle() & wxLC_REPORT) == 0)
return;
- wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
+ wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
dc.SetPen(pen);
dc.SetBrush(* wxTRANSPARENT_BRUSH);
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 9edbdbf703..24bef993a5 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -314,7 +314,7 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
if ( m_clientWindow )
{
- m_clientWindow->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ m_clientWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
m_clientWindow->Refresh();
}
@@ -1142,7 +1142,7 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
CLIENTCREATESTRUCT ccs;
m_windowStyle = style;
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index c87a217ce6..0686c08269 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -99,7 +99,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
#if wxUSE_OWNER_DRAWN
// set default menu colors
- #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
+ #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c))
SetTextColour(SYS_COLOR(MENUTEXT));
SetBackgroundColour(SYS_COLOR(MENU));
diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 010429a878..364d175a89 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -94,13 +94,13 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
{
// Is BMP height larger then text height?
size_t adjustedHeight = m_bmpChecked.GetHeight() +
- wxSystemSettings::GetSystemMetric(wxSYS_EDGE_Y);
+ wxSystemSettings::GetMetric(wxSYS_EDGE_Y);
if (*pheight < adjustedHeight)
*pheight = adjustedHeight;
// Does BMP encroach on default check menu position?
size_t adjustedWidth = m_bmpChecked.GetWidth() +
- (wxSystemSettings::GetSystemMetric(wxSYS_EDGE_X) * 2);
+ (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2);
if (ms_nDefaultMarginWidth < adjustedWidth)
*pwidth += adjustedWidth - ms_nDefaultMarginWidth;
diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 026f8a2830..94deec9009 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -835,7 +835,7 @@ WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE
wxColour colBack = GetBackgroundColour();
if (!IsEnabled())
- colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index c4453ac9ac..a0a8d167a8 100644
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -205,7 +205,7 @@ WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUN
wxColour colBack = GetBackgroundColour();
if (!IsEnabled())
- colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index aab98f4c50..b629c610e8 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -247,7 +247,7 @@ bool wxToolBar::Create(wxWindow *parent,
wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE));
m_foregroundColour = *wxBLACK;
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// position it
int x = pos.x;
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index c1511e337f..ffecf13cd7 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -313,7 +313,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) )
return FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
#if wxUSE_RICHEDIT
if ( IsRich() )
@@ -1222,7 +1222,7 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE
wxColour colBack = GetBackgroundColour();
if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
- colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
@@ -1241,7 +1241,7 @@ void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
#if wxUSE_CTL3D
if (m_useCtl3D)
- col = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+ col = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
#endif
RECT rect;
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 3ebf19f9e2..728801273e 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -583,10 +583,10 @@ bool wxTreeCtrl::Create(wxWindow *parent,
return FALSE;
#if wxUSE_COMCTL32_SAFELY
- wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
wxWindow::SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
#elif 1
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
#else
// This works around a bug in the Windows tree control whereby for some versions
@@ -595,7 +595,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
// THIS FIX NOW REVERTED since it caused problems on _other_ systems.
// Assume the user has an updated comctl32.dll.
::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0,-1);
- wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
#endif
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 5f4c38e7fe..8f4b26cdf9 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2862,7 +2862,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
SubclassWin(m_hWnd);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
}
diff --git a/src/os2/button.cpp b/src/os2/button.cpp
index f77b45338a..b4ce9ac0d5 100644
--- a/src/os2/button.cpp
+++ b/src/os2/button.cpp
@@ -179,7 +179,7 @@ wxSize wxButton::GetDefaultSize()
{
wxScreenDC vDc;
- vDc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ vDc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
//
// The size of a standard button in the dialog units is 50x14,
diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 0101e79a0c..8311751388 100644
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -153,7 +153,7 @@ wxSize wxCheckBox::DoGetBestSize() const
{
wxScreenDC vDc;
- vDc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ vDc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
//
// The height of a standard button in the dialog units is 8,
diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 079295ab77..96df144bf1 100644
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -71,7 +71,7 @@ bool wxChoice::Create(
// A choice/combobox normally has a white background (or other, depending
// on global settings) rather than inheriting the parent's background colour.
//
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
for (int i = 0; i < n; i++)
{
Append(asChoices[i]);
diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index bf7feb6860..7d6565d798 100644
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -140,7 +140,7 @@ bool wxComboBox::Create(
// A choice/combobox normally has a white background (or other, depending
// on global settings) rather than inheriting the parent's background colour.
//
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetFont(pParent->GetFont());
diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index c73062da3c..e503f93cc8 100644
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -49,7 +49,7 @@ void wxDialog::Init()
m_pOldFocus = (wxWindow *)NULL;
m_isShown = FALSE;
m_pWindowDisabler = (wxWindowDisabler *)NULL;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
} // end of wxDialog::Init
bool wxDialog::Create(
@@ -92,7 +92,7 @@ bool wxDialog::Create(
,rsName
))
return FALSE;
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
} // end of wxDialog::Create
@@ -392,7 +392,7 @@ void wxDialog::OnSysColourChanged(
wxSysColourChangedEvent& rEvent
)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
Refresh();
} // end of wxDialog::OnSysColourChanged
diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 261c01de4c..55c626ed14 100644
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -144,7 +144,7 @@ bool wxFrame::Create(
,rsName
))
return FALSE;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this);
return TRUE;
} // end of wxFrame::Create
@@ -449,7 +449,7 @@ void wxFrame::OnSysColourChanged(
wxSysColourChangedEvent& rEvent
)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
#if wxUSE_STATUSBAR
diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 9fe882a4fb..df1b7cc473 100644
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -224,7 +224,7 @@ wxListBox::~wxListBox()
void wxListBox::SetupColours()
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
} // end of wxListBox::SetupColours
diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp
index 800232b152..c60552cdaf 100644
--- a/src/os2/mdi.cpp
+++ b/src/os2/mdi.cpp
@@ -248,7 +248,7 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
if ( m_clientWindow )
{
- m_clientWindow->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ m_clientWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
m_clientWindow->Refresh();
}
@@ -1047,7 +1047,7 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
// TODO:
/*
diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 6b4c37c65a..42a3a893a5 100644
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -130,7 +130,7 @@ wxMenuItem::wxMenuItem(
//
// Set default menu colors
//
- #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
+ #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c))
SetTextColour(SYS_COLOR(MENUTEXT));
SetBackgroundColour(SYS_COLOR(MENU));
diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 32bc0f69d8..69f0914f4b 100644
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -216,7 +216,7 @@ bool wxTextCtrl::Create(
}
else
{
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
}
if (!rsValue.IsEmpty())
{
@@ -267,7 +267,7 @@ void wxTextCtrl::SetupColours()
{
wxColour vBkgndColour;
- vBkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+ vBkgndColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
SetBackgroundColour(vBkgndColour);
SetForegroundColour(GetParent()->GetForegroundColour());
if (m_bIsMLE)
@@ -959,7 +959,7 @@ WXHBRUSH wxTextCtrl::OnCtlColor(
else
::GpiSetBackMix(hPS, BM_OVERPAINT);
if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
- vColBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ vColBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::GpiSetBackColor(hPS, vColBack.GetPixel());
::GpiSetColor(hPS, vColFore.GetPixel());
return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 804f2bc3fd..24a0aa8aff 100644
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -218,7 +218,7 @@ bool wxToolBar::Create(
wxRGBToColour(m_backgroundColour, GetSysColor(COLOR_BTNFACE));
m_foregroundColour = *wxBLACK;
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// position it
int x = pos.x;
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index f6e3e6082e..9ffc8921ef 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -3006,7 +3006,7 @@ bool wxWindowOS2::OS2Create(
return FALSE;
}
SubclassWin(m_hWnd);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
SetSize( nX
,nY
,nWidth
diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 967fa78da4..ac728688b9 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -98,7 +98,7 @@ private:
{
wxSize size;
wxClientDC dc(menubar);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.GetTextExtent(m_label, &size.x, &size.y);
// adjust for the renderer we use and store the width
@@ -530,7 +530,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
// never partially covered as it is always on top of everything
wxDC& dc = renderer->GetDC();
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// FIXME: this should be done in the renderer, however when it is fixed
// wxPopupMenuWindow::RefreshItem() should be changed too!
@@ -1547,7 +1547,7 @@ void wxMenuBar::Attach(wxFrame *frame)
SetCursor(wxCURSOR_ARROW);
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
+ SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
// calculate and set our height (it won't be changed any more)
SetSize(-1, GetBestSize().y);
@@ -1715,7 +1715,7 @@ void wxMenuBar::RefreshItem(size_t pos)
void wxMenuBar::DoDraw(wxControlRenderer *renderer)
{
wxDC& dc = renderer->GetDC();
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// redraw only the items which must be redrawn
@@ -1800,7 +1800,7 @@ wxSize wxMenuBar::DoGetBestClientSize() const
if ( GetMenuCount() > 0 )
{
wxClientDC dc(wxConstCast(this, wxMenuBar));
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
dc.GetTextExtent(GetLabelTop(0), &size.x, &size.y);
// adjust for the renderer we use
diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index e3c7127f12..ab7c9374cf 100644
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -112,7 +112,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
// prepare the DC
wxDC& dc = renderer->GetDC();
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// do draw the fields
int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED;
@@ -244,7 +244,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
wxCoord wxStatusBarUniv::GetHeight() const
{
wxClientDC dc(wxConstCast(this, wxStatusBarUniv));
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return dc.GetCharHeight() + 2*GetBorderY();
}
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 657417a089..25b682f50c 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -1380,7 +1380,7 @@ wxWin32Renderer::wxWin32Renderer(const wxColourScheme *scheme)
m_colHighlight = wxSCHEME_COLOUR(scheme, SHADOW_HIGHLIGHT);
m_penHighlight = wxPen(m_colHighlight, 0, wxSOLID);
- m_titlebarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_titlebarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_titlebarFont.SetWeight(wxFONTWEIGHT_BOLD);
// init the arrow bitmaps
@@ -2873,7 +2873,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
{
// prepare the dc: for now we draw all the items with the system font
wxClientDC dc(win);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// the height of a normal item
wxCoord heightText = dc.GetCharHeight();
--
2.47.2