X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/msw/slider95.h

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index a94978d8b1..45f330d943 100644
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -1,109 +1,134 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider95.h
+// Name:        wx/msw/slider95.h
 // Purpose:     wxSlider95 class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _SLIDER95_H_
-#define _SLIDER95_H_
+#ifndef _WX_SLIDER95_H_
+#define _WX_SLIDER95_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "slider95.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
+class WXDLLEXPORT wxSubwindows;
 
 // Slider
-class WXDLLEXPORT wxSlider95 : public wxControl
+class WXDLLEXPORT wxSlider95 : public wxSliderBase
 {
-    DECLARE_DYNAMIC_CLASS(wxSlider95)
-
 public:
-    wxSlider95();
-
-    wxSlider95(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)
+    wxSlider95() { Init(); }
+
+    wxSlider95(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)
     {
-        Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
+        Init();
+
+        (void)Create(parent, id, value, minValue, maxValue,
+                     pos, size, style, validator, name);
     }
 
-    ~wxSlider95();
+    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 wxString& name = wxSliderNameStr);
 
-    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 wxString& name = wxSliderNameStr);
+    virtual ~wxSlider95();
 
-    virtual int GetValue() const ;
+    // slider methods
+    virtual int GetValue() const;
     virtual void SetValue(int);
 
-    void GetSize(int *x, int *y) const ;
-    void GetPosition(int *x, int *y) const ;
-
-    bool Show(bool show);
-
     void SetRange(int minValue, int maxValue);
 
     int GetMin() const { return m_rangeMin; }
     int GetMax() const { return m_rangeMax; }
 
-    // For trackbars only
+    // Win32-specific slider methods
     void SetTickFreq(int n, int pos);
     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
-    int GetPageSize() const ;
-    void ClearSel() ;
-    void ClearTicks() ;
+    int GetPageSize() const;
+    void ClearSel();
+    void ClearTicks();
     void SetLineSize(int lineSize);
-    int GetLineSize() const ;
-    int GetSelEnd() const ;
-    int GetSelStart() const ;
+    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) ;
-
-    // IMPLEMENTATION
-    WXHWND GetStaticMin() const { return m_staticMin; }
-    WXHWND GetStaticMax() const { return m_staticMax; }
-    WXHWND GetEditValue() const { return m_staticValue; }
+    void SetThumbLength(int len);
+    int GetThumbLength() const;
+    void SetTick(int tickPos);
+
+    // implementation only from now on
+    WXHWND GetStaticMin() const;
+    WXHWND GetStaticMax() const;
+    WXHWND GetEditValue() const;
     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);
-    void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
-    void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
+                             WXWORD pos, WXHWND control);
+
+    virtual bool Show(bool show = true);
+    virtual bool Enable(bool show = true);
+    virtual bool SetFont(const wxFont& font);
 
 protected:
-    WXHWND        m_staticMin;
-    WXHWND        m_staticMax;
-    WXHWND        m_staticValue;
+    // common part of all ctors
+    void Init();
+
+    // format an integer value as string
+    static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
+
+    // get the boundig box for the slider and possible labels
+    wxRect GetBoundingBox() const;
+
+    // get the height and, if the pointer is not NULL, width of our labels
+    int GetLabelsSize(int *width = NULL) const;
+
+
+    // overridden base class virtuals
+    virtual void DoGetPosition(int *x, int *y) const;
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual wxSize DoGetBestSize() const;
+
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
+
+    // the labels windows, if any
+    wxSubwindows *m_labels;
+
     int           m_rangeMin;
     int           m_rangeMax;
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95)
 };
 
-#endif
-    // _SLIDER95_H_
+#endif // _WX_SLIDER95_H_
+