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 7fcd94b5470ec67a9627641f3bafa006d0a50387..cae116ab4337e9d2dcf32ea6ef8013326cebe758 100644 (file)
--- a/src/mac/classic/textctrl.cpp
+++ b/src/mac/classic/textctrl.cpp
@@ -9,19 +9,33 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif

 
 #if wxUSE_TEXTCTRL
 
 
 #if wxUSE_TEXTCTRL
 

+#include "wx/textctrl.h"
+
+#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__
 #ifdef __DARWIN__

-  #include <sys/types.h>
-  #include <sys/stat.h>
+    #include <sys/types.h>
+    #include <sys/stat.h>

 #else
 #else

-  #include <stat.h>
+    #include <stat.h>

 #endif
 
 #endif
 

-#include "wx/msgdlg.h"
-

 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>


@@ -30,21 +44,14 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/button.h"
-#include "wx/toplevel.h"
-#include "wx/textctrl.h"

 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-#include "wx/settings.h"

 #include "wx/filefn.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)

-  #include <alloc.h>
+    #include <alloc.h>

 #elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
 #elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)

-  #include <malloc.h>
+    #include <malloc.h>

 #endif
 
 #ifndef __DARWIN__
 #endif
 
 #ifndef __DARWIN__


@@ -633,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)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)


@@ -655,7 +662,7 @@ static void SetTXNData( TXNObject txn , const wxString& st , TXNOffset start , T
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
 {
 #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
     TXNSetData( txn , kTXNUnicodeTextData,  (void*)st.wc_str(), len * 2,
       start, end);
 #else


@@ -1579,7 +1586,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     }
 
     if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
     }
 
     if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&

-        !( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
+        !( 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_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END */
         )
     {


@@ -1605,7 +1612,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     switch ( key )
     {
         case WXK_RETURN:
     switch ( key )
     {
         case WXK_RETURN:

-            if (m_windowStyle & wxPROCESS_ENTER)
+            if (m_windowStyle & wxTE_PROCESS_ENTER)

             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject( this );