Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index d04870f76e132c846c5c164eb0cd39e13e970a93..9e7a57d8906cf617003e9dcbd6a5f7b136ca85d7 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/gtk/button.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/gtk/button.h

-// Purpose:
+// Purpose:     wxGTK wxButton class declaration

 // Author:      Robert Roebling
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,10 +13,10 @@
 // wxButton
 //-----------------------------------------------------------------------------
 
 // wxButton
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase

 {
 public:
 {
 public:

-    wxButton();
+    wxButton() {}

     wxButton(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
     wxButton(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,


@@ -28,8 +27,6 @@ public:
         Create(parent, id, label, pos, size, style, validator, name);
     }
 
         Create(parent, id, label, pos, size, style, validator, name);
     }
 

-    virtual ~wxButton();
-

     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,


@@ -39,7 +36,6 @@ public:
 
     virtual wxWindow *SetDefault();
     virtual void SetLabel( const wxString &label );
 
     virtual wxWindow *SetDefault();
     virtual void SetLabel( const wxString &label );

-    virtual bool Enable( bool enable = TRUE );

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -50,13 +46,27 @@ 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); }
 
     // 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);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 

-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+#if wxUSE_MARKUP
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP

 
 private:
 
 private:

+    typedef wxButtonBase base_type;
+
+    // Return the GtkLabel used by this button.
+    GtkLabel *GTKGetLabel() const;
+

     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxButton)
 };