Added wxHashSet, with minimal tests.

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index fa4233e801535a96a3dc5826fa5ecee3a64cc4f0..b8795527881f1d7d590cf088a3825bd3b03c237f 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "bmpbuttn.h"
 #endif
 
@@ -48,7 +48,7 @@ public:
                 const wxString& name = wxButtonNameStr);
 
 #if WXWIN_COMPATIBILITY
-    wxBitmap *GetBitmap() const { return (wxBitmap *) & m_bmp; }
+    wxBitmap *GetBitmap() const { return (wxBitmap *) &GetBitmapLabel(); }
 #endif
 
     // Implementation
@@ -59,7 +59,7 @@ public:
     virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };
 
 #endif