cleanup magic number usage and comments

[wxWidgets.git] / src / mac / carbon / textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 91823a80fbb9e853d272608e36ca072f43320f67..3a6d9020bb459049c5f881124586893fcc4b6fab 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -401,8 +401,6 @@ private :
 #endif
 };
 
 #endif
 };
 

-#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
-

 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 


@@ -435,7 +433,7 @@ void wxTextCtrl::Init()
     m_editable = true ;
     m_dirty = false;
 
     m_editable = true ;
     m_dirty = false;
 

-    m_maxLength = TE_UNLIMITED_LENGTH ;
+    m_maxLength = 0;

     m_privateContextMenu = NULL;
 }
 
     m_privateContextMenu = NULL;
 }
 


@@ -895,13 +893,16 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         return ;
     }
 
         return ;
     }
 

-    // Check if we have reached the max # of chars, but still allow navigation and deletion
-    if ( !IsMultiLine() && GetValue().Length() >= m_maxLength &&
+    // Check if we have reached the max # of chars (if it is set), but still
+    // allow navigation and deletion
+    if ( !IsMultiLine() && m_maxLength && GetValue().Length() >= m_maxLength &&

         key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&
         key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxPROCESS_ENTER) )
        )
     {
         // eat it, we don't want to add more than allowed # of characters
         key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&
         key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxPROCESS_ENTER) )
        )
     {
         // eat it, we don't want to add more than allowed # of characters

+
+        // TODO: generate EVT_TEXT_MAXLEN()

         return;
     }
 
         return;
     }
 


@@ -990,23 +991,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     if (!eat_key)
     {
         // perform keystroke handling
     if (!eat_key)
     {
         // perform keystroke handling

-        if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
-        {
-            CallNextEventHandler( (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef(), (EventRef)wxTheApp->MacGetCurrentEvent() ) ;
-        }
-        else
-        {
-            EventRecord rec ;
-            if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) )
-            {
-                short keycode, keychar ;
-                EventRecord *ev = &rec ;
-                keychar = short(ev->message & charCodeMask);
-                keycode = short(ev->message & keyCodeMask) >> 8 ;
-
-                m_peer->HandleKey( keycode , keychar , ev->modifiers ) ;
-            }
-        }
+        event.Skip(true) ;

     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||
     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||


@@ -1124,7 +1109,7 @@ void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
         m_privateContextMenu->AppendSeparator();
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }
         m_privateContextMenu->AppendSeparator();
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }

-
+    

     if (m_privateContextMenu != NULL)
         PopupMenu(m_privateContextMenu);
 }
     if (m_privateContextMenu != NULL)
         PopupMenu(m_privateContextMenu);
 }


@@ -1454,7 +1439,9 @@ bool wxMacUnicodeTextControl::CanPaste() const
 
 void wxMacUnicodeTextControl::SetEditable(bool editable)
 {
 
 void wxMacUnicodeTextControl::SetEditable(bool editable)
 {

-    SetData<Boolean>( 0 , kControlEditTextLockedTag , (Boolean) !editable ) ;
+#if 0 // leads to problem because text cannot be selected anymore
+    SetData<Boolean>( kControlEditTextPart , kControlEditTextLockedTag , (Boolean) !editable ) ;
+#endif

 }
 
 void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const
 }
 
 void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const