Fix interface definition of GetMouseCursorAt

[wxWidgets.git] / src / osx / textctrl_osx.cpp

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 861cc4b92bb47fc3d650e19e5ef44b0c1de11f5a..e513b16b7eabb3d5a28b4bd09e80b48a609e915d 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01

-// RCS-ID:      $Id: textctrl.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -47,13 +47,11 @@
 #include "wx/thread.h"
 
 #include "wx/osx/private.h"
 #include "wx/thread.h"
 
 #include "wx/osx/private.h"

-#include "wx/osx/carbon/private/mactext.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)

 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)

+    EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)

     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)


@@ -76,12 +74,9 @@ END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
 
 void wxTextCtrl::Init()
 {

-    m_editable = true ;

     m_dirty = false;
 
     m_dirty = false;
 

-    m_maxLength = 0;

     m_privateContextMenu = NULL;
     m_privateContextMenu = NULL;

-    m_triggerOnSetValue = true ;

 }
 
 wxTextCtrl::~wxTextCtrl()
 }
 
 wxTextCtrl::~wxTextCtrl()


@@ -100,7 +95,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     const wxValidator& validator,
     const wxString& name )
 {
     const wxValidator& validator,
     const wxString& name )
 {

-    m_macIsUserPane = false ;
+    DontCreatePeer();

     m_editable = true ;
 
     if ( ! (style & wxNO_BORDER) )
     m_editable = true ;
 
     if ( ! (style & wxNO_BORDER) )


@@ -116,12 +111,17 @@ bool wxTextCtrl::Create( wxWindow *parent,
         style |= wxTE_PROCESS_ENTER ;
     }
 
         style |= wxTE_PROCESS_ENTER ;
     }
 

-    m_peer = wxWidgetImpl::CreateTextControl( this, parent, id, str, pos, size, style, GetExtraStyle() );

 
 

-    // CreatePeer( str, pos, size, style );
+    SetPeer(wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos, size) ;
 
 
     MacPostControlCreate(pos, size) ;
 

+#if wxOSX_USE_COCOA
+    // under carbon everything can already be set before the MacPostControlCreate embedding takes place
+    // but under cocoa for single line textfields this only works after everything has been set up
+    GetTextPeer()->SetStringValue(str);
+#endif
+

     // only now the embedding is correct and we can do a positioning update
 
     MacSuperChangedPosition() ;
     // only now the embedding is correct and we can do a positioning update
 
     MacSuperChangedPosition() ;


@@ -134,13 +134,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-void wxTextCtrl::CreatePeer(
-           const wxString& str,
-           const wxPoint& pos,
-           const wxSize& size, long style )
-{
-}
-

 void wxTextCtrl::MacSuperChangedPosition()
 {
     wxWindow::MacSuperChangedPosition() ;
 void wxTextCtrl::MacSuperChangedPosition()
 {
     wxWindow::MacSuperChangedPosition() ;


@@ -158,36 +151,7 @@ void wxTextCtrl::MacVisibilityChanged()
 
 void wxTextCtrl::MacCheckSpelling(bool check)
 {
 
 void wxTextCtrl::MacCheckSpelling(bool check)
 {

-    GetPeer()->CheckSpelling(check);
-}
-
-wxString wxTextCtrl::GetValue() const
-{
-    return GetPeer()->GetStringValue() ;
-}
-
-void wxTextCtrl::GetSelection(long* from, long* to) const
-{
-    GetPeer()->GetSelection( from , to ) ;
-}
-
-void wxTextCtrl::DoSetValue(const wxString& str, int flags)
-{
-    // optimize redraws
-    if ( GetValue() == str )
-        return;
-
-    GetPeer()->SetStringValue( str ) ;
-
-    if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue )
-    {
-        SendTextUpdatedEvent();
-    }
-}
-
-void wxTextCtrl::SetMaxLength(unsigned long len)
-{
-    m_maxLength = len ;
+    GetTextPeer()->CheckSpelling(check);

 }
 
 bool wxTextCtrl::SetFont( const wxFont& font )
 }
 
 bool wxTextCtrl::SetFont( const wxFont& font )


@@ -195,14 +159,15 @@ bool wxTextCtrl::SetFont( const wxFont& font )
     if ( !wxTextCtrlBase::SetFont( font ) )
         return false ;
 
     if ( !wxTextCtrlBase::SetFont( font ) )
         return false ;
 

-    GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle() ) ;
+    GetPeer()->SetFont( font , GetForegroundColour() , GetWindowStyle(), false /* dont ignore black */ ) ;

 
     return true ;
 }
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
 
     return true ;
 }
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {

-    GetPeer()->SetStyle( start , end , style ) ;
+    if (GetTextPeer())
+        GetTextPeer()->SetStyle( start , end , style ) ;

 
     return true ;
 }
 
     return true ;
 }


