SF.net SVN: geany:[5693] trunk

[eht16 at users.sourceforge.net]

Revision: 5693
          http://geany.svn.sourceforge.net/geany/?rev=5693&view=rev
Author:   eht16
Date:     2011-04-04 18:06:09 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
Reset cursors when Scintilla widget is realized (Backport from Scintilla HG, original patch by Matthew Brush).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/gtk/ScintillaGTK.cxx

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-04 18:03:35 UTC (rev 5692)
+++ trunk/ChangeLog	2011-04-04 18:06:09 UTC (rev 5693)
@@ -2,8 +2,10 @@
 
  * scintilla/gtk/ScintillaGTK.cxx:
    Fix X PRIMARY selection issue when Scintilla widget is
-   unrealized/re-realized
-   (Backport from Scintilla HG, original patch by Matthew Brush).
+   unrealized/re-realized (Backport from Scintilla HG,
+   original patch by Matthew Brush).
+   Reset cursors when Scintilla widget is realized (Backport from
+   Scintilla HG, original patch by Matthew Brush).
 
 
 2011-04-04  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/scintilla/gtk/ScintillaGTK.cxx
===================================================================
--- trunk/scintilla/gtk/ScintillaGTK.cxx	2011-04-04 18:03:35 UTC (rev 5692)
+++ trunk/scintilla/gtk/ScintillaGTK.cxx	2011-04-04 18:06:09 UTC (rev 5693)
@@ -421,6 +421,18 @@
 	gtk_widget_realize(PWidget(scrollbarv));
 	gtk_widget_realize(PWidget(scrollbarh));
 
+	cursor = gdk_cursor_new(GDK_XTERM);
+	gdk_window_set_cursor(PWidget(wText)->window, cursor);
+	gdk_cursor_unref(cursor);
+
+	cursor = gdk_cursor_new(GDK_LEFT_PTR);
+	gdk_window_set_cursor(PWidget(scrollbarv)->window, cursor);
+	gdk_cursor_unref(cursor);
+
+	cursor = gdk_cursor_new(GDK_LEFT_PTR);
+	gdk_window_set_cursor(PWidget(scrollbarh)->window, cursor);
+	gdk_cursor_unref(cursor);
+
 	gtk_selection_add_targets(widget, GDK_SELECTION_PRIMARY,
 	                          clipboardCopyTargets, nClipboardCopyTargets);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.