X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..553aa032f2aac24b2b06bd8e38535118950976c1:/include/wx/msw/radiobox.h diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index 58bd4bbe01..9b3a90c121 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -12,7 +12,7 @@ #ifndef _WX_RADIOBOX_H_ #define _WX_RADIOBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "radiobox.h" #endif @@ -41,6 +41,20 @@ 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_HORIZONTAL, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr) + { + (void)Create(parent, id, title, pos, size, choices, majorDim, + style, val, name); + } ~wxRadioBox(); @@ -54,6 +68,16 @@ public: long style = wxRA_HORIZONTAL, 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, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr); // implement the radiobox interface virtual void SetSelection(int n); @@ -100,14 +124,6 @@ public: int GetNumVer() const; int GetNumHor() const; - // compatibility ctor -#if WXWIN_COMPATIBILITY - wxRadioBox(wxWindow *parent, wxFunction func, const char *title, - int x = -1, int y = -1, int width = -1, int height = -1, - int n = 0, char **choices = NULL, - int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr); -#endif // WXWIN_COMPATIBILITY - protected: // subclass one radio button void SubclassRadioButton(WXHWND hWndBtn);