@@ -215,143 +180,11 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
     return true ;
 }
 
     return true ;
 }
 

-// Clipboard operations
-
-void wxTextCtrl::Copy()
-{
-    if (CanCopy())
-        GetPeer()->Copy() ;
-}
-
-void wxTextCtrl::Cut()
-{
-    if (CanCut())
-    {
-        GetPeer()->Cut() ;
-
-        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-        event.SetEventObject( this );
-        HandleWindowEvent( event );
-      }
-}
-
-void wxTextCtrl::Paste()
-{
-    if (CanPaste())
-    {
-        GetPeer()->Paste() ;
-
-        // TODO: eventually we should add setting the default style again
-
-        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-        event.SetEventObject( this );
-        HandleWindowEvent( event );
-    }
-}
-
-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection( &from, &to );
-
-    return (from != to);
-}
-
-bool wxTextCtrl::CanCut() const
-{
-    if ( !IsEditable() )
-        return false;
-
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection( &from, &to );
-
-    return (from != to);
-}
-
-bool wxTextCtrl::CanPaste() const
-{
-    if (!IsEditable())
-        return false;
-
-    return GetPeer()->CanPaste() ;
-}
-
-void wxTextCtrl::SetEditable(bool editable)
-{
-    if ( editable != m_editable )
-    {
-        m_editable = editable ;
-        GetPeer()->SetEditable( editable ) ;
-    }
-}
-
-void wxTextCtrl::SetInsertionPoint(long pos)
-{
-    SetSelection( pos , pos ) ;
-}
-
-void wxTextCtrl::SetInsertionPointEnd()
-{
-    wxTextPos pos = GetLastPosition();
-    SetInsertionPoint( pos );
-}
-
-long wxTextCtrl::GetInsertionPoint() const
-{
-    long begin, end ;
-    GetSelection( &begin , &end ) ;
-
-    return begin ;
-}
-
-wxTextPos wxTextCtrl::GetLastPosition() const
-{
-    return GetPeer()->GetLastPosition() ;
-}
-
-void wxTextCtrl::Replace(long from, long to, const wxString& str)
-{
-    GetPeer()->Replace( from , to , str ) ;
-}
-
-void wxTextCtrl::Remove(long from, long to)
-{
-    GetPeer()->Remove( from , to ) ;
-}
-
-void wxTextCtrl::SetSelection(long from, long to)
-{
-    GetPeer()->SetSelection( from , to ) ;
-}
-
-void wxTextCtrl::WriteText(const wxString& str)
-{
-    GetPeer()->WriteText( str ) ;
-}
-
-void wxTextCtrl::AppendText(const wxString& text)
-{
-    SetInsertionPointEnd();
-    WriteText( text );
-}
-
-void wxTextCtrl::Clear()
-{
-    GetPeer()->Clear() ;
-}
-

 bool wxTextCtrl::IsModified() const
 {
     return m_dirty;
 }
 
 bool wxTextCtrl::IsModified() const
 {
     return m_dirty;
 }
 

-bool wxTextCtrl::IsEditable() const
-{
-    return IsEnabled() && m_editable ;
-}
-

 bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited
 bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited


@@ -360,6 +193,13 @@ bool wxTextCtrl::AcceptsFocus() const
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {

+    if (GetTextPeer())
+    {
+        wxSize size = GetTextPeer()->GetBestSize();
+        if (size.x > 0 && size.y > 0)
+            return size;
+    }
+

     int wText, hText;
 
     // these are the numbers from the HIG:
     int wText, hText;
 
     // these are the numbers from the HIG:


@@ -396,36 +236,9 @@ wxSize wxTextCtrl::DoGetBestSize() const
     return wxSize(wText, hText);
 }
 
     return wxSize(wText, hText);
 }
 

