[maemo-commits] [maemo-commits] r8781 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Dec 15 14:54:57 EET 2006
- Previous message: [maemo-commits] r8780 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop libhildonwm
- Next message: [maemo-commits] r8782 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mitch Date: 2006-12-15 14:54:53 +0200 (Fri, 15 Dec 2006) New Revision: 8781 Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h Log: 2006-12-15 Michael Natterer <mitch at imendio.com> * gtk/gtkwidget.h * gtk/gtktreeview.h * gtk/gtktoolbutton.h * gtk/gtkimcontext.h * gtk/gtkentry.h * gtk/gtkmenushell.h: added class struct changes (vtable entries). Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog 2006-12-15 12:54:53 UTC (rev 8781) @@ -1,6 +1,15 @@ 2006-12-15 Michael Natterer <mitch at imendio.com> - * gtk/gtkfilesystem.c (gtk_file_system_render_icon): added this + * gtk/gtkwidget.h + * gtk/gtktreeview.h + * gtk/gtktoolbutton.h + * gtk/gtkimcontext.h + * gtk/gtkentry.h + * gtk/gtkmenushell.h: added class struct changes (vtable entries). + +2006-12-15 Michael Natterer <mitch at imendio.com> + + * gtk/gtkfilesystem.[ch] (gtk_file_system_render_icon): added this missing stub. 2006-12-13 Michael Natterer <mitch at imendio.com> Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkentry.h 2006-12-15 12:54:53 UTC (rev 8781) @@ -135,10 +135,18 @@ void (* paste_clipboard) (GtkEntry *entry); void (* toggle_overwrite) (GtkEntry *entry); + /* MAEMO START */ + void (* invalid_input) (GtkEntry *entry, + GtkInvalidInputType invalid_input_type); + /* MAEMO END */ + /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); + + /* MAEMO START */ + /* void (*_gtk_reserved3) (void); */ + /* MAEMO END */ }; GType gtk_entry_get_type (void) G_GNUC_CONST; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkimcontext.h 2006-12-15 12:54:53 UTC (rev 8781) @@ -26,6 +26,15 @@ G_BEGIN_DECLS +/* MAEMO START */ +typedef enum +{ + GTK_IM_CONTEXT_CLIPBOARD_OP_COPY, + GTK_IM_CONTEXT_CLIPBOARD_OP_CUT, + GTK_IM_CONTEXT_CLIPBOARD_OP_PASTE +} GtkIMContextClipboardOperation; +/* MAEMO END */ + #define GTK_TYPE_IM_CONTEXT (gtk_im_context_get_type ()) #define GTK_IM_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext)) #define GTK_IM_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass)) @@ -83,13 +92,32 @@ gchar **text, gint *cursor_index); + /* MAEMO START */ + void (*show) (GtkIMContext *context); + void (*hide) (GtkIMContext *context); + + /* Signals again: */ + gboolean (*has_selection) (GtkIMContext *context); + void (*clipboard_operation) (GtkIMContext *context, + GtkIMContextClipboardOperation operation); + + /* Virtual functions again: */ + gboolean (*filter_event) (GtkIMContext *context, + GdkEvent *event); + /* MAEMO END */ + /* Padding for future expansion */ void (*_gtk_reserved1) (void); + + /* MAEMO START */ +#if 0 void (*_gtk_reserved2) (void); void (*_gtk_reserved3) (void); void (*_gtk_reserved4) (void); void (*_gtk_reserved5) (void); void (*_gtk_reserved6) (void); +#endif + /* MAEMO END */ }; GType gtk_im_context_get_type (void) G_GNUC_CONST; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenushell.h 2006-12-15 12:54:53 UTC (rev 8781) @@ -85,10 +85,17 @@ gint position); gint (*get_popup_delay) (GtkMenuShell *menu_shell); + /* MAEMO START */ + void (*close) (GtkMenuShell *menu_shell); + /* MAEMO END */ + /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); + + /* MAEMO START */ + /* void (*_gtk_reserved3) (void); */ + /* MAEMO END */ }; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktoolbutton.h 2006-12-15 12:54:53 UTC (rev 8781) @@ -55,11 +55,18 @@ /* signal */ void (* clicked) (GtkToolButton *tool_item); + /* MAEMO START */ + void (* insensitive_press) (GtkToolButton *tool_item); + /* MAEMO END */ + /* Padding for future expansion */ void (* _gtk_reserved1) (void); void (* _gtk_reserved2) (void); void (* _gtk_reserved3) (void); - void (* _gtk_reserved4) (void); + + /* MAEMO START */ + /* void (* _gtk_reserved4) (void); */ + /* MAEMO END */ }; GType gtk_tool_button_get_type (void) G_GNUC_CONST; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.h 2006-12-15 12:54:53 UTC (rev 8781) @@ -103,12 +103,20 @@ gboolean (* select_cursor_parent) (GtkTreeView *tree_view); gboolean (* start_interactive_search) (GtkTreeView *tree_view); + /* MAEMO START */ + void (* row_insensitive) (GtkTreeView *tree_view, + GtkTreePath *path); + /* MAEMO END */ + /* Padding for future expansion */ void (*_gtk_reserved0) (void); void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); + + /* MAEMO START */ + /* void (*_gtk_reserved4) (void); */ + /* MAEMO END */ }; Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h =================================================================== --- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h 2006-12-15 12:41:49 UTC (rev 8780) +++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.h 2006-12-15 12:54:53 UTC (rev 8781) @@ -37,6 +37,16 @@ G_BEGIN_DECLS +/* MAEMO START */ +typedef enum +{ + GTK_TAP_AND_HOLD_NONE = 0, + GTK_TAP_AND_HOLD_PASS_PRESS = 1 << 0, + GTK_TAP_AND_HOLD_NO_SIGNALS = 1 << 1, + GTK_TAP_AND_HOLD_NO_INTERNALS = 1 << 2 +} GtkWidgetTapAndHoldFlags; +/* MAEMO END */ + /* The flags that are used by GtkWidget on top of the * flags field of GtkObject. */ @@ -408,12 +418,21 @@ GdkEventGrabBroken *event); 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 + void (*tap_and_hold) (GtkWidget *widget); /* Tap and hold action */ + void (*tap_and_hold_setup) (GtkWidget *widget, GtkWidget *menu, + GtkCallback func, GtkWidgetTapAndHoldFlags flags); + gboolean (*tap_and_hold_query) (GtkWidget *widget, GdkEvent *event); + void (*insensitive_press) (GtkWidget *widget); + /* MAEMO END */ }; struct _GtkWidgetAuxInfo @@ -797,14 +816,6 @@ GdkColormap* _gtk_widget_peek_colormap (void); /* MAEMO START */ -typedef enum -{ - GTK_TAP_AND_HOLD_NONE = 0, - GTK_TAP_AND_HOLD_PASS_PRESS = 1 << 0, - GTK_TAP_AND_HOLD_NO_SIGNALS = 1 << 1, - GTK_TAP_AND_HOLD_NO_INTERNALS = 1 << 2 -} GtkWidgetTapAndHoldFlags; - void gtk_widget_set_hildon_focus_handling( GtkWidget *widget, gboolean hildon_like ); gboolean gtk_widget_get_hildon_focus_handling( GtkWidget *widget );
- Previous message: [maemo-commits] r8780 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop libhildonwm
- Next message: [maemo-commits] r8782 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]