Some but not all compile fixes for typetest (VC++ 1.5); added datetime.cpp

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index cb7e567c0f852985ecd08d4bd8359f3b0517599b..c94dae8403fbc4945cbe45506ba82f4eb6bc0ebd 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -7,7 +7,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 
 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 


@@ -16,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_SLIDER
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -38,10 +40,8 @@ extern const char *wxSliderNameStr;
 
 class wxSlider: public wxControl
 {
 
 class wxSlider: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxSlider)
-
-  public:
-    wxSlider(void);
+public:
+    wxSlider() {}

     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -52,42 +52,46 @@ class wxSlider: public wxControl
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }

-    ~wxSlider(void);

     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,

-           const wxValidator& validator = wxDefaultValidator, 
+           const wxValidator& validator = wxDefaultValidator,

            const wxString& name = wxSliderNameStr );
            const wxString& name = wxSliderNameStr );

-    virtual int GetValue(void) const;
+    virtual int GetValue() const;

     virtual void SetValue( int );
     void SetRange( int minValue, int maxValue );
     virtual void SetValue( int );
     void SetRange( int minValue, int maxValue );

-    int GetMin(void) const;
-    int GetMax(void) const;
+    int GetMin() const;
+    int GetMax() const;

     void SetTickFreq( int n, int pos );
     void SetTickFreq( int n, int pos );

-    int GetTickFreq(void) const;
+    int GetTickFreq() const;

     void SetPageSize( int pageSize );
     void SetPageSize( int pageSize );

-    int GetPageSize(void) const;
-    void ClearSel(void);
-    void ClearTicks(void);
+    int GetPageSize() const;
+    void ClearSel();
+    void ClearTicks();

     void SetLineSize( int lineSize );
     void SetLineSize( int lineSize );

-    int GetLineSize(void) const;
-    int GetSelEnd(void) const;
-    int GetSelStart(void) const;
+    int GetLineSize() const;
+    int GetSelEnd() const;
+    int GetSelStart() const;

     void SetSelection( int minPos, int maxPos );
     void SetThumbLength( int len );
     void SetSelection( int minPos, int maxPos );
     void SetThumbLength( int len );

-    int GetThumbLength(void) const;
+    int GetThumbLength() const;

     void SetTick( int tickPos );
 
     void SetTick( int tickPos );
 

-  // implementation    
-    
+    // implementation
+    // --------------
+

     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

-    
+

     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

-    
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSlider)

 };
 
 };
 

+#endif
+

 #endif // __GTKSLIDERH__
 #endif // __GTKSLIDERH__