slackbuilds_ponce/system/gdmap/gtk-fix.patch

52 lines
1.4 KiB
Diff
Raw Normal View History

--- gui_support.c 2008/05/23 14:54:28 1.2
+++ gui_support.c 2012/01/06 13:51:36 1.3
@@ -2,8 +2,8 @@
* distributed under the terms of the GNU Public License. See the
* file COPYING for details.
*/
-/* $Revision: 1.2 $
- * $Date: 2008/05/23 14:54:28 $
+/* $Revision: 1.3 $
+ * $Date: 2012/01/06 13:51:36 $
* $Author: sgop $
*/
@@ -85,7 +85,11 @@
const char* text;
(void)event;
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_sensitive(GTK_WIDGET(label))) {
+#else
if (GTK_WIDGET_SENSITIVE(label)) {
+#endif
char* temp;
text = g_object_get_data(G_OBJECT(label), "label");
@@ -129,7 +133,11 @@
void ui_event_label_set_sensitive(GtkWidget* ebox, gboolean set) {
gpointer callback = g_object_get_data(G_OBJECT(ebox), "callback");
GtkWidget* child = GTK_BIN(ebox)->child;
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_sensitive(child) == set) return;
+#else
if (GTK_WIDGET_SENSITIVE(child) == set) return;
+#endif
if (set && !callback) return;
gtk_widget_set_sensitive(child, set);
@@ -164,8 +172,11 @@
// GDK_FOCUS_CHANGE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
+#if GTK_CHECK_VERSION(2,22,0)
+ gtk_widget_set_can_focus(ebox, TRUE);
+#else
GTK_WIDGET_SET_FLAGS(ebox, GTK_CAN_FOCUS);
-
+#endif
gtk_widget_show(ebox);
temp = g_strdup_printf(EVENT_FMT, text);