Compilation fix for VC++ 5 and 6

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index f0e8f7782b24a5e0019bdc24d71fdca930291fea..61a5428e2081ff4d132b4d88c766e21401b29a1a 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -12,12 +12,14 @@
 #ifndef _WX_BMPBUTTON_H_BASE_
 #define _WX_BMPBUTTON_H_BASE_
 
 #ifndef _WX_BMPBUTTON_H_BASE_
 #define _WX_BMPBUTTON_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_BMPBUTTON
 
 #include "wx/bitmap.h"
 #include "wx/button.h"
 
 #if wxUSE_BMPBUTTON
 
 #include "wx/bitmap.h"
 #include "wx/button.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;

 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.


@@ -61,7 +63,7 @@ public:
 
 protected:
     // function called when any of the bitmaps changes
 
 protected:
     // function called when any of the bitmaps changes

-    virtual void OnSetBitmap() { }
+    virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); }

 
     // the bitmaps for various states
     wxBitmap m_bmpNormal,
 
     // the bitmaps for various states
     wxBitmap m_bmpNormal,


@@ -72,10 +74,13 @@ protected:
     // the margins around the bitmap
     int m_marginX,
         m_marginY;
     // the margins around the bitmap
     int m_marginX,
         m_marginY;

+

 private:
     // Prevent Virtual function hiding warnings
     void SetLabel(const wxString& rsLabel)
 private:
     // Prevent Virtual function hiding warnings
     void SetLabel(const wxString& rsLabel)

-    { wxWindowBase::SetLabel(rsLabel); }
+        { wxWindowBase::SetLabel(rsLabel); }
+
+    DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)