forward Enable() and SetFont() to the labels as well

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 1d34aba16465a3b8390f359eb6698b08d602294f..45f330d94345a547e403c540e16356e0b79f6705 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -88,9 +88,9 @@ public:
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
 
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
 

-    void DoGetPosition(int *x, int *y) const;
-
-    bool Show(bool show = true);
+    virtual bool Show(bool show = true);
+    virtual bool Enable(bool show = true);
+    virtual bool SetFont(const wxFont& font);

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -107,6 +107,7 @@ protected:
 
 
     // overridden base class virtuals
 
 
     // overridden base class virtuals

+    virtual void DoGetPosition(int *x, int *y) const;

     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;


@@ -114,7 +115,6 @@ protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

-    virtual bool MSWAlwaysDrawBg() const { return true; }

 
 
     // the labels windows, if any
 
 
     // the labels windows, if any