Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index a8a396b8c542049f0b276cf99ad6afe523f62e77..15966f3f4104efc39af4dadd6eac87dcdf50cbb8 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -14,22 +14,20 @@
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxBitmapButton() { Init(); }
+    wxBitmapButton() { }

 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
 
     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)
     {
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {

-        Init();
-

         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 


@@ -38,40 +36,12 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 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);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 

-    void SetLabel( const wxString &label );
-    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
-
-    virtual bool Enable(bool enable = true);
-
-    // implementation
-    // --------------
-
-    void GTKMouseEnters();
-    void GTKMouseLeaves();
-    void GTKPressed();
-    void GTKReleased();
-
-protected:
-    virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
-    void DoApplyWidgetStyle(GtkRcStyle *style);
-
-    void Init();
-

 private:
 private:

-    void OnFocusChange(wxFocusEvent& event);
-
-    // true iff mouse hovers over the button
-    bool         m_mouseHovers;
-    // true iff the button is in pressed state
-    bool         m_isPressed;
-

     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)

-    DECLARE_EVENT_TABLE()

 };
 
 #endif // _WX_GTK_BMPBUTTON_H_
 };
 
 #endif // _WX_GTK_BMPBUTTON_H_