Applied [ 1555974 ] small wxURL improvements

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 3bd5a5f28a8ae585cff67b152058676121a84c31..ce620dec4110d654737ddcabd0928bfaecd0b0a4 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -1,71 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/gtk/button.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKBUTTONH__
-#define __GTKBUTTONH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxButtonNameStr;
+#ifndef _WX_GTK_BUTTON_H_
+#define _WX_GTK_BUTTON_H_

 
 //-----------------------------------------------------------------------------
 // wxButton
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxButton
 //-----------------------------------------------------------------------------
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxButton)
-
-  public:
-
+public:

     wxButton();
     wxButton();

-    inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+    wxButton(wxWindow *parent, wxWindowID id,
+           const wxString& label = wxEmptyString,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {

-      Create(parent, id, label, pos, size, style, validator, name);
+        Create(parent, id, label, pos, size, style, validator, name);

     }
     }

-    ~wxButton();
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+
+    virtual ~wxButton();
+
+    bool Create(wxWindow *parent, wxWindowID id,
+           const wxString& label = wxEmptyString,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);

-    void SetDefault();
-    void SetLabel( const wxString &label );
-    bool Enable( bool enable );

 
 

-    static wxSize GetDefaultSize();
+    virtual void SetDefault();
+    virtual void SetLabel( const wxString &label );
+    virtual bool Enable( bool enable = TRUE );
+
+    // implementation
+    // --------------
+
+    // Since this wxButton doesn't derive from wxButtonBase (why?) we need
+    // to override this here too...
+    virtual bool ShouldInheritColours() const { return false; }

     
     

-  // implementation        
-  
-    void ApplyWidgetStyle();    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    // 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); }
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)

 };
 
 };
 

-#endif // __GTKBUTTONH__
+#endif // _WX_GTK_BUTTON_H_