put wxUSE_DATAVIEWCTRL in alphabetical order

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

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

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,10 +10,6 @@
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"


@@ -23,33 +19,36 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxButton;
+class WXDLLIMPEXP_CORE wxButton;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar *wxButtonNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];

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

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

 {
 public:
     wxButton();
 {
 public:
     wxButton();

-    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);

     }
     }

+

     virtual ~wxButton();
 
     virtual ~wxButton();
 

-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+    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 wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,


@@ -59,14 +58,19 @@ public:
     virtual void SetLabel( const wxString &label );
     virtual bool Enable( bool enable = TRUE );
 
     virtual void SetLabel( const wxString &label );
     virtual bool Enable( bool enable = TRUE );
 

-    static wxSize GetDefaultSize();
-

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

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     bool IsOwnGtkWindow( GdkWindow *window );
 
     bool IsOwnGtkWindow( GdkWindow *window );
 

+    // Since this wxButton doesn't derive from wxButtonBase (why?) we need
+    // to override this here too...
+    virtual bool ShouldInheritColours() const { return false; }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;