X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70dc287a3997b65d954bfbd5861f72696bd3dd27..1e6d9c20fdb220e4cb9c1ee2a52709b08bb414ba:/include/wx/msw/radiobox.h diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index 34a460902f..698bde3d7a 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); @@ -88,7 +112,7 @@ public: virtual bool SetFont(const wxFont& font); - long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); @@ -100,6 +124,9 @@ public: int GetNumVer() const; int GetNumHor() const; + virtual void ApplyParentThemeBackground(const wxColour& bg) + { SetBackgroundColour(bg); } + protected: // subclass one radio button void SubclassRadioButton(WXHWND hWndBtn);