-// ----------------------------------------------------------------------------
-// Undo/redo
-// ----------------------------------------------------------------------------
-
-void wxTextCtrl::Undo()
-{
-    if (CanUndo())
-        GetPeer()->Undo() ;
-}
-
-void wxTextCtrl::Redo()
+bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)

 {
 {

-    if (CanRedo())
-        GetPeer()->Redo() ;
-}
-
-bool wxTextCtrl::CanUndo() const
-{
-    if ( !IsEditable() )
-        return false ;
-
-    return GetPeer()->CanUndo() ;
-}
-
-bool wxTextCtrl::CanRedo() const
-{
-    if ( !IsEditable() )
-        return false ;
-
-    return GetPeer()->CanRedo() ;
+    return GetTextPeer()->GetStyle(position, style);

 }
 
 void wxTextCtrl::MarkDirty()
 }
 
 void wxTextCtrl::MarkDirty()


@@ -440,38 +253,76 @@ void wxTextCtrl::DiscardEdits()
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 
 int wxTextCtrl::GetNumberOfLines() const
 {

-    return GetPeer()->GetNumberOfLines() ;
+    return GetTextPeer()->GetNumberOfLines() ;

 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {

-    return GetPeer()->XYToPosition( x , y ) ;
+    return GetTextPeer()->XYToPosition( x , y ) ;

 }
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {
 }
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {

-    return GetPeer()->PositionToXY( pos , x , y ) ;
+    return GetTextPeer()->PositionToXY( pos , x , y ) ;

 }
 
 void wxTextCtrl::ShowPosition(long pos)
 {
 }
 
 void wxTextCtrl::ShowPosition(long pos)
 {

-    return GetPeer()->ShowPosition(pos) ;
+    return GetTextPeer()->ShowPosition(pos) ;

 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {

-    return GetPeer()->GetLineLength(lineNo) ;
+    return GetTextPeer()->GetLineLength(lineNo) ;

 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {

-    return GetPeer()->GetLineText(lineNo) ;
+    return GetTextPeer()->GetLineText(lineNo) ;

 }
 
 }
 

-void wxTextCtrl::Command(wxCommandEvent & event)
+void wxTextCtrl::Copy()

 {
 {

-    SetValue(event.GetString());
-    ProcessCommand(event);
+    if (CanCopy())
+    {
+        wxClipboardTextEvent evt(wxEVT_TEXT_COPY, GetId());
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Copy();
+        }
+    }
+}
+
+void wxTextCtrl::Cut()
+{
+    if (CanCut())
+    {
+        wxClipboardTextEvent evt(wxEVT_TEXT_CUT, GetId());
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Cut();
+
+            SendTextUpdatedEvent();
+        }
+    }
+}
+
+void wxTextCtrl::Paste()
+{
+    if (CanPaste())
+    {
+        wxClipboardTextEvent evt(wxEVT_TEXT_PASTE, GetId());
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Paste();
+
+            // TODO: eventually we should add setting the default style again
+            SendTextUpdatedEvent();
+        }
+    }

 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)


@@ -481,28 +332,42 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
         LoadFile( event.GetFiles()[0] );
 }
 
         LoadFile( event.GetFiles()[0] );
 }
 

+void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
+{
+    if ( event.GetModifiers() == wxMOD_CONTROL )
+    {
+        switch( event.GetKeyCode() )
+        {
+            case 'A':
+                SelectAll();
+                return;
+            case 'C':
+                if ( CanCopy() )
+                    Copy() ;
+                return;
+            case 'V':
+                if ( CanPaste() )
+                    Paste() ;
+                return;
+            case 'X':
+                if ( CanCut() )
+                    Cut() ;
+                return;
+            default:
+                break;
+        }
+    }
+    // no, we didn't process it
+    event.Skip();
+}
+

 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
     long from, to;
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
     long from, to;
 

