Allow spell-checking to be turned off with the MLTE implementation of wxTextCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index 1818f2d602a97883587a7196d2f8781168ac464f..457b4f98f2924eb42c37cdadb1dfb08c229d181e 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -170,6 +170,7 @@ public:
     virtual void MacVisibilityChanged();
     virtual void MacEnabledStateChanged();
     virtual void MacSuperChangedPosition();
     virtual void MacVisibilityChanged();
     virtual void MacEnabledStateChanged();
     virtual void MacSuperChangedPosition();

+    virtual void MacCheckSpelling(bool check);

 
 #ifndef __WXMAC_OSX__
     virtual void MacControlUserPaneDrawProc(wxInt16 part);
 
 #ifndef __WXMAC_OSX__
     virtual void MacControlUserPaneDrawProc(wxInt16 part);

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 1e50c814127250ae6a7a114b2660d29ceeca221b..66d4b0eec05472c7d276d101e3853b535012a370 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -206,6 +206,7 @@ public :
     virtual void ShowPosition(long WXUNUSED(pos)) ;
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void ShowPosition(long WXUNUSED(pos)) ;
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;

+    virtual void CheckSpelling(bool check) { }

 
 #ifndef __WXMAC_OSX__
     virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;
 
 #ifndef __WXMAC_OSX__
     virtual void            MacControlUserPaneDrawProc(wxInt16 part) = 0 ;


@@ -263,6 +264,12 @@ public :
         return false ;
     }
 
         return false ;
     }
 

+    virtual void CheckSpelling(bool check)
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    TXNSetSpellCheckAsYouType( m_txn, (Boolean) check );
+#endif
+    }

     virtual void Clear() ;
 
     virtual bool CanUndo() const ;
     virtual void Clear() ;
 
     virtual bool CanUndo() const ;


@@ -540,6 +547,11 @@ void wxTextCtrl::MacEnabledStateChanged()
 {
 }
 
 {
 }
 

+void wxTextCtrl::MacCheckSpelling(bool check)
+{
+    GetPeer()->CheckSpelling(check);
+}
+

 wxString wxTextCtrl::GetValue() const
 {
     return GetPeer()->GetStringValue() ;
 wxString wxTextCtrl::GetValue() const
 {
     return GetPeer()->GetStringValue() ;

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index 630ba209ba9647fdc337e90d3292b564b49bd417..e012776b25545f6a6cd9d14dcfce6886f8d5ab90 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -343,6 +343,8 @@ the client area origin nor scrolling. ", "",
     virtual void SetSelection(long from, long to);
     virtual void SelectAll();
     virtual void SetEditable(bool editable);
     virtual void SetSelection(long from, long to);
     virtual void SelectAll();
     virtual void SetEditable(bool editable);

+    
+    virtual void MacCheckSpelling(bool check);

 
     // generate the wxEVT_COMMAND_TEXT_UPDATED event, like SetValue() does
     void SendTextUpdatedEvent();
 
     // generate the wxEVT_COMMAND_TEXT_UPDATED event, like SetValue() does
     void SendTextUpdatedEvent();