X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df39467f88f92032a4cd847c02ccc94d32f608ad..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 7b1142a3ce..24f9fdf83e 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -24,6 +24,7 @@
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/toplevel.h"
 #endif
 
 #ifdef __DARWIN__
@@ -41,7 +42,6 @@
     #endif
 #endif
 
-#include "wx/toplevel.h"
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 
@@ -414,9 +414,9 @@ private :
 };
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
@@ -1018,6 +1018,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||
+         ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
@@ -1554,7 +1555,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     if ( value )
     {
         wxMacCFStringHolder cf(value) ;
-        textLength = cf.AsString().Length() ;
+        textLength = cf.AsString().length() ;
     }
 
     if ((from == -1) && (to == -1))
@@ -2209,7 +2210,7 @@ void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffse
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
-    size_t len = st.Len() ;
+    size_t len = st.length() ;
     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
 #else
     wxMBConvUTF16 converter ;