Some compile fixes.

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 6994913a8542bbdac6178ff3d5817496d0ca1b03..1e50c814127250ae6a7a114b2660d29ceeca221b 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -64,13 +64,6 @@
 
 #include "wx/mac/uma.h"
 
-
-// if this is set to 1 then under OSX 10.2 the 'classic' MLTE implementation will be used
-// if set to 0 then the unicode textctrl will be used
-#ifndef wxMAC_AWAYS_USE_MLTE
-#define wxMAC_AWAYS_USE_MLTE 1
-#endif
-
 #ifndef __WXMAC_OSX__
 enum
 {
@@ -475,10 +468,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
-        wxASSERT_MSG(
-            !(m_windowStyle & wxTE_PROCESS_ENTER),
-            wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );
-
+        // always turn on this style for multi-line controls
         m_windowStyle |= wxTE_PROCESS_ENTER;
         style |= wxTE_PROCESS_ENTER ;
     }
@@ -491,6 +481,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
         forceMLTE = true ;
     }
 #endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    forceMLTE = false;
+#endif
 
 #ifdef __WXMAC_OSX__
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
@@ -503,13 +496,20 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     if ( !m_peer )
     {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
         if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE )
+#endif
+        {
             m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
+        }
     }
 #endif
 
+    // the horizontal single line scrolling bug that made us keep 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
     if ( !m_peer )
         m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ;
+#endif
 
     MacPostControlCreate(pos, size) ;
 
@@ -550,20 +550,17 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     GetPeer()->GetSelection( from , to ) ;
 }
 
-void wxTextCtrl::SetValue(const wxString& str)
+void wxTextCtrl::DoSetValue(const wxString& str, int flags)
 {
     // optimize redraws
     if ( GetValue() == str )
-        return ;
+        return;
 
     GetPeer()->SetStringValue( str ) ;
 
-    if ( m_triggerOnSetValue )
+    if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue )
     {
-        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-        event.SetString( GetValue() );
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
+        SendTextUpdatedEvent();
     }
 }
 
@@ -708,11 +705,6 @@ void wxTextCtrl::SetSelection(long from, long to)
     GetPeer()->SetSelection( from , to ) ;
 }
 
-bool wxTextCtrl::LoadFile(const wxString& file)
-{
-    return wxTextCtrlBase::LoadFile( file );
-}
-
 void wxTextCtrl::WriteText(const wxString& str)
 {
     // TODO: this MPRemoting will be moved into a remoting peer proxy for any command
@@ -1728,7 +1720,9 @@ void wxMacMLTEControl::SetStringValue( const wxString &str )
     wxMacConvertNewlines10To13( &st );
 
     {
-        wxMacWindowClipper c( m_peer );
+#ifndef __LP64__
+        wxMacWindowClipper c( m_peer ) ;
+#endif
 
         {
             wxMacEditHelper help( m_txn );
@@ -1909,7 +1903,7 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
 #else
         typeAttr[attrCount].tag = kTXNATSUIStyle ;
         typeAttr[attrCount].size = kTXNATSUIStyleSize ;
-        typeAttr[attrCount].data.dataValue = (UInt32)font.MacGetATSUStyle() ;
+        typeAttr[attrCount].data.dataPtr = font.MacGetATSUStyle() ;
         attrCount++ ;
 #endif
     }
@@ -2003,7 +1997,9 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString &str )
     wxMacConvertNewlines10To13( &value ) ;
 
     wxMacEditHelper help( m_txn ) ;
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
 
     TXNSetSelection( m_txn, from, to ) ;
     TXNClear( m_txn ) ;
@@ -2012,7 +2008,9 @@ void wxMacMLTEControl::Replace( long from , long to , const wxString &str )
 
 void wxMacMLTEControl::Remove( long from , long to )
 {
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
     wxMacEditHelper help( m_txn ) ;
     TXNSetSelection( m_txn , from , to ) ;
     TXNClear( m_txn ) ;
@@ -2025,7 +2023,9 @@ void wxMacMLTEControl::GetSelection( long* from, long* to) const
 
 void wxMacMLTEControl::SetSelection( long from , long to )
 {
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
 
     // change the selection
     if ((from == -1) && (to == -1))
@@ -2044,7 +2044,9 @@ void wxMacMLTEControl::WriteText( const wxString& str )
     long start , end , dummy ;
 
     GetSelection( &start , &dummy ) ;
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
 
     {
         wxMacEditHelper helper( m_txn ) ;
@@ -2058,7 +2060,9 @@ void wxMacMLTEControl::WriteText( const wxString& str )
 
 void wxMacMLTEControl::Clear()
 {
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
     wxMacEditHelper st( m_txn ) ;
     TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
     TXNClear( m_txn ) ;
@@ -2176,30 +2180,24 @@ bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const
 
 void wxMacMLTEControl::ShowPosition( long pos )
 {
-#if TARGET_RT_MAC_MACHO && defined(AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER)
-    {
-        Point current, desired ;
-        TXNOffset selstart, selend;
+    Point current, desired ;
+    TXNOffset selstart, selend;
 
-        TXNGetSelection( m_txn, &selstart, &selend );
-        TXNOffsetToPoint( m_txn, selstart, &current );
-        TXNOffsetToPoint( m_txn, pos, &desired );
+    TXNGetSelection( m_txn, &selstart, &selend );
+    TXNOffsetToPoint( m_txn, selstart, &current );
+    TXNOffsetToPoint( m_txn, pos, &desired );
 
-        // TODO: use HIPoints for 10.3 and above
-        if ( (UInt32)TXNScroll != (UInt32)kUnresolvedCFragSymbolAddress )
-        {
-            OSErr theErr = noErr;
-            SInt32 dv = desired.v - current.v;
-            SInt32 dh = desired.h - current.h;
-            TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
-            theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
-
-            // there will be an error returned for classic MLTE implementation when the control is
-            // invisible, but HITextView works correctly, so we don't assert that one
-            // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
-        }
-    }
-#endif
+    // TODO: use HIPoints for 10.3 and above
+
+    OSErr theErr = noErr;
+    long dv = desired.v - current.v;
+    long dh = desired.h - current.h;
+    TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
+    theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
+
+    // there will be an error returned for classic MLTE implementation when the control is
+    // invisible, but HITextView works correctly, so we don't assert that one
+    // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
 }
 
 void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
@@ -2300,6 +2298,8 @@ int wxMacMLTEControl::GetLineLength(long lineNo) const
     return theLength ;
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+
 // ----------------------------------------------------------------------------
 // MLTE control implementation (classic part)
 // ----------------------------------------------------------------------------
@@ -2987,6 +2987,7 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 
     return err;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // MLTE control implementation (OSX part)
@@ -3096,8 +3097,9 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
     }
 
     AdjustCreationAttributes( *wxWHITE , true ) ;
-
+#ifndef __LP64__
     wxMacWindowClipper c( m_peer ) ;
+#endif
     SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
 
     TXNSetSelection( m_txn, 0, 0 );