avoid a bug in Carbon headers

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 548e005b0e21da865ea917fab420518f8337795d..cad7e1cc4a7801c2a11276130535c652b27a5cad 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -18,67 +18,72 @@ 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:
-  inline wxBitmapButton() { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
-  inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, bitmap, pos, size, style, validator, name);
-  }
+public:
+    inline wxBitmapButton()
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }
+    inline wxBitmapButton( wxWindow*          pParent
+                          ,wxWindowID         vId
+                          ,const wxBitmap&    rBitmap
+                          ,const wxPoint&     rPos = wxDefaultPosition
+                          ,const wxSize&      rSize = wxDefaultSize
+                          ,long               lStyle = wxBU_AUTODRAW
+                          ,const wxValidator& rValidator = wxDefaultValidator
+                          ,const wxString&    rsName = wxButtonNameStr
+                         )
+    {
+        Create( pParent
+               ,vId
+               ,rBitmap
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
 
-  bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxBitmap&    rBitmap
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = wxBU_AUTODRAW
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxButtonNameStr
+               );
 
-  virtual void SetLabel(const wxBitmap& bitmap)
-  {
-    SetBitmapLabel(bitmap);
-  }
+    virtual void SetLabel(const wxBitmap& rBitmap)
+    {
+        SetBitmapLabel(rBitmap);
+    }
 
-  virtual void SetBitmapLabel(const wxBitmap& bitmap);
+    //
+    // Implementation
+    //
+    virtual void SetDefault();
+    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem);
 
-#if WXWIN_COMPATIBILITY
-    wxBitmap *GetBitmap() const { return (wxBitmap *) & m_buttonBitmap; }
-#endif
-
-  inline wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; }
-  inline wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; }
-  inline wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; }
-  inline wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; }
-
-  inline void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; };
-  inline void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; };
-  inline void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; };
+private:
 
-  inline void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
-  inline int GetMarginX() { return m_marginX; }
-  inline int GetMarginY() { return m_marginY; }
+    virtual void DrawFace( wxClientDC& rDC
+                          ,bool        bSel
+                         );
+    virtual void DrawButtonFocus(wxClientDC& rDC);
+    virtual void DrawButtonDisable( wxClientDC& rDC
+                                   ,wxBitmap&   rBmp
+                                  );
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 
-  virtual void SetDefault();
-//  virtual bool OS2OnDraw(WXDRAWITEMSTRUCT *item);
-  virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-  virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-  virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
+    virtual void SetLabel(const wxString& rsString)
+    {
+        wxButton::SetLabel(rsString);
+    }
+}; // end of CLASS wxBitmapButton
 
- protected:
-  wxBitmap m_buttonBitmap;
-  wxBitmap m_buttonBitmapSelected;
-  wxBitmap m_buttonBitmapFocus;
-  wxBitmap m_buttonBitmapDisabled;
-  int      m_marginX;
-  int      m_marginY;
-private:
-  virtual void SetLabel(const wxString& string)
-  { wxButton::SetLabel(string); };
-};
+#endif // _WX_BMPBUTTN_H_
 
-#endif
-    // _WX_BMPBUTTN_H_