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 4199b5038f6db6a7b9aad331e66371e9ec6cc2ec..40de393a9c08c72477731f28ad4e0802526ac2ec 100644 (file)
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -12,14 +12,10 @@
 #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();
+    wxBitmapButton() { }
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
@@ -28,7 +24,10 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr);
+                   const wxString& name = wxButtonNameStr)
+    {
+        Create(parent, id, bitmap, pos, size, style, validator, name);
+    }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -41,14 +40,14 @@ public:
 
     virtual void SetMargins(int x, int y)
     {
-        SetImageMargins(x, y);
+        SetBitmapMargins(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();
@@ -60,8 +59,8 @@ protected:
     // 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: