fixes for __WINCE_NET__ build (slightly modified patch 1892654)

[wxWidgets.git] / include / wx / msw / slider95.h

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 580b77f89b378e6d94d8b6ef3e5b44d6d41980c9..7d50a97762510e0f77563f5208f7c05f5f09b698 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -12,7 +12,7 @@
 #ifndef _WX_SLIDER95_H_
 #define _WX_SLIDER95_H_
 
-class WXDLLEXPORT wxSubwindows;
+class WXDLLIMPEXP_FWD_CORE wxSubwindows;
 
 // Slider
 class WXDLLEXPORT wxSlider : public wxSliderBase
@@ -83,6 +83,8 @@ public:
     // we should let background show through the slider (and its labels)
     virtual bool HasTransparentBackground() { return true; }
 
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
 
     void Command(wxCommandEvent& event);
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
@@ -92,6 +94,8 @@ public:
     virtual bool Enable(bool show = true);
     virtual bool SetFont(const wxFont& font);
 
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
 protected:
     // common part of all ctors
     void Init();
@@ -112,13 +116,8 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
 
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
-
-
     // the labels windows, if any
-    wxSubwindows *m_labels;
+    wxSubwindows  *m_labels;
 
     int           m_rangeMin;
     int           m_rangeMax;