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 a5a23f58890c9b797ecc36c48b75d8a587b2f433..0476b55aaee1269d050f654b7f04e232550f0e85 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -30,6 +30,7 @@ public:
         Create( parent, id, value, minValue, maxValue,
                 pos, size, style, validator, name );
     }
         Create( parent, id, value, minValue, maxValue,
                 pos, size, style, validator, name );
     }

+    ~wxSlider();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -58,16 +59,26 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

     // implementation
     // 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;
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

+    // set the slider value unconditionally
+    void GTKSetValue(int value);
+

     DECLARE_DYNAMIC_CLASS(wxSlider)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };