X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..61fef19b852d426f5b00b60de083539b9ba0f76c:/include/wx/mac/scrolbar.h diff --git a/include/wx/mac/scrolbar.h b/include/wx/mac/scrolbar.h index 9efad2dfd0..bac1fca239 100644 --- a/include/wx/mac/scrolbar.h +++ b/include/wx/mac/scrolbar.h @@ -1,24 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// // Name: scrollbar.h // Purpose: wxScrollBar class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SCROLBAR_H_ #define _WX_SCROLBAR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "scrolbar.h" #endif #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; // Scrollbar item class WXDLLEXPORT wxScrollBar: public wxControl @@ -46,8 +46,8 @@ public: const wxString& name = wxScrollBarNameStr); int GetThumbPosition() const ; - inline int GetThumbSize() const { return m_pageSize; } - inline int GetPageSize() const { return m_viewSize; } + inline int GetThumbSize() const { return m_viewSize; } + inline int GetPageSize() const { return m_pageSize; } inline int GetRange() const { return m_objectSize; } bool IsVertical() const { return (m_windowStyle & wxVERTICAL) != 0; } @@ -57,7 +57,7 @@ public: bool refresh = TRUE); void Command(wxCommandEvent& event); - virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; protected: int m_pageSize;