X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6fd73d33ac80632981dee1c0be669f20ba765b5..7a0a6cc8f61cb53ce1c76897489e1e363d1a1fa5:/src/msw/bmpbuttn.cpp

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 1438b7cffa..aea2db8f61 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -127,11 +127,11 @@ bool wxBitmapButton::Create(wxWindow *parent,
                             const wxBitmap& bitmap,
                             const wxPoint& pos,
                             const wxSize& size, long style,
-                            const wxValidator& wxVALIDATOR_PARAM(validator),
+                            const wxValidator& validator,
                             const wxString& name)
 {
-    if ( !wxBitmapButtonBase::Create(parent, id, "",
-                                     pos, size, style, validator, name) )
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
+                                     validator, name) )
         return false;
 
     SetBitmapLabel(bitmap);
@@ -178,6 +178,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
+                ;
         }
     }