X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..eab1336c903271946530509a6c7939eba54371e6:/include/wx/osx/window.h diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index 783aee0929..1137022d21 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -99,7 +99,7 @@ public: virtual int GetScrollThumb( int orient ) const; virtual int GetScrollRange( int orient ) const; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = (wxRect *) NULL ); + const wxRect* rect = NULL ); virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true); virtual bool IsScrollbarAlwaysShown(int orient) const { @@ -162,7 +162,7 @@ public: wxWindowMac *FindItem(long id) const; wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; - virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; + virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; virtual bool MacDoRedraw( void* updatergn , long time ) ; // this should not be overriden in classes above wxWindowMac @@ -251,7 +251,8 @@ public: // osx specific event handling common for all osx-ports - virtual bool HandleClicked( double timestampsec ); + virtual bool OSXHandleClicked( double timestampsec ); + virtual bool OSXHandleKeyEvent( wxKeyEvent& event ); protected: // For controls like radio buttons which are genuinely composite wxList m_subControls;