Partial Watcom C++ 10.6 support added (doesn't link for some reason)

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

diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index cf461ecd593772d0031cb8e2798d80ae4def4f51..588d3d13218584955ed761d0d308af3938495b7b 100644 (file)
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -45,19 +45,19 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr);
 

-  int GetPosition(void) const ;
+  int GetThumbPosition(void) const ;

   inline int GetThumbSize() const { return m_pageSize; }
   inline int GetPageSize() const { return m_viewSize; }
   inline int GetRange() const { return m_objectSize; }
 
   inline int GetThumbSize() const { return m_pageSize; }
   inline int GetPageSize() const { return m_viewSize; }
   inline int GetRange() const { return m_objectSize; }
 

-  virtual void SetPosition(int viewStart);
+  virtual void SetThumbPosition(int viewStart);

   virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh = TRUE);
 
 #if WXWIN_COMPATIBILITY
   // Backward compatibility
   virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh = TRUE);
 
 #if WXWIN_COMPATIBILITY
   // Backward compatibility

-  inline int GetValue(void) const { return GetPosition(); }
-  inline void SetValue(int viewStart) { SetPosition(viewStart); }
+  inline int GetValue(void) const { return GetThumbPosition(); }
+  inline void SetValue(int viewStart) { SetThumbPosition(viewStart); }

   void GetValues(int *viewStart, int *viewLength, int *objectLength,
                  int *pageLength) const ;
   inline int GetViewLength() const { return m_viewSize; }
   void GetValues(int *viewStart, int *viewLength, int *objectLength,
                  int *pageLength) const ;
   inline int GetViewLength() const { return m_viewSize; }