[Commits] about.c 1.4.2.79 1.4.2.80 authors.h 1.1.2.73 1.1.2.74 colorlabel.c 1.2.2.33 1.2.2.34 colorsel.c 1.1.4.15 1.1.4.16 gtkcmclist.c 1.1.2.15 1.1.2.16 gtkcmctree.c 1.1.2.17 1.1.2.18 gtkcmoptionmenu.c 1.1.2.6 1.1.2.7 gtksctree.c 1.1.4.60 1.1.4.61 gtkutils.c 1.5.2.95 1.5.2.96 gtkvscrollbutton.c 1.5.2.21 1.5.2.22 inputdialog.c 1.2.2.42 1.2.2.43 logwindow.c 1.1.4.37 1.1.4.38 menu.c 1.5.2.42 1.5.2.43 prefswindow.c 1.12.2.56 1.12.2.57 progressdialog.c 1.1.4.27 1.1.4.28
colin at claws-mail.org
colin at claws-mail.org
Fri Oct 7 11:08:59 CEST 2011
Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv23693/src/gtk
Modified Files:
Tag: gtk2
about.c authors.h colorlabel.c colorsel.c gtkcmclist.c
gtkcmctree.c gtkcmoptionmenu.c gtksctree.c gtkutils.c
gtkvscrollbutton.c inputdialog.c logwindow.c menu.c
prefswindow.c progressdialog.c
Log Message:
2011-10-07 [colin] 3.7.10cvs19
* AUTHORS
* src/account.c
* src/action.c
* src/addr_compl.c
* src/addressbook.c
* src/alertpanel.c
* src/compose.c
* src/edittags.c
* src/folderview.c
* src/grouplistdialog.c
* src/image_viewer.c
* src/mainwindow.c
* src/mimeview.c
* src/noticeview.c
* src/prefs_filtering_action.c
* src/prefs_folder_column.c
* src/prefs_msg_colors.c
* src/prefs_summary_column.c
* src/prefs_toolbar.c
* src/printing.c
* src/stock_pixmap.c
* src/summaryview.c
* src/textview.c
* src/undo.c
* src/wizard.c
* src/gtk/about.c
* src/gtk/authors.h
* src/gtk/colorlabel.c
* src/gtk/colorsel.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmoptionmenu.c
* src/gtk/gtksctree.c
* src/gtk/gtkutils.c
* src/gtk/gtkvscrollbutton.c
* src/gtk/inputdialog.c
* src/gtk/logwindow.c
* src/gtk/menu.c
* src/gtk/prefswindow.c
* src/gtk/progressdialog.c
* src/plugins/pgpcore/passphrase.c
* src/plugins/trayicon/trayicon.c
Bug #2371, "Port to GTK+ 3.0": Use accessor functions.
Patch by Hanno Thurow-Meyer, many thanks to him !
Index: progressdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/progressdialog.c,v
retrieving revision 1.1.4.27
retrieving revision 1.1.4.28
diff -u -d -r1.1.4.27 -r1.1.4.28
--- progressdialog.c 16 Feb 2011 07:16:21 -0000 1.1.4.27
+++ progressdialog.c 7 Oct 2011 09:08:57 -0000 1.1.4.28
@@ -48,6 +48,7 @@
ProgressDialog *progress;
GtkWidget *dialog;
GtkWidget *hbox;
+ GtkWidget *vbox;
GtkWidget *label;
GtkWidget *cancel_btn;
GtkWidget *progressbar;
@@ -67,11 +68,12 @@
gtk_widget_realize(dialog);
gtk_container_set_border_width
- (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 0);
- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 8);
+ (GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 0);
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ gtk_box_set_spacing(GTK_BOX(vbox), 8);
hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
+ gtk_box_pack_start(GTK_BOX(vbox), hbox,
FALSE, FALSE, 8);
gtk_widget_show(hbox);
@@ -86,13 +88,13 @@
gtk_widget_grab_focus(cancel_btn);
progressbar = gtk_progress_bar_new();
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), progressbar,
+ gtk_box_pack_start(GTK_BOX(vbox), progressbar,
FALSE, FALSE, 0);
gtk_widget_show(progressbar);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwin);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), scrolledwin,
+ gtk_box_pack_start(GTK_BOX(vbox), scrolledwin,
TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
Index: colorsel.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/colorsel.c,v
retrieving revision 1.1.4.15
retrieving revision 1.1.4.16
diff -u -d -r1.1.4.15 -r1.1.4.16
--- colorsel.c 16 Feb 2011 07:16:19 -0000 1.1.4.15
+++ colorsel.c 7 Oct 2011 09:08:57 -0000 1.1.4.16
@@ -56,6 +56,7 @@
{
GdkColor color;
GtkColorSelectionDialog *color_dialog;
+ GtkWidget *ok_button, *cancel_button;
gint result;
color_dialog = GTK_COLOR_SELECTION_DIALOG(gtk_color_selection_dialog_new(title));
@@ -63,10 +64,15 @@
gtk_window_set_resizable(GTK_WINDOW(color_dialog), FALSE);
manage_window_set_transient(GTK_WINDOW(color_dialog));
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
+ g_object_get(color_dialog,
+ "ok-button", &ok_button,
+ "cancel-button", &cancel_button,
+ NULL);
+
+ g_signal_connect(G_OBJECT(ok_button),
"clicked",
G_CALLBACK(quote_colors_set_dialog_ok), &result);
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+ g_signal_connect(G_OBJECT(cancel_button),
"clicked",
G_CALLBACK(quote_colors_set_dialog_cancel), &result);
g_signal_connect(G_OBJECT(color_dialog), "key_press_event",
@@ -74,14 +80,15 @@
/* preselect the previous color in the color selection dialog */
gtkut_convert_int_to_gdk_color(rgbvalue, &color);
- gtk_color_selection_set_current_color
- (GTK_COLOR_SELECTION(color_dialog->colorsel), &color);
+ gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection(color_dialog)), &color);
gtk_widget_show(GTK_WIDGET(color_dialog));
gtk_main();
if (result == 0) {
- gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(color_dialog->colorsel), &color);
+ gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection(color_dialog)), &color);
rgbvalue = gtkut_convert_gdk_color_to_int(&color);
}
Index: prefswindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/prefswindow.c,v
retrieving revision 1.12.2.56
retrieving revision 1.12.2.57
diff -u -d -r1.12.2.56 -r1.12.2.57
--- prefswindow.c 30 Aug 2011 20:25:58 -0000 1.12.2.56
+++ prefswindow.c 7 Oct 2011 09:08:57 -0000 1.12.2.57
@@ -600,7 +600,7 @@
#endif
adj = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
- gtk_adjustment_set_value(adj, adj->lower);
+ gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
gtk_adjustment_changed(adj);
}
@@ -686,6 +686,7 @@
PrefsTreeNode *prefsnode;
PrefsPage *page;
PrefsWindow *prefswindow = (PrefsWindow *) data;
+ gfloat lower;
gchar *labeltext;
gint pagenum, i;
GtkTreeIter iter;
@@ -730,11 +731,12 @@
adj = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(page->widget));
- gtk_adjustment_set_value(adj, adj->lower);
+ lower = gtk_adjustment_get_lower(adj);
+ gtk_adjustment_set_value(adj, lower);
gtk_adjustment_changed(adj);
adj = gtk_scrolled_window_get_hadjustment(
GTK_SCROLLED_WINDOW(page->widget));
- gtk_adjustment_set_value(adj, adj->lower);
+ gtk_adjustment_set_value(adj, lower);
gtk_adjustment_changed(adj);
#ifdef GENERIC_UMPC
Index: colorlabel.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/colorlabel.c,v
retrieving revision 1.2.2.33
retrieving revision 1.2.2.34
diff -u -d -r1.2.2.33 -r1.2.2.34
--- colorlabel.c 10 Apr 2011 17:19:04 -0000 1.2.2.33
+++ colorlabel.c 7 Oct 2011 09:08:57 -0000 1.2.2.34
@@ -191,7 +191,8 @@
static gboolean colorlabel_drawing_area_expose_event_cb
(GtkWidget *widget, GdkEventExpose *expose, gpointer data)
{
- GdkDrawable *drawable = widget->window;
+ GdkDrawable *drawable = gtk_widget_get_window(widget);
+ GtkAllocation allocation;
gulong c = (gulong) GPOINTER_TO_INT(data);
GdkColor color;
cairo_t *cr;
@@ -199,17 +200,18 @@
INTCOLOR_TO_GDKCOLOR(c, color)
gdk_colormap_alloc_color(gtk_widget_get_colormap(widget), &color, FALSE, TRUE);
+ gtk_widget_get_allocation(widget, &allocation);
cr = gdk_cairo_create(drawable);
cairo_set_source_rgb(cr, 0., 0., 0.);
cairo_rectangle(cr, 0, 0,
- widget->allocation.width - 1,
- widget->allocation.height - 1);
+ allocation.width - 1,
+ allocation.height - 1);
cairo_stroke(cr);
gdk_cairo_set_source_color(cr, &color);
cairo_rectangle(cr, 1, 1,
- widget->allocation.width - 2,
- widget->allocation.height - 2);
+ allocation.width - 2,
+ allocation.height - 2);
cairo_fill(cr);
cairo_destroy(cr);
Index: gtkcmctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmctree.c,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -d -r1.1.2.17 -r1.1.2.18
--- gtkcmctree.c 20 Dec 2010 13:17:42 -0000 1.1.2.17
+++ gtkcmctree.c 7 Oct 2011 09:08:57 -0000 1.1.2.18
@@ -31,11 +31,6 @@
#include <config.h>
#include <stdlib.h>
-/* We know this file uses some deprecated stuff. */
-#undef G_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#undef GDK_DISABLE_DEPRECATED
-
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "gtkcmctree.h"
@@ -847,6 +842,7 @@
GdkGCValues values;
GtkCMCTreeNode *node;
GtkCMCTreeNode *child;
+ GtkStyle *style;
gint i;
cm_return_if_fail (GTK_IS_CMCTREE (widget));
@@ -866,8 +862,10 @@
node = GTK_CMCTREE_NODE_NEXT (node);
}
- values.foreground = widget->style->fg[GTK_STATE_NORMAL];
- values.background = widget->style->base[GTK_STATE_NORMAL];
+ style = gtk_widget_get_style(widget);
+
+ values.foreground = style->fg[GTK_STATE_NORMAL];
+ values.background = style->base[GTK_STATE_NORMAL];
values.subwindow_mode = GDK_INCLUDE_INFERIORS;
values.line_style = GDK_LINE_SOLID;
ctree->lines_gc = gdk_gc_new_with_values (GTK_CMCLIST(widget)->clist_window,
@@ -977,6 +975,7 @@
gint dest_row_number,
GtkCMCListDragPos drag_pos)
{
+ GtkAllocation allocation;
GtkCMCTree *ctree;
GdkPoint points[4];
gint level;
@@ -986,6 +985,7 @@
cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
+ gtk_widget_get_allocation(GTK_WIDGET(ctree), &allocation);
level = ((GtkCMCTreeRow *)(dest_row))->level;
@@ -1016,7 +1016,7 @@
COLUMN_LEFT_XPIXEL(clist, ctree->tree_column) +
ctree->tree_indent * level -
(ctree->tree_indent - PM_SIZE) / 2, y,
- GTK_WIDGET (ctree)->allocation.width, y);
+ allocation.width, y);
break;
case GTK_JUSTIFY_RIGHT:
if (ctree->tree_column < clist->columns - 1)
@@ -1172,10 +1172,12 @@
GdkGC **fg_gc,
GdkGC **bg_gc)
{
+ GtkStyle *gtkstyle;
gint fg_state;
+ gtkstyle = gtk_widget_get_style (GTK_WIDGET (clist));
if ((state == GTK_STATE_NORMAL) &&
- (GTK_WIDGET (clist)->state == GTK_STATE_INSENSITIVE))
+ (gtk_widget_get_state(GTK_WIDGET (clist)) == GTK_STATE_INSENSITIVE))
fg_state = GTK_STATE_INSENSITIVE;
else
fg_state = state;
@@ -1209,14 +1211,14 @@
else
{
if (style)
- *style = GTK_WIDGET (clist)->style;
+ *style = gtkstyle;
if (fg_gc)
- *fg_gc = GTK_WIDGET (clist)->style->fg_gc[fg_state];
+ *fg_gc = gtkstyle->fg_gc[fg_state];
if (bg_gc) {
if (state == GTK_STATE_SELECTED)
- *bg_gc = GTK_WIDGET (clist)->style->bg_gc[state];
+ *bg_gc = gtkstyle->bg_gc[state];
else
- *bg_gc = GTK_WIDGET (clist)->style->base_gc[state];
+ *bg_gc = gtkstyle->base_gc[state];
}
if (state != GTK_STATE_SELECTED)
@@ -1537,7 +1539,7 @@
else if (state == GTK_STATE_SELECTED)
bg_gc = style->base_gc[state];
else
- bg_gc = GTK_WIDGET (clist)->style->base_gc[state];
+ bg_gc = gtk_widget_get_style (GTK_WIDGET (clist))->base_gc[state];
if (!area)
gdk_draw_rectangle (clist->clist_window, bg_gc, TRUE,
@@ -1601,8 +1603,8 @@
if (!area)
gdk_draw_rectangle (clist->clist_window,
- GTK_WIDGET
- (ctree)->style->base_gc[GTK_STATE_NORMAL],
+ gtk_widget_get_style (GTK_WIDGET
+ (ctree))->base_gc[GTK_STATE_NORMAL],
TRUE,
tree_rectangle.x,
tree_rectangle.y,
@@ -1611,8 +1613,8 @@
else if (gdk_rectangle_intersect (area, &tree_rectangle,
&tc_rectangle))
gdk_draw_rectangle (clist->clist_window,
- GTK_WIDGET
- (ctree)->style->base_gc[GTK_STATE_NORMAL],
+ gtk_widget_get_style (GTK_WIDGET
+ (ctree))->base_gc[GTK_STATE_NORMAL],
TRUE,
tc_rectangle.x,
tc_rectangle.y,
@@ -1744,6 +1746,7 @@
gint row,
GtkCMCListRow *clist_row)
{
+ GtkStyle *style;
GtkWidget *widget;
GtkCMCTree *ctree;
GdkRectangle *crect;
@@ -1801,8 +1804,9 @@
state = clist_row->state;
+ style = gtk_widget_get_style (widget);
gdk_gc_set_foreground (ctree->lines_gc,
- &widget->style->fg[clist_row->state]);
+ &style->fg[clist_row->state]);
/* draw the cell borders */
if (area)
@@ -1811,7 +1815,7 @@
if (gdk_rectangle_intersect (area, &cell_rectangle, crect))
gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
+ style->base_gc[GTK_STATE_NORMAL], TRUE,
crect->x, crect->y, crect->width, crect->height);
}
else
@@ -1819,7 +1823,7 @@
crect = &cell_rectangle;
gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
+ style->base_gc[GTK_STATE_NORMAL], TRUE,
crect->x, crect->y, crect->width, crect->height);
}
@@ -1866,7 +1870,7 @@
if (!area || gdk_rectangle_intersect (area, &cell_rectangle, crect))
{
gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
+ gtk_widget_get_style (widget)->base_gc[GTK_STATE_NORMAL], TRUE,
crect->x, crect->y, crect->width, crect->height);
/* horizontal black lines */
@@ -2883,8 +2887,12 @@
/* run a "gtk_cmclist_optimal_column_width" but break, if
* the column doesn't shrink */
if (GTK_CMCLIST_SHOW_TITLES (clist) && clist->column[column].button)
- new_width = (clist->column[column].button->requisition.width -
+ {
+ GtkRequisition req;
+ gtk_widget_get_requisition (clist->column[column].button, &req);
+ new_width = (req.width -
(CELL_SPACING + (2 * COLUMN_INSET)));
+ }
else
new_width = 0;
@@ -5864,14 +5872,18 @@
gint y,
GtkCMCListDestInfo *dest_info)
{
+ GtkStyle *style;
GtkWidget *widget;
+ guint border_width;
widget = GTK_WIDGET (clist);
+ style = gtk_widget_get_style (widget);
dest_info->insert_pos = GTK_CMCLIST_DRAG_NONE;
- y -= (GTK_CONTAINER (widget)->border_width +
- widget->style->ythickness + clist->column_title_area.height);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+ y -= (border_width +
+ style->ythickness + clist->column_title_area.height);
dest_info->cell.row = ROW_FROM_YPIXEL (clist, y);
if (dest_info->cell.row >= clist->rows)
@@ -5882,7 +5894,7 @@
if (dest_info->cell.row < -1)
dest_info->cell.row = -1;
- x -= GTK_CONTAINER (widget)->border_width + widget->style->xthickness;
+ x -= border_width + style->xthickness;
dest_info->cell.column = COLUMN_FROM_XPIXEL (clist, x);
@@ -5980,18 +5992,10 @@
if (GTK_CMCLIST_REORDERABLE (clist))
{
- GList *list;
GdkAtom atom = gdk_atom_intern_static_string ("gtk-clist-drag-reorder");
+ GdkAtom found = gtk_drag_dest_find_target(widget, context, NULL);
- list = context->targets;
- while (list)
- {
- if (atom == GDK_POINTER_TO_ATOM (list->data))
- break;
- list = list->next;
- }
-
- if (list)
+ if (atom == found)
{
GtkCMCTreeNode *drag_source;
GtkCMCTreeNode *drag_target;
@@ -6035,7 +6039,8 @@
clist->drag_highlight_row = dest_info->cell.row;
clist->drag_highlight_pos = dest_info->insert_pos;
- gdk_drag_status (context, context->suggested_action, time);
+ gdk_drag_status (context,
+ gdk_drag_context_get_suggested_action(context), time);
}
return TRUE;
}
@@ -6068,14 +6073,14 @@
if (GTK_CMCLIST_REORDERABLE (clist) &&
gtk_drag_get_source_widget (context) == widget &&
- selection_data->target ==
+ gtk_selection_data_get_target (selection_data) ==
gdk_atom_intern_static_string ("gtk-clist-drag-reorder") &&
- selection_data->format == 8 &&
- selection_data->length == sizeof (GtkCMCListCellInfo))
+ gtk_selection_data_get_format (selection_data) == 8 &&
+ gtk_selection_data_get_length (selection_data) == sizeof (GtkCMCListCellInfo))
{
GtkCMCListCellInfo *source_info;
- source_info = (GtkCMCListCellInfo *)(selection_data->data);
+ source_info = (GtkCMCListCellInfo *)(gtk_selection_data_get_data (selection_data));
if (source_info)
{
GtkCMCListDestInfo dest_info;
Index: inputdialog.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/inputdialog.c,v
retrieving revision 1.2.2.42
retrieving revision 1.2.2.43
diff -u -d -r1.2.2.42 -r1.2.2.43
--- inputdialog.c 10 Apr 2011 17:19:05 -0000 1.2.2.42
+++ inputdialog.c 7 Oct 2011 09:08:57 -0000 1.2.2.43
@@ -320,11 +320,12 @@
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
- gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
+ vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ gtk_box_set_spacing (GTK_BOX (vbox), 14);
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+ gtk_box_pack_start (GTK_BOX (vbox), hbox,
FALSE, FALSE, 0);
/* for title label */
@@ -353,7 +354,7 @@
gint size;
size = pango_font_description_get_size
- (msg_title->style->font_desc);
+ (gtk_widget_get_style(msg_title)->font_desc);
font_desc = pango_font_description_new();
pango_font_description_set_weight
(font_desc, PANGO_WEIGHT_BOLD);
@@ -389,11 +390,11 @@
&ok_button, GTK_STOCK_OK,
NULL, NULL);
- gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+ gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
confirm_area, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(confirm_area), 5);
- gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
+ gtk_widget_show_all(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
gtk_widget_hide(remember_checkbtn);
Index: gtkutils.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkutils.c,v
retrieving revision 1.5.2.95
retrieving revision 1.5.2.96
diff -u -d -r1.5.2.95 -r1.5.2.96
--- gtkutils.c 29 Aug 2011 08:12:10 -0000 1.5.2.95
+++ gtkutils.c 7 Oct 2011 09:08:57 -0000 1.5.2.96
@@ -84,7 +84,7 @@
gint size;
cm_return_if_fail(widget != NULL);
- cm_return_if_fail(widget->style != NULL);
+ cm_return_if_fail(gtk_widget_get_style(widget) != NULL);
if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
font_desc = pango_font_description_from_string(NORMAL_FONT);
@@ -605,19 +605,22 @@
void gtkut_window_popup(GtkWidget *window)
{
+ GdkWindow *gdkwin;
gint x, y, sx, sy, new_x, new_y;
+ gdkwin = gtk_widget_get_window(window);
+
cm_return_if_fail(window != NULL);
- cm_return_if_fail(window->window != NULL);
+ cm_return_if_fail(gdkwin != NULL);
sx = gdk_screen_width();
sy = gdk_screen_height();
- gdk_window_get_origin(window->window, &x, &y);
+ gdk_window_get_origin(gdkwin, &x, &y);
new_x = x % sx; if (new_x < 0) new_x = 0;
new_y = y % sy; if (new_y < 0) new_y = 0;
if (new_x != x || new_y != y)
- gdk_window_move(window->window, new_x, new_y);
+ gdk_window_move(gdkwin, new_x, new_y);
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(window), FALSE);
gtk_window_present_with_time(GTK_WINDOW(window), time(NULL));
@@ -625,17 +628,20 @@
void gtkut_widget_get_uposition(GtkWidget *widget, gint *px, gint *py)
{
+ GdkWindow *gdkwin;
gint x, y;
gint sx, sy;
+ gdkwin = gtk_widget_get_window(widget);
+
cm_return_if_fail(widget != NULL);
- cm_return_if_fail(widget->window != NULL);
+ cm_return_if_fail(gdkwin != NULL);
sx = gdk_screen_width();
sy = gdk_screen_height();
/* gdk_window_get_root_origin ever return *rootwindow*'s position */
- gdk_window_get_root_origin(widget->window, &x, &y);
+ gdk_window_get_root_origin(gdkwin, &x, &y);
x %= sx; if (x < 0) x = 0;
y %= sy; if (y < 0) y = 0;
@@ -646,7 +652,7 @@
void gtkut_widget_draw_now(GtkWidget *widget)
{
if (widget && gtkut_widget_get_visible(widget) && gtkut_widget_is_drawable(widget))
- gdk_window_process_updates(widget->window, FALSE);
+ gdk_window_process_updates(gtk_widget_get_window(widget), FALSE);
}
static void gtkut_clist_bindings_add(GtkWidget *clist)
@@ -709,7 +715,7 @@
static GdkPixbuf *icon = NULL;
cm_return_if_fail(widget != NULL);
- cm_return_if_fail(widget->window != NULL);
+ cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
if (!icon) {
stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
}
@@ -722,7 +728,7 @@
static GdkPixbuf *icon = NULL;
cm_return_if_fail(widget != NULL);
- cm_return_if_fail(widget->window != NULL);
+ cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
if (!icon) {
stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
}
@@ -1148,12 +1154,15 @@
static void link_btn_enter(GtkButton *button, gpointer data)
{
+ GdkWindow *gdkwin;
GtkWidget *window = (GtkWidget *)data;
+ gdkwin = gtk_widget_get_window(window);
+
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
- if (window && window->window)
- gdk_window_set_cursor(window->window, hand_cursor);
+ if (window && gdkwin)
+ gdk_window_set_cursor(gdkwin, hand_cursor);
gtk_button_set_relief(button, GTK_RELIEF_NONE);
gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
@@ -1162,10 +1171,13 @@
static void link_btn_leave(GtkButton *button, gpointer data)
{
+ GdkWindow *gdkwin;
GtkWidget *window = (GtkWidget *)data;
- if (window && window->window)
- gdk_window_set_cursor(window->window, NULL);
+ gdkwin = gtk_widget_get_window(window);
+
+ if (window && gdkwin)
+ gdk_window_set_cursor(gdkwin, NULL);
gtk_button_set_relief(button, GTK_RELIEF_NONE);
gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
@@ -1218,7 +1230,7 @@
btn = gtk_button_new_with_label(label?label:url);
gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE);
btn_label = gtk_bin_get_child(GTK_BIN((btn)));
- cmap = gdk_drawable_get_colormap(window->window);
+ cmap = gdk_drawable_get_colormap(gtk_widget_get_window(window));
gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
if (success[0] == TRUE && success[1] == TRUE) {
GtkStyle *style;
@@ -1307,12 +1319,12 @@
}
for (i = step; i <= change_value; i += step) {
- vadj->value = old_value + (up ? -i : i);
+ gtk_adjustment_set_value(vadj, old_value + (up ? -i : i));
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
}
- vadj->value = last_value;
+ gtk_adjustment_set_value(vadj, last_value);
g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
gtk_widget_queue_draw(widget);
@@ -1325,16 +1337,15 @@
gfloat old_value;
gfloat last_value;
+ page_incr = gtk_adjustment_get_page_increment(vadj);
if (prefs_common.scroll_halfpage)
- page_incr = vadj->page_increment / 2;
- else
- page_incr = vadj->page_increment;
+ page_incr /= 2;
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- old_value = vadj->value;
- last_value = vadj->value + page_incr;
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ last_value = old_value + page_incr;
last_value = MIN(last_value, upper);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1343,9 +1354,8 @@
} else
return FALSE;
} else {
- if (vadj->value > 0.0) {
- old_value = vadj->value;
- last_value = vadj->value - page_incr;
+ if (old_value > 0.0) {
+ last_value = old_value - page_incr;
last_value = MAX(last_value, 0.0);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1362,28 +1372,31 @@
{
gfloat upper;
gfloat page_incr;
+ gfloat old_value;
if (prefs_common.enable_smooth_scroll)
return gtkutils_smooth_scroll_page(widget, vadj, up);
+ page_incr = gtk_adjustment_get_page_increment(vadj);
if (prefs_common.scroll_halfpage)
- page_incr = vadj->page_increment / 2;
- else
- page_incr = vadj->page_increment;
+ page_incr /= 2;
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- vadj->value += page_incr;
- vadj->value = MIN(vadj->value, upper);
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ old_value += page_incr;
+ old_value = MIN(old_value, upper);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
} else
return FALSE;
} else {
- if (vadj->value > 0.0) {
- vadj->value -= page_incr;
- vadj->value = MAX(vadj->value, 0.0);
+ if (old_value > 0.0) {
+ old_value -= page_incr;
+ old_value = MAX(old_value, 0.0);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
} else
@@ -1398,11 +1411,11 @@
gfloat old_value;
gfloat last_value;
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- old_value = vadj->value;
- last_value = vadj->value + vadj->step_increment;
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ last_value = old_value + gtk_adjustment_get_step_increment(vadj);
last_value = MIN(last_value, upper);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1410,9 +1423,8 @@
prefs_common.scroll_step);
}
} else {
- if (vadj->value > 0.0) {
- old_value = vadj->value;
- last_value = vadj->value - vadj->step_increment;
+ if (old_value > 0.0) {
+ last_value = old_value - gtk_adjustment_get_step_increment(vadj);
last_value = MAX(last_value, 0.0);
gtkutils_smooth_scroll_do(widget, vadj, old_value,
@@ -1425,24 +1437,28 @@
void gtkutils_scroll_one_line(GtkWidget *widget, GtkAdjustment *vadj, gboolean up)
{
gfloat upper;
+ gfloat old_value;
if (prefs_common.enable_smooth_scroll) {
gtkutils_smooth_scroll_one_line(widget, vadj, up);
return;
}
+ old_value = gtk_adjustment_get_value(vadj);
if (!up) {
- upper = vadj->upper - vadj->page_size;
- if (vadj->value < upper) {
- vadj->value += vadj->step_increment;
- vadj->value = MIN(vadj->value, upper);
+ upper = gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj);
+ if (old_value < upper) {
+ old_value += gtk_adjustment_get_step_increment(vadj);
+ old_value = MIN(old_value, upper);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
}
} else {
- if (vadj->value > 0.0) {
- vadj->value -= vadj->step_increment;
- vadj->value = MAX(vadj->value, 0.0);
+ if (old_value > 0.0) {
+ old_value -= gtk_adjustment_get_step_increment(vadj);
+ old_value = MAX(old_value, 0.0);
+ gtk_adjustment_set_value(vadj, old_value);
g_signal_emit_by_name(G_OBJECT(vadj),
"value_changed", 0);
}
Index: gtkcmclist.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmclist.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- gtkcmclist.c 20 Dec 2010 13:17:42 -0000 1.1.2.15
+++ gtkcmclist.c 7 Oct 2011 09:08:57 -0000 1.1.2.16
@@ -30,11 +30,6 @@
#include <stdlib.h>
#include <string.h>
-/* We know this file uses some deprecated stuff. */
-#undef G_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#undef GDK_DISABLE_DEPRECATED
-
#include <gtk/gtk.h>
#include "claws-marshal.h"
#include "gtkcmclist.h"
[...964 lines suppressed...]
+ GdkAtom target;
cm_return_if_fail (GTK_IS_CMCLIST (widget));
cm_return_if_fail (context != NULL);
cm_return_if_fail (selection_data != NULL);
- if (selection_data->target == gdk_atom_intern_static_string ("gtk-clist-drag-reorder"))
+ target = gtk_selection_data_get_target (selection_data);
+ if (target == gdk_atom_intern_static_string ("gtk-clist-drag-reorder"))
{
GtkCMCListCellInfo *info;
@@ -7794,7 +7839,7 @@
ret_info.row = info->row;
ret_info.column = info->column;
- gtk_selection_data_set (selection_data, selection_data->target,
+ gtk_selection_data_set (selection_data, target,
8, (guchar *) &ret_info,
sizeof (GtkCMCListCellInfo));
}
Index: gtksctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtksctree.c,v
retrieving revision 1.1.4.60
retrieving revision 1.1.4.61
diff -u -d -r1.1.4.60 -r1.1.4.61
--- gtksctree.c 16 Feb 2011 07:16:20 -0000 1.1.4.60
+++ gtksctree.c 7 Oct 2011 09:08:57 -0000 1.1.4.61
@@ -28,11 +28,6 @@
#include <stdlib.h>
-/* We know this file uses some deprecated stuff. */
-#undef G_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#undef GDK_DISABLE_DEPRECATED
-
#include "gtksctree.h"
#include "claws-marshal.h"
#include "prefs_common.h"
@@ -207,10 +202,11 @@
GdkGC **fg_gc,
GdkGC **bg_gc)
{
+ GtkStyle *gtkstyle;
gint fg_state;
if ((state == GTK_STATE_NORMAL) &&
- (GTK_WIDGET (clist)->state == GTK_STATE_INSENSITIVE))
+ (gtk_widget_get_state (GTK_WIDGET (clist)) == GTK_STATE_INSENSITIVE))
fg_state = GTK_STATE_INSENSITIVE;
else
fg_state = state;
@@ -242,15 +238,16 @@
}
else
{
+ gtkstyle = gtk_widget_get_style (GTK_WIDGET (clist));
if (style)
- *style = GTK_WIDGET (clist)->style;
+ *style = gtkstyle;
if (fg_gc)
- *fg_gc = GTK_WIDGET (clist)->style->fg_gc[fg_state];
+ *fg_gc = gtkstyle->fg_gc[fg_state];
if (bg_gc) {
if (state == GTK_STATE_SELECTED)
- *bg_gc = GTK_WIDGET (clist)->style->bg_gc[state];
+ *bg_gc = gtkstyle->bg_gc[state];
else
- *bg_gc = GTK_WIDGET (clist)->style->base_gc[state];
+ *bg_gc = gtkstyle->base_gc[state];
}
if (state != GTK_STATE_SELECTED)
@@ -574,7 +571,7 @@
else if (state == GTK_STATE_SELECTED)
bg_gc = style->base_gc[state];
else
- bg_gc = GTK_WIDGET (clist)->style->base_gc[state];
+ bg_gc = gtk_widget_get_style (GTK_WIDGET (clist))->base_gc[state];
if (!area)
gdk_draw_rectangle (clist->clist_window, bg_gc, TRUE,
@@ -638,8 +635,8 @@
if (!area)
gdk_draw_rectangle (clist->clist_window,
- GTK_WIDGET
- (ctree)->style->base_gc[GTK_STATE_NORMAL],
+ gtk_widget_get_style (GTK_WIDGET
+ (ctree))->base_gc[GTK_STATE_NORMAL],
TRUE,
tree_rectangle.x,
tree_rectangle.y,
@@ -648,8 +645,8 @@
else if (gdk_rectangle_intersect (area, &tree_rectangle,
&tc_rectangle))
gdk_draw_rectangle (clist->clist_window,
- GTK_WIDGET
- (ctree)->style->base_gc[GTK_STATE_NORMAL],
+ gtk_widget_get_style (GTK_WIDGET
+ (ctree))->base_gc[GTK_STATE_NORMAL],
TRUE,
tc_rectangle.x,
tc_rectangle.y,
@@ -845,6 +842,7 @@
GtkCMCListRow *clist_row)
{
GtkWidget *widget;
+ GtkStyle *style;
GtkCMCTree *ctree;
GdkRectangle *rect;
GdkRectangle *crect;
@@ -861,13 +859,17 @@
static GdkColor greybg={0, 0, 0, 0};
static gboolean color_change = TRUE;
+ cm_return_if_fail (clist != NULL);
+ widget = GTK_WIDGET (clist);
+ style = gtk_widget_get_style (widget);
+
if (greybg.pixel == 0 &&
greybg.red == 0 &&
greybg.green == 0 &&
greybg.blue == 0) {
GdkColor normalbg = {0, 0xffff, 0xffff, 0xffff};
- if (GTK_WIDGET (clist)->style) {
- normalbg = GTK_WIDGET (clist)->style->base[GTK_STATE_NORMAL];
+ if (style) {
+ normalbg = style->base[GTK_STATE_NORMAL];
}
if (normalbg.red > 0x8888 && normalbg.green > 0x8888 && normalbg.blue > 0x8888) {
greybg.pixel = normalbg.pixel;
@@ -884,13 +886,10 @@
}
}
- cm_return_if_fail (clist != NULL);
-
/* bail now if we arn't drawable yet */
if (!gtkut_widget_is_drawable (GTK_WIDGET(clist)) || row < 0 || row >= clist->rows)
return;
- widget = GTK_WIDGET (clist);
ctree = GTK_CMCTREE (clist);
/* if the function is passed the pointer to the row instead of null,
@@ -935,7 +934,7 @@
state = clist_row->state;
gdk_gc_set_foreground (ctree->lines_gc,
- &widget->style->fg[clist_row->state]);
+ &style->fg[clist_row->state]);
/* draw the cell borders */
if (area)
@@ -945,7 +944,7 @@
if (gdk_rectangle_intersect (area, &cell_rectangle, crect))
gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
+ style->base_gc[GTK_STATE_NORMAL], TRUE,
crect->x, crect->y, crect->width, crect->height);
}
else
@@ -954,7 +953,7 @@
crect = &cell_rectangle;
gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
+ style->base_gc[GTK_STATE_NORMAL], TRUE,
crect->x, crect->y, crect->width, crect->height);
}
@@ -1001,7 +1000,7 @@
if (!area || gdk_rectangle_intersect (area, &cell_rectangle, crect))
{
gdk_draw_rectangle (clist->clist_window,
- widget->style->base_gc[GTK_STATE_NORMAL], TRUE,
+ style->base_gc[GTK_STATE_NORMAL], TRUE,
crect->x, crect->y, crect->width, crect->height);
/* horizontal black lines */
@@ -1953,13 +1952,17 @@
old_width == clist->column[column].width)
{
GList *list;
+ GtkRequisition button_req;
gint new_width;
/* run a "gtk_cmclist_optimal_column_width" but break, if
* the column doesn't shrink */
if (GTK_CMCLIST_SHOW_TITLES (clist) && clist->column[column].button)
- new_width = (clist->column[column].button->requisition.width -
+ {
+ gtk_widget_get_requisition (clist->column[column].button, &button_req);
+ new_width = (button_req.width -
(CELL_SPACING + (2 * COLUMN_INSET)));
+ }
else
new_width = 0;
Index: menu.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/menu.c,v
retrieving revision 1.5.2.42
retrieving revision 1.5.2.43
diff -u -d -r1.5.2.42 -r1.5.2.43
--- menu.c 16 Feb 2011 07:16:21 -0000 1.5.2.42
+++ menu.c 7 Oct 2011 09:08:57 -0000 1.5.2.43
@@ -123,10 +123,13 @@
void menu_set_sensitive_all(GtkMenuShell *menu_shell, gboolean sensitive)
{
+ GList *children = gtk_container_get_children(GTK_CONTAINER(menu_shell));
GList *cur;
- for (cur = menu_shell->children; cur != NULL; cur = cur->next)
+ for (cur = children; cur != NULL; cur = cur->next)
gtk_widget_set_sensitive(GTK_WIDGET(cur->data), sensitive);
+
+ g_list_free(children);
}
void menu_button_position(GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
@@ -135,7 +138,8 @@
GtkWidget *widget;
gint wheight;
gint wx, wy;
- GtkRequisition mreq;
+ GtkAllocation allocation;
+ GtkRequisition mreq, wreq;
GdkScreen *screen;
GdkRectangle monitor;
gint monitor_num;
@@ -145,10 +149,12 @@
widget = GTK_WIDGET(user_data);
- gdk_window_get_origin(widget->window, x, y);
- wheight = widget->requisition.height;
- wx = widget->allocation.x;
- wy = widget->allocation.y;
+ gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
+ gtk_widget_get_requisition(widget, &wreq);
+ wheight = wreq.height;
+ gtk_widget_get_allocation(widget, &allocation);
+ wx = allocation.x;
+ wy = allocation.y;
gtk_widget_size_request(GTK_WIDGET(menu), &mreq);
screen = gtk_widget_get_screen (widget);
@@ -169,12 +175,14 @@
GtkWidget *menu;
GtkWidget *menuitem;
gpointer menu_data;
+ GList *children;
GList *cur;
gint n;
menu = gtk_cmoption_menu_get_menu(optmenu);
+ children = gtk_container_get_children(GTK_CONTAINER(GTK_MENU_SHELL(menu)));
- for (cur = GTK_MENU_SHELL(menu)->children, n = 0;
+ for (cur = children, n = 0;
cur != NULL; cur = cur->next, n++) {
menuitem = GTK_WIDGET(cur->data);
menu_data = g_object_get_data(G_OBJECT(menuitem),
@@ -186,5 +194,7 @@
return n;
}
+ g_list_free(children);
+
return -1;
}
Index: gtkcmoptionmenu.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmoptionmenu.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- gtkcmoptionmenu.c 10 Apr 2011 17:19:05 -0000 1.1.2.6
+++ gtkcmoptionmenu.c 7 Oct 2011 09:08:57 -0000 1.1.2.7
@@ -255,7 +255,7 @@
G_CALLBACK (gtk_cmoption_menu_calc_size),
option_menu);
- if (GTK_WIDGET (option_menu)->parent)
+ if (gtk_widget_get_parent (GTK_WIDGET (option_menu)))
gtk_widget_queue_resize (GTK_WIDGET (option_menu));
gtk_cmoption_menu_update_contents (option_menu);
@@ -271,7 +271,8 @@
if (option_menu->menu)
{
- if (GTK_MENU_SHELL (option_menu->menu)->active)
+ if (option_menu->menu_item ==
+ gtk_menu_get_active (GTK_MENU (option_menu->menu)))
gtk_menu_shell_cancel (GTK_MENU_SHELL (option_menu->menu));
gtk_menu_detach (GTK_MENU (option_menu->menu));
@@ -310,6 +311,8 @@
gtk_cmoption_menu_get_history (GtkCMOptionMenu *option_menu)
{
GtkWidget *active_widget;
+ GList *list;
+ gint index;
cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (option_menu), -1);
@@ -318,8 +321,14 @@
active_widget = gtk_menu_get_active (GTK_MENU (option_menu->menu));
if (active_widget)
- return g_list_index (GTK_MENU_SHELL (option_menu->menu)->children,
- active_widget);
+ {
+ list = gtk_container_get_children (GTK_CONTAINER
+ (GTK_MENU_SHELL (option_menu->menu)));
+ index = g_list_index (list, active_widget);
+ g_list_free (list);
+
+ return index;
+ }
else
return -1;
}
@@ -419,26 +428,32 @@
GtkCMOptionMenu *option_menu = GTK_CMOPTION_MENU (widget);
GtkCMOptionMenuProps props;
gint tmp;
+ GtkWidget *child;
GtkRequisition child_requisition = { 0, 0 };
+ GtkStyle *style;
+ gint border_width;
gtk_cmoption_menu_get_props (option_menu, &props);
- if (GTK_BIN (option_menu)->child && gtkut_widget_get_visible (GTK_BIN (option_menu)->child))
+ child = gtk_bin_get_child (GTK_BIN (option_menu));
+ if (child && gtkut_widget_get_visible (child))
{
- gtk_widget_size_request (GTK_BIN (option_menu)->child, &child_requisition);
+ gtk_widget_size_request (child, &child_requisition);
requisition->width += child_requisition.width;
requisition->height += child_requisition.height;
}
-
- requisition->width = ((GTK_CONTAINER (widget)->border_width +
- GTK_WIDGET (widget)->style->xthickness + props.focus_pad) * 2 +
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+ style = gtk_widget_get_style (widget);
+ requisition->width = ((border_width +
+ style->xthickness + props.focus_pad) * 2 +
MAX (child_requisition.width, option_menu->width) +
props.indicator_size.width +
props.indicator_spacing.left + props.indicator_spacing.right +
CHILD_LEFT_SPACING + CHILD_RIGHT_SPACING + props.focus_width * 2);
- requisition->height = ((GTK_CONTAINER (widget)->border_width +
- GTK_WIDGET (widget)->style->ythickness + props.focus_pad) * 2 +
+ requisition->height = ((border_width +
+ style->ythickness + props.focus_pad) * 2 +
MAX (child_requisition.height, option_menu->height) +
CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING + props.focus_width * 2);
@@ -452,28 +467,31 @@
GtkAllocation *allocation)
{
GtkWidget *child;
+ GtkStyle *style;
GtkButton *button = GTK_BUTTON (widget);
- GtkAllocation child_allocation;
+ GtkAllocation child_allocation, widget_allocation;
GtkCMOptionMenuProps props;
gint border_width;
gtk_cmoption_menu_get_props (GTK_CMOPTION_MENU (widget), &props);
- border_width = GTK_CONTAINER (widget)->border_width;
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
- widget->allocation = *allocation;
+ gtk_widget_set_allocation (widget, allocation);
if (gtkut_widget_get_realized (widget))
- gdk_window_move_resize (button->event_window,
+ gdk_window_move_resize (gtk_button_get_event_window (button),
allocation->x + border_width, allocation->y + border_width,
allocation->width - border_width * 2, allocation->height - border_width * 2);
- child = GTK_BIN (widget)->child;
+ child = gtk_bin_get_child (GTK_BIN (widget));
if (child && gtkut_widget_get_visible (child))
{
- gint xthickness = GTK_WIDGET (widget)->style->xthickness;
- gint ythickness = GTK_WIDGET (widget)->style->ythickness;
+ style = gtk_widget_get_style (widget);
+ gint xthickness = style->xthickness;
+ gint ythickness = style->ythickness;
- child_allocation.x = widget->allocation.x + border_width + xthickness + props.focus_width + props.focus_pad + CHILD_LEFT_SPACING;
- child_allocation.y = widget->allocation.y + border_width + ythickness + props.focus_width + props.focus_pad + CHILD_TOP_SPACING;
+ gtk_widget_get_allocation (widget, &widget_allocation);
+ child_allocation.x = widget_allocation.x + border_width + xthickness + props.focus_width + props.focus_pad + CHILD_LEFT_SPACING;
+ child_allocation.y = widget_allocation.y + border_width + ythickness + props.focus_width + props.focus_pad + CHILD_TOP_SPACING;
child_allocation.width = MAX (1, allocation->width - (border_width + xthickness + props.focus_width + props.focus_pad) * 2 -
props.indicator_size.width - props.indicator_spacing.left - props.indicator_spacing.right -
CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING);
@@ -491,7 +509,10 @@
gtk_cmoption_menu_paint (GtkWidget *widget,
GdkRectangle *area)
{
+ GtkAllocation allocation;
+ GtkStyle *style;
GdkRectangle button_area;
+ GdkWindow *window;
GtkCMOptionMenuProps props;
gint border_width;
gint tab_x;
@@ -501,13 +522,14 @@
if (gtkut_widget_is_drawable (widget))
{
- border_width = GTK_CONTAINER (widget)->border_width;
+ gtk_widget_get_allocation (widget, &allocation);
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_cmoption_menu_get_props (GTK_CMOPTION_MENU (widget), &props);
- button_area.x = widget->allocation.x + border_width;
- button_area.y = widget->allocation.y + border_width;
- button_area.width = widget->allocation.width - 2 * border_width;
- button_area.height = widget->allocation.height - 2 * border_width;
+ button_area.x = allocation.x + border_width;
+ button_area.y = allocation.y + border_width;
+ button_area.width = allocation.width - 2 * border_width;
+ button_area.height = allocation.height - 2 * border_width;
if (!props.interior_focus && gtkut_widget_has_focus (widget))
{
@@ -517,7 +539,9 @@
button_area.height -= 2 * (props.focus_width + props.focus_pad);
}
- gtk_paint_box (widget->style, widget->window,
+ style = gtk_widget_get_style (widget);
+ window = gtk_widget_get_window (widget);
+ gtk_paint_box (style, window,
gtkut_widget_get_state (widget), GTK_SHADOW_OUT,
area, widget, "optionmenu",
button_area.x, button_area.y,
@@ -525,13 +549,13 @@
if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL)
tab_x = button_area.x + props.indicator_spacing.right +
- widget->style->xthickness;
+ style->xthickness;
else
tab_x = button_area.x + button_area.width -
props.indicator_size.width - props.indicator_spacing.right -
- widget->style->xthickness;
+ style->xthickness;
- gtk_paint_tab (widget->style, widget->window,
+ gtk_paint_tab (style, window,
gtkut_widget_get_state (widget), GTK_SHADOW_OUT,
area, widget, "optionmenutab",
tab_x,
@@ -542,13 +566,13 @@
{
if (props.interior_focus)
{
- button_area.x += widget->style->xthickness + props.focus_pad;
- button_area.y += widget->style->ythickness + props.focus_pad;
- button_area.width -= 2 * (widget->style->xthickness + props.focus_pad) +
+ button_area.x += style->xthickness + props.focus_pad;
+ button_area.y += style->ythickness + props.focus_pad;
+ button_area.width -= 2 * (style->xthickness + props.focus_pad) +
props.indicator_spacing.left +
props.indicator_spacing.right +
props.indicator_size.width;
- button_area.height -= 2 * (widget->style->ythickness + props.focus_pad);
+ button_area.height -= 2 * (style->ythickness + props.focus_pad);
if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL)
button_area.x += props.indicator_spacing.left +
props.indicator_spacing.right +
@@ -562,7 +586,7 @@
button_area.height += 2 * (props.focus_width + props.focus_pad);
}
- gtk_paint_focus (widget->style, widget->window, gtkut_widget_get_state (widget),
+ gtk_paint_focus (style, window, gtkut_widget_get_state (widget),
area, widget, "button",
button_area.x,
button_area.y,
@@ -576,6 +600,7 @@
gtk_cmoption_menu_expose (GtkWidget *widget,
GdkEventExpose *event)
{
+ GtkWidget *child;
cm_return_val_if_fail (GTK_IS_CMOPTION_MENU (widget), FALSE);
cm_return_val_if_fail (event != NULL, FALSE);
@@ -618,9 +643,10 @@
if (remove_child)
gtk_cmoption_menu_remove_contents (GTK_CMOPTION_MENU (widget));
#else
- if (GTK_BIN (widget)->child)
+ child = gtk_bin_get_child (GTK_BIN (widget));
+ if (child)
gtk_container_propagate_expose (GTK_CONTAINER (widget),
- GTK_BIN (widget)->child,
+ child,
event);
#endif /* 0 */
}
@@ -708,7 +734,7 @@
{
if (option_menu->menu)
{
- GList *children = GTK_MENU_SHELL (option_menu->menu)->children;
+ GList *children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
gint index = 0;
while (children)
@@ -722,6 +748,8 @@
children = children->next;
index++;
}
+
+ g_list_free (children);
}
}
@@ -730,7 +758,7 @@
GtkStateType previous_state,
GtkCMOptionMenu *option_menu)
{
- GtkWidget *child = GTK_BIN (option_menu)->child;
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (option_menu));
if (child && gtkut_widget_get_sensitive (child) != gtkut_widget_is_sensitive (widget))
gtk_widget_set_sensitive (child, gtkut_widget_is_sensitive (widget));
@@ -740,7 +768,7 @@
gtk_cmoption_menu_item_destroy_cb (GtkWidget *widget,
GtkCMOptionMenu *option_menu)
{
- GtkWidget *child = GTK_BIN (option_menu)->child;
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (option_menu));
if (child)
{
@@ -758,6 +786,7 @@
{
GtkWidget *child;
GtkRequisition child_requisition;
+ GtkAllocation allocation;
cm_return_if_fail (GTK_IS_CMOPTION_MENU (option_menu));
@@ -771,7 +800,7 @@
if (option_menu->menu_item)
{
g_object_ref (option_menu->menu_item);
- child = GTK_BIN (option_menu->menu_item)->child;
+ child = gtk_bin_get_child (GTK_BIN (option_menu->menu_item));
if (child)
{
if (!gtkut_widget_is_sensitive (option_menu->menu_item))
@@ -785,8 +814,9 @@
G_CALLBACK (gtk_cmoption_menu_item_destroy_cb), option_menu);
gtk_widget_size_request (child, &child_requisition);
+ gtk_widget_get_allocation (GTK_WIDGET (option_menu), &allocation);
gtk_widget_size_allocate (GTK_WIDGET (option_menu),
- &(GTK_WIDGET (option_menu)->allocation));
+ &allocation);
if (gtkut_widget_is_drawable (GTK_WIDGET(option_menu)))
gtk_widget_queue_draw (GTK_WIDGET (option_menu));
@@ -806,7 +836,7 @@
if (option_menu->menu_item)
{
- child = GTK_BIN (option_menu)->child;
+ child = gtk_bin_get_child (GTK_BIN (option_menu));
if (child)
{
@@ -843,7 +873,7 @@
if (option_menu->menu)
{
- children = GTK_MENU_SHELL (option_menu->menu)->children;
+ children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
while (children)
{
child = children->data;
@@ -851,7 +881,7 @@
if (gtkut_widget_get_visible (child))
{
- GtkWidget *inner = GTK_BIN (child)->child;
+ GtkWidget *inner = gtk_bin_get_child (GTK_BIN (child));
if (inner)
{
@@ -862,6 +892,8 @@
}
}
}
+
+ g_list_free(children);
}
if (old_width != option_menu->width || old_height != option_menu->height)
@@ -880,7 +912,8 @@
GtkWidget *child;
GtkWidget *widget;
GtkRequisition requisition;
- GList *children;
+ GtkAllocation allocation;
+ GList *children, *cur;
gint screen_width;
gint menu_xpos;
gint menu_ypos;
@@ -895,10 +928,11 @@
menu_width = requisition.width;
active = gtk_menu_get_active (GTK_MENU (option_menu->menu));
- gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
+ gdk_window_get_origin (gtk_widget_get_window (widget), &menu_xpos, &menu_ypos);
- menu_xpos += widget->allocation.x;
- menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2;
+ gtk_widget_get_allocation (widget, &allocation);
+ menu_xpos += allocation.x;
+ menu_ypos += allocation.y + allocation.height / 2 - 2;
if (active != NULL)
{
@@ -906,10 +940,10 @@
menu_ypos -= requisition.height / 2;
}
- children = GTK_MENU_SHELL (option_menu->menu)->children;
- while (children)
+ children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
+ for (cur = children; cur && cur->data; cur = cur->next)
{
- child = children->data;
+ child = cur->data;
if (active == child)
break;
@@ -919,12 +953,12 @@
gtk_widget_get_child_requisition (child, &requisition);
menu_ypos -= requisition.height;
}
-
- children = children->next;
}
+ g_list_free (children);
+
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- menu_xpos = menu_xpos + widget->allocation.width - menu_width;
+ menu_xpos = menu_xpos + allocation.width - menu_width;
/* Clamp the position on screen */
screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
@@ -968,7 +1002,7 @@
container = GTK_CONTAINER (widget);
gtk_widget_hide (widget);
- gtk_container_foreach (container, (GtkCallback) gtk_widget_hide_all, NULL);
+ gtk_container_foreach (container, (GtkCallback) gtk_widget_hide, NULL);
}
static gboolean
@@ -987,14 +1021,15 @@
gint index;
gint n_children;
gint index_dir;
- GList *l;
+ GList *l, *children;
GtkMenuItem *item;
index = gtk_cmoption_menu_get_history (option_menu);
if (index != -1)
{
- n_children = g_list_length (GTK_MENU_SHELL (option_menu->menu)->children);
+ children = gtk_container_get_children (GTK_CONTAINER (GTK_MENU_SHELL (option_menu->menu)));
+ n_children = g_list_length (children);
if (event->direction == GDK_SCROLL_UP)
index_dir = -1;
@@ -1011,7 +1046,7 @@
if (index >= n_children)
break;
- l = g_list_nth (GTK_MENU_SHELL (option_menu->menu)->children, index);
+ l = g_list_nth (children, index);
item = GTK_MENU_ITEM (l->data);
if (gtkut_widget_get_visible (GTK_WIDGET(item)) &&
gtkut_widget_is_sensitive (GTK_WIDGET(item)))
@@ -1022,6 +1057,8 @@
}
}
+
+ g_list_free (children);
}
return TRUE;
Index: logwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/logwindow.c,v
retrieving revision 1.1.4.37
retrieving revision 1.1.4.38
diff -u -d -r1.1.4.37 -r1.1.4.38
--- logwindow.c 16 Feb 2011 07:16:20 -0000 1.1.4.37
+++ logwindow.c 7 Oct 2011 09:08:57 -0000 1.1.4.38
@@ -178,7 +178,7 @@
logwin->status_nok_color = color[6];
logwin->status_skip_color = color[7];
- colormap = gdk_drawable_get_colormap(logwin->window->window);
+ colormap = gdk_drawable_get_colormap(gtk_widget_get_window(logwin->window));
gdk_colormap_alloc_colors(colormap, color, LOG_COLORS, FALSE, TRUE, success);
for (i = 0; i < LOG_COLORS; i++) {
@@ -364,10 +364,12 @@
log_window_clip (logwindow, logwindow->clip_length);
if (!logwindow->hidden) {
- GtkAdjustment *vadj = text->vadjustment;
- gfloat upper = vadj->upper - vadj->page_size;
- if (vadj->value == upper ||
- (upper - vadj->value < 16 && vadj->value < 8))
+ GtkAdjustment *vadj = gtk_text_view_get_vadjustment(text);
+ gfloat upper = gtk_adjustment_get_upper(vadj) -
+ gtk_adjustment_get_page_size(vadj);
+ gfloat value = gtk_adjustment_get_value(vadj);
+ if (value == upper ||
+ (upper - value < 16 && value < 8))
gtk_text_view_scroll_mark_onscreen(text, logwindow->end_mark);
}
Index: authors.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/authors.h,v
retrieving revision 1.1.2.73
retrieving revision 1.1.2.74
diff -u -d -r1.1.2.73 -r1.1.2.74
--- authors.h 31 Aug 2011 16:54:53 -0000 1.1.2.73
+++ authors.h 7 Oct 2011 09:08:57 -0000 1.1.2.74
@@ -184,6 +184,7 @@
"David Mehrmann",
"Christian Mertes",
"Bram Metsch",
+"Hanno Meyer-Thurow",
"George Michaelson",
"Florian Mickler",
"Neill Miller",
Index: gtkvscrollbutton.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkvscrollbutton.c,v
retrieving revision 1.5.2.21
retrieving revision 1.5.2.22
diff -u -d -r1.5.2.21 -r1.5.2.22
--- gtkvscrollbutton.c 10 Apr 2011 08:07:07 -0000 1.5.2.21
+++ gtkvscrollbutton.c 7 Oct 2011 09:08:57 -0000 1.5.2.22
@@ -119,7 +119,7 @@
GdkEventVisibility *event,
gpointer data)
{
- gdk_window_set_cursor(widget->window, hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
return FALSE;
}
@@ -127,7 +127,7 @@
GdkEventCrossing *event,
gpointer data)
{
- gdk_window_set_cursor(widget->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
return FALSE;
}
@@ -135,7 +135,7 @@
GdkEventCrossing *event,
gpointer data)
{
- gdk_window_set_cursor(widget->window, hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
return FALSE;
}
@@ -290,34 +290,36 @@
gboolean gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
{
+ gfloat bound;
gfloat new_value;
+ gfloat page_size;
+ gfloat value;
gboolean return_val;
cm_return_val_if_fail(scrollbutton != NULL, FALSE);
cm_return_val_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton), FALSE);
- new_value = scrollbutton->adjustment->value;
+ new_value = value = gtk_adjustment_get_value(scrollbutton->adjustment);
return_val = TRUE;
switch (scrollbutton->scroll_type) {
case GTK_SCROLL_STEP_BACKWARD:
- new_value -= scrollbutton->adjustment->step_increment;
- if (new_value <= scrollbutton->adjustment->lower) {
- new_value = scrollbutton->adjustment->lower;
+ new_value = value - gtk_adjustment_get_step_increment(scrollbutton->adjustment);
+ bound = gtk_adjustment_get_lower(scrollbutton->adjustment);
+ if (new_value <= bound) {
+ new_value = bound;
return_val = FALSE;
scrollbutton->timer = 0;
}
break;
case GTK_SCROLL_STEP_FORWARD:
- new_value += scrollbutton->adjustment->step_increment;
- if (new_value >=
- (scrollbutton->adjustment->upper -
- scrollbutton->adjustment->page_size)) {
- new_value =
- scrollbutton->adjustment->upper -
- scrollbutton->adjustment->page_size;
+ new_value = value + gtk_adjustment_get_step_increment(scrollbutton->adjustment);
+ bound = gtk_adjustment_get_upper(scrollbutton->adjustment);
+ page_size = gtk_adjustment_get_page_size(scrollbutton->adjustment);
+ if (new_value >= (bound - page_size)) {
+ new_value = bound - page_size;
return_val = FALSE;
scrollbutton->timer = 0;
}
@@ -328,8 +330,8 @@
}
- if (new_value != scrollbutton->adjustment->value) {
- scrollbutton->adjustment->value = new_value;
+ if (new_value != value) {
+ gtk_adjustment_set_value(scrollbutton->adjustment, new_value);
g_signal_emit_by_name(G_OBJECT
(scrollbutton->adjustment),
"value_changed");
@@ -417,11 +419,14 @@
static void gtk_vscrollbutton_set_sensitivity (GtkAdjustment *adjustment,
GtkVScrollbutton *scrollbutton)
{
+ gfloat value;
if (!gtkut_widget_get_realized(GTK_WIDGET(scrollbutton))) return;
if (scrollbutton->button != 0) return; /* not while something is pressed */
+ value = gtk_adjustment_get_value(adjustment);
gtk_widget_set_sensitive(scrollbutton->upbutton,
- (adjustment->value > adjustment->lower));
+ (value > gtk_adjustment_get_lower(adjustment)));
gtk_widget_set_sensitive(scrollbutton->downbutton,
- (adjustment->value < (adjustment->upper - adjustment->page_size)));
+ (value < (gtk_adjustment_get_upper(adjustment) -
+ gtk_adjustment_get_page_size(adjustment))));
}
Index: about.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/about.c,v
retrieving revision 1.4.2.79
retrieving revision 1.4.2.80
diff -u -d -r1.4.2.79 -r1.4.2.80
--- about.c 5 Jun 2011 05:51:46 -0000 1.4.2.79
+++ about.c 7 Oct 2011 09:08:57 -0000 1.4.2.80
@@ -847,7 +847,7 @@
GtkWidget *textview)
{
about_textview_uri_update(textview, event->x, event->y);
- gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
+ gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, NULL);
return FALSE;
}
More information about the Commits
mailing list