don't force __WXMOTIF__ definition under HP-UX (patch 1017801)

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

diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index 49c91d7d001ce74cdcd0418b3a610e37c40da1fb..aea430dc1c82376c96eeb9ab5263d5cd8c29f5d1 100644 (file)
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -12,8 +12,8 @@
 #ifndef _WX_UNIV_BMPBUTTN_H_
 #define _WX_UNIV_BMPBUTTN_H_
 
-#ifdef __GNUG__
-    #pragma interface "bmpbuttn.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univbmpbuttn.h"
 #endif
 
 class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
@@ -49,9 +49,9 @@ public:
         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();
@@ -64,7 +64,7 @@ protected:
     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
+    // true if the bitmap really changed
     bool ChangeBitmap(const wxBitmap& bmp);
 
 private: