SF.net SVN: geany: [615] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Mon Jul 24 17:30:13 UTC 2006


Revision: 615
Author:   ntrel
Date:     2006-07-24 10:30:08 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=615&view=rev

Log Message:
-----------
Use tab reorder workaround only if GTK runtime <2.8

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/notebook.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-24 17:27:30 UTC (rev 614)
+++ trunk/ChangeLog	2006-07-24 17:30:08 UTC (rev 615)
@@ -1,6 +1,7 @@
 2006-07-24  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/geany.h: Use generic font names & increase the default size.
+ * src/notebook.c: Use tab reorder workaround only if GTK runtime <2.8.
 
 
 2006-07-23  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/notebook.c
===================================================================
--- trunk/src/notebook.c	2006-07-24 17:27:30 UTC (rev 614)
+++ trunk/src/notebook.c	2006-07-24 17:30:08 UTC (rev 615)
@@ -71,9 +71,13 @@
 		G_CALLBACK(notebook_drag_motion_cb), NULL);
 
 #if ! GTK_CHECK_VERSION(2, 8, 0)
-	// workaround GTK+2.6 drag start bug when over sci widget:
-	g_signal_connect(G_OBJECT(notebook), "motion-notify-event",
-		G_CALLBACK(notebook_motion_notify_event_cb), NULL);
+	// handle higher gtk+ runtime than build environment
+	if (gtk_check_version(2, 8, 0) != NULL) //null means version ok
+	{
+		// workaround GTK+2.6 drag start bug when over sci widget:
+		g_signal_connect(G_OBJECT(notebook), "motion-notify-event",
+			G_CALLBACK(notebook_motion_notify_event_cb), NULL);
+	}
 #endif
 
 	// set up drag motion for moving notebook pages
@@ -96,7 +100,6 @@
 	GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(app->notebook),
 			gtk_notebook_get_current_page(GTK_NOTEBOOK(app->notebook)));
 
-	//g_print("%g, %g; %p (%p)\n", event->x, event->y, event->window, page->window);
 	if (page == NULL || event->x < 0 || event->y < 0) return FALSE;
 
 	if (event->window == page->window) //cursor over sci widget


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




More information about the Commits mailing list