Move wxBell() from base to core library.

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 76f6dae280b91cd0189e6ee7a581c719cfdb3c9c..50e9df086c04642bb6487fd3628bccccbc58d324 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKSLIDERH__
-#define __GTKSLIDERH__
+#ifndef _WX_GTK_SLIDER_H_
+#define _WX_GTK_SLIDER_H_

 
 // ----------------------------------------------------------------------------
 // wxSlider
 
 // ----------------------------------------------------------------------------
 // wxSlider


@@ -58,17 +58,27 @@ 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;

+    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;
 

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

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

-#endif // __GTKSLIDERH__
+#endif // _WX_GTK_SLIDER_H_