X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/msw/scrolbar.h?ds=sidebyside diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h index 9edd72a589..ec4e2dfebd 100644 --- 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$ -// 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" @@ -18,74 +18,74 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; // Scrollbar item class WXDLLEXPORT wxScrollBar: public wxControl { - DECLARE_DYNAMIC_CLASS(wxScrollBar) + DECLARE_DYNAMIC_CLASS(wxScrollBar) public: - inline wxScrollBar(void) { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(void); - - inline wxScrollBar(wxWindow *parent, const wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - bool Create(wxWindow *parent, const wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr); - - int GetPosition(void) const ; - 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); + wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } + ~wxScrollBar(); + + wxScrollBar(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxSB_HORIZONTAL, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxScrollBarNameStr) + { + Create(parent, id, pos, size, style, validator, name); + } + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxSB_HORIZONTAL, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxScrollBarNameStr); + + int GetThumbPosition() const ; + int GetThumbSize() const { return m_pageSize; } + int GetPageSize() const { return m_viewSize; } + int GetRange() const { return m_objectSize; } + + virtual void SetThumbPosition(int viewStart); + 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(const int viewStart) { SetPosition(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 SetPageSize(const int pageLength); - void SetObjectLength(const int objectLength); - void SetViewLength(const int viewLength); + // Backward compatibility + int GetValue() const { return GetThumbPosition(); } + void SetValue(int viewStart) { SetThumbPosition(viewStart); } + void GetValues(int *viewStart, int *viewLength, int *objectLength, + int *pageLength) const ; + int GetViewLength() const { return m_viewSize; } + int GetObjectLength() const { return m_objectSize; } + + void SetPageSize(int pageLength); + void SetObjectLength(int objectLength); + void SetViewLength(int viewLength); #endif - void Command(wxCommandEvent& event); - virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, - 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 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); #if WXWIN_COMPATIBILITY - // Backward compatibility: generate an old-style scroll command - void OnScroll(wxScrollEvent& event); -#endif + // Backward compatibility: generate an old-style scroll command + void OnScroll(wxScrollEvent& event); +#endif // WXWIN_COMPATIBILITY protected: int m_pageSize; int m_viewSize; int m_objectSize; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; #endif - // __SCROLBARH__ + // _WX_SCROLBAR_H_