use generic timer in wxMGL and wxX11

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index b0e2220c0e23cfe5e770b2e0a46dbae742b64a83..c239f5b7a1f48b6db22e6987643277291cc7e0e8 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -2,13 +2,11 @@
 // Name:        button.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        button.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 


@@ -31,7 +29,7 @@ class wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;

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


@@ -39,20 +37,38 @@ extern const char *wxButtonNameStr;
 
 class wxButton: public wxControl
 {
 
 class wxButton: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxButton)
-
-  public:
-
-    wxButton(void);
-    wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxButtonNameStr  );
-    bool Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxButtonNameStr  );
-    void SetDefault(void);
+public:
+    wxButton();
+    inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+           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);
+    }
+    ~wxButton();
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr);
+    virtual void SetDefault();

     void SetLabel( const wxString &label );
     void SetLabel( const wxString &label );

-    wxString GetLabel(void) const;
+    bool Enable( bool enable );
+
+    static wxSize GetDefaultSize();
+    
+    // implementation
+    // --------------
+  
+    void ApplyWidgetStyle();    
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)

 };
 
 #endif // __GTKBUTTONH__
 };
 
 #endif // __GTKBUTTONH__