Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h
index e84a0e146a09b6240d495a35cf06320cccf67bcb..a16c5952e05e5cca1a52da21cd3ac4d709d4c6d5 100644 (file)
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -59,7 +58,6 @@ public:
     int GetMax() const { return m_rangeMax; }
 
     // Win32-specific slider methods
     int GetMax() const { return m_rangeMax; }
 
     // Win32-specific slider methods

-    void SetTickFreq(int n, int pos);

     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     int GetPageSize() const;
     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     int GetPageSize() const;


@@ -107,6 +105,10 @@ protected:
     wxRect GetBoundingBox() const;
 
     // Get the height and, if the pointers are non NULL, widths of both labels.
     wxRect GetBoundingBox() const;
 
     // Get the height and, if the pointers are non NULL, widths of both labels.

+    //
+    // Notice that the return value will be 0 if we don't have wxSL_LABELS
+    // style but we do fill widthMin and widthMax even if we don't have
+    // wxSL_MIN_MAX_LABELS style set so the caller should account for it.

     int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const;
 
 
     int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const;
 
 


@@ -124,13 +126,14 @@ protected:
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;

-    int           m_minLabelWidth;
-    int           m_maxLabelWidth;

 
     // flag needed to detect whether we're getting THUMBRELEASE event because
     // of dragging the thumb or scrolling the mouse wheel
     bool m_isDragging;
 
 
     // flag needed to detect whether we're getting THUMBRELEASE event because
     // of dragging the thumb or scrolling the mouse wheel
     bool m_isDragging;
 

+    // Platform-specific implementation of SetTickFreq
+    virtual void DoSetTickFreq(int freq);
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };