don't attempt to convert 8bit values to Unicode in ANSI build

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index dd046850d806f6b629ecfb39480d0988c74a25fe..58fa70b3c654755389e81c6e2e1554c85e322723 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:
@@ -12,22 +12,14 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
-    DECLARE_DYNAMIC_CLASS(wxButton)
-        
 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,
@@ -35,23 +27,31 @@ public:
     {
         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 wxString& name = wxButtonNameStr);
-    
-    virtual void SetDefault();
+
+    virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);
-    
+
     static wxSize GetDefaultSize();
-    
+
     // Implementation
-private:
+    virtual wxSize GetMinSize() const;
+
+protected:
     virtual wxSize DoGetBestSize() const;
+
+private:
+    wxSize OldGetBestSize() const;
+    wxSize OldGetMinSize() const;
     void SetDefaultShadowThicknessAndResize();
+
+    DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
-#endif
-// _WX_BUTTON_H_
+#endif // _WX_BUTTON_H_