use the new wxSystemSettings API everywhere

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

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index 965c5724eafbfc6a22873aaba4a81c596cc9c67b..a5b2a828ea8807b89da7936bcc1d1206dc7ddce0 100644 (file)
--- 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 b8815324100cff21c6e4735677192edb15e389f0..91cdb4ae8c989d0e2a79e5495d21895d5c44d4df 100644 (file)
--- 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 8e7e80b76929dc40fe1778d31c59e0a66ed059e4..4521ba7b8ff4d1a9d98fe5355a2839317d9868e3 100644 (file)
--- 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 2321126dde829509e169b9da73d46ff4507f8ff9..3b378ec0020dbb60da3f1f0ea3662156c76f1b45 100644 (file)
--- 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 63151ab13ba1daf4be381ce2ec475d33d56b02a9..a6446d9710e5a85ed71eca96b533c303c3c19071 100644 (file)
--- 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 5b677218c737d03085d7b7e740f5ea5ab5b2f998..3a1fd0f2d867caefbdf4f80e884bf32a5f938165 100644 (file)
--- 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 ac83bc99bdea6bbd79169d330d3af12f846cee67..e7632a737c9166d9318728274660081d07d3c6eb 100644 (file)
--- 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 a5860c70d5d7a328e2de17d64fffd3045d0adafd..6387d6e676684650a130ef2c6e99cc74e7980b2a 100644 (file)
--- 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 3f28058a1496222d581cf42e55bc20b020b0a110..4c33a1a32ad2b7d1be9294b9912ad6fab3580f94 100644 (file)
--- 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 9f32c43da4a62f9874dc4951df0b30b68383a783..f61435dac07279023a4b26e14c263be115ac3c0f 100644 (file)
--- 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 5a071db228d221f8d4f28171fa8bd216dcbf462d..8551727656de2c1f432a5f537ca0d762fc5f8dbc 100644 (file)
--- 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 94170c605e294a1568e6184f081aa972df6804e6..5cb54f9c67cf4179267703dfd363146f32fd4968 100644 (file)
--- 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 1b36dff649e2f55e6e4ce72ae86770210b0c6bb6..a67f7da2e556f1d644102a94c97377f9657f914f 100644 (file)
--- 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 8f2fc1e4042aa3b5111a8c2440cb86d51275ec95..0e4c493c4368092b13861833669c1eb1ac1cd846 100644 (file)
--- 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 8d679953dfc5c32bee6e49c651b7f25a077b8b9e..90bc832b3920c99c6bbfc67a61200cf4ee3783f6 100644 (file)
--- 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 5d89066765321f5db779cc3cb02bf58f72754b86..8205ca5e246694deef03ee7e8cd29960100df461 100644 (file)
--- 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 c433a1dfde90894a2351973fb440a556865a4208..fa7a9f0690346de7f07b2628f90c018f75aef7bf 100644 (file)
--- 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 bd0ba3d2ebdfa57d51f78fa6dce76c0abdc9d5d1..33119247e69175e836a5a073c0c05bcaf54d59ba 100644 (file)
--- 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 417a093903a51da7469742805b08cce7c2e08518..6f9ba6f7df64556d91d501446f5a84e069ffa4dd 100644 (file)
--- 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 f90be606527f46c3dab268180250f25f4d5e52cd..01c0e5151eb183faa1057c9a8586138d8ef49523 100644 (file)
--- 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 1994629da8f1d6999b60d4fabcef7a769ab690ca..5fd8f5b4f21a3d49b6fed230279918bf619ab721 100644 (file)
--- 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 bd085bae0d39b7353b9e76c260aab124c3eeb1cb..326381bcb41edc77bce20cb0dac4475a4dc9d572 100644 (file)
--- 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 15909254a4a109c07bd90fcf085286ae773d4e2e..d1239aba2533bb507d133e1feac7287b5a0adf96 100644 (file)
--- 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 9cf8883c8e0e625ff8ee6957e27c50a16fae45a4..de25cc767e69da38ed150f6a3b268457f7f4ad91 100644 (file)
--- 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 044106456711c296bac7d8bf34b4f9b581448a2c..6c37c6636ac42b8c054524fa27eaa063965066af 100644 (file)
--- 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 01d6e259a24214450e94f9b8a74bc39f17d19659..d3f6cf1e1c2ca37c41fb16ee47dd350c9d012b9e 100644 (file)
--- 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 bd085bae0d39b7353b9e76c260aab124c3eeb1cb..326381bcb41edc77bce20cb0dac4475a4dc9d572 100644 (file)
--- 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 15909254a4a109c07bd90fcf085286ae773d4e2e..d1239aba2533bb507d133e1feac7287b5a0adf96 100644 (file)
--- 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 9cf8883c8e0e625ff8ee6957e27c50a16fae45a4..de25cc767e69da38ed150f6a3b268457f7f4ad91 100644 (file)
--- 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 044106456711c296bac7d8bf34b4f9b581448a2c..6c37c6636ac42b8c054524fa27eaa063965066af 100644 (file)
--- 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 01d6e259a24214450e94f9b8a74bc39f17d19659..d3f6cf1e1c2ca37c41fb16ee47dd350c9d012b9e 100644 (file)
--- 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 8a066964ca05483659bf1da95be611489b782a0a..eed25f3fb7bd6922eed982788497ecf962acf9f2 100644 (file)
--- 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 adc15790af5a511acb22c6768a1ae5fbfcae9e03..990ba1a5141cd7315d8768782e9dfbe3dd903d4b 100644 (file)
--- 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 91595e5f38c5dd2899fef6ea82a0787a7eabc18a..a5ef8163b078a08b3b70e132c91c205cba82401d 100644 (file)
--- 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 6f7ff1e8051dbb8a180fff3402fb9f80d7a7b3eb..024c4fb6c724e0cf4e08223e8c548d08f960b4be 100644 (file)
--- 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 3b2476af406b8b0f775308e21f4f7cbe8f16ea58..2982b7c5c4be9b726a936966abb1003832fb3409 100644 (file)
--- 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 bd38b3ccd2c29ee7dc2fde22c389778a3908f33d..78b3c56ba7edab2c6b76d539bdd7e55b4840a426 100644 (file)
--- 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 8a066964ca05483659bf1da95be611489b782a0a..eed25f3fb7bd6922eed982788497ecf962acf9f2 100644 (file)
--- 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 adc15790af5a511acb22c6768a1ae5fbfcae9e03..990ba1a5141cd7315d8768782e9dfbe3dd903d4b 100644 (file)
--- 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 91595e5f38c5dd2899fef6ea82a0787a7eabc18a..a5ef8163b078a08b3b70e132c91c205cba82401d 100644 (file)
--- 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 6f7ff1e8051dbb8a180fff3402fb9f80d7a7b3eb..024c4fb6c724e0cf4e08223e8c548d08f960b4be 100644 (file)
--- 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 3b2476af406b8b0f775308e21f4f7cbe8f16ea58..2982b7c5c4be9b726a936966abb1003832fb3409 100644 (file)
--- 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 bd38b3ccd2c29ee7dc2fde22c389778a3908f33d..78b3c56ba7edab2c6b76d539bdd7e55b4840a426 100644 (file)
--- 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 8ad12fc890bfa65f5be7870c2911c8f9771c31ca..d3b4828427a2d495e7ebad4e992d5b7df8119876 100644 (file)
--- 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 46f6d29183c6a1d733289ecce136ad9433afbc74..8694f0b6eccd70854984e0fecd501adf0f9e4702 100644 (file)
--- 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 7e8aaf56379e4edd8690e7a35aa3602a5b1e7b54..19a321cc023f3e6d532be0ed384c88f3a3ce7a10 100644 (file)
--- 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 afbaa2d71000995eacdae6b479ab7a036dc836e5..91f301028c958aeab9481ef2f0a8099a716ab1a5 100644 (file)
--- 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 d5b995aa3bacad6f3bebcf9e1393185d585a8077..acfc72ec82ab92ef420179d4c012fef925cb66e4 100644 (file)
--- 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 5984fe2b591df5a80c46e3b4fa6d500e4c6a642d..14b660afe3491e0795b550137c7ed5e4f7758f6e 100644 (file)
--- 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 8b25c36f2a3ca3f5d1d82f7f01bd4265f47ba11a..3502c25afce81e698d6c76bcf4a017701ef3f98a 100644 (file)
--- 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 f8aa8af3f064a1e7b193ded08e692bc83664598d..a62339fce34445333181d29cbcdd4ceabadef612 100644 (file)
--- 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 05c09120079726625978e9d9bcc3395771b616e1..84410f4f5f92eb47ae6d73132539ad1c067c4b8e 100644 (file)
--- 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 3a66bd8ff8a6661ecacf9abedfb47e1610558110..fe72b88437e85d413dfc78b1c84ada12432144cd 100644 (file)
--- 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 b38f1c392981d3fa859a3da2cc5b1a2519ec16e7..a7faa4d42aff45e8224bddc42b4744c2bd0f72ef 100644 (file)
--- 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 b2f4037d0ee0468160dabd288c1e339242a7ce7e..30a1b00391f53ddfa7531582d4c41b8c47cda0e9 100644 (file)
--- 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 24d5340b6e8a5a2fc769ae12ddc21bb86c06ed91..62da82af8e9ebd9f9aadc4278061fcc6d878af5f 100644 (file)
--- 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 28773bbb3634dcc219462a54832187dc909c6343..8a5c375e22bf53271e81a0ce3ffa2fedd0201d8c 100644 (file)
--- 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 6c9206a7960773f5a61ec7fbdb0955408f6fa968..8ef52dbcff5e8855a10be52fb43dae6598911153 100644 (file)
--- 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 6d31e99dbad9b9f263fed7445362e64e53322770..f7c97122e14b98f87e92c5901f35fac8443cffa7 100644 (file)
--- 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 df6ccbf4f4f059e5ddfb0179a681a10d5320eeb3..d528829c9d7eabb5aa2b1dda1a59b81309857a57 100644 (file)
--- 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 fcad2efdfd370181d6f5ecc5e119c087eed89fa8..ababd9e7cd092951c5fb30b65823a08a1ccf47c7 100644 (file)
--- 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 814f3bd2544317516a62ef0abd0eebe12b660bcb..76370db43478606ddbf68de804f93751456d3d87 100644 (file)
--- 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 e06e74dc22af39e62221b2ca0571ca7d8ad3936f..3b037573382a76df81b6c3e80cbebfa2a3d1e246 100644 (file)
--- 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 b024c65b0737a23324e3b1cc048834b5e569ed2c..9634d400626832c618476b03bebdd601bea0fd4b 100644 (file)
--- 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 6b4a8821316662861fc5c13b38d5f95f0fec34b6..b21c61756cd06b6f9ac6ac93d08d7a3d0e497bd4 100644 (file)
--- 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 9edbdbf703ea139e7778265b94d27e594ad23d34..24bef993a5951d7d2744bd1cd66d2e50664e6e9b 100644 (file)
--- 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 c87a217ce6f8b60ec15e2c8c7e8eb647cdd48f48..0686c08269a43e3b0422f594a2aa40df77d6fe7a 100644 (file)
--- 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 010429a8783f8fe40e055decf4578f9b68bdad42..364d175a89368eac751ee757a602345e760e4c8f 100644 (file)
--- 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 026f8a283080f7c3eb9a09d23fed2e0392272dd2..94deec9009b37905cb42910bb6da1caa3b3307d5 100644 (file)
--- 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 c4453ac9ac5da90d1e281a731e1b47ac79eed965..a0a8d167a8395a22a7666803676811986fb449b4 100644 (file)
--- 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 aab98f4c5077be1376cebb763cd6919cca0734a7..b629c610e8a6e3dcbb9d54f7002014a8af835459 100644 (file)
--- 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 c1511e337f85a17eb14eb4dc672587e079242fa4..ffecf13cd71683d12d79414de299dbbe9feb9333 100644 (file)
--- 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 3ebf19f9e28a475ede3236af7111edd89cc44e5e..728801273ede6a870f06ce2a6c93d741dda15e7b 100644 (file)
--- 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 5f4c38e7fe760dec7befbba0420d16ad358b0970..8f4b26cdf9e8328944ed761d7945c92cd8fb26ee 100644 (file)
--- 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 f77b45338a8629c5d0e1b2eb77fb3891ee2445b8..b4ce9ac0d51364139558929f07506bd572244dda 100644 (file)
--- 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 0101e79a0c355a3cf9a4f0f6b650b925329af4b9..83117513887cdfb363c35635af9339c59bb2aad3 100644 (file)
--- 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 079295ab77803d5ddcb67038361989911acee866..96df144bf15320426ad3227e3ff651a6b5612532 100644 (file)
--- 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 bf7feb68607fe3fd64820cffc9dee551fd6e0165..7d6565d7982d8c61dceec4b90eb94da48616fb50 100644 (file)
--- 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 c73062da3cdced61562b81068a9da4c212e342f5..e503f93cc89ee7337faad783be4682385f44a154 100644 (file)
--- 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 261c01de4c463f1609e61793bba9ab7b99ee574d..55c626ed148ffb879aaacb4e88e1448d8998d207 100644 (file)
--- 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 9fe882a4fb09e6c1415123482e49c10c842669c6..df1b7cc473d7e48f451c348e78e0413a439c3810 100644 (file)
--- 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 800232b1528ceffb060be1cc7421632b34889677..c60552cdaf7b64b6aa5914d86c06ba162b2abec5 100644 (file)
--- 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 6b4c37c65ae5c6ed02bb4fcdbee65442de8da1e7..42a3a893a57c5a1a685d787ccf38aa88a0750b8e 100644 (file)
--- 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 32bc0f69d808ff65c55527beb539a9cbe8b7ccba..69f0914f4b5fb685130a2ab8502cd71ba5b36a1d 100644 (file)
--- 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 804f2bc3fd65272aff8133dcc05feaff975c33b7..24a0aa8aff484df33a5195cfdaf1278685a5b2e3 100644 (file)
--- 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 f6e3e6082ef48df6cb32745b6823fbad90207431..9ffc8921ef4598b2a5d33712a1f6e4ac1e0cfb59 100644 (file)
--- 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 967fa78da4a3594b87cde7a99c2852c813f53989..ac728688b9c9badedb689fa7c0726258f11fc569 100644 (file)
--- 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 e3c7127f12ed6c9bfb18c881ed323231aa903559..ab7c9374cf8377887bd0a77e657350c350af54ea 100644 (file)
--- 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 657417a08906a641ecc5d868a2a3632011dbef45..25b682f50c25f1ebea5c83cd69638ccf8f149fd6 100644 (file)
--- 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();