corrections for buffers

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 47506b8948126ed0e2bd53f3afc64de5b16b4e12..ad911c398783ed0ab2b4de559f92f4ef80161887 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -439,7 +439,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
         /* set up locals */
     focusResult = kControlFocusNoPart;
     tpvars = (STPTextPaneVars **) GetControlReference(theControl);
-    if (tpvars != NULL && IsControlVisible( theControl ) ) {
+    if (tpvars != NULL ) {
         state = HGetState((Handle) tpvars);
         HLock((Handle) tpvars);
         varsp = *tpvars;
@@ -460,10 +460,7 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
                 kControlFocusNoPart, otherwise return a non-zero part code.
             kUserClickedToFocusPart - is a constant defined for this example.  You should
                 define your own value for handling click-to-focus type events. */
-            /* save the drawing state */
-        SetPort((**tpvars).fDrawingEnvironment);
-        wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
-            /* calculate the next highlight state */
+             /* calculate the next highlight state */
         switch (action) {
             default:
             case kControlFocusNoPart:
@@ -485,6 +482,9 @@ static pascal ControlPartCode TPPaneFocusProc(ControlHandle theControl, ControlF
         new focus state */
         if ( IsControlVisible( theControl ) )
         {
+           /* save the drawing state */
+               SetPort((**tpvars).fDrawingEnvironment);
+               wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
             DrawThemeEditTextFrame(&varsp->fRTextOutline, varsp->fIsActive ? kThemeStateActive: kThemeStateInactive);
             DrawThemeFocusRect(&varsp->fRFocusOutline, varsp->fIsActive && varsp->fInFocus);
         }
@@ -687,7 +687,7 @@ const short kVerticalMargin = 2 ;
 const short kHorizontalMargin = 2 ;
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
-           const wxString& st,
+           const wxString& str,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
@@ -747,6 +747,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         m_editable = FALSE ;
     }
 
+    wxString st = str ;
+    wxMacConvertNewlines13To10( &st ) ;
     if ( !m_macUsesTXN )
     {
         m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , false , 0 , 0 , 1,
@@ -771,7 +773,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     if ( !m_macUsesTXN )
     {
-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text = st.mb_str(wxConvLocal) ;
         ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;
     }
     else
@@ -785,7 +787,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         TXNSetData( ((TXNObject) m_macTXN) , kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2,
           kTXNStartOffset, kTXNEndOffset);
 #else
-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal)  ;
         TXNSetData( ((TXNObject) m_macTXN) , kTXNTextData,  (void*)text.data(), strlen( text ) ,
           kTXNStartOffset, kTXNEndOffset);
 #endif
@@ -817,7 +819,7 @@ wxString wxTextCtrl::GetValue() const
             ::GetControlData( (ControlHandle) m_macControl, 0,
                 ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
                 actualSize , buf.data() , &actualSize ) ;
-            result = wxMacMakeStringFromCString( buf ) ;
+            result = wxString( buf , wxConvLocal) ;
         }
     }
     else
@@ -856,14 +858,14 @@ wxString wxTextCtrl::GetValue() const
             if ( actualSize > 0 )
             {
                 HLock( theText ) ;
-                result = wxMacMakeStringFromCString( *theText , actualSize ) ;
+                result = wxString( *theText , wxConvLocal , actualSize ) ;
                 HUnlock( theText ) ;
             }
             DisposeHandle( theText ) ;
         }
 #endif
     }
-
+    wxMacConvertNewlines10To13( &result ) ;
     return result ;
 }
 
@@ -880,11 +882,13 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
    }
 }
 
-void wxTextCtrl::SetValue(const wxString& st)
+void wxTextCtrl::SetValue(const wxString& str)
 {
+    wxString st = str ;
+    wxMacConvertNewlines13To10( &st ) ;
     if ( !m_macUsesTXN )
     {
-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
         ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , strlen(text) , text ) ;
     }
     else
