Window management and sizer layout corrections

[wxWidgets.git] / include / wx / os2 / bmpbuttn.h

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 76e7fbdaea6671bbd30f6e637818e987bb7a6e68..8847ff3d1049c9ff996a9920dee024e231ebaf9e 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -18,7 +18,7 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
-class WXDLLEXPORT wxBitmapButton: public wxButton
+class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
  public:
@@ -27,11 +27,7 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
            const wxValidator& validator = wxDefaultValidator,
-#  endif
 #endif
            const wxString& name = wxButtonNameStr)
   {
@@ -42,11 +38,7 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
            const wxValidator& validator = wxDefaultValidator,
-#  endif
 #endif
            const wxString& name = wxButtonNameStr);