there is no std::wostream under Palm (part of ticket 4700)

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

diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index a33f669a1c1dec438363ce637b7aa635cfed5656..91a44f01203ebb5859d02149165100451b8be456 100644 (file)
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/29
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/29

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BUTTON_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BUTTON_H__


@@ -17,7 +17,7 @@
 // ========================================================================
 // wxButton
 // ========================================================================
 // ========================================================================
 // wxButton
 // ========================================================================

-class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase, protected wxCocoaNSButton

 {
     DECLARE_DYNAMIC_CLASS(wxButton)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
     DECLARE_EVENT_TABLE()


@@ -28,7 +28,7 @@ class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton
 public:
    wxButton() { }
    wxButton(wxWindow *parent, wxWindowID winid,
 public:
    wxButton() { }
    wxButton(wxWindow *parent, wxWindowID winid,

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


@@ -36,35 +36,15 @@ public:
     {
         Create(parent, winid, label, pos, size, style, validator, name);
     }
     {
         Create(parent, winid, 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 winid,
 
     bool Create(wxWindow *parent, wxWindowID winid,

-            const wxString& label,
+            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 ~wxButton();
 
 // ------------------------------------------------------------------------
     virtual ~wxButton();
 
 // ------------------------------------------------------------------------


@@ -78,6 +58,8 @@ protected:
 public:
     wxString GetLabel() const;
     void SetLabel(const wxString& label);
 public:
     wxString GetLabel() const;
     void SetLabel(const wxString& label);

+    wxSize DoGetBestSize() const;

 };
 
 };
 

-#endif // __WX_COCOA_BUTTON_H__
+#endif
+    // __WX_COCOA_BUTTON_H__