| Index: chrome/browser/gtk/gtk_custom_menu.h
|
| diff --git a/chrome/browser/gtk/gtk_custom_menu.h b/chrome/browser/gtk/gtk_custom_menu.h
|
| index 1faa730c30b57ab6b4674bc2407b1726d1e0a7bf..bd708c3f650d237f87038980bcf1fd7df1574ed7 100644
|
| --- a/chrome/browser/gtk/gtk_custom_menu.h
|
| +++ b/chrome/browser/gtk/gtk_custom_menu.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -6,49 +6,7 @@
|
| #define CHROME_BROWSER_GTK_GTK_CUSTOM_MENU_H_
|
| #pragma once
|
|
|
| -// GtkCustomMenu is a GtkMenu subclass that can contain, and collaborates with,
|
| -// GtkCustomMenuItem instances. GtkCustomMenuItem is a GtkMenuItem that can
|
| -// have buttons and other normal widgets embeded in it. GtkCustomMenu exists
|
| -// only to override most of the button/motion/move callback functions so
|
| -// that the normal GtkMenu implementation doesn't handle events related to
|
| -// GtkCustomMenuItem items.
|
| -//
|
| -// For a more through overview of this system, see the comments in
|
| -// gtk_custom_menu_item.h.
|
| -
|
| -#include <gdk/gdk.h>
|
| -#include <gtk/gtk.h>
|
| -#include <gtk/gtkmenuitem.h>
|
| -
|
| -G_BEGIN_DECLS
|
| -
|
| -#define GTK_TYPE_CUSTOM_MENU \
|
| - (gtk_custom_menu_get_type())
|
| -#define GTK_CUSTOM_MENU(obj) \
|
| - (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_CUSTOM_MENU, GtkCustomMenu))
|
| -#define GTK_CUSTOM_MENU_CLASS(klass) \
|
| - (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_CUSTOM_MENU, GtkCustomMenuClass))
|
| -#define GTK_IS_CUSTOM_MENU(obj) \
|
| - (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_CUSTOM_MENU))
|
| -#define GTK_IS_CUSTOM_MENU_CLASS(klass) \
|
| - (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_CUSTOM_MENU))
|
| -#define GTK_CUSTOM_MENU_GET_CLASS(obj) \
|
| - (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_CUSTOM_MENU, GtkCustomMenuClass))
|
| -
|
| -typedef struct _GtkCustomMenu GtkCustomMenu;
|
| -typedef struct _GtkCustomMenuClass GtkCustomMenuClass;
|
| -
|
| -struct _GtkCustomMenu {
|
| - GtkMenu menu;
|
| -};
|
| -
|
| -struct _GtkCustomMenuClass {
|
| - GtkMenuClass parent_class;
|
| -};
|
| -
|
| -GType gtk_custom_menu_get_type(void) G_GNUC_CONST;
|
| -GtkWidget* gtk_custom_menu_new();
|
| -
|
| -G_END_DECLS
|
| +#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
|
| +// TODO(msw): remove this file once all includes have been updated.
|
|
|
| #endif // CHROME_BROWSER_GTK_GTK_CUSTOM_MENU_H_
|
|
|