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

Unified Diff: ui/views/widget/gtk_views_fixed.cc

Issue 9728002: Removing deprecated GTK-Views code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « ui/views/widget/gtk_views_fixed.h ('k') | ui/views/widget/gtk_views_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/gtk_views_fixed.cc
diff --git a/ui/views/widget/gtk_views_fixed.cc b/ui/views/widget/gtk_views_fixed.cc
deleted file mode 100644
index 60aed5cfe204771ce2eeb09af19e53080a5b90db..0000000000000000000000000000000000000000
--- a/ui/views/widget/gtk_views_fixed.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/views/widget/gtk_views_fixed.h"
-
-#include "base/logging.h"
-
-// We store whether we use the widget's allocated size as a property. Ideally
-// we would stash this in GtkFixedChild, but GtkFixed doesn't allow subclassing
-// gtk_fixed_put. Alternatively we could subclass GtkContainer and use our own
-// API (effectively duplicating GtkFixed), but that means folks could no longer
-// use the GtkFixed API else where in Chrome. For now I'm going with this route.
-static const char* kUseAllocatedSize = "__VIEWS_USE_ALLOCATED_SIZE__";
-static const char* kRequisitionWidth = "__VIEWS_REQUISITION_WIDTH__";
-static const char* kRequisitionHeight = "__VIEWS_REQUISITION_HEIGHT__";
-
-G_BEGIN_DECLS
-
-G_DEFINE_TYPE(GtkViewsFixed, gtk_views_fixed, GTK_TYPE_FIXED)
-
-static void gtk_views_fixed_size_allocate(GtkWidget* widget,
- GtkAllocation* allocation) {
- widget->allocation = *allocation;
- if (!GTK_WIDGET_NO_WINDOW(widget) && GTK_WIDGET_REALIZED(widget)) {
- gdk_window_move_resize(widget->window, allocation->x, allocation->y,
- allocation->width, allocation->height);
- }
-
- int border_width = GTK_CONTAINER(widget)->border_width;
- GList* children = GTK_FIXED(widget)->children;
- while (children) {
- GtkFixedChild* child = reinterpret_cast<GtkFixedChild*>(children->data);
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE(child->widget)) {
- GtkAllocation child_allocation;
-
- int width, height;
- bool use_allocated_size =
- gtk_views_fixed_get_widget_size(child->widget, &width, &height);
- if (use_allocated_size) {
- // NOTE: even though the size isn't changing, we have to call
- // size_allocate, otherwise things like buttons won't repaint.
- child_allocation.width = width;
- child_allocation.height = height;
- } else {
- GtkRequisition child_requisition;
- gtk_widget_get_child_requisition(child->widget, &child_requisition);
- child_allocation.width = child_requisition.width;
- child_allocation.height = child_requisition.height;
- }
- child_allocation.x = child->x + border_width;
- child_allocation.y = child->y + border_width;
-
- if (GTK_WIDGET_NO_WINDOW(widget)) {
- child_allocation.x += widget->allocation.x;
- child_allocation.y += widget->allocation.y;
- }
-
- gtk_widget_size_allocate(child->widget, &child_allocation);
- }
- }
-}
-
-static void gtk_views_fixed_class_init(GtkViewsFixedClass* views_fixed_class) {
- GtkWidgetClass* widget_class =
- reinterpret_cast<GtkWidgetClass*>(views_fixed_class);
- widget_class->size_allocate = gtk_views_fixed_size_allocate;
-}
-
-static void gtk_views_fixed_init(GtkViewsFixed* fixed) {
- GTK_WIDGET_SET_FLAGS(GTK_WIDGET(fixed), GTK_CAN_FOCUS);
-}
-
-GtkWidget* gtk_views_fixed_new(void) {
- return GTK_WIDGET(g_object_new(GTK_TYPE_VIEWS_FIXED, NULL));
-}
-
-void gtk_views_fixed_set_widget_size(GtkWidget* widget,
- int width, int height) {
- // Remember the allocation request, and set this widget up to use it.
- bool use_requested_size = (width != 0 && height != 0);
- g_object_set_data(G_OBJECT(widget), kUseAllocatedSize,
- reinterpret_cast<gpointer>(use_requested_size ? 1 : 0));
- g_object_set_data(G_OBJECT(widget), kRequisitionWidth,
- reinterpret_cast<gpointer>(width));
- g_object_set_data(G_OBJECT(widget), kRequisitionHeight,
- reinterpret_cast<gpointer>(height));
-
- gtk_widget_queue_resize(widget);
-}
-
-bool gtk_views_fixed_get_widget_size(GtkWidget* widget,
- int* width, int* height) {
- DCHECK(width);
- DCHECK(height);
- *width = reinterpret_cast<glong>(g_object_get_data(G_OBJECT(widget),
- kRequisitionWidth));
- *height = reinterpret_cast<glong>(g_object_get_data(G_OBJECT(widget),
- kRequisitionHeight));
- return (g_object_get_data(G_OBJECT(widget), kUseAllocatedSize) != 0);
-}
-
-G_END_DECLS
« no previous file with comments | « ui/views/widget/gtk_views_fixed.h ('k') | ui/views/widget/gtk_views_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698