hack to allow icons in wxStaticBitmap as well as bitmaps

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

diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 9edd72a58915476b5861d921a46bcd8319169a9e..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"


@@ -29,50 +29,50 @@ public:
   inline wxScrollBar(void) { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
   ~wxScrollBar(void);
 
   inline wxScrollBar(void) { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
   ~wxScrollBar(void);
 

-  inline wxScrollBar(wxWindow *parent, const wxWindowID id,
+  inline wxScrollBar(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxSB_HORIZONTAL,
+           long style = wxSB_HORIZONTAL,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);
   }
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);
   }

-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxSB_HORIZONTAL,
+           long style = wxSB_HORIZONTAL,

            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(const int viewStart);
-  virtual void SetScrollbar(const int position, const int thumbSize, const int range, const int pageSize,
-    const bool refresh = TRUE);
+  virtual void SetThumbPosition(int viewStart);
+  virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
+    bool refresh = TRUE);

 
 #if WXWIN_COMPATIBILITY
   // Backward compatibility
 
 #if WXWIN_COMPATIBILITY
   // Backward compatibility

-  inline int GetValue(void) const { return GetPosition(); }
-  inline void SetValue(const 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; }
   inline int GetObjectLength() const { return m_objectSize; }
 
   void GetValues(int *viewStart, int *viewLength, int *objectLength,
                  int *pageLength) const ;
   inline int GetViewLength() const { return m_viewSize; }
   inline int GetObjectLength() const { return m_objectSize; }
 

-  void SetPageSize(const int pageLength);
-  void SetObjectLength(const int objectLength);
-  void SetViewLength(const int viewLength);
+  void SetPageSize(int pageLength);
+  void SetObjectLength(int objectLength);
+  void SetViewLength(int viewLength);

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

-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

-  void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
-  void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+  void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+  void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);

 
 #if WXWIN_COMPATIBILITY
   // Backward compatibility: generate an old-style scroll command
 
 #if WXWIN_COMPATIBILITY
   // Backward compatibility: generate an old-style scroll command


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

-    // __SCROLBARH__
+    // _WX_SCROLBAR_H_