X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9467bdb7f5bfde9f99331097daacb93564ca122e..9a02779a5557fb8af3f1367defc597314ea5ddd4:/src/univ/button.cpp diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 39ac1eb1b8..f04966be28 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -126,8 +126,11 @@ bool wxButton::Create(wxWindow *parent, return false; SetLabel(label); - SetImageLabel(bitmap); - // SetBestSize(size); -- called by SetImageLabel() + + if (bitmap.Ok()) + SetImageLabel(bitmap); // SetBestSize called by SetImageLabel() + else + SetBestSize(size); CreateInputHandler(wxINP_HANDLER_BUTTON);