Made the colours more muted

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index dc69dceae7089c98174c515325cfc62cd2990a4d..dc2feeb89d1839730ea8f9be98083b45d5d68cb9 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -12,17 +12,12 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

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

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 

-#include "wx/control.h"
-#include "wx/gdicmn.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-

 // Pushbutton
 // Pushbutton

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

 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         


@@ -30,7 +25,7 @@ public:
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,

-        const wxString& label,
+        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,


@@ -39,7 +34,8 @@ public:
         Create(parent, id, label, pos, size, style, validator, name);
     }
     
         Create(parent, id, label, pos, size, style, validator, name);
     }
     

-    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,


@@ -51,9 +47,10 @@ public:
     static wxSize GetDefaultSize();
     
     // Implementation
     static wxSize GetDefaultSize();
     
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
+private:
+    virtual wxSize DoGetBestSize() const;
+    wxSize OldGetBestSize() const;
+    void SetDefaultShadowThicknessAndResize();

 };
 
 #endif
 };
 
 #endif