Fixed OS/2 compilation problems.

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

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

-// Id:          $id$
+// Id:          $Id$

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

-

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


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

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

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


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

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

     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,


@@ -51,16 +47,28 @@ class wxButton: public wxControl
     {
       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,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
     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);

-    void SetDefault(void);
+    virtual void SetDefault();

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

-    void Enable( bool enable );
-    void SetFont( const wxFont &font );
-    void SetBackgroundColour( const wxColour &colour );
+    bool Enable( bool enable );
+
+    static wxSize GetDefaultSize();
+    
+    // implementation
+    // --------------
+  
+    void ApplyWidgetStyle();    
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)

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