diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-09-03 15:23:17 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-09-03 15:23:17 +0000 |
| commit | e4f4f03fcf45589cc904e433441aba46f485b8ca (patch) | |
| tree | 6c2c529eec36af85d358edb96ec78eb360b975a3 | |
| parent | 32b4a4658b84eb61346880e30b16e947cf36eca0 (diff) | |
| download | gtk+-e4f4f03fcf45589cc904e433441aba46f485b8ca.tar.gz | |
gtk/gtkmenu.c remove unused macro cruft. Also remove some unneeded
2008-09-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c
* gtk/gtkmenuitem.c: remove unused macro cruft. Also remove some
unneeded includes.
svn path=/trunk/; revision=21266
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 22 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.c | 5 |
3 files changed, 16 insertions, 17 deletions
@@ -1,5 +1,11 @@ 2008-09-03 Michael Natterer <mitch@imendio.com> + * gtk/gtkmenu.c + * gtk/gtkmenuitem.c: remove unused macro cruft. Also remove some + unneeded includes. + +2008-09-03 Michael Natterer <mitch@imendio.com> + * gtk/gtkarrow.c: expose-event returns gboolean not gint, reindented static prototypes and did some minor cleanups. diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 959ebd9a26..9cfbdb19c8 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -21,21 +21,19 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #define GTK_MENU_INTERNALS #include "config.h" -#include <string.h> /* memset */ +#include <string.h> #include "gdk/gdkkeysyms.h" #include "gtkaccellabel.h" #include "gtkaccelmap.h" #include "gtkbindings.h" -#include "gtklabel.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkmenu.h" -#include "gtkmenuitem.h" #include "gtktearoffmenuitem.h" #include "gtkwindow.h" #include "gtkhbox.h" @@ -46,20 +44,18 @@ #include "gtkalias.h" -#define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_GET_CLASS (w) - -#define DEFAULT_POPUP_DELAY 225 +#define DEFAULT_POPUP_DELAY 225 #define DEFAULT_POPDOWN_DELAY 1000 #define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region * extends below the submenu */ -#define MENU_SCROLL_STEP1 8 -#define MENU_SCROLL_STEP2 15 -#define MENU_SCROLL_FAST_ZONE 8 -#define MENU_SCROLL_TIMEOUT1 50 -#define MENU_SCROLL_TIMEOUT2 20 +#define MENU_SCROLL_STEP1 8 +#define MENU_SCROLL_STEP2 15 +#define MENU_SCROLL_FAST_ZONE 8 +#define MENU_SCROLL_TIMEOUT1 50 +#define MENU_SCROLL_TIMEOUT2 20 #define ATTACH_INFO_KEY "gtk-menu-child-attach-info-key" #define ATTACHED_MENUS "gtk-attached-menus" @@ -248,7 +244,7 @@ static gboolean gtk_menu_real_can_activate_accel (GtkWidget *widget, static void _gtk_menu_refresh_accel_paths (GtkMenu *menu, gboolean group_changed); -static const gchar attach_data_key[] = "gtk-menu-attach-data"; +static const gchar attach_data_key[] = "gtk-menu-attach-data"; static guint menu_signals[LAST_SIGNAL] = { 0 }; diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index b8fae76149..b0d6198618 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #define GTK_MENU_INTERNALS @@ -34,14 +34,11 @@ #include "gtkmarshalers.h" #include "gtkmenu.h" #include "gtkmenubar.h" -#include "gtkmenuitem.h" #include "gtkseparatormenuitem.h" #include "gtkprivate.h" #include "gtkintl.h" #include "gtkalias.h" -#define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass) - enum { ACTIVATE, ACTIVATE_ITEM, |