Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxBitmapButton bug fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-25 22:53:49 +00:00
parent 9a1b2c283e
commit ab6e89dea5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/resource.cpp
View File

@@ -823,10 +823,14 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
// Check for bitmap resource name (in case loading old-style resource file) // Check for bitmap resource name (in case loading old-style resource file)
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord))) if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
{ {
wxString str(expr->Nth(count)->StringValue());
controlItem->SetValue4(str);
count ++; count ++;
controlItem->SetType("wxBitmapButton"); wxString str(expr->Nth(count)->StringValue());
if (str != "")
{
controlItem->SetValue4(str);
controlItem->SetType("wxBitmapButton");
}
} }
if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));