• R/O
  • SSH
  • HTTPS

kazehakase: 提交


Commit MetaInfo

修订版3871 (tree)
时间2010-05-03 16:23:57
作者ikezoe

Log Message

adapt to the latest GTK+.

更改概述

差异

--- kazehakase/trunk/src/kz-tab-label.c (revision 3870)
+++ kazehakase/trunk/src/kz-tab-label.c (revision 3871)
@@ -519,7 +519,7 @@
519519
520520 g_return_if_fail(KZ_IS_TAB_LABEL(kztab));
521521
522- if (!GTK_WIDGET_REALIZED(kztab)) return;
522+ if (!gtk_widget_get_realized(GTK_WIDGET(kztab))) return;
523523
524524 priv = KZ_TAB_LABEL_GET_PRIVATE (kztab);
525525 if (priv->create_thumbnail &&
@@ -965,7 +965,7 @@
965965
966966 widget = GTK_WIDGET(kztab);
967967
968- if(GTK_WIDGET_REALIZED(widget))
968+ if(gtk_widget_get_realized(widget))
969969 {
970970 GdkBitmap *mask;
971971 KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE(kztab);
--- kazehakase/trunk/src/dialogs/kz-about-dialog.c (revision 3870)
+++ kazehakase/trunk/src/dialogs/kz-about-dialog.c (revision 3871)
@@ -78,7 +78,7 @@
7878
7979 /* Draw background image */
8080 gdk_draw_pixbuf(widget->window,
81- widget->style->bg_gc[GTK_WIDGET_STATE(widget)],
81+ widget->style->bg_gc[gtk_widget_get_state(widget)],
8282 image,
8383 0, 0,
8484 0, 0,
@@ -87,7 +87,7 @@
8787 0, 0);
8888 /* Draw logo at top right */
8989 gdk_draw_pixbuf(widget->window,
90- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
90+ widget->style->fg_gc[gtk_widget_get_state(widget)],
9191 logo,
9292 0, 0,
9393 bg_width - logo_width, 0,
@@ -113,7 +113,7 @@
113113 pango_layout_set_alignment(info_layout, PANGO_ALIGN_RIGHT);
114114 pango_layout_get_pixel_extents(info_layout, &link, &logical);
115115 gdk_draw_layout(widget->window,
116- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
116+ widget->style->fg_gc[gtk_widget_get_state(widget)],
117117 bg_width - logical.width, logo_height,
118118 info_layout);
119119 g_free (version);
@@ -127,7 +127,7 @@
127127 pango_layout_set_width(copyright_layout, -1);
128128 pango_layout_get_pixel_extents(copyright_layout, &link, &logical);
129129 gdk_draw_layout(widget->window,
130- widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
130+ widget->style->fg_gc[gtk_widget_get_state(widget)],
131131 bg_width - logical.width, bg_height - logical.height,
132132 copyright_layout);
133133
--- kazehakase/trunk/src/kz-web.c (revision 3870)
+++ kazehakase/trunk/src/kz-web.c (revision 3871)
@@ -656,7 +656,7 @@
656656
657657 requisition->height = GTK_CONTAINER(widget)->border_width;
658658
659- if (child && GTK_WIDGET_VISIBLE(child)) {
659+ if (child && gtk_widget_get_visible(child)) {
660660 gtk_widget_size_request(child, &child_requisition);
661661 requisition->width += child_requisition.width;
662662 requisition->height += child_requisition.height;
@@ -669,11 +669,11 @@
669669 GtkWidget *child;
670670 GtkAllocation child_allocation;
671671
672- if (!GTK_WIDGET_REALIZED(widget))
672+ if (!gtk_widget_get_realized(widget))
673673 return;
674674 widget->allocation = *allocation;
675675
676- if (GTK_WIDGET_NO_WINDOW(widget)) {
676+ if (!gtk_widget_get_has_window(widget)) {
677677 child_allocation.x = allocation->x + GTK_CONTAINER(widget)->border_width;
678678 child_allocation.y = allocation->y + GTK_CONTAINER(widget)->border_width;
679679 } else {
--- kazehakase/trunk/src/widget/kz-entry.c (revision 3870)
+++ kazehakase/trunk/src/widget/kz-entry.c (revision 3871)
@@ -137,7 +137,7 @@
137137 {
138138 GtkEntry *entry = GTK_ENTRY(widget);
139139
140- if (!GTK_WIDGET_HAS_FOCUS(widget) &&
140+ if (!gtk_widget_has_focus(widget) &&
141141 (!gtk_entry_get_text(entry) || gtk_entry_get_text(entry)[0] == '\0')) {
142142 PangoLayout *layout;
143143 PangoAttrList *attrs;
--- kazehakase/trunk/src/widget/kz-paned.c (revision 3870)
+++ kazehakase/trunk/src/widget/kz-paned.c (revision 3871)
@@ -154,8 +154,8 @@
154154
155155 paned = GTK_PANED(kzpaned);
156156
157- return paned->child1 && GTK_WIDGET_VISIBLE(paned->child1) &&
158- paned->child2 && GTK_WIDGET_VISIBLE(paned->child2);
157+ return paned->child1 && gtk_widget_get_visible(paned->child1) &&
158+ paned->child2 && gtk_widget_get_visible(paned->child2);
159159 }
160160
161161 void
--- kazehakase/trunk/src/kz-download-box.c (revision 3870)
+++ kazehakase/trunk/src/kz-download-box.c (revision 3871)
@@ -344,7 +344,7 @@
344344 icon_set,
345345 icon->image->style,
346346 gtk_widget_get_direction(icon->image),
347- GTK_WIDGET_STATE(icon->image),
347+ gtk_widget_get_state(icon->image),
348348 GTK_ICON_SIZE_MENU,
349349 icon->image,
350350 "download icon");
--- kazehakase/trunk/src/actions/kz-zoom-action.c (revision 3870)
+++ kazehakase/trunk/src/actions/kz-zoom-action.c (revision 3871)
@@ -205,7 +205,7 @@
205205 KzWeb *web;
206206 KzZoomActionPrivate *priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
207207
208- if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
208+ if (!priv->spin || !gtk_widget_get_visible(priv->spin))
209209 return;
210210
211211 web = KZ_WINDOW_CURRENT_WEB(priv->kz);
@@ -228,7 +228,7 @@
228228
229229 priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
230230
231- if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
231+ if (!priv->spin || !gtk_widget_get_visible(priv->spin))
232232 return;
233233
234234 spin = priv->spin;
@@ -249,7 +249,7 @@
249249
250250 priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
251251
252- if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
252+ if (!priv->spin || !gtk_widget_get_visible(priv->spin))
253253 return 1.0;
254254 ratio = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->spin)) / 100;
255255
--- kazehakase/trunk/src/kz-window.c (revision 3870)
+++ kazehakase/trunk/src/kz-window.c (revision 3871)
@@ -615,7 +615,7 @@
615615
616616 g_return_if_fail(KZ_IS_WINDOW(kz));
617617
618- if (!GTK_WIDGET_REALIZED(kz)) return;
618+ if (!gtk_widget_get_realized(GTK_WIDGET(kz))) return;
619619
620620 web = KZ_WINDOW_CURRENT_WEB(kz);
621621 kz_actions_set_sensitive(kz, web);
--- kazehakase/trunk/configure.ac (revision 3870)
+++ kazehakase/trunk/configure.ac (revision 3871)
@@ -101,7 +101,7 @@
101101 dnl **************************************************************
102102 dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
103103 dnl in MODULES, pass to pkg-config
104-AM_PATH_GTK_2_0(2.17.7, , ,[gthread])
104+AM_PATH_GTK_2_0(2.20.0, , ,[gthread])
105105 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
106106 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
107107
Show on old repository browser