-    if ( key == 'a' && event.MetaDown() )
-    {
-        SelectAll() ;
-
-        return ;
-    }
-
-    if ( key == 'c' && event.MetaDown() )
-    {
-        if ( CanCopy() )
-            Copy() ;
-
-        return ;
-    }
-
-    if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
+    if ( !IsEditable() && !event.IsKeyInCategory(WXK_CATEGORY_ARROW | WXK_CATEGORY_TAB) &&

         !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
 //        && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END
         )
         !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
 //        && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END
         )


@@ -511,45 +376,32 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         return ;
     }
 
         return ;
     }
 

-    // Check if we have reached the max # of chars (if it is set), but still
-    // allow navigation and deletion
-    GetSelection( &from, &to );
-    if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
-        key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB && key != WXK_UP && key != WXK_DOWN && 
-        key != WXK_BACK && key != WXK_DELETE && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) &&
-        from == to )
+    if ( !GetTextPeer()->CanClipMaxLength() )

     {
     {

-        // eat it, we don't want to add more than allowed # of characters
+        // Check if we have reached the max # of chars (if it is set), but still
+        // allow navigation and deletion
+        GetSelection( &from, &to );
+        if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
+            !event.IsKeyInCategory(WXK_CATEGORY_ARROW | WXK_CATEGORY_TAB | WXK_CATEGORY_CUT) &&
+            !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) &&
+            from == to )
+        {
+            // eat it, we don't want to add more than allowed # of characters

 
 

-        // TODO: generate EVT_TEXT_MAXLEN()
-        return;
+            // TODO: generate EVT_TEXT_MAXLEN()
+            return;
+        }

     }
 
     // assume that any key not processed yet is going to modify the control
     m_dirty = true;
 
     }
 
     // assume that any key not processed yet is going to modify the control
     m_dirty = true;
 

-    if ( key == 'v' && event.MetaDown() )
-    {
-        if ( CanPaste() )
-            Paste() ;
-
-        return ;
-    }
-
-    if ( key == 'x' && event.MetaDown() )
-    {
-        if ( CanCut() )
-            Cut() ;
-
-        return ;
-    }
-

     switch ( key )
     {
         case WXK_RETURN:
             if (m_windowStyle & wxTE_PROCESS_ENTER)
             {
     switch ( key )
     {
         case WXK_RETURN:
             if (m_windowStyle & wxTE_PROCESS_ENTER)
             {

-                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);

                 event.SetEventObject( this );
                 event.SetString( GetValue() );
                 if ( HandleWindowEvent(event) )
                 event.SetEventObject( this );
                 event.SetString( GetValue() );
                 if ( HandleWindowEvent(event) )


@@ -564,7 +416,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
                     wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {

-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event(wxEVT_BUTTON, def->GetId() );

                         event.SetEventObject(def);
                         def->Command(event);
 
                         event.SetEventObject(def);
                         def->Command(event);
 


@@ -609,22 +461,33 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         event.Skip(true) ;
     }
 
         event.Skip(true) ;
     }
 

+    // osx_cocoa sends its event upon insertText
+#if wxOSX_USE_CARBON

     if ( ( key >= 0x20 && key < WXK_START ) ||
          ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
     {
     if ( ( key >= 0x20 && key < WXK_START ) ||
          ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
     {

-        wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+        wxCommandEvent event1(wxEVT_TEXT, m_windowId);

         event1.SetEventObject( this );
         wxPostEvent( GetEventHandler(), event1 );
     }
         event1.SetEventObject( this );
         wxPostEvent( GetEventHandler(), event1 );
     }

+#endif
+}
+
+void wxTextCtrl::Command(wxCommandEvent & event)
+{
+    SetValue(event.GetString());
+    ProcessCommand(event);

 }
 
 // ----------------------------------------------------------------------------
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 

+// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment
+

 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 {
     Cut();
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 {
     Cut();


@@ -702,11 +565,9 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
     event.Enable(GetLastPosition() > 0);
 }
 

-// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment
-

 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {

-    if ( GetPeer()->HasOwnContextMenu() )
+    if ( GetTextPeer()->HasOwnContextMenu() )

     {
         event.Skip() ;
         return ;
     {
         event.Skip() ;
         return ;


@@ -727,136 +588,145 @@ void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }
 
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }
 

-    if (m_privateContextMenu != NULL)
-        PopupMenu(m_privateContextMenu);
+    PopupMenu(m_privateContextMenu);

 #endif
 }
 
 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {
 #endif
 }
 
 bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 {

-    if ( !GetPeer()->SetupCursor( pt ) )
+    if ( !GetTextPeer()->SetupCursor( pt ) )

         return wxWindow::MacSetupCursor( pt ) ;
     else
         return true ;
 }
 
         return wxWindow::MacSetupCursor( pt ) ;
     else
         return true ;
 }
 

-// ----------------------------------------------------------------------------
-// implementation base class
-// ----------------------------------------------------------------------------
+bool wxTextCtrl::SetHint(const wxString& hint)
+{
+    m_hintString = hint;
+    
+    if ( GetTextPeer() && GetTextPeer()->SetHint(hint) )
+        return true;
+    
+    return false;
+}

 
 

-#if wxOSX_USE_CARBON
-    wxMacTextControl::wxMacTextControl(wxTextCtrl* peer) :
-    wxMacControl( peer )
-#else
-    wxMacTextControl::wxMacTextControl(wxTextCtrl* peer, WXWidget w) :
-    wxWidgetCocoaImpl( peer, w )
-#endif 
+wxString wxTextCtrl::GetHint() const

 {
 {

+    return m_hintString;

 }
 
 }
 

-wxMacTextControl::~wxMacTextControl()
+// ----------------------------------------------------------------------------
+// implementation base class
+// ----------------------------------------------------------------------------
+
+bool wxTextWidgetImpl::GetStyle(long WXUNUSED(position),
+                                wxTextAttr& WXUNUSED(style))

 {
 {

+    return false;

 }
 
 }
 

-void wxMacTextControl::SetStyle(long WXUNUSED(start),
+void wxTextWidgetImpl::SetStyle(long WXUNUSED(start),

                                 long WXUNUSED(end),
                                 const wxTextAttr& WXUNUSED(style))
 {
 }
 
                                 long WXUNUSED(end),
                                 const wxTextAttr& WXUNUSED(style))
 {
 }
 

-void wxMacTextControl::Copy()
+void wxTextWidgetImpl::Copy()

 {
 }
 
 {
 }
 

-void wxMacTextControl::Cut()
+void wxTextWidgetImpl::Cut()

 {
 }
 
 {
 }
 

-void wxMacTextControl::Paste()
+void wxTextWidgetImpl::Paste()

 {
 }
 
 {
 }
 

-bool wxMacTextControl::CanPaste() const
+bool wxTextWidgetImpl::CanPaste() const

 {
     return false ;
 }
 
 {
     return false ;
 }
 

-void wxMacTextControl::SetEditable(bool WXUNUSED(editable))
+void wxTextWidgetImpl::SetEditable(bool WXUNUSED(editable))

 {
 }
 
 {
 }
 

-wxTextPos wxMacTextControl::GetLastPosition() const
+long wxTextWidgetImpl::GetLastPosition() const

 {
     return GetStringValue().length() ;
 }
 
 {
     return GetStringValue().length() ;
 }
 

-void wxMacTextControl::Replace( long from , long to , const wxString &val )
+void wxTextWidgetImpl::Replace( long from , long to , const wxString &val )

 {
     SetSelection( from , to ) ;
     WriteText( val ) ;
 }
 
 {
     SetSelection( from , to ) ;
     WriteText( val ) ;
 }
 

-void wxMacTextControl::Remove( long from , long to )
+void wxTextWidgetImpl::Remove( long from , long to )

 {
     SetSelection( from , to ) ;
     WriteText( wxEmptyString) ;
 }
 
 {
     SetSelection( from , to ) ;
     WriteText( wxEmptyString) ;
 }
 

-void wxMacTextControl::Clear()
+void wxTextWidgetImpl::Clear()

 {
     SetStringValue( wxEmptyString ) ;
 }
 
 {
     SetStringValue( wxEmptyString ) ;
 }
 

-bool wxMacTextControl::CanUndo() const
+bool wxTextWidgetImpl::CanUndo() const

 {
     return false ;
 }
 
 {
     return false ;
 }
 

-void wxMacTextControl::Undo()
+void wxTextWidgetImpl::Undo()

 {
 }
 
 {
 }
 

-bool wxMacTextControl::CanRedo()  const
+bool wxTextWidgetImpl::CanRedo()  const

 {
     return false ;
 }
 
 {
     return false ;
 }
 

-void wxMacTextControl::Redo()
+void wxTextWidgetImpl::Redo()

 {
 }
 
 {
 }
 

-long wxMacTextControl::XYToPosition(long WXUNUSED(x), long WXUNUSED(y)) const
+long wxTextWidgetImpl::XYToPosition(long WXUNUSED(x), long WXUNUSED(y)) const

 {
     return 0 ;
 }
 
 {
     return 0 ;
 }
 

-bool wxMacTextControl::PositionToXY(long WXUNUSED(pos),
+bool wxTextWidgetImpl::PositionToXY(long WXUNUSED(pos),

                                     long *WXUNUSED(x),
                                     long *WXUNUSED(y)) const
 {
     return false ;
 }
 
                                     long *WXUNUSED(x),
                                     long *WXUNUSED(y)) const
 {
     return false ;
 }
 

-void wxMacTextControl::ShowPosition( long WXUNUSED(pos) )
+void wxTextWidgetImpl::ShowPosition( long WXUNUSED(pos) )

 {
 }
 
 {
 }
 

-int wxMacTextControl::GetNumberOfLines() const
+int wxTextWidgetImpl::GetNumberOfLines() const

 {
 {

-    ItemCount lines = 0 ;

     wxString content = GetStringValue() ;
     wxString content = GetStringValue() ;

-    lines = 1;
+    ItemCount lines = 1;

 
     for (size_t i = 0; i < content.length() ; i++)
     {
 
     for (size_t i = 0; i < content.length() ; i++)
     {

+#if wxOSX_USE_COCOA
+        if (content[i] == '\n')
+#else

         if (content[i] == '\r')
         if (content[i] == '\r')

+#endif

             lines++;
     }
 
     return lines ;
 }
 
             lines++;
     }
 
     return lines ;
 }
 

-wxString wxMacTextControl::GetLineText(long lineNo) const
+wxString wxTextWidgetImpl::GetLineText(long lineNo) const

 {
     // TODO: change this if possible to reflect real lines
     wxString content = GetStringValue() ;
 {
     // TODO: change this if possible to reflect real lines
     wxString content = GetStringValue() ;


@@ -888,7 +758,7 @@ wxString wxMacTextControl::GetLineText(long lineNo) const
     return wxEmptyString ;
 }
 
     return wxEmptyString ;
 }
 

-int wxMacTextControl::GetLineLength(long lineNo) const
+int wxTextWidgetImpl::GetLineLength(long lineNo) const

 {
     // TODO: change this if possible to reflect real lines
     wxString content = GetStringValue() ;
 {
     // TODO: change this if possible to reflect real lines
     wxString content = GetStringValue() ;


@@ -903,9 +773,10 @@ int wxMacTextControl::GetLineLength(long lineNo) const
             count = 0;
             for (size_t j = i; j < content.length(); j++)
             {
             count = 0;
             for (size_t j = i; j < content.length(); j++)
             {

-                count++;

                 if (content[j] == '\n')
                     return count;
                 if (content[j] == '\n')
                     return count;

+
+                count++;

             }
 
             return count;
             }
 
             return count;


@@ -918,22 +789,4 @@ int wxMacTextControl::GetLineLength(long lineNo) const
     return 0 ;
 }
 
     return 0 ;
 }
 

-void wxMacTextControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
-{
-#if wxOSX_USE_CARBON
-    wxMacControl::SetFont(font, foreground, windowStyle );
-
-    // overrule the barrier in wxMacControl for supporting disabled controls, in order to support
-    // setting the color to eg red and back to black by controllers
-
-    if ( foreground == *wxBLACK )
-    {
-        ControlFontStyleRec fontStyle;
-        fontStyle.foreColor.red = fontStyle.foreColor.green = fontStyle.foreColor.blue = 0;
-        fontStyle.flags = kControlUseForeColorMask;
-        ::SetControlFontStyle( m_controlRef , &fontStyle );
-    }
-#endif
-}
-

 #endif // wxUSE_TEXTCTRL
 #endif // wxUSE_TEXTCTRL