cleaning up problems after string changes

[wxWidgets.git] / include / wx / msw / slider95.h

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index d1efb04d8c96123d084eb4a7d6de7049a25f2d8d..a1891f8d89f886adb63247f3140e1e938603d90b 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/slider95.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/slider95.h

-// Purpose:     wxSlider95 class
+// Purpose:     wxSlider class, using the Win95 (and later) trackbar control

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -9,55 +9,56 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _SLIDER95_H_
-#define _SLIDER95_H_
+#ifndef _WX_SLIDER95_H_
+#define _WX_SLIDER95_H_

 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider95.h"
-#endif
+class WXDLLEXPORT wxSubwindows;

 
 // Slider
 
 // Slider

-class WXDLLEXPORT wxSlider95 : public wxSliderBase
+class WXDLLEXPORT wxSlider : public wxSliderBase

 {
 public:
 {
 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)
+    wxSlider() { Init(); }
+
+    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)

     {
     {

-        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 ~wxSlider();

 
 

+    // slider methods

     virtual int GetValue() const;
     virtual void SetValue(int);
 
     virtual int GetValue() const;
     virtual void SetValue(int);
 

-    void GetSize(int *w, int *h) const;
-
-    void GetPosition(int *x, int *y) const;
-
-    bool Show(bool show = TRUE);
-

     void SetRange(int minValue, int maxValue);
 
     int GetMin() const { return m_rangeMin; }
     int GetMax() const { return m_rangeMax; }
 
     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);
     void SetTickFreq(int n, int pos);
     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);


@@ -73,36 +74,64 @@ public:
     int GetThumbLength() const;
     void SetTick(int tickPos);
 
     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; }
+    // implementation only from now on
+    WXHWND GetStaticMin() const;
+    WXHWND GetStaticMax() const;
+    WXHWND GetEditValue() const;

     virtual bool ContainsHWND(WXHWND hWnd) const;
 
     virtual bool ContainsHWND(WXHWND hWnd) const;
 

+    // we should let background show through the slider (and its labels)
+    virtual bool HasTransparentBackground() { return true; }
+
+

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool MSWOnScroll(int orientation, 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);
+
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+

 protected:
 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; }
+
+
+    // the labels windows, if any
+    wxSubwindows *m_labels;
+

     int           m_rangeMin;
     int           m_rangeMax;
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;
 
     int           m_rangeMin;
     int           m_rangeMax;
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;
 

-    virtual void DoGetSize(int *width, int *height) const;
+    // flag needed to detect whether we're getting THUMBRELEASE event because
+    // of dragging the thumb or scrolling the mouse wheel
+    bool m_isDragging;

 
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)

 };
 
 };
 

-#endif
-    // _SLIDER95_H_
+#endif // _WX_SLIDER95_H_
+