Add wxUSE_MARKUP and wrap SetLabelMarkup() in it.

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 5c266905516eea397115bb6b0babdefe463cee74..50e9df086c04642bb6487fd3628bccccbc58d324 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -60,12 +60,19 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation

+    void GTKDisableEvents();
+    void GTKEnableEvents();
+    bool GTKEventsDisabled() const;
+

     double m_pos;
     int m_scrollEventType;
     bool m_needThumbRelease;
     double m_pos;
     int m_scrollEventType;
     bool m_needThumbRelease;

-    bool m_blockScrollEvent;
+    GtkWidget *m_scale;

 
 protected:
 
 protected:

+    GtkWidget *m_minLabel,*m_maxLabel;
+    bool m_blockScrollEvent;
+

     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     // set the slider value unconditionally
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     // set the slider value unconditionally