added conversion ctor to create const_iterator from iterator, otherwise assigning...

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 68033d6c793e4e8143a18bf6d80d4cc6a3cd8d80..a1891f8d89f886adb63247f3140e1e938603d90b 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -12,10 +12,6 @@
 #ifndef _WX_SLIDER95_H_
 #define _WX_SLIDER95_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider95.h"
-#endif
-
 class WXDLLEXPORT wxSubwindows;
 
 // Slider
@@ -96,6 +92,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();
@@ -118,8 +116,6 @@ protected:
 
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
-
 
     // the labels windows, if any
     wxSubwindows *m_labels;
@@ -130,6 +126,9 @@ protected:
     int           m_lineSize;
     int           m_tickFreq;
 
+    // flag needed to detect whether we're getting THUMBRELEASE event because
+    // of dragging the thumb or scrolling the mouse wheel
+    bool m_isDragging;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };