Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / slider.h

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 76f6dae280b91cd0189e6ee7a581c719cfdb3c9c..0476b55aaee1269d050f654b7f04e232550f0e85 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKSLIDERH__
-#define __GTKSLIDERH__
+#ifndef _WX_GTK_SLIDER_H_
+#define _WX_GTK_SLIDER_H_
 
 // ----------------------------------------------------------------------------
 // wxSlider
@@ -30,6 +30,7 @@ public:
         Create( parent, id, value, minValue, maxValue,
                 pos, size, style, validator, name );
     }
+    ~wxSlider();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -58,17 +59,27 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
+    void GTKDisableEvents();
+    void GTKEnableEvents();
+    bool GTKEventsDisabled() const;
+
     double m_pos;
     int m_scrollEventType;
     bool m_needThumbRelease;
+    GtkWidget *m_scale;
 
 protected:
+    GtkWidget *m_minLabel,*m_maxLabel;
+    bool m_blockScrollEvent;
+
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
-private:
+    // set the slider value unconditionally
+    void GTKSetValue(int value);
+
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };
 
-#endif // __GTKSLIDERH__
+#endif // _WX_GTK_SLIDER_H_