comparison gtk/dw.c @ 1794:97b1edb41d44

Added code to disable Ubuntu overlay scrollbars for widgets created with dw_scrollbar_new() on GTK2.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 13 Aug 2012 06:18:30 +0000
parents c5ea64e8b436
children 9304241b7b33
comparison
equal deleted inserted replaced
1793:2cfbfccbbafe 1794:97b1edb41d44
4750 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); 4750 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
4751 DW_MUTEX_UNLOCK; 4751 DW_MUTEX_UNLOCK;
4752 return tmp; 4752 return tmp;
4753 } 4753 }
4754 4754
4755 #ifdef HAVE_OVERLAY_SCROLLBARS2
4756 gboolean ubuntu_gtk_get_use_overlay_scrollbar(void);
4757 void ubuntu_gtk_set_use_overlay_scrollbar(gboolean enabled);
4758 #endif
4759
4755 /* 4760 /*
4756 * Create a new scrollbar window (widget) to be packed. 4761 * Create a new scrollbar window (widget) to be packed.
4757 * Parameters: 4762 * Parameters:
4758 * vertical: TRUE or FALSE if scrollbar is vertical. 4763 * vertical: TRUE or FALSE if scrollbar is vertical.
4759 * increments: Number of increments available. 4764 * increments: Number of increments available.
4762 HWND dw_scrollbar_new(int vertical, ULONG id) 4767 HWND dw_scrollbar_new(int vertical, ULONG id)
4763 { 4768 {
4764 GtkWidget *tmp; 4769 GtkWidget *tmp;
4765 GtkAdjustment *adjustment; 4770 GtkAdjustment *adjustment;
4766 int _locked_by_me = FALSE; 4771 int _locked_by_me = FALSE;
4767 4772 #ifdef HAVE_OVERLAY_SCROLLBARS2
4768 DW_MUTEX_LOCK; 4773 gboolean overlaysb;
4774 #endif
4775
4776 DW_MUTEX_LOCK;
4777 #ifdef HAVE_OVERLAY_SCROLLBARS2
4778 overlaysb = ubuntu_gtk_get_use_overlay_scrollbar();
4779 ubuntu_gtk_set_use_overlay_scrollbar(FALSE);
4780 #endif
4769 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1); 4781 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1);
4770 if(vertical) 4782 if(vertical)
4771 tmp = gtk_vscrollbar_new(adjustment); 4783 tmp = gtk_vscrollbar_new(adjustment);
4772 else 4784 else
4773 tmp = gtk_hscrollbar_new(adjustment); 4785 tmp = gtk_hscrollbar_new(adjustment);
4786 #ifdef HAVE_OVERLAY_SCROLLBARS2
4787 ubuntu_gtk_set_use_overlay_scrollbar(overlaysb);
4788 #endif
4774 GTK_WIDGET_UNSET_FLAGS(tmp, GTK_CAN_FOCUS); 4789 GTK_WIDGET_UNSET_FLAGS(tmp, GTK_CAN_FOCUS);
4775 gtk_widget_show(tmp); 4790 gtk_widget_show(tmp);
4776 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment); 4791 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
4777 gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp); 4792 gtk_object_set_data(GTK_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp);
4778 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); 4793 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));