X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc26eeb36a7415bd73d3e442c79b7acc0aeed6eb..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/radiobox.h diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index 60f29cb922..05bccdc050 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -92,6 +92,7 @@ public: virtual bool Show(unsigned int n, bool show = true); virtual bool IsItemEnabled(unsigned int n) const; virtual bool IsItemShown(unsigned int n) const; + virtual int GetItemFromPoint(const wxPoint& pt) const; // override some base class methods virtual bool Show(bool show = true); @@ -102,6 +103,13 @@ public: #if wxUSE_TOOLTIPS virtual bool HasToolTips() const; #endif // wxUSE_TOOLTIPS +#if wxUSE_HELP + // override virtual function with a platform-independent implementation + virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const + { + return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); + } +#endif // wxUSE_HELP // we inherit a version always returning false from wxStaticBox, override // it to behave normally @@ -110,7 +118,6 @@ public: void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetButtonFont(const wxFont& font) { SetFont(font); } - // implementation only from now on // ------------------------------- @@ -123,9 +130,6 @@ protected: // common part of all ctors void Init(); - // we can't compute our best size before the items are added to the control - virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { } - // subclass one radio button void SubclassRadioButton(WXHWND hWndBtn); @@ -144,16 +148,6 @@ protected: virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip); #endif - virtual int GetItemFromPoint(const wxPoint& pt) const; - -#if wxUSE_HELP - // override virtual function with a platform-independent implementation - virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const - { - return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); - } -#endif // wxUSE_HELP - #ifndef __WXWINCE__ virtual WXHRGN MSWGetRegionWithoutChildren(); #endif // __WXWINCE__