[maemo-commits] [maemo-commits] r9259 - 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:03:02 EET 2007
- Previous message: [maemo-commits] r9258 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9260 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: timj Date: 2007-01-23 15:02:44 +0200 (Tue, 23 Jan 2007) New Revision: 9259 Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.h Log: Tue Jan 23 13:54:49 2007 Tim Janik <timj at imendio.com> * gtk/gtkwindow.[hc]: * gtk/gtkwidget.[hc]: * gtk/gtkrange.[hc]: * gtk/gtkstyle.[hc]: * gtk/gtkrc.[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 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2007-01-23 13:02:44 UTC (rev 9259) @@ -1,3 +1,11 @@ +Tue Jan 23 13:54:49 2007 Tim Janik <timj at imendio.com> + + * gtk/gtkwindow.[hc]: + * gtk/gtkwidget.[hc]: + * gtk/gtkrange.[hc]: + * gtk/gtkstyle.[hc]: + * gtk/gtkrc.[hc]: conditionalize maemo chanegs with MAEMO_CHANGES. + Tue Jan 23 13:49:31 2007 Tim Janik <timj at imendio.com> * gdk/x11/gdkwindow-x11.c: Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c 2007-01-23 13:02:44 UTC (rev 9259) @@ -3403,7 +3403,7 @@ } } -/* MAEMO START */ +#ifdef MAEMO_CHANGES void osso_gtk_range_set_stream_indicator (GtkRange *range, gboolean stream_indicator) @@ -3425,7 +3425,7 @@ return 0.0; } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_RANGE_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.h 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.h 2007-01-23 13:02:44 UTC (rev 9259) @@ -173,7 +173,7 @@ gdouble _gtk_range_get_wheel_delta (GtkRange *range, GdkScrollDirection direction); -/* MAEMO START */ +#ifdef MAEMO_CHANGES void osso_gtk_range_set_stream_indicator (GtkRange *range, gboolean stream_indicator); gboolean osso_gtk_range_get_stream_indicator (GtkRange *range); @@ -181,7 +181,7 @@ void osso_gtk_range_set_stream_position (GtkRange *range, gdouble position); gdouble osso_gtk_range_get_stream_position (GtkRange *range); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrc.c 2007-01-23 13:02:44 UTC (rev 9259) @@ -2208,10 +2208,10 @@ for (i = 0; i < G_N_ELEMENTS (symbols); i++) g_scanner_scope_add_symbol (scanner, 0, symbol_names + symbols[i].name_offset, GINT_TO_POINTER (symbols[i].token)); - /* MAEMO START */ +#ifdef MAEMO_CHANGES g_scanner_scope_add_symbol (scanner, 0, "logical_color", GINT_TO_POINTER (GTK_RC_TOKEN_COLOR)); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ done = FALSE; while (!done) @@ -3864,16 +3864,16 @@ case G_TOKEN_STRING: if (!gdk_color_parse (scanner->value.v_string, color)) { - /* MAEMO START */ +#ifdef MAEMO_CHANGES if (!(style && lookup_color (style, scanner->value.v_string, color))) { - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ g_scanner_warn (scanner, "Invalid color constant '%s'", scanner->value.v_string); return G_TOKEN_STRING; - /* MAEMO START */ +#ifdef MAEMO_CHANGES } - /* MAEMO_END */ +#endif /* MAEMO_CHANGES */ } return G_TOKEN_NONE; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c 2007-01-23 13:02:44 UTC (rev 9259) @@ -6766,7 +6766,7 @@ gdk_gc_set_clip_rectangle (gc, NULL); } -/* MAEMO START */ +#ifdef MAEMO_CHANGES gboolean gtk_style_lookup_logical_color (GtkStyle *style, const gchar *color_name, @@ -6775,7 +6775,7 @@ return gtk_style_lookup_color (style, color_name, color); } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_STYLE_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.h 2007-01-23 13:02:44 UTC (rev 9259) @@ -900,11 +900,11 @@ GtkTextDirection direction, gboolean draw_arrow); -/* MAEMO START */ +#ifdef MAEMO_CHANGES gboolean gtk_style_lookup_logical_color (GtkStyle *style, const gchar *color_name, GdkColor *color); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c 2007-01-23 13:02:44 UTC (rev 9259) @@ -53,24 +53,24 @@ #include "gtktooltips.h" #include "gtkinvisible.h" #include "gtkalias.h" -/* MAEMO START */ +#ifdef MAEMO_CHANGES #include <x11/gdkx.h> #include <stdlib.h> #include "gtkmenu.h" #include "gtkmenuitem.h" #include "gtkicontheme.h" #include "gtkdnd.h" -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w) #define INIT_PATH_SIZE (512) -/* MAEMO START */ +#ifdef MAEMO_CHANGES #define TAP_AND_HOLD_TIMER_COUNTER 11 #define TAP_AND_HOLD_TIMER_INTERVAL 100 #define TAP_AND_HOLD_ANIMATION 1 -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ enum { SHOW, @@ -137,11 +137,11 @@ GRAB_BROKEN, COMPOSITED_CHANGED, KEYNAV_FAILED, - /* MAEMO START */ +#ifdef MAEMO_CHANGES TAP_AND_HOLD, TAP_AND_HOLD_SETUP, TAP_AND_HOLD_QUERY, - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ LAST_SIGNAL }; @@ -165,9 +165,9 @@ PROP_EVENTS, PROP_EXTENSION_EVENTS, PROP_NO_SHOW_ALL, - /* MAEMO START */ +#ifdef MAEMO_CHANGES PROP_TAP_AND_HOLD - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ }; typedef struct _GtkStateData GtkStateData; @@ -180,7 +180,7 @@ guint use_forall : 1; }; -/* MAEMO START */ +#ifdef MAEMO_CHANGES typedef struct { GtkWidget *menu; @@ -217,7 +217,7 @@ GdkEvent *event); static gboolean gtk_widget_real_tap_and_hold_query (GtkWidget *widget, GdkEvent *event); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ /* --- prototypes --- */ @@ -468,11 +468,11 @@ klass->screen_changed = NULL; klass->can_activate_accel = gtk_widget_real_can_activate_accel; klass->grab_broken_event = NULL; - /* MAEMO START */ +#ifdef MAEMO_CHANGES klass->tap_and_hold_setup = gtk_widget_real_tap_and_hold_setup; klass->tap_and_hold = gtk_widget_real_tap_and_hold; klass->tap_and_hold_query = gtk_widget_real_tap_and_hold_query; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ klass->show_help = gtk_widget_real_show_help; @@ -615,7 +615,7 @@ FALSE, GTK_PARAM_READWRITE)); - /* MAEMO START */ +#ifdef MAEMO_CHANGES /** * GtkWidget:tap-and-hold-state: * @@ -637,7 +637,7 @@ GTK_STATE_NORMAL, G_PARAM_READWRITE)); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ widget_signals[SHOW] = g_signal_new (I_("show"), @@ -1582,7 +1582,7 @@ _gtk_marshal_BOOLEAN__UINT, G_TYPE_BOOLEAN, 1, G_TYPE_UINT); - /* MAEMO START */ +#ifdef MAEMO_CHANGES /** * GtkWidget::tap-and-hold: * @widget: the object which received the signal @@ -1646,7 +1646,7 @@ _gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, GDK_F10, GDK_SHIFT_MASK, @@ -1936,10 +1936,10 @@ case PROP_NO_SHOW_ALL: gtk_widget_set_no_show_all (widget, g_value_get_boolean (value)); break; - /* MAEMO START */ +#ifdef MAEMO_CHANGES case PROP_TAP_AND_HOLD: break; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ default: break; } @@ -2034,10 +2034,10 @@ case PROP_NO_SHOW_ALL: g_value_set_boolean (value, gtk_widget_get_no_show_all (widget)); break; - /* MAEMO START */ +#ifdef MAEMO_CHANGES case PROP_TAP_AND_HOLD: break; - /* MAEMO END */ +#endif /* MAEMO_CHANGES */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -8363,7 +8363,7 @@ g_object_notify (G_OBJECT (widget), "no-show-all"); } -/* MAEMO START */ +#ifdef MAEMO_CHANGES void gtk_widget_set_hildon_focus_handling( GtkWidget *widget, gboolean hildon_like ) { } @@ -8830,7 +8830,7 @@ void gtk_widget_insensitive_press ( GtkWidget *widget ) { } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_WIDGET_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h 2007-01-23 13:02:44 UTC (rev 9259) @@ -37,7 +37,7 @@ G_BEGIN_DECLS -/* MAEMO START */ +#ifdef MAEMO_CHANGES typedef enum { GTK_TAP_AND_HOLD_NONE = 0, @@ -45,7 +45,7 @@ GTK_TAP_AND_HOLD_NO_SIGNALS = 1 << 1, GTK_TAP_AND_HOLD_NO_INTERNALS = 1 << 2 } GtkWidgetTapAndHoldFlags; -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ /* The flags that are used by GtkWidget on top of the * flags field of GtkObject. @@ -419,14 +419,7 @@ void (* composited_changed) (GtkWidget *widget); - /* MAEMO START */ -#if 0 - /* Padding for future expansion */ - void (*_gtk_reserved4) (void); - void (*_gtk_reserved5) (void); - void (*_gtk_reserved6) (void); - void (*_gtk_reserved7) (void); -#endif +#ifdef MAEMO_CHANGES void (*tap_and_hold) (GtkWidget *widget); /* Tap and hold action */ void (*tap_and_hold_setup) (GtkWidget *widget, GtkWidget *menu, @@ -436,7 +429,13 @@ GdkEvent *event); void (*insensitive_press) (GtkWidget *widget); - /* MAEMO END */ +#else /* !MAEMO_CHANGES */ + /* Padding for future expansion */ + void (*_gtk_reserved4) (void); + void (*_gtk_reserved5) (void); + void (*_gtk_reserved6) (void); + void (*_gtk_reserved7) (void); +#endif /* !MAEMO_CHANGES */ }; struct _GtkWidgetAuxInfo @@ -822,7 +821,7 @@ GdkColormap* _gtk_widget_peek_colormap (void); -/* MAEMO START */ +#ifdef MAEMO_CHANGES void gtk_widget_set_hildon_focus_handling( GtkWidget *widget, gboolean hildon_like ); gboolean gtk_widget_get_hildon_focus_handling( GtkWidget *widget ); @@ -837,7 +836,7 @@ GtkWidgetTapAndHoldFlags flags); void gtk_widget_insensitive_press ( GtkWidget *widget ); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.c 2007-01-23 13:02:44 UTC (rev 9259) @@ -7850,7 +7850,7 @@ #endif -/* MAEMO START */ +#ifdef MAEMO_CHANGES GtkWidget *gtk_window_get_prev_focus_widget( GtkWindow *window ) { @@ -7862,7 +7862,7 @@ { } -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ #define __GTK_WINDOW_C__ #include "gtkaliasdef.c" Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.h 2007-01-23 12:57:38 UTC (rev 9258) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwindow.h 2007-01-23 13:02:44 UTC (rev 9259) @@ -421,10 +421,10 @@ guint accel_key, GdkModifierType accel_mods); -/* MAEMO START */ +#ifdef MAEMO_CHANGES GtkWidget *gtk_window_get_prev_focus_widget( GtkWindow *window ); void gtk_window_set_prev_focus_widget( GtkWindow *window, GtkWidget *widget ); -/* MAEMO END */ +#endif /* MAEMO_CHANGES */ G_END_DECLS
- Previous message: [maemo-commits] r9258 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9260 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]