Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2301,7 +2301,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
|
||||
else
|
||||
{
|
||||
wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);
|
||||
return (wxIcon *) NULL;
|
||||
return wxNullIcon;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2827,7 +2827,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
|
||||
}
|
||||
|
||||
// Should have some kind of font at this point
|
||||
if (!GetFont()->Ok())
|
||||
if (!GetFont().Ok())
|
||||
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
|
||||
if (!GetBackgroundColour().Ok())
|
||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
|
||||
|
Reference in New Issue
Block a user