Test using wxString::ToCDouble() in wxAny.

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

diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index 6890aaafb75265450e130b2b0ad9b8ae6432233b..82ae33f1278fa51655f45df801ad4556d11a3701 100644 (file)
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/radiobox.h
+// Name:        wx/osx/radiobox.h

 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -26,7 +26,7 @@ public:
     inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
     inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,

-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 0, long style = wxRA_SPECIFY_COLS,

              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
         {
             Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
         {
             Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);


@@ -34,7 +34,7 @@ public:
     inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos, const wxSize& size,
              const wxArrayString& choices,
     inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos, const wxSize& size,
              const wxArrayString& choices,

-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 0, long style = wxRA_SPECIFY_COLS,

              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr)
      {
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr)
      {


@@ -45,12 +45,12 @@ public:
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,

-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 0, long style = wxRA_SPECIFY_COLS,

              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos, const wxSize& size,
              const wxArrayString& choices,
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos, const wxSize& size,
              const wxArrayString& choices,

-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 0, long style = wxRA_SPECIFY_COLS,

              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 
              const wxValidator& val = wxDefaultValidator,
              const wxString& name = wxRadioBoxNameStr);
 


@@ -89,6 +89,9 @@ public:
     void OnRadioButton( wxCommandEvent& event ) ;
 
 protected:
     void OnRadioButton( wxCommandEvent& event ) ;
 
 protected:

+    // resolve ambiguity in base classes
+    virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
+

     wxRadioButton    *m_radioButtonCycle;
 
     unsigned int      m_noItems;
     wxRadioButton    *m_radioButtonCycle;
 
     unsigned int      m_noItems;