X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..b466e85a7e81db84545bc44c83cbe4ccacd4fe8e:/include/wx/gtk/slider.h diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h index 7c1ab92185..5c26690551 100644 --- a/include/wx/gtk/slider.h +++ b/include/wx/gtk/slider.h @@ -7,12 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKSLIDERH__ -#define __GTKSLIDERH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif +#ifndef _WX_GTK_SLIDER_H_ +#define _WX_GTK_SLIDER_H_ // ---------------------------------------------------------------------------- // wxSlider @@ -21,7 +17,7 @@ class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase { public: - wxSlider() { } + wxSlider(); wxSlider(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, @@ -62,17 +58,20 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation - bool IsOwnGtkWindow( GdkWindow *window ); - void GtkDisableEvents(); - void GtkEnableEvents(); + double m_pos; + int m_scrollEventType; + bool m_needThumbRelease; + bool m_blockScrollEvent; + +protected: + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - GtkAdjustment *m_adjust; - float m_oldPos; + // set the slider value unconditionally + void GTKSetValue(int value); -private: DECLARE_DYNAMIC_CLASS(wxSlider) }; -#endif // __GTKSLIDERH__ +#endif // _WX_GTK_SLIDER_H_