correct access for virtuals

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index 4f350d8f30df3ba87bb06c69017d6158e1f9dec1..ce07dd572ae0bc77a1c04695e6e2040eedf606a9 100644 (file)
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -73,8 +73,9 @@ public:
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #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
 
 protected:
 #endif
 
 protected:

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index e7d826968b23c416eb302f41b0ba328000cc285c..70390a958444269bf652e811c37adacf88cc9400 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -56,11 +56,11 @@ public:
     void SetDeterminateMode();
     void Pulse();
 
     void SetDeterminateMode();
     void Pulse();
 

+    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

-    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
 };
 

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index a301eba1720940639ba823d27b93109f5ecdbb1b..05bccdc050c0355551975f163311ed3d15f986b6 100644 (file)
--- 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 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);
 
     // 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_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
 
     // 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); }
 
     void SetLabelFont(const wxFont& WXUNUSED(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);
 #endif
 
     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__
 #ifndef __WXWINCE__
     virtual WXHRGN MSWGetRegionWithoutChildren();
 #endif // __WXWINCE__