bugfixes, bugfixes, bugfixes...

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

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 4df175c6a5c8bacdb74ec5436114ed499abe43a9..ba675da4d1633e2a43666aec84450dcef513fa1c 100644 (file)
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -1,27 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        slider.h
 // Purpose:     wxSlider class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/15/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SLIDER_H_
 #define _WX_SLIDER_H_
 
-#ifdef __GNUG__
-#pragma interface "slider.h"
-#endif
-
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 
 // Slider
-class WXDLLEXPORT wxSlider: public wxControl
+class WXDLLEXPORT wxSlider: public wxSliderBase
 {
   DECLARE_DYNAMIC_CLASS(wxSlider)
 
@@ -33,7 +29,9 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxSliderNameStr)
   {
       Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
@@ -46,14 +44,17 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxSliderNameStr);
 
   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);
@@ -61,6 +62,10 @@ public:
   inline int GetMin() const { return m_rangeMin; }
   inline int GetMax() const { return m_rangeMax; }
 
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+
+
+
   // For trackbars only
   void SetTickFreq(int n, int pos);
   inline int GetTickFreq() const { return m_tickFreq; }
@@ -77,16 +82,31 @@ public:
   int GetThumbLength() const ;
   void SetTick(int tickPos) ;
 
+  // IMPLEMENTATION
+  WXHWND GetStaticMin() const { return m_staticMin; }
+  WXHWND GetStaticMax() const { return m_staticMax; }
+  WXHWND GetEditValue() const { return m_staticValue; }
+  virtual bool ContainsHWND(WXHWND hWnd) const;
+
   void Command(wxCommandEvent& event);
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+          WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool OS2OnScroll(int orientation, WXWORD wParam,
+                           WXWORD pos, WXHWND control);
+
  protected:
+  WXHWND        m_staticMin;
+  WXHWND        m_staticMax;
+  WXHWND        m_staticValue;
   int           m_rangeMin;
   int           m_rangeMax;
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;
-DECLARE_EVENT_TABLE()
-private:
-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
+
+  virtual void DoSetSize(int x, int y,
+                         int width, int height,
+                         int sizeFlags = wxSIZE_AUTO);
 };
 
 #endif