merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -152,7 +152,8 @@ public:
    void OnUpdateRedo(wxUpdateUIEvent& event);

   	virtual bool MacCanFocus() const { return true ; }
-    
+    virtual bool MacSetupCursor( const wxPoint& pt ) ;
+
    virtual void 	 MacSuperShown( bool show ) ;
    virtual bool	 Show(bool show = TRUE) ;