X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..c50f92d08cc3633f8127931e7cf5d362ab8ac392:/include/wx/mac/slider.h diff --git a/include/wx/mac/slider.h b/include/wx/mac/slider.h index 7c52c5a54a..7c49d1ff0c 100644 --- a/include/wx/mac/slider.h +++ b/include/wx/mac/slider.h @@ -6,13 +6,13 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SLIDER_H_ #define _WX_SLIDER_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "slider.h" #endif @@ -20,7 +20,7 @@ #include "wx/slider.h" #include "wx/stattext.h" -WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; // Slider class WXDLLEXPORT wxSlider: public wxControl @@ -87,12 +87,12 @@ public: virtual void DoMoveWindow(int x, int y, int w, int h); void Command(wxCommandEvent& event); - void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ; - virtual void MacUpdateDimensions() ; + void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + virtual void MacUpdateDimensions() ; - wxStaticText* m_macMinimumStatic ; - wxStaticText* m_macMaximumStatic ; - wxStaticText* m_macValueStatic ; + wxStaticText* m_macMinimumStatic ; + wxStaticText* m_macMaximumStatic ; + wxStaticText* m_macValueStatic ; int m_rangeMin; int m_rangeMax;