X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..6a8b0d458663e48152afcf6576a057f5b8ab8be3:/include/wx/univ/radiobox.h diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index a0022ca429..cb915c9a65 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_RADIOBOX_H_ #define _WX_UNIV_RADIOBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univradiobox.h" #endif @@ -21,7 +21,7 @@ class WXDLLEXPORT wxRadioButton; #include "wx/statbox.h" #include "wx/dynarray.h" -WX_DEFINE_ARRAY(wxRadioButton *, wxArrayRadioButtons); +WX_DEFINE_EXPORTED_ARRAY_PTR(wxRadioButton *, wxArrayRadioButtons); // ---------------------------------------------------------------------------- // wxRadioBox: a box full of radio buttons @@ -50,6 +50,16 @@ public: (void)Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name); } + wxRadioBox(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + int majorDim = 0, + long style = wxRA_SPECIFY_COLS, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr); bool Create(wxWindow *parent, wxWindowID id, @@ -61,6 +71,16 @@ public: 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, + int majorDim = 0, + long style = wxRA_SPECIFY_COLS, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr); virtual ~wxRadioBox(); @@ -75,12 +95,12 @@ public: virtual wxString GetString(int n) const; virtual void SetString(int n, const wxString& label); - virtual void Enable(int n, bool enable = TRUE); - virtual void Show(int n, bool show = TRUE); + virtual void Enable(int n, bool enable = true); + virtual void Show(int n, bool show = true); // we also override the wxControl methods to avoid virtual function hiding - virtual bool Enable(bool enable = TRUE); - virtual bool Show(bool show = TRUE); + virtual bool Enable(bool enable = true); + virtual bool Show(bool show = true); virtual wxString GetLabel() const; virtual void SetLabel(const wxString& label);