Added wxToggleBitmapButton

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index fbe92a43df7605c6fad10edba6b931135ca6ae54..08cf96528a69e9978f3d83dc410f0823e100b630 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -12,11 +12,7 @@
 #ifndef _WX_SLIDER95_H_
 #define _WX_SLIDER95_H_
 
 #ifndef _WX_SLIDER95_H_
 #define _WX_SLIDER95_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider95.h"
-#endif
-
-class WXDLLEXPORT wxSubwindows;
+class WXDLLIMPEXP_FWD_CORE wxSubwindows;

 
 // Slider
 class WXDLLEXPORT wxSlider : public wxSliderBase
 
 // Slider
 class WXDLLEXPORT wxSlider : public wxSliderBase


@@ -87,6 +83,8 @@ public:
     // we should let background show through the slider (and its labels)
     virtual bool HasTransparentBackground() { return true; }
 
     // 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,
 
     void Command(wxCommandEvent& event);
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,


@@ -96,6 +94,8 @@ public:
     virtual bool Enable(bool show = true);
     virtual bool SetFont(const wxFont& font);
 
     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();
 protected:
     // common part of all ctors
     void Init();


@@ -116,11 +116,6 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
 
     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;
 
     // the labels windows, if any
     wxSubwindows *m_labels;