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 548e005b0e21da865ea917fab420518f8337795d..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
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

-class WXDLLEXPORT wxBitmapButton: public wxButton
+class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase

 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
  public:


@@ -26,7 +26,9 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
   inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,

+#if wxUSE_VALIDATORS

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

+#endif

            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, bitmap, pos, size, style, validator, name);
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, bitmap, pos, size, style, validator, name);


@@ -35,7 +37,9 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
   bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,

+#if wxUSE_VALIDATORS

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

+#endif

            const wxString& name = wxButtonNameStr);
 
   virtual void SetLabel(const wxBitmap& bitmap)
            const wxString& name = wxButtonNameStr);
 
   virtual void SetLabel(const wxBitmap& bitmap)