X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/slider.h diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h index fa507b201d..04dc08a6d0 100644 --- a/include/wx/mac/carbon/slider.h +++ b/include/wx/mac/carbon/slider.h @@ -16,10 +16,10 @@ #include "wx/slider.h" #include "wx/stattext.h" -WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[]; +WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[]; // Slider -class WXDLLEXPORT wxSlider: public wxSliderBase +class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase { DECLARE_DYNAMIC_CLASS(wxSlider) @@ -74,11 +74,6 @@ public: int GetThumbLength() const ; void SetTick(int tickPos) ; - // set min/max size of the slider - virtual void DoSetSizeHints( int minW, int minH, - int maxW = -1, int maxH = -1, - int incW = -1, int incH = -1 ); - void Command(wxCommandEvent& event); virtual wxInt32 MacControlHit(WXEVENTHANDLERREF handler, WXEVENTREF event); void MacHandleControlClick(WXWidget control, wxInt16 controlpart, bool mouseStillDown); @@ -88,6 +83,11 @@ protected: virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags); virtual void DoMoveWindow(int x, int y, int w, int h); + // set min/max size of the slider + virtual void DoSetSizeHints( int minW, int minH, + int maxW, int maxH, + int incW, int incH); + // Common processing to invert slider values based on wxSL_INVERSE virtual int ValueInvertOrNot(int value) const;