Handle accelerators earlier in keyboard processing code in wxGTK.

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

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index a9552e5e6f6398d5a8fb90043bf77ebaaaa5c5a6..aa500bce448f77f7daf3aa43138059a092827627 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -48,8 +48,6 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.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)


@@ -97,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) )


@@ -114,16 +112,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 
 
     }
 
 

-    m_peer = wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() );
+    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
 #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() ;


@@ -156,11 +154,6 @@ void wxTextCtrl::MacCheckSpelling(bool check)
     GetTextPeer()->CheckSpelling(check);
 }
 
     GetTextPeer()->CheckSpelling(check);
 }
 

-void wxTextCtrl::SetMaxLength(unsigned long len)
-{
-    m_maxLength = len ;
-}
-

 bool wxTextCtrl::SetFont( const wxFont& font )
 {
     if ( !wxTextCtrlBase::SetFont( font ) )
 bool wxTextCtrl::SetFont( const wxFont& font )
 {
     if ( !wxTextCtrlBase::SetFont( font ) )


@@ -206,7 +199,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
         if (size.x > 0 && size.y > 0)
             return size;
     }
         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:


@@ -292,7 +285,7 @@ void wxTextCtrl::Copy()
 {
     if (CanCopy())
     {
 {
     if (CanCopy())
     {

-        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());        
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());

         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {
         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {


@@ -305,7 +298,7 @@ void wxTextCtrl::Cut()
 {
     if (CanCut())
     {
 {
     if (CanCut())
     {

-        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_CUT, GetId());        
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_CUT, GetId());

         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {
         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {


@@ -320,7 +313,7 @@ void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {
 {
     if (CanPaste())
     {

-        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_PASTE, GetId());        
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_PASTE, GetId());

         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {
         evt.SetEventObject(this);
         if (!GetEventHandler()->ProcessEvent(evt))
         {


@@ -341,7 +334,7 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 
 void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
 {

-    if ( event.GetModifiers() == wxMOD_CMD )
+    if ( event.GetModifiers() == wxMOD_CONTROL )

     {
         switch( event.GetKeyCode() )
         {
     {
         switch( event.GetKeyCode() )
         {


@@ -383,18 +376,21 @@ 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 &&
-        !event.IsKeyInCategory(WXK_CATEGORY_ARROW | WXK_CATEGORY_TAB | WXK_CATEGORY_CUT) &&
-        !( 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
     }
 
     // assume that any key not processed yet is going to modify the control


@@ -604,6 +600,21 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
         return true ;
 }
 
         return true ;
 }
 

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

 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------


@@ -762,9 +773,10 @@ int wxTextWidgetImpl::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;