SetTextColour is gone

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 7b08b21e6af2c1b33714fd82db8b888ac3fd1146..583578d66886ef5bf01e68d4cc339487db2b9eb6 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/motif/button.h

 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:


@@ -12,20 +12,16 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-

 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxButton)

-        
+

 public:
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,
 public:
     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,


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

-    
-    wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, stock, descriptiveLabel, pos, 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 wxString& name = wxButtonNameStr);
         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, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-    {
-        return CreateStock(parent, id, stock, descriptiveLabel,
-                           pos, style, validator, name);
-    }
-    
+

     virtual void SetDefault();
     virtual void Command(wxCommandEvent& event);
     virtual void SetDefault();
     virtual void Command(wxCommandEvent& event);

-    
+

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

-    
+

     // Implementation
     // Implementation

-private:
+protected:
+

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+
+private:
+
+    virtual wxSize GetMinSize() const;

     wxSize OldGetBestSize() const;
     wxSize OldGetBestSize() const;

+    wxSize OldGetMinSize() const;

     void SetDefaultShadowThicknessAndResize();
 };
 
     void SetDefaultShadowThicknessAndResize();
 };