X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/osx/window.h

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 133b6d8fc9..d5693becf3 100644
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -138,7 +138,7 @@ public:
 
     // event handlers
     // --------------
-    void OnPaint( wxPaintEvent& event );
+
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );
     void OnMouseEvent( wxMouseEvent &event );
@@ -162,12 +162,13 @@ public:
     wxWindowMac *FindItem(long id) const;
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
-    virtual void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-    virtual bool        MacDoRedraw( void* updatergn , long time ) ;
-
+    virtual void        TriggerScrollEvent( wxEventType scrollEvent ) ;
     // this should not be overriden in classes above wxWindowMac
     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
+    
+    virtual bool        MacDoRedraw( long time ) ;
+    virtual void        MacPaintChildrenBorders();
     virtual void        MacPaintBorders( int left , int top ) ;
     void                MacPaintGrowBox();
 
@@ -251,7 +252,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;
@@ -337,7 +339,7 @@ private:
     void DoUpdateScrollbarVisibility();
 
 
-    DECLARE_NO_COPY_CLASS(wxWindowMac)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMac);
     DECLARE_EVENT_TABLE()
 };