From 331d7544ceccdd2ebb77c0497eb458eaaf0e5915 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Fri, 22 Sep 2000 11:19:36 +0000
Subject: An hasFocus flag was added to separate logical focus from environment
 determined focus. hasFocus determines whether the caret is displayed.

---
 gtk/ScintillaGTK.cxx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'gtk')

diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index a8644e81f..83ba91798 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -260,13 +260,11 @@ gint ScintillaGTK::CursorMoved(GtkWidget *widget, int xoffset, int yoffset, Scin
 gint ScintillaGTK::FocusIn(GtkWidget *widget, GdkEventFocus * /*event*/, ScintillaGTK *sciThis) {
 	//Platform::DebugPrintf("ScintillaGTK::focus in %x\n", sciThis);
 	GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS);
-	sciThis->NotifyFocus(true);
-	sciThis->ShowCaretAtCurrentPosition();
-	sciThis->InvalidateCaret();
+	sciThis->SetFocusState(true);
 
 #ifdef USE_XIM
-  if (sciThis->ic)
-    gdk_im_begin (sciThis->ic, widget->window);
+	if (sciThis->ic)
+		gdk_im_begin(sciThis->ic, widget->window);
 #endif
 
 	return FALSE;
@@ -275,11 +273,10 @@ gint ScintillaGTK::FocusIn(GtkWidget *widget, GdkEventFocus * /*event*/, Scintil
 gint ScintillaGTK::FocusOut(GtkWidget *widget, GdkEventFocus * /*event*/, ScintillaGTK *sciThis) {
 	//Platform::DebugPrintf("ScintillaGTK::focus out %x\n", sciThis);
 	GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS);
-	sciThis->NotifyFocus(false);
-	sciThis->DropCaret();
+	sciThis->SetFocusState(false);
   
 #ifdef USE_XIM
-  gdk_im_end ();
+	gdk_im_end();
 #endif
   
 	return FALSE;
-- 
cgit v1.2.3