Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct access for virtuals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-09 19:48:21 +00:00
parent b3ffb94d27
commit 1c3693e8f5
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/combo.h
View File

@@ -73,8 +73,9 @@ public:
static int GetFeatures() { return wxComboCtrlFeatures::All; } static int GetFeatures() { return wxComboCtrlFeatures::All; }
#if wxUSE_COMBOCTRL_POPUP_ANIMATION #if wxUSE_COMBOCTRL_POPUP_ANIMATION
virtual bool AnimateShow( const wxRect& rect, int flags );
void OnTimerEvent( wxTimerEvent& event ); void OnTimerEvent( wxTimerEvent& event );
protected:
virtual bool AnimateShow( const wxRect& rect, int flags );
#endif #endif
protected: protected:

4
include/wx/msw/gauge95.h
View File

@@ -56,11 +56,11 @@ public:
void SetDeterminateMode(); void SetDeterminateMode();
void Pulse(); void Pulse();
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95) DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
}; };

19
include/wx/msw/radiobox.h
View File

@@ -92,6 +92,7 @@ public:
virtual bool Show(unsigned int n, bool show = true); virtual bool Show(unsigned int n, bool show = true);
virtual bool IsItemEnabled(unsigned int n) const; virtual bool IsItemEnabled(unsigned int n) const;
virtual bool IsItemShown(unsigned int n) const; virtual bool IsItemShown(unsigned int n) const;
virtual int GetItemFromPoint(const wxPoint& pt) const;
// override some base class methods // override some base class methods
virtual bool Show(bool show = true); virtual bool Show(bool show = true);
@@ -102,6 +103,13 @@ public:
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual bool HasToolTips() const; virtual bool HasToolTips() const;
#endif // wxUSE_TOOLTIPS #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 // we inherit a version always returning false from wxStaticBox, override
// it to behave normally // it to behave normally
@@ -110,7 +118,6 @@ public:
void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetLabelFont(const wxFont& WXUNUSED(font)) {}
void SetButtonFont(const wxFont& font) { SetFont(font); } void SetButtonFont(const wxFont& font) { SetFont(font); }
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
@@ -141,16 +148,6 @@ protected:
virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip); virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip);
#endif #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__ #ifndef __WXWINCE__
virtual WXHRGN MSWGetRegionWithoutChildren(); virtual WXHRGN MSWGetRegionWithoutChildren();
#endif // __WXWINCE__ #endif // __WXWINCE__