#95117# SetInputContext, Basic-IDE and HTML-Source-View don't do it in GetFocus()

3 files changed, 15 insertions, 7 deletions

diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 51c1c5af6ee4..a58b1160dda0 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svmedit.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mt $ $Date: 2001-11-19 17:57:58 $
+ *  last change: $Author: mt $ $Date: 2001-11-26 12:46:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -885,7 +885,6 @@ void TextWindow::GetFocus()
         }
         mpExtTextView->SetPaintSelection( TRUE );
         mpExtTextView->ShowCursor( bGotoCursor );
-        SetInputContext( InputContext( GetFont(), !mpExtTextView->IsReadOnly() ? INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT : 0 ) );
     }
 }
 
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 425a3ff9ca4b..8b73c163969e 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: texteng.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: mt $ $Date: 2001-11-08 14:28:55 $
+ *  last change: $Author: mt $ $Date: 2001-11-26 12:46:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -262,6 +262,12 @@ void TextEngine::SetFont( const Font& rFont )
         mnFixCharWidth100 = 0;
 
         FormatFullDoc();
+
+        for ( USHORT nView = mpViews->Count(); nView; )
+        {
+            TextView* pView = mpViews->GetObject( --nView );
+            pView->GetWindow()->SetInputContext( InputContext( GetFont(), !pView->IsReadOnly() ? INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT : 0 ) );
+        }
     }
 }
 
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 97ec1d48367e..286647f5690f 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textview.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: mt $ $Date: 2001-11-06 12:38:39 $
+ *  last change: $Author: mt $ $Date: 2001-11-26 12:46:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -270,6 +270,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow )
     mpCursor = new Cursor;
     mpCursor->Show();
     pWindow->SetCursor( mpCursor );
+    pWindow->SetInputContext( InputContext( pEng->GetFont(), INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT ) );
 
     if ( pWindow->GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_INVERT )
         mbHighlightSelection = TRUE;
@@ -1173,6 +1174,8 @@ void TextView::SetReadOnly( BOOL bReadOnly )
             ShowCursor( mbAutoScroll, FALSE );
         else
             HideCursor();
+
+        GetWindow()->SetInputContext( InputContext( mpTextEngine->GetFont(), bReadOnly ? INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT : 0 ) );
     }
 }