wxBitmapButton bug fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9a1b2c283e
commit
ab6e89dea5
@ -823,10 +823,14 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
|
||||
// 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)))
|
||||
{
|
||||
wxString str(expr->Nth(count)->StringValue());
|
||||
controlItem->SetValue4(str);
|
||||
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)
|
||||
controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
|
||||
|
Loading…
Reference in New Issue
Block a user