From 872efdd9a527e472e5f2724138344fdef3839df4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 15 Mar 2001 19:02:23 +0000 Subject: Delete. 2001-03-14 Havoc Pennington * gtk/gtkdata.h, gtk/gtkdata.c: Delete. * gtk/gtk.h: remove gtkdata.h * gtk/Makefile.am: remove gtkdata * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" not "disconnect" on the adjustments. * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not GtkData * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject not GtkData * configure.in: handle case where X render exists, but Pango lacks Xft support. 2001-03-14 Havoc Pennington * Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file from gdk-pixbuf-marshal.h, fixes parallel makes. 2001-03-14 Havoc Pennington * gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple * gtk/gtk.types: remove gtk_data_get_type --- ChangeLog | 20 ++ ChangeLog.pre-2-0 | 20 ++ ChangeLog.pre-2-10 | 20 ++ ChangeLog.pre-2-2 | 20 ++ ChangeLog.pre-2-4 | 20 ++ ChangeLog.pre-2-6 | 20 ++ ChangeLog.pre-2-8 | 20 ++ configure.in | 8 +- docs/reference/ChangeLog | 6 + docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy | 5 + docs/reference/gdk/tmpl/gdk-unused.sgml | 336 +++++++++++++++++++++++++ docs/reference/gdk/tmpl/input_contexts.sgml | 224 ----------------- docs/reference/gdk/tmpl/input_methods.sgml | 125 --------- docs/reference/gtk/gtk-docs.sgml | 2 - docs/reference/gtk/gtk.hierarchy | 5 +- docs/reference/gtk/gtk.types | 1 - docs/reference/gtk/tmpl/gtk-unused.sgml | 14 ++ docs/reference/gtk/tmpl/gtkdata.sgml | 14 -- gdk-pixbuf/ChangeLog | 5 + gdk-pixbuf/Makefile.am | 6 +- gtk/Makefile.am | 2 - gtk/gtk.h | 1 - gtk/gtkadjustment.c | 2 +- gtk/gtkadjustment.h | 6 +- gtk/gtkdata.c | 83 ------ gtk/gtkdata.h | 72 ------ gtk/gtktext.c | 18 +- gtk/gtktooltips.c | 6 +- gtk/gtktooltips.h | 6 +- 29 files changed, 537 insertions(+), 550 deletions(-) delete mode 100644 gtk/gtkdata.c delete mode 100644 gtk/gtkdata.h diff --git a/ChangeLog b/ChangeLog index 9ad514a957..97f2170127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9ad514a957..97f2170127 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9ad514a957..97f2170127 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9ad514a957..97f2170127 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9ad514a957..97f2170127 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9ad514a957..97f2170127 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9ad514a957..97f2170127 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +2001-03-14 Havoc Pennington + + * gtk/gtkdata.h, gtk/gtkdata.c: Delete. + + * gtk/gtk.h: remove gtkdata.h + + * gtk/Makefile.am: remove gtkdata + + * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" + not "disconnect" on the adjustments. + + * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not + GtkData + + * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject + not GtkData + + * configure.in: handle case where X render exists, but Pango lacks + Xft support. + 2001-03-15 Alexander Larsson * gtk/gtktoolbar.[ch]: diff --git a/configure.in b/configure.in index 12faa999a5..baabd25814 100644 --- a/configure.in +++ b/configure.in @@ -440,6 +440,12 @@ if test "x$gdktarget" = "xx11"; then AC_CHECK_LIB(Xft, XftFontOpen, have_xft=true, :, -lXrender -lXext $X_LIBS $FREETYPE_LIBS) ,:,-lXext $X_LIBS) + ## be sure we also have Pango built with xft support + if ! $PKG_CONFIG --exists pangoxft ; then + have_xft=false + AC_MSG_WARN([X render extension found, but Pango lacks Xft support]) + fi + if $have_xft = 'true' ; then X_LIBS="-lXft -lXrender -lXext $FREETYPE_LIBS $X_LIBS" AC_DEFINE(HAVE_XFT) @@ -447,7 +453,7 @@ if test "x$gdktarget" = "xx11"; then fi AC_SUBST(XFT_LIBS) - AM_CONDITIONAL(HAVE_XFT, $have_xft) + AM_CONDITIONAL(HAVE_XFT, $have_xft) # Check for XIM support. diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 3a2311e96d..397cb72d79 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,9 @@ +2001-03-14 Havoc Pennington + + * gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple + + * gtk/gtk.types: remove gtk_data_get_type + Wed Mar 7 23:58:53 2001 Owen Taylor * gtk/tmpl/gtkwidget.sgml: Document ::hierarchy-changed. diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy b/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy index 7346c3efc4..9751e84164 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.hierarchy @@ -1,2 +1,7 @@ GObject + GdkDrawable + GdkWindow + GdkDrawableImplX11 + GdkWindowImplX11 + GdkColormap GdkPixbufLoader diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index b5ab803635..a74714d9b8 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -96,6 +96,187 @@ device. It has the following fields: which describe what key press events are generated for each macro button. + + +The #GdkIC struct is an opaque structure representing an input context +for use with the global Input Method. + + + + + +The #GdkICAttr struct is used when getting and setting attributes of the +input context. It is used together with a #GdkICAttributesType mask which +specifies which of the fields are being set or returned. + + +@style: the pre-edit and status style. This attribute is required when +creating the #GdkIC, and cannot be changed. +@client_window: the #GdkWindow in which the input method will display its +pre-edit and status areas or create subwindows. +The preedit_area and status_area attributes are specified relative to this +window. This attribute is required when creating the #GdkIC, and cannot be +changed. +@focus_window: the #GdkWindow which is to be used when editing text. +gdk_im_begin() sets this attribute before starting the text input process, +so it is normally not necessary to set it elsewhere. +@filter_events: the mask of events that the input method requires. +See the gdk_ic_get_events() function. This attribute is read-only and is +never changed. +@spot_location: the position of the insertion cursor, for use with the +%GDK_IM_PREEDIT_POSITION style. The y coordinate specifies the baseline of +the text. +@line_spacing: the line spacing to be used in the pre-edit and status areas +when displaying multi-line text. +@cursor: the cursor to use in the input method's windows. +If this attribute isn't set it is determined by the input method. +@preedit_fontset: the font to use for the pre-edit area. +If this attribute isn't set it is determined by the input method. +@preedit_area: the area in which the input method will display pre-editing +data, used for the %GDK_IM_PREEDIT_POSITION and %GDK_IM_PREEDIT_AREA styles. +@preedit_area_needed: the area that the input method requests for displaying +pre-editing data, used for the %GDK_IM_PREEDIT_POSITION and +%GDK_IM_PREEDIT_AREA styles. +@preedit_foreground: the foreground color to use for the pre-edit area. +This color must already be allocated in the preedit_colormap. +If this attribute isn't set it is determined by the input method. +@preedit_background: the background color to use for the pre-edit area. +This color must already be allocated in the preedit_colormap. +If this attribute isn't set it is determined by the input method. +@preedit_pixmap: the background pixmap to use for the pre-edit area. +If this attribute isn't set it is determined by the input method. +@preedit_colormap: the colormap the input method should use to allocate colors. +The default value is the colormap of client_window. +@status_fontset: the font to use for the status area. +If this attribute isn't set it is determined by the input method. +@status_area: the are that the input method will display status information in. +This is used for the %GDK_IM_STATUS_AREA style. +@status_area_needed: the size that the input method requests for displaying +status information, for the %GDK_IM_STATUS_AREA style. +@status_foreground: the foreground color to use for the status area. +This color must already be allocated in the status_colormap. +If this attribute isn't set it is determined by the input method. +@status_background: the background color to use for the status area. +This color must already be allocated in the status_colormap. +If this attribute isn't set it is determined by the input method. +@status_pixmap: the background pixmap to use for the status area. +If this attribute isn't set it is determined by the input method. +@status_colormap: the colormap the input method should use to allocate colors. +The default value is the colormap of client_window. + + + +The #GdkICAttributesType contains a set of bit-flags which are used to +specify which of the attributes in a #GdkICAttr are being set or returned. + + +It also contains several combinations of the flags which specify required +attributes for the various styles: + + +%GDK_IC_ALL_REQ: + +the set of attributes required for all styles. + + + + +%GDK_IC_PREEDIT_AREA_REQ: + +the set of additional attributes required for the +%GDK_IM_PREEDIT_AREA pre-edit style. + + + + +%GDK_IC_PREEDIT_POSITION_REQ: + +the set of additional attributes required for the +%GDK_IM_PREEDIT_POSITION pre-edit style. + + + + +%GDK_IC_STATUS_AREA_REQ: + +the set of additional attributes required for the +%GDK_IM_STATUS_AREA status style. + + + + + +@GDK_IC_STYLE: +@GDK_IC_CLIENT_WINDOW: +@GDK_IC_FOCUS_WINDOW: +@GDK_IC_FILTER_EVENTS: +@GDK_IC_SPOT_LOCATION: +@GDK_IC_LINE_SPACING: +@GDK_IC_CURSOR: +@GDK_IC_PREEDIT_FONTSET: +@GDK_IC_PREEDIT_AREA: +@GDK_IC_PREEDIT_AREA_NEEDED: +@GDK_IC_PREEDIT_FOREGROUND: +@GDK_IC_PREEDIT_BACKGROUND: +@GDK_IC_PREEDIT_PIXMAP: +@GDK_IC_PREEDIT_COLORMAP: +@GDK_IC_STATUS_FONTSET: +@GDK_IC_STATUS_AREA: +@GDK_IC_STATUS_AREA_NEEDED: +@GDK_IC_STATUS_FOREGROUND: +@GDK_IC_STATUS_BACKGROUND: +@GDK_IC_STATUS_PIXMAP: +@GDK_IC_STATUS_COLORMAP: +@GDK_IC_ALL_REQ: +@GDK_IC_PREEDIT_AREA_REQ: +@GDK_IC_PREEDIT_POSITION_REQ: +@GDK_IC_STATUS_AREA_REQ: + + + +A set of bit-flags used to specify the input method styles which are supported +or which are currently in use. The flags can be divided into 2 groups, the +pre-edit flags and the status flags. + + +The pre-edit flags specify how pre-editing data is displayed. +For example, this could display the text being typed in the phonetic +alphabet before it is composed and inserted as an ideograph. + + +The status flags specify how status information is displayed. +The status information can be thought of as an extension of the +standard keyboard mode indicators, such as the Caps Lock indicator. + + + +The %GDK_IM_PREEDIT_CALLBACKS and %GDK_IM_STATUS_CALLBACKS styles are not +currently supported in GTK+. + + + +@GDK_IM_PREEDIT_AREA: The application provides the input method with an area +in which to perform off-the-spot pre-editing. +@GDK_IM_PREEDIT_CALLBACKS: The application registers a number of callback +functions which are used to display pre-editing data. +@GDK_IM_PREEDIT_POSITION: The application provides the input method with the +position of the insertion cursor, for over-the-spot +pre-editing. The input method creates its own window over the widget to +display the pre-editing data. +@GDK_IM_PREEDIT_NOTHING: The input method uses the root X window to perform +pre-editing, so the application does not need to do anything. +@GDK_IM_PREEDIT_NONE: No pre-editing is done by the input method, or no +pre-editing data needs to be displayed. +@GDK_IM_PREEDIT_MASK: A bit-mask containing all the pre-edit flags. +@GDK_IM_STATUS_AREA: The application provides the input method with an area +in which to display status information. +@GDK_IM_STATUS_CALLBACKS: The applications registers a number of callback +functions which are used to display status information. +@GDK_IM_STATUS_NOTHING: The input method uses the root X window to display +status information, so the application does not need to do anything. +@GDK_IM_STATUS_NONE: The input method does not display status information. +@GDK_IM_STATUS_MASK: A bit-mask containing all the status flags. + @@ -235,6 +416,161 @@ device. It has the following fields: @num_colors: @Returns: + + +Destroys the given #GdkICAttr struct, freeing the allocated memory. + + +@attr: a #GdkICAttr struct. + + + +Creates a new #GdkICAttr struct, with all fields set to 0. +The #GdkICAttr struct should be freed with gdk_ic_attr_destroy() when no +longer needed. + + +@Returns: a new #GdkICAttr struct. + + + +Destroys the input context. + + +@ic: a #GdkIC. + + + +Gets attributes of a #GdkIC. + + +@ic: a #GdkIC. +@attr: a #GdkICAttr struct to contain the returned attributes. +@mask: a #GdkICAttributesType mask specifying which attributes to get. +@Returns: a #GdkICAttributesType mask specifying which of the attributes +were not retrieved succesfully. + + + +Returns the mask of events that the input method needs to function properly. +This is typically called in a widget's realize method after creating the +#GdkIC. The returned event mask is then combined with the widget's +own event mask and applied using gdk_window_set_events(). + + +@ic: a #GdkIC. +@Returns: the mask of events that the input method needs to function +properly. + + + +Returns the pre-edit and status style of the #GdkIC. + + +@ic: a #GdkIC. +@Returns: the pre-edit and status style of the #GdkIC. + + + +Creates a new #GdkIC using the given attributes. + + +@attr: a #GdkICAttr struct containing attributes to use for the input context. +@mask: a #GdkICAttributesType mask specifying which of the attributes in @attr +are set. +@Returns: a new #GdkIC. + + + +Sets attributes of the #GdkIC. + + +Note that the GDK_IC_STYLE and GDK_IC_CLIENT_WINDOW attributes can only be set +when creating the #GdkIC, and the GDK_IC_FILTER_EVENTS attribute is read-only. + + +@ic: a #GdkIC. +@attr: a #GdkICAttr struct containing attributes to use for the input context. +@mask: a #GdkICAttributesType mask specifying which of the attributes in @attr +are set. +@Returns: a #GdkICAttributesType mask indicating which of the attributes +were not set successfully. + + + +Starts editing, using the given input context and #GdkWindow. +This should be called when the widget receives the input focus, typically in +the widget's focus_in_event method. + + +@ic: a #GdkIC. +@window: the #GdkWindow which will be receiving the key press events. + + + +Decides which input method style should be used, by comparing the styles given +in @supported_style with those of the available input method. + + +@supported_style: styles which are supported by the widget. +@Returns: the best style in @supported_style that is also supported by the +available input method. + + + +Stops editing using the input method. +This should be called when the widget loses the input focus, typically in +the widget's focus_out_event method. + + + + + +Checks if an input method is to be used for the current locale. +If GTK+ has been compiled without support for input methods, or the current +locale doesn't need an input method, then this will return FALSE. + + +@Returns: TRUE if an input method is available and should be used. + + + +Sets the best pre-edit and/or status style which should be used. +This will affect the style chosen in gdk_im_decide_style(). + + +The order of the pre-edit styles is (from worst to best): +%GDK_IM_PREEDIT_NONE, %GDK_IM_PREEDIT_NOTHING, %GDK_IM_PREEDIT_AREA, +%GDK_IM_PREEDIT_POSITION, %GDK_IM_PREEDIT_CALLBACKS. +The order of the status styles is: +%GDK_IM_STATUS_NONE, %GDK_IM_STATUS_NOTHING, %GDK_IM_STATUS_AREA, +%GDK_IM_STATUS_CALLBACKS. + + +So, for example, to set the best allowed pre-edit style to %GDK_IM_PREEDIT_AREA +you would do this: + + + + gdk_im_set_best_style (GDK_IM_PREEDIT_AREA); + + + +Or to set the best allowed pre-edit style to %GDK_IM_PREEDIT_POSITION and the +best allowed status style to %GDK_IM_STATUS_NOTHING you can do this: + + + + gdk_im_set_best_style (GDK_IM_PREEDIT_POSITION | GDK_IM_STATUS_NOTHING); + + + + +@best_allowed_style: a bit-mask with the best pre-edit style and/or the best +status style to use. If 0 is used, then the current bit-mask of all allowed +styles is returned. +@Returns: a bit-mask of all the styles allowed. + Lists all available input devices, along with their diff --git a/docs/reference/gdk/tmpl/input_contexts.sgml b/docs/reference/gdk/tmpl/input_contexts.sgml index b655f10bb4..683017ba20 100644 --- a/docs/reference/gdk/tmpl/input_contexts.sgml +++ b/docs/reference/gdk/tmpl/input_contexts.sgml @@ -17,227 +17,3 @@ of how internationalized text input works in GTK+. - - -The #GdkIC struct is an opaque structure representing an input context -for use with the global Input Method. - - - - - -Creates a new #GdkIC using the given attributes. - - -@attr: a #GdkICAttr struct containing attributes to use for the input context. -@mask: a #GdkICAttributesType mask specifying which of the attributes in @attr -are set. -@Returns: a new #GdkIC. - - - - -Destroys the input context. - - -@ic: a #GdkIC. - - - - -Returns the mask of events that the input method needs to function properly. -This is typically called in a widget's realize method after creating the -#GdkIC. The returned event mask is then combined with the widget's -own event mask and applied using gdk_window_set_events(). - - -@ic: a #GdkIC. -@Returns: the mask of events that the input method needs to function -properly. - - - - -Returns the pre-edit and status style of the #GdkIC. - - -@ic: a #GdkIC. -@Returns: the pre-edit and status style of the #GdkIC. - - - - -Gets attributes of a #GdkIC. - - -@ic: a #GdkIC. -@attr: a #GdkICAttr struct to contain the returned attributes. -@mask: a #GdkICAttributesType mask specifying which attributes to get. -@Returns: a #GdkICAttributesType mask specifying which of the attributes -were not retrieved succesfully. - - - - -Sets attributes of the #GdkIC. - - -Note that the GDK_IC_STYLE and GDK_IC_CLIENT_WINDOW attributes can only be set -when creating the #GdkIC, and the GDK_IC_FILTER_EVENTS attribute is read-only. - - -@ic: a #GdkIC. -@attr: a #GdkICAttr struct containing attributes to use for the input context. -@mask: a #GdkICAttributesType mask specifying which of the attributes in @attr -are set. -@Returns: a #GdkICAttributesType mask indicating which of the attributes -were not set successfully. - - - - -The #GdkICAttr struct is used when getting and setting attributes of the -input context. It is used together with a #GdkICAttributesType mask which -specifies which of the fields are being set or returned. - - -@style: the pre-edit and status style. This attribute is required when -creating the #GdkIC, and cannot be changed. -@client_window: the #GdkWindow in which the input method will display its -pre-edit and status areas or create subwindows. -The preedit_area and status_area attributes are specified relative to this -window. This attribute is required when creating the #GdkIC, and cannot be -changed. -@focus_window: the #GdkWindow which is to be used when editing text. -gdk_im_begin() sets this attribute before starting the text input process, -so it is normally not necessary to set it elsewhere. -@filter_events: the mask of events that the input method requires. -See the gdk_ic_get_events() function. This attribute is read-only and is -never changed. -@spot_location: the position of the insertion cursor, for use with the -%GDK_IM_PREEDIT_POSITION style. The y coordinate specifies the baseline of -the text. -@line_spacing: the line spacing to be used in the pre-edit and status areas -when displaying multi-line text. -@cursor: the cursor to use in the input method's windows. -If this attribute isn't set it is determined by the input method. -@preedit_fontset: the font to use for the pre-edit area. -If this attribute isn't set it is determined by the input method. -@preedit_area: the area in which the input method will display pre-editing -data, used for the %GDK_IM_PREEDIT_POSITION and %GDK_IM_PREEDIT_AREA styles. -@preedit_area_needed: the area that the input method requests for displaying -pre-editing data, used for the %GDK_IM_PREEDIT_POSITION and -%GDK_IM_PREEDIT_AREA styles. -@preedit_foreground: the foreground color to use for the pre-edit area. -This color must already be allocated in the preedit_colormap. -If this attribute isn't set it is determined by the input method. -@preedit_background: the background color to use for the pre-edit area. -This color must already be allocated in the preedit_colormap. -If this attribute isn't set it is determined by the input method. -@preedit_pixmap: the background pixmap to use for the pre-edit area. -If this attribute isn't set it is determined by the input method. -@preedit_colormap: the colormap the input method should use to allocate colors. -The default value is the colormap of client_window. -@status_fontset: the font to use for the status area. -If this attribute isn't set it is determined by the input method. -@status_area: the are that the input method will display status information in. -This is used for the %GDK_IM_STATUS_AREA style. -@status_area_needed: the size that the input method requests for displaying -status information, for the %GDK_IM_STATUS_AREA style. -@status_foreground: the foreground color to use for the status area. -This color must already be allocated in the status_colormap. -If this attribute isn't set it is determined by the input method. -@status_background: the background color to use for the status area. -This color must already be allocated in the status_colormap. -If this attribute isn't set it is determined by the input method. -@status_pixmap: the background pixmap to use for the status area. -If this attribute isn't set it is determined by the input method. -@status_colormap: the colormap the input method should use to allocate colors. -The default value is the colormap of client_window. - - - -The #GdkICAttributesType contains a set of bit-flags which are used to -specify which of the attributes in a #GdkICAttr are being set or returned. - - -It also contains several combinations of the flags which specify required -attributes for the various styles: - - -%GDK_IC_ALL_REQ: - -the set of attributes required for all styles. - - - - -%GDK_IC_PREEDIT_AREA_REQ: - -the set of additional attributes required for the -%GDK_IM_PREEDIT_AREA pre-edit style. - - - - -%GDK_IC_PREEDIT_POSITION_REQ: - -the set of additional attributes required for the -%GDK_IM_PREEDIT_POSITION pre-edit style. - - - - -%GDK_IC_STATUS_AREA_REQ: - -the set of additional attributes required for the -%GDK_IM_STATUS_AREA status style. - - - - - -@GDK_IC_STYLE: -@GDK_IC_CLIENT_WINDOW: -@GDK_IC_FOCUS_WINDOW: -@GDK_IC_FILTER_EVENTS: -@GDK_IC_SPOT_LOCATION: -@GDK_IC_LINE_SPACING: -@GDK_IC_CURSOR: -@GDK_IC_PREEDIT_FONTSET: -@GDK_IC_PREEDIT_AREA: -@GDK_IC_PREEDIT_AREA_NEEDED: -@GDK_IC_PREEDIT_FOREGROUND: -@GDK_IC_PREEDIT_BACKGROUND: -@GDK_IC_PREEDIT_PIXMAP: -@GDK_IC_PREEDIT_COLORMAP: -@GDK_IC_STATUS_FONTSET: -@GDK_IC_STATUS_AREA: -@GDK_IC_STATUS_AREA_NEEDED: -@GDK_IC_STATUS_FOREGROUND: -@GDK_IC_STATUS_BACKGROUND: -@GDK_IC_STATUS_PIXMAP: -@GDK_IC_STATUS_COLORMAP: -@GDK_IC_ALL_REQ: -@GDK_IC_PREEDIT_AREA_REQ: -@GDK_IC_PREEDIT_POSITION_REQ: -@GDK_IC_STATUS_AREA_REQ: - - - -Creates a new #GdkICAttr struct, with all fields set to 0. -The #GdkICAttr struct should be freed with gdk_ic_attr_destroy() when no -longer needed. - - -@Returns: a new #GdkICAttr struct. - - - - -Destroys the given #GdkICAttr struct, freeing the allocated memory. - - -@attr: a #GdkICAttr struct. - - diff --git a/docs/reference/gdk/tmpl/input_methods.sgml b/docs/reference/gdk/tmpl/input_methods.sgml index 8416b02463..7346e1c5af 100644 --- a/docs/reference/gdk/tmpl/input_methods.sgml +++ b/docs/reference/gdk/tmpl/input_methods.sgml @@ -86,128 +86,3 @@ global input method. - - -A set of bit-flags used to specify the input method styles which are supported -or which are currently in use. The flags can be divided into 2 groups, the -pre-edit flags and the status flags. - - -The pre-edit flags specify how pre-editing data is displayed. -For example, this could display the text being typed in the phonetic -alphabet before it is composed and inserted as an ideograph. - - -The status flags specify how status information is displayed. -The status information can be thought of as an extension of the -standard keyboard mode indicators, such as the Caps Lock indicator. - - - -The %GDK_IM_PREEDIT_CALLBACKS and %GDK_IM_STATUS_CALLBACKS styles are not -currently supported in GTK+. - - - -@GDK_IM_PREEDIT_AREA: The application provides the input method with an area -in which to perform off-the-spot pre-editing. -@GDK_IM_PREEDIT_CALLBACKS: The application registers a number of callback -functions which are used to display pre-editing data. -@GDK_IM_PREEDIT_POSITION: The application provides the input method with the -position of the insertion cursor, for over-the-spot -pre-editing. The input method creates its own window over the widget to -display the pre-editing data. -@GDK_IM_PREEDIT_NOTHING: The input method uses the root X window to perform -pre-editing, so the application does not need to do anything. -@GDK_IM_PREEDIT_NONE: No pre-editing is done by the input method, or no -pre-editing data needs to be displayed. -@GDK_IM_PREEDIT_MASK: A bit-mask containing all the pre-edit flags. -@GDK_IM_STATUS_AREA: The application provides the input method with an area -in which to display status information. -@GDK_IM_STATUS_CALLBACKS: The applications registers a number of callback -functions which are used to display status information. -@GDK_IM_STATUS_NOTHING: The input method uses the root X window to display -status information, so the application does not need to do anything. -@GDK_IM_STATUS_NONE: The input method does not display status information. -@GDK_IM_STATUS_MASK: A bit-mask containing all the status flags. - - - -Checks if an input method is to be used for the current locale. -If GTK+ has been compiled without support for input methods, or the current -locale doesn't need an input method, then this will return FALSE. - - -@Returns: TRUE if an input method is available and should be used. - - - - -Decides which input method style should be used, by comparing the styles given -in @supported_style with those of the available input method. - - -@supported_style: styles which are supported by the widget. -@Returns: the best style in @supported_style that is also supported by the -available input method. - - - - -Sets the best pre-edit and/or status style which should be used. -This will affect the style chosen in gdk_im_decide_style(). - - -The order of the pre-edit styles is (from worst to best): -%GDK_IM_PREEDIT_NONE, %GDK_IM_PREEDIT_NOTHING, %GDK_IM_PREEDIT_AREA, -%GDK_IM_PREEDIT_POSITION, %GDK_IM_PREEDIT_CALLBACKS. -The order of the status styles is: -%GDK_IM_STATUS_NONE, %GDK_IM_STATUS_NOTHING, %GDK_IM_STATUS_AREA, -%GDK_IM_STATUS_CALLBACKS. - - -So, for example, to set the best allowed pre-edit style to %GDK_IM_PREEDIT_AREA -you would do this: - - - - gdk_im_set_best_style (GDK_IM_PREEDIT_AREA); - - - -Or to set the best allowed pre-edit style to %GDK_IM_PREEDIT_POSITION and the -best allowed status style to %GDK_IM_STATUS_NOTHING you can do this: - - - - gdk_im_set_best_style (GDK_IM_PREEDIT_POSITION | GDK_IM_STATUS_NOTHING); - - - - -@best_allowed_style: a bit-mask with the best pre-edit style and/or the best -status style to use. If 0 is used, then the current bit-mask of all allowed -styles is returned. -@Returns: a bit-mask of all the styles allowed. - - - - -Starts editing, using the given input context and #GdkWindow. -This should be called when the widget receives the input focus, typically in -the widget's focus_in_event method. - - -@ic: a #GdkIC. -@window: the #GdkWindow which will be receiving the key press events. - - - - -Stops editing using the input method. -This should be called when the widget loses the input focus, typically in -the widget's focus_out_event method. - - - - diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 94bed15dae..a6206885f1 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -19,7 +19,6 @@ - @@ -100,7 +99,6 @@ - diff --git a/docs/reference/gtk/gtk.hierarchy b/docs/reference/gtk/gtk.hierarchy index 255c3c7dd5..0919709543 100644 --- a/docs/reference/gtk/gtk.hierarchy +++ b/docs/reference/gtk/gtk.hierarchy @@ -96,12 +96,11 @@ GObject GtkPreview GtkProgress GtkProgressBar - GtkData - GtkAdjustment - GtkTooltips + GtkAdjustment GtkIMContext GtkIMMulticontext GtkItemFactory + GtkTooltips GtkTextBuffer GtkTextTag GtkTextTagTable diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types index dfc7230fc1..54b1e81c82 100644 --- a/docs/reference/gtk/gtk.types +++ b/docs/reference/gtk/gtk.types @@ -19,7 +19,6 @@ gtk_combo_get_type gtk_container_get_type gtk_ctree_get_type gtk_curve_get_type -gtk_data_get_type gtk_dialog_get_type gtk_drawing_area_get_type gtk_entry_get_type diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index a7061119f1..ed4abe8fb9 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -247,6 +247,20 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN @a: + + +The #GtkData-struct struct contains no public fields. + + + + + +Emitted to notify any views on the #GtkData object to disconnect from it, +possibly because the #GtkData object is about to be destroyed. + + +@data: the object which received the signal. + Indicates that the user has activated the widget diff --git a/docs/reference/gtk/tmpl/gtkdata.sgml b/docs/reference/gtk/tmpl/gtkdata.sgml index e24459d5d2..09e9d453cf 100644 --- a/docs/reference/gtk/tmpl/gtkdata.sgml +++ b/docs/reference/gtk/tmpl/gtkdata.sgml @@ -22,17 +22,3 @@ before the #GtkData is destroyed. - - -The #GtkData-struct struct contains no public fields. - - - - - -Emitted to notify any views on the #GtkData object to disconnect from it, -possibly because the #GtkData object is about to be destroyed. - - -@data: the object which received the signal. - diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7068bacf51..5cf930a817 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2001-03-14 Havoc Pennington + + * Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file + from gdk-pixbuf-marshal.h, fixes parallel makes. + Thu Mar 1 04:01:57 2001 Tim Janik * test-gdk-pixbuf.c: fixed includes. diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index b6ff3143b2..f7c9390e73 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -241,6 +241,6 @@ gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list cd $(srcdir) \ - && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmh \ - && (cmp -s xgen-gmh gdk-pixbuf-marshal.c || cp xgen-gmh gdk-pixbuf-marshal.c) \ - && rm -f xgen-gmh xgen-gmh~ + && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \ + && (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \ + && rm -f xgen-gmc xgen-gmc~ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e9feac73e4..623759da91 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -79,7 +79,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \ gtkcellrenderertextpixbuf.h \ gtkcellrenderertoggle.h \ gtkcellrendererpixbuf.h \ - gtkdata.h \ gtkdebug.h \ gtkdialog.h \ gtkdnd.h \ @@ -238,7 +237,6 @@ gtk_c_sources = @STRIP_BEGIN@ \ gtkcontainer.c \ gtkctree.c \ gtkcurve.c \ - gtkdata.c \ gtkdialog.c \ gtkdnd.c \ gtkdrawingarea.c \ diff --git a/gtk/gtk.h b/gtk/gtk.h index f1676ca084..c1df20b2ad 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index a23aa3e804..c5cc64f966 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -61,7 +61,7 @@ gtk_adjustment_get_type (void) (GtkClassInitFunc) NULL, }; - adjustment_type = gtk_type_unique (GTK_TYPE_DATA, &adjustment_info); + adjustment_type = gtk_type_unique (GTK_TYPE_OBJECT, &adjustment_info); } return adjustment_type; diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h index 01df904176..3a9a48d46e 100644 --- a/gtk/gtkadjustment.h +++ b/gtk/gtkadjustment.h @@ -29,7 +29,7 @@ #include -#include +#include #ifdef __cplusplus @@ -50,7 +50,7 @@ typedef struct _GtkAdjustmentClass GtkAdjustmentClass; struct _GtkAdjustment { - GtkData data; + GtkObject parent_instance; gfloat lower; gfloat upper; @@ -62,7 +62,7 @@ struct _GtkAdjustment struct _GtkAdjustmentClass { - GtkDataClass parent_class; + GtkObjectClass parent_class; void (* changed) (GtkAdjustment *adjustment); void (* value_changed) (GtkAdjustment *adjustment); diff --git a/gtk/gtkdata.c b/gtk/gtkdata.c deleted file mode 100644 index 1b7d677993..0000000000 --- a/gtk/gtkdata.c +++ /dev/null @@ -1,83 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * 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/. - */ - -#include "gtkdata.h" -#include "gtksignal.h" - - -enum { - DISCONNECT, - LAST_SIGNAL -}; - - -static void gtk_data_class_init (GtkDataClass *klass); - - -static guint data_signals[LAST_SIGNAL] = { 0 }; - - -GtkType -gtk_data_get_type (void) -{ - static GtkType data_type = 0; - - if (!data_type) - { - static const GtkTypeInfo data_info = - { - "GtkData", - sizeof (GtkData), - sizeof (GtkDataClass), - (GtkClassInitFunc) gtk_data_class_init, - (GtkObjectInitFunc) NULL, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - data_type = gtk_type_unique (gtk_object_get_type (), &data_info); - } - - return data_type; -} - -static void -gtk_data_class_init (GtkDataClass *class) -{ - GtkObjectClass *object_class; - - object_class = (GtkObjectClass*) class; - - data_signals[DISCONNECT] = - gtk_signal_new ("disconnect", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkDataClass, disconnect), - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); -} - diff --git a/gtk/gtkdata.h b/gtk/gtkdata.h deleted file mode 100644 index 04a63f6c78..0000000000 --- a/gtk/gtkdata.h +++ /dev/null @@ -1,72 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * 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/. - */ - -#ifndef __GTK_DATA_H__ -#define __GTK_DATA_H__ - - -#include -#include - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define GTK_TYPE_DATA (gtk_data_get_type ()) -#define GTK_DATA(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_DATA, GtkData)) -#define GTK_DATA_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DATA, GtkDataClass)) -#define GTK_IS_DATA(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_DATA)) -#define GTK_IS_DATA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DATA)) -#define GTK_DATA_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DATA, GtkDataClass)) - - -typedef struct _GtkData GtkData; -typedef struct _GtkDataClass GtkDataClass; - -struct _GtkData -{ - GtkObject object; -}; - -struct _GtkDataClass -{ - GtkObjectClass parent_class; - - void (* disconnect) (GtkData *data); -}; - - -GtkType gtk_data_get_type (void) G_GNUC_CONST; - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GTK_DATA_H__ */ diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 9a9829b45e..5a8d86f1a1 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -217,9 +217,6 @@ static void gtk_text_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void gtk_text_adjustment (GtkAdjustment *adjustment, GtkText *text); -static void gtk_text_disconnect (GtkAdjustment *adjustment, - GtkText *text); - static void gtk_text_insert_text (GtkOldEditable *old_editable, const gchar *new_text, gint new_text_length, @@ -239,6 +236,9 @@ static void gtk_text_set_selection (GtkOldEditable *old_editable, static void gtk_text_real_set_editable (GtkOldEditable *old_editable, gboolean is_editable); +static void gtk_text_adjustment_destroyed (GtkAdjustment *adjustment, + GtkText *text); + /* Event handlers */ static gint gtk_text_expose (GtkWidget *widget, GdkEventExpose *event); @@ -844,8 +844,8 @@ gtk_text_set_adjustments (GtkText *text, gtk_signal_connect (GTK_OBJECT (text->hadj), "value_changed", (GtkSignalFunc) gtk_text_adjustment, text); - gtk_signal_connect (GTK_OBJECT (text->hadj), "disconnect", - (GtkSignalFunc) gtk_text_disconnect, + gtk_signal_connect (GTK_OBJECT (text->hadj), "destroy", + (GtkSignalFunc) gtk_text_adjustment_destroyed, text); gtk_text_adjustment (hadj, text); } @@ -862,8 +862,8 @@ gtk_text_set_adjustments (GtkText *text, gtk_signal_connect (GTK_OBJECT (text->vadj), "value_changed", (GtkSignalFunc) gtk_text_adjustment, text); - gtk_signal_connect (GTK_OBJECT (text->vadj), "disconnect", - (GtkSignalFunc) gtk_text_disconnect, + gtk_signal_connect (GTK_OBJECT (text->vadj), "destroy", + (GtkSignalFunc) gtk_text_adjustment_destroyed, text); gtk_text_adjustment (vadj, text); } @@ -2194,8 +2194,8 @@ gtk_text_adjustment (GtkAdjustment *adjustment, } static void -gtk_text_disconnect (GtkAdjustment *adjustment, - GtkText *text) +gtk_text_adjustment_destroyed (GtkAdjustment *adjustment, + GtkText *text) { g_return_if_fail (adjustment != NULL); g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index faf7254340..acc5c6a8d4 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -62,7 +62,7 @@ static gint gtk_tooltips_timeout (gpointer data); static gint gtk_tooltips_paint_window (GtkTooltips *tooltips); static void gtk_tooltips_draw_tips (GtkTooltips *tooltips); -static GtkDataClass *parent_class; +static GtkObjectClass *parent_class; static const gchar *tooltips_data_key = "_GtkTooltipsData"; GtkType @@ -84,7 +84,7 @@ gtk_tooltips_get_type (void) (GtkClassInitFunc) NULL, }; - tooltips_type = gtk_type_unique (GTK_TYPE_DATA, &tooltips_info); + tooltips_type = gtk_type_unique (GTK_TYPE_OBJECT, &tooltips_info); } return tooltips_type; @@ -96,7 +96,7 @@ gtk_tooltips_class_init (GtkTooltipsClass *class) GtkObjectClass *object_class; object_class = (GtkObjectClass*) class; - parent_class = gtk_type_class (GTK_TYPE_DATA); + parent_class = gtk_type_class (GTK_TYPE_OBJECT); object_class->destroy = gtk_tooltips_destroy; } diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h index 12adf631d5..1f2b13b009 100644 --- a/gtk/gtktooltips.h +++ b/gtk/gtktooltips.h @@ -28,7 +28,7 @@ #define __GTK_TOOLTIPS_H__ #include -#include +#include #ifdef __cplusplus @@ -58,7 +58,7 @@ struct _GtkTooltipsData struct _GtkTooltips { - GtkData data; + GtkObject parent_instance; GtkWidget *tip_window; GtkWidget *tip_label; @@ -74,7 +74,7 @@ struct _GtkTooltips struct _GtkTooltipsClass { - GtkDataClass parent_class; + GtkObjectClass parent_class; }; GtkType gtk_tooltips_get_type (void) G_GNUC_CONST; -- cgit v1.2.1