X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..878d055d0b7e6e733e4545b7c83404685e543866:/include/wx/msw/radiobox.h diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index f97606b44a..0cab158a27 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 @@ -66,9 +66,9 @@ public: virtual int GetColumnCount() const; virtual int GetRowCount() const; - bool Show(bool show); + virtual bool Show(bool show = TRUE); void SetFocus(); - bool Enable(bool enable); + virtual bool Enable(bool enable = TRUE); void SetLabelFont(const wxFont& WXUNUSED(font)) {}; void SetButtonFont(const wxFont& font) { SetFont(font); } @@ -100,14 +100,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); @@ -134,6 +126,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxRadioBox) + DECLARE_NO_COPY_CLASS(wxRadioBox) }; #endif