Fixed preview navigation as per ancient bug report

[wxWidgets.git] / include / wx / mac / textctrl.h

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 799265855285c34ef7c748a7b04b22f9b517891a..baa7ab853dff17beba77a0bb3b20958e37604f0d 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -1,25 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textctrl.h
 // Purpose:     wxTextCtrl class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        textctrl.h
 // Purpose:     wxTextCtrl class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "textctrl.h"
 #endif
 
 #include "wx/control.h"
 
 #pragma interface "textctrl.h"
 #endif
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;

 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase


@@ -151,10 +150,11 @@ public:
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 

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

 
 protected:
   virtual wxSize DoGetBestSize() const;
 
 protected:
   virtual wxSize DoGetBestSize() const;