Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index aea430dc1c82376c96eeb9ab5263d5cd8c29f5d1..40de393a9c08c72477731f28ad4e0802526ac2ec 100644 (file)
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -12,11 +12,7 @@
 #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,7 +40,7 @@ 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);
     }


@@ -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: