comparison gtk3/dw.c @ 1793:2cfbfccbbafe

Added code to disable Ubuntu overlay scrollbars for widgets created with dw_scrollbar_new() on GTK3.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 13 Aug 2012 05:45:25 +0000
parents c5ea64e8b436
children 9304241b7b33
comparison
equal deleted inserted replaced
1792:b0bdec1b820c 1793:2cfbfccbbafe
4072 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); 4072 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
4073 DW_MUTEX_UNLOCK; 4073 DW_MUTEX_UNLOCK;
4074 return tmp; 4074 return tmp;
4075 } 4075 }
4076 4076
4077 #ifdef HAVE_OVERLAY_SCROLLBARS
4078 gboolean ubuntu_overlay_scrollbar_get_enabled(void);
4079 void ubuntu_overlay_scrollbar_set_enabled(gboolean enabled);
4080 #endif
4081
4077 /* 4082 /*
4078 * Create a new scrollbar window (widget) to be packed. 4083 * Create a new scrollbar window (widget) to be packed.
4079 * Parameters: 4084 * Parameters:
4080 * vertical: TRUE or FALSE if scrollbar is vertical. 4085 * vertical: TRUE or FALSE if scrollbar is vertical.
4081 * increments: Number of increments available. 4086 * increments: Number of increments available.
4084 HWND dw_scrollbar_new(int vertical, ULONG id) 4089 HWND dw_scrollbar_new(int vertical, ULONG id)
4085 { 4090 {
4086 GtkWidget *tmp; 4091 GtkWidget *tmp;
4087 GtkAdjustment *adjustment; 4092 GtkAdjustment *adjustment;
4088 int _locked_by_me = FALSE; 4093 int _locked_by_me = FALSE;
4089 4094 #ifdef HAVE_OVERLAY_SCROLLBARS
4090 DW_MUTEX_LOCK; 4095 gboolean overlaysb;
4096 #endif
4097
4098 DW_MUTEX_LOCK;
4099 #ifdef HAVE_OVERLAY_SCROLLBARS
4100 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
4101 ubuntu_overlay_scrollbar_set_enabled(FALSE);
4102 #endif
4091 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1); 4103 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1);
4092 tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment); 4104 tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
4105 #ifdef HAVE_OVERLAY_SCROLLBARS
4106 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
4107 #endif
4093 gtk_widget_set_can_focus(tmp, FALSE); 4108 gtk_widget_set_can_focus(tmp, FALSE);
4094 gtk_widget_show(tmp); 4109 gtk_widget_show(tmp);
4095 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); 4110 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
4096 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp); 4111 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp);
4097 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); 4112 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));