moved smart phone test to chkconf.h from features.h

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 051c16637cd4fe1c43566044ddf16ab44724acac..5b895a059ef59d2615a83ab368e618507095127b 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -39,7 +39,7 @@ class wxButton: public wxControl
 {
 public:
     wxButton();
 {
 public:
     wxButton();

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

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,


@@ -47,22 +47,29 @@ public:
     {
       Create(parent, id, label, pos, size, style, validator, name);
     }
     {
       Create(parent, id, label, pos, size, style, validator, name);
     }

-    ~wxButton();
+    virtual ~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);

+

     virtual void SetDefault();
     virtual void SetDefault();

-    void SetLabel( const wxString &label );
-    bool Enable( bool enable );
+    virtual void SetLabel( const wxString &label );
+    virtual bool Enable( bool enable = TRUE );

 
     static wxSize GetDefaultSize();
 
     static wxSize GetDefaultSize();

-    
-  // implementation        
-  
-    void ApplyWidgetStyle();    
-    
+
+    // implementation
+    // --------------
+
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };