safe macro expansion

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 750e38e438ae67896b3d1aa260778ba5aec294da..8847ff3d1049c9ff996a9920dee024e231ebaf9e 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -1,28 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        bmpbuttn.h
 // Purpose:     wxBitmapButton class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/13/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#ifdef __GNUG__
-#pragma interface "bmpbuttn.h"
-#endif
-
 #include "wx/button.h"
 
 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:
@@ -30,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,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, bitmap, pos, size, style, validator, name);
@@ -39,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,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxButtonNameStr);
 
   virtual void SetLabel(const wxBitmap& bitmap)
@@ -49,6 +49,10 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
 
   virtual void SetBitmapLabel(const wxBitmap& bitmap);
 
+#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; }
@@ -62,13 +66,11 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   inline int GetMarginX() { return m_marginX; }
   inline int GetMarginY() { return m_marginY; }
 
-/*
-  // TODO: Implementation
-  virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+  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 );
-*/
 
  protected:
   wxBitmap m_buttonBitmap;
@@ -78,9 +80,8 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   int      m_marginX;
   int      m_marginY;
 private:
-  // Supress VisualAge's hidden functin warning
-  void SetLabel(const wxString& label)
-  { wxButton::SetLabel(label); }
+  virtual void SetLabel(const wxString& string)
+  { wxButton::SetLabel(string); };
 };
 
 #endif