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

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

diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 265d2757bd2d91c57337667d7eb42bd9d19a320c..e55856496e633670d19db363a3ca2fff532723de 100644 (file)
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.h
+// Name:        wx/osx/bmpbuttn.h

 // Purpose:     wxBitmapButton class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxBitmapButton class
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,25 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_BMPBUTTN_H_
-#define _WX_BMPBUTTN_H_
+#ifndef _WX_OSX_BMPBUTTN_H_
+#define _WX_OSX_BMPBUTTN_H_

 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
-

 #define wxDEFAULT_BUTTON_MARGIN 4
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-

 public:
     wxBitmapButton()
         {
             SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
         }
 public:
     wxBitmapButton()
         {
             SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
         }

-    
+

     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,


@@ -43,11 +39,11 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 

-    virtual void SetBitmapLabel(const wxBitmap& bitmap);
-

 protected:
 protected:

-    virtual wxSize DoGetBestSize() const;    
+
+    virtual wxSize DoGetBestSize() const;
+
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)

 };
 
 };
 

-#endif
-    // _WX_BMPBUTTN_H_
+#endif // _WX_OSX_BMPBUTTN_H_