diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 22:30:19 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 22:30:19 +0000 |
| commit | 27883bbbf6b412ff4b239e0eaa32afb0773036fb (patch) | |
| tree | b16076df12a7bb0ba5b8b387b1e290572de9d345 /chrome/browser/ui/gtk/gtk_floating_container.cc | |
| parent | 722fe2fda5e19985413c9f492cf93b7fc902354e (diff) | |
| download | chromium_src-27883bbbf6b412ff4b239e0eaa32afb0773036fb.zip chromium_src-27883bbbf6b412ff4b239e0eaa32afb0773036fb.tar.gz chromium_src-27883bbbf6b412ff4b239e0eaa32afb0773036fb.tar.bz2 | |
Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.
This does not take care of everything! There are many deprecated macros that we
can't replace because their accessor replacements were in 2.20 or later.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7227027
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/7329003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_floating_container.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_floating_container.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/gtk_floating_container.cc b/chrome/browser/ui/gtk/gtk_floating_container.cc index 5309fc4..e3891a6 100644 --- a/chrome/browser/ui/gtk/gtk_floating_container.cc +++ b/chrome/browser/ui/gtk/gtk_floating_container.cc @@ -147,7 +147,7 @@ static void gtk_floating_container_remove(GtkContainer* container, if (child->widget == widget) { removed_child = true; - gboolean was_visible = gtk_widget_get_visible(GTK_WIDGET(widget)); + gboolean was_visible = GTK_WIDGET_VISIBLE(widget); gtk_widget_unparent(widget); @@ -156,7 +156,7 @@ static void gtk_floating_container_remove(GtkContainer* container, g_list_free(children); g_free(child); - if (was_visible && gtk_widget_get_visible(GTK_WIDGET(container))) + if (was_visible && GTK_WIDGET_VISIBLE(container)) gtk_widget_queue_resize(GTK_WIDGET(container)); break; @@ -236,7 +236,7 @@ static void gtk_floating_container_size_allocate(GtkWidget* widget, reinterpret_cast<GtkFloatingContainerChild*>(children->data); children = children->next; - if (gtk_widget_get_visible(GTK_WIDGET(child->widget))) { + if (GTK_WIDGET_VISIBLE(child->widget)) { gtk_widget_size_request(child->widget, &child_requisition); child_allocation.x = allocation->x + child->x; child_allocation.y = allocation->y + child->y; |