don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/classic/textctrl.cpp b/src/mac/classic/textctrl.cpp
index c482de0f2c70201da933504c6d5d29ff6fde980f..cae116ab4337e9d2dcf32ea6ef8013326cebe758 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -21,6 +21,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/toplevel.h"
 #endif
 
 #ifdef __DARWIN__
@@ -30,8 +36,6 @@
     #include <stat.h>
 #endif
 
-#include "wx/msgdlg.h"
-
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
@@ -40,14 +44,9 @@
     #endif
 #endif
 
-#include "wx/dc.h"
-#include "wx/button.h"
-#include "wx/toplevel.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/settings.h"
 #include "wx/filefn.h"
-#include "wx/utils.h"
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
     #include <alloc.h>
@@ -641,9 +640,9 @@ OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
 
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
@@ -663,7 +662,7 @@ static void SetTXNData( TXNObject txn , const wxString& st , TXNOffset start , T
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
-    size_t len = st.Len() ;
+    size_t len = st.length() ;
     TXNSetData( txn , kTXNUnicodeTextData,  (void*)st.wc_str(), len * 2,
       start, end);
 #else