compilation fixed

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

diff --git a/include/wx/qt/slider.h b/include/wx/qt/slider.h
index 32b61d4f75d851473674ad3446a1a885f2f8476e..239e914e5cedb657ef56e3cfd4dbc19d035d2046 100644 (file)
--- a/include/wx/qt/slider.h
+++ b/include/wx/qt/slider.h
@@ -1,86 +1,91 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        slider.h
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxSlider class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __GTKSLIDERH__
-#define __GTKSLIDERH__
+#ifndef _WX_SLIDER_H_
+#define _WX_SLIDER_H_
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "slider.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
 #include "wx/control.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxSlider;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 
-//-----------------------------------------------------------------------------
-// wxSlider
-//-----------------------------------------------------------------------------
-
-class wxSlider: public wxControl
+// Slider
+class WXDLLEXPORT wxSlider: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxSlider)
 
-  public:
-    wxSlider(void);
-    wxSlider( wxWindow *parent, wxWindowID id,
+public:
+  wxSlider();
+
+  inline wxSlider(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 wxString& name = wxSliderNameStr);
-   ~wxSlider(void);
-   bool Create(wxWindow *parent, wxWindowID id,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxSliderNameStr)
+  {
+      Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
+  }
+
+  ~wxSlider();
+
+  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);
-    virtual int GetValue(void) const;
-    virtual void SetValue( int );
-    void GetSize( int *x, int *y ) const;
-    void SetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
-    void GetPosition( int *x, int *y ) const;
-    void SetRange( int minValue, int maxValue );
-    int GetMin(void) const;
-    int GetMax(void) const;
-    void SetTickFreq( int n, int pos );
-    int GetTickFreq(void) const;
-    void SetPageSize( int pageSize );
-    int GetPageSize(void) const;
-    void ClearSel(void);
-    void ClearTicks(void);
-    void SetLineSize( int lineSize );
-    int GetLineSize(void) const;
-    int GetSelEnd(void) const;
-    int GetSelStart(void) const;
-    void SetSelection( int minPos, int maxPos );
-    void SetThumbLength( int len );
-    int GetThumbLength(void) const;
-    void SetTick( int tickPos );
-    
+
+  virtual int GetValue() const ;
+  virtual void SetValue(int);
+  void GetSize(int *x, int *y) const ;
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void GetPosition(int *x, int *y) const ;
+  bool Show(bool show);
+
+  void SetRange(int minValue, int maxValue);
+
+  inline int GetMin() const { return m_rangeMin; }
+  inline int GetMax() const { return m_rangeMax; }
+
+  // For trackbars only
+  void SetTickFreq(int n, int pos);
+  inline int GetTickFreq() const { return m_tickFreq; }
+  void SetPageSize(int pageSize);
+  int GetPageSize() const ;
+  void ClearSel() ;
+  void ClearTicks() ;
+  void SetLineSize(int lineSize);
+  int GetLineSize() const ;
+  int GetSelEnd() const ;
+  int GetSelStart() const ;
+  void SetSelection(int minPos, int maxPos);
+  void SetThumbLength(int len) ;
+  int GetThumbLength() const ;
+  void SetTick(int tickPos) ;
+
+  void Command(wxCommandEvent& event);
+ protected:
+  int           m_rangeMin;
+  int           m_rangeMax;
+  int           m_pageSize;
+  int           m_lineSize;
+  int           m_tickFreq;
+DECLARE_EVENT_TABLE()
 };
 
-#endif // __GTKSLIDERH__
+#endif
+    // _WX_SLIDER_H_