From ab6e89dea5bb411ba135553ec22423e2d6ecd986 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 25 Feb 1999 22:53:49 +0000 Subject: [PATCH] wxBitmapButton bug fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/resource.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/common/resource.cpp b/src/common/resource.cpp index 347446ea8b..a3c99026f9 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -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)));