Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."

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

diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index 6845fe9c16498e99be27738d8aab735c744b47bf..40de393a9c08c72477731f28ad4e0802526ac2ec 100644 (file)
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -6,17 +6,13 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BMPBUTTN_H_
 #define _WX_UNIV_BMPBUTTN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BMPBUTTN_H_
 #define _WX_UNIV_BMPBUTTN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univbmpbuttn.h"
-#endif
-
-class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase

 {
 public:
     wxBitmapButton() { }
 {
 public:
     wxBitmapButton() { }


@@ -44,14 +40,14 @@ public:
 
     virtual void SetMargins(int x, int y)
     {
 
     virtual void SetMargins(int x, int y)
     {

-        SetImageMargins(x, y);
+        SetBitmapMargins(x, y);

 
         wxBitmapButtonBase::SetMargins(x, y);
     }
 
 
         wxBitmapButtonBase::SetMargins(x, y);
     }
 

-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);

 
 

-    virtual bool SetCurrent(bool doit = TRUE);
+    virtual bool SetCurrent(bool doit = true);

 
     virtual void Press();
     virtual void Release();
 
     virtual void Press();
     virtual void Release();


@@ -63,8 +59,8 @@ protected:
     // called when one of the bitmap is changed by user
     virtual void OnSetBitmap();
 
     // called when one of the bitmap is changed by user
     virtual void OnSetBitmap();
 

-    // set bitmap to the given one if it's ok or to m_bmpNormal and return
-    // TRUE if the bitmap really changed
+    // set bitmap to the given one if it's ok or to the normal bitmap and
+    // return true if the bitmap really changed

     bool ChangeBitmap(const wxBitmap& bmp);
 
 private:
     bool ChangeBitmap(const wxBitmap& bmp);
 
 private: