[maemo-commits] [maemo-commits] r9260 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Jan 23 15:16:10 EET 2007
- Previous message: [maemo-commits] r9259 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Next message: [maemo-commits] r9261 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: timj Date: 2007-01-23 15:15:54 +0200 (Tue, 23 Jan 2007) New Revision: 9260 Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcontainer.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/updateiconcache.c Log: Tue Jan 23 14:11:26 2007 Tim Janik <timj at imendio.com> * gtk/updateiconcache.c: * gtk/gtktoolbutton.h: * gtk/gtkcontainer.c: * gtk/gtkbutton.[hc]: * gtk/gtkmenu.[hc]: conditionalize maemo chanegs with MAEMO_CHANGES. Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-23 13:15:54 UTC (rev 9260) @@ -1,3 +1,11 @@ +Tue Jan 23 14:11:26 2007 Tim Janik <timj at imendio.com> + + * gtk/updateiconcache.c: + * gtk/gtktoolbutton.h: + * gtk/gtkcontainer.c: + * gtk/gtkbutton.[hc]: + * gtk/gtkmenu.[hc]: conditionalize maemo chanegs with MAEMO_CHANGES. + Tue Jan 23 13:54:49 2007 Tim Janik <timj at imendio.com> * gtk/gtkwindow.[hc]: Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c 2007-01-23 13:15:54 UTC (rev 9260) @@ -516,11 +516,11 @@ priv->image_is_stock = TRUE; priv->image_position = GTK_POS_LEFT; - /* MAEMO START */ +#ifdef MAEMO_CHANGES g_object_set (G_OBJECT (button), "tap-and-hold-state", GTK_STATE_ACTIVE, NULL); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ } static void @@ -2061,7 +2061,7 @@ } -/* MAEMO START */ +#ifdef MAEMO_CHANGES const gchar *osso_gtk_button_attach_details [OSSO_GTK_BUTTON_ATTACH_ENUM_END] = { "osso_button", @@ -2094,7 +2094,7 @@ { } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_BUTTON_C__ Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h 2007-01-23 13:15:54 UTC (rev 9260) @@ -134,7 +134,7 @@ const gchar *main_detail, const gchar *default_detail); -/* MAEMO START */ +#ifdef MAEMO_CHANGES void hildon_gtk_button_set_depressed (GtkButton *button, gboolean depressed); @@ -150,7 +150,7 @@ void osso_gtk_button_set_detail_from_attach_flags (GtkButton *button, OssoGtkButtonAttachFlags flags); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcontainer.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcontainer.c 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkcontainer.c 2007-01-23 13:15:54 UTC (rev 9260) @@ -39,9 +39,9 @@ #include <gobject/gobjectnotifyqueue.c> #include <gobject/gvaluecollector.h> #include "gtkalias.h" -/* MAEMO START */ +#ifdef MAEMO_CHANGES #include "gtkmenu.h" -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ enum { ADD, @@ -58,7 +58,7 @@ PROP_CHILD }; -/* MAEMO START */ +#ifdef MAEMO_CHANGES typedef struct { GtkWidget *menu; @@ -66,7 +66,7 @@ GtkWidgetTapAndHoldFlags flags; } GtkContainerTAH; -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define PARAM_SPEC_PARAM_ID(pspec) ((pspec)->param_id) #define PARAM_SPEC_SET_PARAM_ID(pspec, id) ((pspec)->param_id = (id)) @@ -111,14 +111,14 @@ static gchar* gtk_container_child_default_composite_name (GtkContainer *container, GtkWidget *child); -/* MAEMO START */ +#ifdef MAEMO_CHANGES static void gtk_container_tap_and_hold_setup (GtkWidget *widget, GtkWidget *menu, GtkCallback func, GtkWidgetTapAndHoldFlags flags); static void gtk_container_tap_and_hold_setup_forall (GtkWidget *widget, GtkContainerTAH *tah); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ /* --- variables --- */ static const gchar vadjustment_key[] = "gtk-vadjustment"; @@ -210,9 +210,9 @@ widget_class->map = gtk_container_map; widget_class->unmap = gtk_container_unmap; widget_class->focus = gtk_container_focus; - /* MAEMO START */ +#ifdef MAEMO_CHANGES widget_class->tap_and_hold_setup = gtk_container_tap_and_hold_setup; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ class->add = gtk_container_add_unimplemented; class->remove = gtk_container_remove_unimplemented; @@ -2487,7 +2487,7 @@ } } -/* MAEMO START */ +#ifdef MAEMO_CHANGES static void gtk_container_tap_and_hold_setup_forall (GtkWidget *widget, GtkContainerTAH *tah) @@ -2520,7 +2520,7 @@ parent_class->tap_and_hold_setup (widget, menu, func, flags); } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_CONTAINER_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c 2007-01-23 13:15:54 UTC (rev 9260) @@ -101,12 +101,12 @@ gboolean ignore_button_release; gboolean initially_pushed_in; - /* MAEMO START */ +#ifdef MAEMO_CHANGES /* For context menu behavior */ gboolean context_menu; int popup_pointer_x; int popup_pointer_y; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ }; typedef struct @@ -903,11 +903,11 @@ priv->upper_arrow_state = GTK_STATE_NORMAL; priv->lower_arrow_state = GTK_STATE_NORMAL; - /* MAEMO START */ +#ifdef MAEMO_CHANGES priv->context_menu = FALSE; priv->popup_pointer_x = -1; priv->popup_pointer_y = -1; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ priv->have_layout = FALSE; } @@ -1442,14 +1442,14 @@ gtk_menu_scroll_to (menu, menu->scroll_offset); - /* MAEMO START */ +#ifdef MAEMO_CHANGES /* Hildon: save position of the pointer during popup. Not multihead safe. */ if (priv->context_menu) gdk_display_get_pointer (gtk_widget_get_display (widget), NULL, &priv->popup_pointer_x, &priv->popup_pointer_y, NULL); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ /* Once everything is set up correctly, map the toplevel window on the screen. @@ -4857,7 +4857,7 @@ } } -/* MAEMO START */ +#ifdef MAEMO_CHANGES /* Hildon function to make context menus behave according to spec */ void _gtk_menu_enable_context_menu_behavior (GtkMenu *menu) @@ -4866,7 +4866,7 @@ priv->context_menu = TRUE; } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_MENU_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.h 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.h 2007-01-23 13:15:54 UTC (rev 9260) @@ -198,9 +198,9 @@ gint monitor_num); GList* gtk_menu_get_for_attach_widget (GtkWidget *widget); -/* MAEMO START */ +#ifdef MAEMO_CHANGES void _gtk_menu_enable_context_menu_behavior (GtkMenu *menu); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #ifndef GTK_DISABLE_DEPRECATED #define gtk_menu_append(menu,child) gtk_menu_shell_append ((GtkMenuShell *)(menu),(child)) Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h 2007-01-23 13:15:54 UTC (rev 9260) @@ -55,18 +55,15 @@ /* signal */ void (* clicked) (GtkToolButton *tool_item); - /* MAEMO START */ - void (* insensitive_press) (GtkToolButton *tool_item); - /* MAEMO END */ - /* Padding for future expansion */ +#ifdef MAEMO_CHANGES + void (* insensitive_press) (GtkToolButton *tool_item); +#else void (* _gtk_reserved1) (void); +#endif /* MAEMO_CHANGES */ void (* _gtk_reserved2) (void); void (* _gtk_reserved3) (void); - - /* MAEMO START */ - /* void (* _gtk_reserved4) (void); */ - /* MAEMO END */ + void (* _gtk_reserved4) (void); }; GType gtk_tool_button_get_type (void) G_GNUC_CONST; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/updateiconcache.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/updateiconcache.c 2007-01-23 13:02:44 UTC (rev 9259) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/updateiconcache.c 2007-01-23 13:15:54 UTC (rev 9260) @@ -51,9 +51,9 @@ #define HAS_SUFFIX_SVG (1 << 1) #define HAS_SUFFIX_PNG (1 << 2) #define HAS_ICON_FILE (1 << 3) -/* MAEMO START */ +#ifdef MAEMO_CHANGES #define HAS_SUFFIX_ANI (1 << 4) -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define CAN_CACHE_IMAGE_DATA(flags) (!index_only && (((flags) & HAS_SUFFIX_PNG) || ((flags) & HAS_SUFFIX_XPM))) @@ -513,10 +513,10 @@ flags |= HAS_SUFFIX_XPM; else if (g_str_has_suffix (name, ".icon")) flags |= HAS_ICON_FILE; - /* MAEMO START */ +#ifdef MAEMO_CHANGES else if (g_str_has_suffix (name, ".ani")) flags |= HAS_SUFFIX_ANI; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ if (flags == 0) continue;
- Previous message: [maemo-commits] r9259 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Next message: [maemo-commits] r9261 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]