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

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

Issue 7329003: Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
===================================================================
--- chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc (revision 91773)
+++ chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc (working copy)
@@ -27,12 +27,12 @@
};
void CountVisibleChildren(GtkWidget* child, gpointer userdata) {
- if (gtk_widget_get_visible(child))
+ if (GTK_WIDGET_VISIBLE(child))
++(*reinterpret_cast<int*>(userdata));
}
void SumChildrenWidthRequisition(GtkWidget* child, gpointer userdata) {
- if (gtk_widget_get_visible(child)) {
+ if (GTK_WIDGET_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 ShowInvisibleChildren(GtkWidget* child, gpointer userdata) {
- if (!gtk_widget_get_visible(child)) {
+ if (!GTK_WIDGET_VISIBLE(child)) {
gtk_widget_show(child);
++(*reinterpret_cast<int*>(userdata));
}
}
void ChildSizeAllocate(GtkWidget* child, gpointer userdata) {
- if (!gtk_widget_get_visible(child))
+ if (!GTK_WIDGET_VISIBLE(child))
return;
SizeAllocateData* data = reinterpret_cast<SizeAllocateData*>(userdata);
Property changes on: chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
___________________________________________________________________
Added: svn:mergeinfo
« 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