respect wxBU_NOTEXT style in wxButton

[wxWidgets.git] / src / msw / bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 1438b7cffa5d2645f293968dd4501acad6cac03b..2627bf51cc21bd84dae8861418c6fd87fbfb8df7 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -131,7 +131,9 @@ bool wxBitmapButton::Create(wxWindow *parent,
                             const wxString& name)
 {
     if ( !wxBitmapButtonBase::Create(parent, id, "",
-                                     pos, size, style, validator, name) )
+                                     pos, size,
+                                     style | wxBU_NOTEXT,
+                                     validator, name) )
         return false;
 
     SetBitmapLabel(bitmap);
@@ -178,6 +180,11 @@ void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)
                 // from the normal one
                 m_disabledSetByUser = true;
                 break;
+
+            default:
+                // nothing special to do but include the default clause to
+                // suppress gcc warnings
+                ;
         }
     }