Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 3ff3ad6ea2f2e61692ff30c5a07a61a4a77f887c..f8833c468509fa997ae523a8855bf8ac270b9728 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -2,26 +2,21 @@
 // Name:        wx/gtk/slider.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk/slider.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // 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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxSlider
 // ----------------------------------------------------------------------------
 

-class wxSlider : public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase

 {
 public:
 {
 public:

-    wxSlider() { }
+    wxSlider();

     wxSlider(wxWindow *parent,
              wxWindowID id,
              int value, int minValue, int maxValue,
     wxSlider(wxWindow *parent,
              wxWindowID id,
              int value, int minValue, int maxValue,


@@ -34,6 +29,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,


@@ -62,17 +58,27 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

     // implementation
     // implementation

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void GtkDisableEvents();
-    void GtkEnableEvents();
+    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;

 
 

-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
+    // set the slider value unconditionally
+    void GTKSetValue(int value);

 
 

-private:

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

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