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 2ef6b9a55ce0d07869e44927083e90fc53febe87..588d3d13218584955ed761d0d308af3938495b7b 100644 (file)
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __SCROLBARH__
-#define __SCROLBARH__
+#ifndef _WX_SCROLBAR_H_
+#define _WX_SCROLBAR_H_

 
 #ifdef __GNUG__
 #pragma interface "scrolbar.h"
 
 #ifdef __GNUG__
 #pragma interface "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; }


@@ -88,4 +88,4 @@ DECLARE_EVENT_TABLE()
 };
 
 #endif
 };
 
 #endif

-    // __SCROLBARH__
+    // _WX_SCROLBAR_H_