@@ -896,7 +900,7 @@ void wxTextCtrl::SetValue(const wxString& st)
         TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2 ,
           kTXNStartOffset, kTXNEndOffset);
 #else
-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
         TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)text.data(), strlen( text ) ,
           kTXNStartOffset, kTXNEndOffset);
 #endif
@@ -1167,8 +1171,10 @@ long wxTextCtrl::GetLastPosition() const
     }
 }
 
-void wxTextCtrl::Replace(long from, long to, const wxString& value)
+void wxTextCtrl::Replace(long from, long to, const wxString& str)
 {
+    wxString value = str ;
+    wxMacConvertNewlines13To10( &value ) ;
     if ( !m_macUsesTXN )
     {
         ControlEditTextSelectionRec selection ;
@@ -1270,11 +1276,13 @@ bool wxTextCtrl::LoadFile(const wxString& file)
     return FALSE;
 }
 
-void wxTextCtrl::WriteText(const wxString& st)
+void wxTextCtrl::WriteText(const wxString& str)
 {
+    wxString st = str ;
+    wxMacConvertNewlines13To10( &st ) ;
     if ( !m_macUsesTXN )
     {
-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
         TEInsert( text , strlen(text) , ((TEHandle) m_macTE) ) ;
     }
     else
@@ -1288,7 +1296,7 @@ void wxTextCtrl::WriteText(const wxString& st)
         TXNSetData( ((TXNObject) m_macTXN), kTXNUnicodeTextData,  (void*)st.wc_str(), st.Length() * 2 ,
           kTXNUseCurrentSelection, kTXNUseCurrentSelection);
 #else
-       wxCharBuffer text = wxMacStringToCString( st ) ;
+       wxCharBuffer text =  st.mb_str(wxConvLocal) ;
         TXNSetData( ((TXNObject) m_macTXN), kTXNTextData,  (void*)text.data(), strlen( text ) ,
           kTXNUseCurrentSelection, kTXNUseCurrentSelection);
 #endif
@@ -1308,10 +1316,6 @@ void wxTextCtrl::AppendText(const wxString& text)
 
 void wxTextCtrl::Clear()
 {
-    if ( !IsEditable() )
-    {
-        return ;
-    }
     if ( !m_macUsesTXN )
     {
         ::SetControlData((ControlHandle)  m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
@@ -1425,7 +1429,12 @@ bool wxTextCtrl::CanRedo() const
     return FALSE ;
 }
 
-// Makes 'unmodified'
+// Makes modifie or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_dirty = true;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_dirty = false;
@@ -1477,12 +1486,12 @@ int wxTextCtrl::GetLineLength(long lineNo) const
             for (size_t j = i; j < content.Length(); j++)
             {
                 count++;
-                if (content[j] == '\r') return count;
+                if (content[j] == '\n') return count;
             }
 
             return count;
         }
-        if (content[i] == '\r') count++;
+        if (content[i] == '\n') count++;
     }
     return 0;
 }
@@ -1503,7 +1512,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 
             for (size_t j = i; j < content.Length(); j++)
             {
-                if (content[j] == '\r')
+                if (content[j] == '\n')
                     return tmp;
 
                 tmp += content[j];
@@ -1511,7 +1520,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 
             return tmp;
         }
-        if (content[i] == '\r') count++;
+        if (content[i] == '\n') count++;
     }
     return wxEmptyString ;
 }
@@ -1636,7 +1645,6 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         if ( m_macUsesTXN && wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
             CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
         else 
-#endif
         {
             EventRecord rec ;
             if ( wxMacConvertEventToRecord(  (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) )
@@ -1650,6 +1658,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
             }
         }
+#else
+        EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
+        short keycode ;
+        short keychar ;
+        keychar = short(ev->message & charCodeMask);
+        keycode = short(ev->message & keyCodeMask) >> 8 ;
+
+        ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
+#endif
     }
     if ( ( key >= 0x20 && key < WXK_START ) ||
          key == WXK_RETURN ||