X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7be740a3fdba6e7203bd82c1674f48207dc00eed..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk/button.h

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index cdf674aa78..9e7a57d890 100644
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/button.h
 // Purpose:     wxGTK wxButton class declaration
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
-    wxButton() { }
+    wxButton() {}
     wxButton(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
@@ -37,7 +36,6 @@ public:
 
     virtual wxWindow *SetDefault();
     virtual void SetLabel( const wxString &label );
-    virtual bool Enable( bool enable = true );
 
     // implementation
     // --------------
@@ -48,18 +46,26 @@ public:
     // helper to allow access to protected member from GTK callback
     void MoveWindow(int x, int y, int width, int height) { DoMoveWindow(x, y, width, height); }
 
+    // called from GTK callbacks: they update the button state and call
+    // GTKUpdateBitmap()
+    void GTKMouseEnters();
+    void GTKMouseLeaves();
+    void GTKPressed();
+    void GTKReleased();
+
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
-
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapPosition(wxDirection dir);
+#if wxUSE_MARKUP
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP
 
 private:
-    wxBitmap m_bitmaps[State_Max];
+    typedef wxButtonBase base_type;
+
+    // Return the GtkLabel used by this button.
+    GtkLabel *GTKGetLabel() const;
 
     DECLARE_DYNAMIC_CLASS(wxButton)
 };