Warning fixes for Cygwin

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

diff --git a/include/wx/cocoa/radiobox.h b/include/wx/cocoa/radiobox.h
index 53c09d57f95e10c4800d49c598083595e72c8baf..13c2391dbce9d1677c8512393a00aead10c16a9f 100644 (file)
--- a/include/wx/cocoa/radiobox.h
+++ b/include/wx/cocoa/radiobox.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/18
 // RCS-ID:      $Id:
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_RADIOBOX_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_RADIOBOX_H__


@@ -38,6 +38,17 @@ public:
     {
         Create(parent, winid, title, pos, size, n, choices, majorDim, style, validator, name);
     }
     {
         Create(parent, winid, title, pos, size, n, choices, majorDim, style, validator, name);
     }

+    wxRadioBox(wxWindow *parent, wxWindowID winid,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            int majorDim = 0,
+            long style = 0, const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxRadioBoxNameStr)
+    {
+        Create(parent, winid, title, pos, size, choices, majorDim, style, validator, name);
+    }

 
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxString& title,
 
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxString& title,


@@ -48,12 +59,23 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxRadioBoxNameStr);
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxRadioBoxNameStr);

+    bool Create(wxWindow *parent, wxWindowID winid,
+            const wxString& title,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            int majorDim = 0,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxRadioBoxNameStr);

     virtual ~wxRadioBox();
 
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:
     virtual ~wxRadioBox();
 
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:

+    // Static boxes cannot be enabled/disabled
+    virtual void CocoaSetEnabled(bool enable) { }

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------


@@ -67,11 +89,13 @@ public:
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
     // change the individual radio button state
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
     // change the individual radio button state

-    virtual void Enable(int n, bool enable = TRUE);
-    virtual void Show(int n, bool show = TRUE);
+    virtual bool Enable(int n, bool enable = true);
+    virtual bool Show(int n, bool show = true);

     // layout parameters
     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;
     // layout parameters
     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;

+protected:
+    virtual wxSize DoGetBestSize() const;

 };
 
 #endif // __WX_COCOA_RADIOBOX_H__
 };
 
 #endif // __WX_COCOA_RADIOBOX_H__