Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6990)

Unified Diff: chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc

Issue 7227027: GTK: More 2.18 goodness. Move from macros to real accessor functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove views/ Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
diff --git a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
index 4f8d8575a1f17268c477948ae9591115eb356466..e549f8640a72a08c9fc0c75f15369573f87e2ed8 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
@@ -27,12 +27,12 @@ struct SizeAllocateData {
};
void CountVisibleChildren(GtkWidget* child, gpointer userdata) {
- if (GTK_WIDGET_VISIBLE(child))
+ if (gtk_widget_get_visible(child))
++(*reinterpret_cast<int*>(userdata));
}
void SumChildrenWidthRequisition(GtkWidget* child, gpointer userdata) {
- if (GTK_WIDGET_VISIBLE(child)) {
+ if (gtk_widget_get_visible(child)) {
GtkRequisition req;
gtk_widget_get_child_requisition(child, &req);
(*reinterpret_cast<int*>(userdata)) += std::max(req.width, 0);
@@ -40,14 +40,14 @@ void SumChildrenWidthRequisition(GtkWidget* child, gpointer userdata) {
}
void ShowInvisibleChildren(GtkWidget* child, gpointer userdata) {
- if (!GTK_WIDGET_VISIBLE(child)) {
+ if (!gtk_widget_get_visible(child)) {
gtk_widget_show(child);
++(*reinterpret_cast<int*>(userdata));
}
}
void ChildSizeAllocate(GtkWidget* child, gpointer userdata) {
- if (!GTK_WIDGET_VISIBLE(child))
+ if (!gtk_widget_get_visible(child))
return;
SizeAllocateData* data = reinterpret_cast<SizeAllocateData*>(userdata);
« no previous file with comments | « chrome/browser/ui/gtk/gtk_chrome_link_button.cc ('k') | chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698