Misplaced #ifdef ... #endif fix.

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index e5855c0fbb4bd337fc1dd5c185ddc9d1f6b1dbf5..6645f1e8818d7b4af30590a17e078639c4864890 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.cpp
+// Name:        src/mac/carbon/textctrl.cpp

 // Purpose:     wxTextCtrl
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Purpose:     wxTextCtrl
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)


@@ -13,12 +13,19 @@
 
 #if wxUSE_TEXTCTRL
 
 
 #if wxUSE_TEXTCTRL
 

+#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.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
 
 #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msgdlg.h"


@@ -31,22 +38,18 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/app.h"

 #include "wx/dc.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"
 #include "wx/dc.h"
 #include "wx/button.h"
 #include "wx/toplevel.h"

-#include "wx/textctrl.h"

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

-#include "wx/utils.h"

 #include "wx/sysopt.h"
 #include "wx/menu.h"
 #include "wx/sysopt.h"
 #include "wx/menu.h"

-#include "wx/intl.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__


@@ -435,6 +438,7 @@ void wxTextCtrl::Init()
 
     m_maxLength = 0;
     m_privateContextMenu = NULL;
 
     m_maxLength = 0;
     m_privateContextMenu = NULL;

+    m_triggerOnSetValue = true ;

 }
 
 wxTextCtrl::~wxTextCtrl()
 }
 
 wxTextCtrl::~wxTextCtrl()


@@ -545,10 +549,13 @@ void wxTextCtrl::SetValue(const wxString& str)
 
     GetPeer()->SetStringValue( str ) ;
 
 
     GetPeer()->SetStringValue( str ) ;
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-    event.SetString( GetValue() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
+    if ( m_triggerOnSetValue )
+    {
+        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
+        event.SetString( GetValue() );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }

 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)
 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)


@@ -876,6 +883,13 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
 
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
 

+    if ( key == 'a' && event.MetaDown() )
+    {
+        SelectAll() ;
+
+        return ;
+    }
+

     if ( key == 'c' && event.MetaDown() )
     {
         if ( CanCopy() )
     if ( key == 'c' && event.MetaDown() )
     {
         if ( CanCopy() )


@@ -885,8 +899,8 @@ 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_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END
+        !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
+//        && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END

         )
     {
         // eat it
         )
     {
         // eat it


@@ -895,9 +909,9 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 
     // Check if we have reached the max # of chars (if it is set), but still
     // allow navigation and deletion
 
     // 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 &&
+    if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&

         key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&
         key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&

-        key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxPROCESS_ENTER) )
+        key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) )

        )
     {
         // eat it, we don't want to add more than allowed # of characters
        )
     {
         // eat it, we don't want to add more than allowed # of characters


@@ -928,7 +942,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 );


@@ -1208,7 +1222,7 @@ void wxMacTextControl::SetEditable(bool editable)
 
 wxTextPos wxMacTextControl::GetLastPosition() const
 {
 
 wxTextPos wxMacTextControl::GetLastPosition() const
 {

-    return GetStringValue().Length() ;
+    return GetStringValue().length() ;

 }
 
 void wxMacTextControl::Replace( long from , long to , const wxString &val )
 }
 
 void wxMacTextControl::Replace( long from , long to , const wxString &val )


@@ -1266,7 +1280,7 @@ int wxMacTextControl::GetNumberOfLines() const
     wxString content = GetStringValue() ;
     lines = 1;
 
     wxString content = GetStringValue() ;
     lines = 1;
 

-    for (size_t i = 0; i < content.Length() ; i++)
+    for (size_t i = 0; i < content.length() ; i++)

     {
         if (content[i] == '\r')
             lines++;
     {
         if (content[i] == '\r')
             lines++;


@@ -1282,14 +1296,14 @@ wxString wxMacTextControl::GetLineText(long lineNo) const
 
     // Find line first
     int count = 0;
 
     // Find line first
     int count = 0;

-    for (size_t i = 0; i < content.Length() ; i++)
+    for (size_t i = 0; i < content.length() ; i++)

     {
         if (count == lineNo)
         {
             // Add chars in line then
             wxString tmp;
 
     {
         if (count == lineNo)
         {
             // Add chars in line then
             wxString tmp;
 

-            for (size_t j = i; j < content.Length(); j++)
+            for (size_t j = i; j < content.length(); j++)

             {
                 if (content[j] == '\n')
                     return tmp;
             {
                 if (content[j] == '\n')
                     return tmp;


@@ -1314,13 +1328,13 @@ int wxMacTextControl::GetLineLength(long lineNo) const
 
     // Find line first
     int count = 0;
 
     // Find line first
     int count = 0;

-    for (size_t i = 0; i < content.Length() ; i++)
+    for (size_t i = 0; i < content.length() ; i++)

     {
         if (count == lineNo)
         {
             // Count chars in line then
             count = 0;
     {
         if (count == lineNo)
         {
             // Count chars in line then
             count = 0;

-            for (size_t j = i; j < content.Length(); j++)
+            for (size_t j = i; j < content.length(); j++)

             {
                 count++;
                 if (content[j] == '\n')
             {
                 count++;
                 if (content[j] == '\n')


@@ -1439,7 +1453,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


@@ -1482,7 +1498,7 @@ void wxMacUnicodeTextControl::WriteText( const wxString& str )
         val.Remove( start , end - start ) ;
         val.insert( start , str ) ;
         SetStringValue( val ) ;
         val.Remove( start , end - start ) ;
         val.insert( start , str ) ;
         SetStringValue( val ) ;

-        SetSelection( start + str.Length() , start + str.Length() ) ;
+        SetSelection( start + str.length() , start + str.length() ) ;

 #endif
 }
 
 #endif
 }
 


@@ -1561,9 +1577,11 @@ wxString wxMacMLTEControl::GetStringValue() const
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;

+                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") );

                 ptr = new wxChar[noChars + 1] ;
 
                 ptr = new wxChar[noChars + 1] ;
 

-                noChars = converter.MB2WC( ptr , (const char*)*theText , noChars ) ;
+                noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ;
+                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") );

                 ptr[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif
                 ptr[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif