X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/gtk/bmpbuttn.h?ds=sidebyside

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index bc3a5cfe16..15966f3f41 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -7,34 +7,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __BMPBUTTONH__
-#define __BMPBUTTONH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#ifndef _WX_GTK_BMPBUTTON_H_
+#define _WX_GTK_BMPBUTTON_H_
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 {
 public:
-    wxBitmapButton() { Init(); }
+    wxBitmapButton() { }
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
-        Init();
-
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 
@@ -43,37 +36,12 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
-    void SetLabel( const wxString &label );
-    wxString GetLabel() const;
-    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
-
-    virtual void SetDefault();
-    virtual bool Enable(bool enable = TRUE);
-
-    // implementation
-    // --------------
-
-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-    void DoApplyWidgetStyle(GtkRcStyle *style);
-
-    bool         m_hasFocus:1;
-    bool         m_isSelected:1;
-
-protected:
-    virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
-
-    void Init();
-
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 
-#endif // __BMPBUTTONH__
+#endif // _WX_GTK_BMPBUTTON_H_