X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66e23ad2081689dad6e829b9667cdbc93ac45154..9b69526274b023fa1460b29a92bea8bf82e4703f:/src/common/resourc2.cpp?ds=inline 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.