diff options
-rw-r--r-- | docs/reference/gtk/gtk4-sections.txt | 20 | ||||
-rw-r--r-- | gtk/a11y/Makefile.inc | 2 | ||||
-rw-r--r-- | gtk/a11y/gtkaccessibility.c | 2 | ||||
-rw-r--r-- | gtk/a11y/gtkaccessibilitymisc.c | 53 | ||||
-rw-r--r-- | gtk/a11y/gtkaccessibilitymisc.h | 44 | ||||
-rw-r--r-- | gtk/deprecated/Makefile.inc | 2 | ||||
-rw-r--r-- | gtk/deprecated/gtkmisc.c | 483 | ||||
-rw-r--r-- | gtk/deprecated/gtkmisc.h | 93 | ||||
-rw-r--r-- | gtk/gtk.h | 1 |
9 files changed, 0 insertions, 700 deletions
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index eef7bed55d..374a667c1e 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -2486,26 +2486,6 @@ gtk_info_bar_get_type </SECTION> <SECTION> -<FILE>gtkmisc</FILE> -<TITLE>GtkMisc</TITLE> -GtkMisc -gtk_misc_set_alignment -gtk_misc_set_padding -gtk_misc_get_alignment -gtk_misc_get_padding -<SUBSECTION Standard> -GTK_MISC -GTK_IS_MISC -GTK_TYPE_MISC -GTK_MISC_CLASS -GTK_IS_MISC_CLASS -GTK_MISC_GET_CLASS -<SUBSECTION Private> -GtkMiscPrivate -gtk_misc_get_type -</SECTION> - -<SECTION> <FILE>gtknativedialog</FILE> <TITLE>GtkNativeDialog</TITLE> GTK_TYPE_NATIVE_DIALOG diff --git a/gtk/a11y/Makefile.inc b/gtk/a11y/Makefile.inc index 90b802e35c..6d27c0b77c 100644 --- a/gtk/a11y/Makefile.inc +++ b/gtk/a11y/Makefile.inc @@ -53,7 +53,6 @@ a11y_h_sources = \ a11y_private_h_sources = \ a11y/gtkaccessibility.h \ - a11y/gtkaccessibilitymisc.h \ a11y/gtkaccessibilityutil.h \ a11y/gtkcellaccessibleprivate.h \ a11y/gtkcolorswatchaccessibleprivate.h \ @@ -70,7 +69,6 @@ a11y_private_h_sources = \ a11y_c_sources = \ a11y/gtkaccessibility.c \ - a11y/gtkaccessibilitymisc.c \ a11y/gtkaccessibilityutil.c \ a11y/gtkbooleancellaccessible.c \ a11y/gtkbuttonaccessible.c \ diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c index 9fc1ed6fd5..a879627127 100644 --- a/gtk/a11y/gtkaccessibility.c +++ b/gtk/a11y/gtkaccessibility.c @@ -19,7 +19,6 @@ #include "gtkaccessibility.h" #include "gtkaccessibilityutil.h" -#include "gtkaccessibilitymisc.h" #include "gtkwindowaccessible.h" @@ -980,5 +979,4 @@ _gtk_accessibility_init (void) atk_bridge_adaptor_init (NULL, NULL); #endif - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); } diff --git a/gtk/a11y/gtkaccessibilitymisc.c b/gtk/a11y/gtkaccessibilitymisc.c deleted file mode 100644 index f49ccb5cac..0000000000 --- a/gtk/a11y/gtkaccessibilitymisc.c +++ /dev/null @@ -1,53 +0,0 @@ -/* GTK+ - accessibility implementations - * Copyright 2001, 2002, 2003 Sun Microsystems Inc. - * - * 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, see <http://www.gnu.org/licenses/>. - */ - -#include "config.h" - -#include <gtk/gtk.h> -#include "gtkaccessibilitymisc.h" - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -G_DEFINE_TYPE (GtkMiscImpl, _gtk_misc_impl, ATK_TYPE_MISC) - -static void -gtk_misc_impl_threads_enter (AtkMisc *misc) -{ - gdk_threads_enter (); -} - -static void -gtk_misc_impl_threads_leave (AtkMisc *misc) -{ - gdk_threads_leave (); -} - -static void -_gtk_misc_impl_class_init (GtkMiscImplClass *klass) -{ - AtkMiscClass *misc_class = ATK_MISC_CLASS (klass); - - misc_class->threads_enter = gtk_misc_impl_threads_enter; - misc_class->threads_leave = gtk_misc_impl_threads_leave; -} - -static void -_gtk_misc_impl_init (GtkMiscImpl *misc) -{ -} - -G_GNUC_END_IGNORE_DEPRECATIONS diff --git a/gtk/a11y/gtkaccessibilitymisc.h b/gtk/a11y/gtkaccessibilitymisc.h deleted file mode 100644 index 1274bdc2f8..0000000000 --- a/gtk/a11y/gtkaccessibilitymisc.h +++ /dev/null @@ -1,44 +0,0 @@ -/* GTK+ - accessibility implementations - * Copyright 2001 Sun Microsystems Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef __GTK_ACCESSIBILITY_MISC_H__ -#define __GTK_ACCESSIBILITY_MISC_H__ - -#include <atk/atk.h> - -G_BEGIN_DECLS - -#define GTK_TYPE_MISC_IMPL (_gtk_misc_impl_get_type ()) - -typedef struct _GtkMiscImpl GtkMiscImpl; -typedef struct _GtkMiscImplClass GtkMiscImplClass; - -struct _GtkMiscImpl -{ - AtkMisc parent; -}; - -struct _GtkMiscImplClass -{ - AtkMiscClass parent_class; -}; - -GType _gtk_misc_impl_get_type (void); - -G_END_DECLS - -#endif /* __GTK_ACCESSIBILITY_MISC_H__ */ diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index 9c1470b128..8e9f75aaee 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -15,7 +15,6 @@ deprecated_h_sources = \ deprecated/gtkhsv.h \ deprecated/gtkiconfactory.h \ deprecated/gtkimagemenuitem.h \ - deprecated/gtkmisc.h \ deprecated/gtkradioaction.h \ deprecated/gtkrecentaction.h \ deprecated/gtkstock.h \ @@ -55,7 +54,6 @@ deprecated_c_sources = \ deprecated/gtkhsv.c \ deprecated/gtkiconfactory.c \ deprecated/gtkimagemenuitem.c \ - deprecated/gtkmisc.c \ deprecated/gtkradioaction.c \ deprecated/gtkrecentaction.c \ deprecated/gtkstock.c \ diff --git a/gtk/deprecated/gtkmisc.c b/gtk/deprecated/gtkmisc.c deleted file mode 100644 index 8035e68845..0000000000 --- a/gtk/deprecated/gtkmisc.c +++ /dev/null @@ -1,483 +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, see <http://www.gnu.org/licenses/>. - */ - -/* - * 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 "config.h" -#include "gtkcontainer.h" -#include "gtkmisc.h" -#include "gtklabel.h" -#include "gtkintl.h" -#include "gtkprivate.h" - - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -/** - * SECTION:gtkmisc - * @Short_description: Base class for widgets with alignments and padding - * @Title: GtkMisc - * - * The #GtkMisc widget is an abstract widget which is not useful itself, but - * is used to derive subclasses which have alignment and padding attributes. - * - * The horizontal and vertical padding attributes allows extra space to be - * added around the widget. - * - * The horizontal and vertical alignment attributes enable the widget to be - * positioned within its allocated area. Note that if the widget is added to - * a container in such a way that it expands automatically to fill its - * allocated area, the alignment settings will not alter the widget's position. - * - * Note that the desired effect can in most cases be achieved by using the - * #GtkWidget:halign, #GtkWidget:valign and #GtkWidget:margin properties - * on the child widget, so GtkMisc should not be used in new code. To reflect - * this fact, all #GtkMisc API has been deprecated. - */ - -struct _GtkMiscPrivate -{ - gfloat xalign; - gfloat yalign; - - guint16 xpad; - guint16 ypad; -}; - -enum { - PROP_0, - PROP_XALIGN, - PROP_YALIGN, - PROP_XPAD, - PROP_YPAD -}; - -static void gtk_misc_realize (GtkWidget *widget); -static void gtk_misc_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_misc_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - - -G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET) - -static void -gtk_misc_class_init (GtkMiscClass *class) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - - gobject_class = G_OBJECT_CLASS (class); - widget_class = (GtkWidgetClass*) class; - - gobject_class->set_property = gtk_misc_set_property; - gobject_class->get_property = gtk_misc_get_property; - - widget_class->realize = gtk_misc_realize; - - /** - * GtkMisc:xalign: - * - * The horizontal alignment. A value of 0.0 means left alignment (or right - * on RTL locales); a value of 1.0 means right alignment (or left on RTL - * locales). - * - * Deprecated: 3.14: Use gtk_widget_set_halign() instead. If you are using - * #GtkLabel, use #GtkLabel:xalign instead. - */ - g_object_class_install_property (gobject_class, - PROP_XALIGN, - g_param_spec_float ("xalign", - P_("X align"), - P_("The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."), - 0.0, - 1.0, - 0.5, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - - /** - * GtkMisc:yalign: - * - * The vertical alignment. A value of 0.0 means top alignment; - * a value of 1.0 means bottom alignment. - * - * Deprecated: 3.14: Use gtk_widget_set_valign() instead. If you are using - * #GtkLabel, use #GtkLabel:yalign instead. - */ - g_object_class_install_property (gobject_class, - PROP_YALIGN, - g_param_spec_float ("yalign", - P_("Y align"), - P_("The vertical alignment, from 0 (top) to 1 (bottom)"), - 0.0, - 1.0, - 0.5, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - - /** - * GtkMisc:xpad: - * - * The amount of space to add on the left and right of the widget, in - * pixels. - * - * Deprecated: 3.14: Use gtk_widget_set_margin_start() and - * gtk_widget_set_margin_end() instead - */ - g_object_class_install_property (gobject_class, - PROP_XPAD, - g_param_spec_int ("xpad", - P_("X pad"), - P_("The amount of space to add on the left and right of the widget, in pixels"), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - - /** - * GtkMisc:ypad: - * - * The amount of space to add on the top and bottom of the widget, in - * pixels. - * - * Deprecated: 3.14: Use gtk_widget_set_margin_top() and - * gtk_widget_set_margin_bottom() instead - */ - g_object_class_install_property (gobject_class, - PROP_YPAD, - g_param_spec_int ("ypad", - P_("Y pad"), - P_("The amount of space to add on the top and bottom of the widget, in pixels"), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); -} - -static void -gtk_misc_init (GtkMisc *misc) -{ - GtkMiscPrivate *priv; - - misc->priv = gtk_misc_get_instance_private (misc); - priv = misc->priv; - - priv->xalign = 0.5; - priv->yalign = 0.5; - priv->xpad = 0; - priv->ypad = 0; -} - -static void -gtk_misc_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkMisc *misc = GTK_MISC (object); - GtkMiscPrivate *priv = misc->priv; - - switch (prop_id) - { - case PROP_XALIGN: - gtk_misc_set_alignment (misc, g_value_get_float (value), priv->yalign); - break; - case PROP_YALIGN: - gtk_misc_set_alignment (misc, priv->xalign, g_value_get_float (value)); - break; - case PROP_XPAD: - gtk_misc_set_padding (misc, g_value_get_int (value), priv->ypad); - break; - case PROP_YPAD: - gtk_misc_set_padding (misc, priv->xpad, g_value_get_int (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_misc_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GtkMisc *misc = GTK_MISC (object); - GtkMiscPrivate *priv = misc->priv; - - switch (prop_id) - { - case PROP_XALIGN: - g_value_set_float (value, priv->xalign); - break; - case PROP_YALIGN: - g_value_set_float (value, priv->yalign); - break; - case PROP_XPAD: - g_value_set_int (value, priv->xpad); - break; - case PROP_YPAD: - g_value_set_int (value, priv->ypad); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/** - * gtk_misc_set_alignment: - * @misc: a #GtkMisc. - * @xalign: the horizontal alignment, from 0 (left) to 1 (right). - * @yalign: the vertical alignment, from 0 (top) to 1 (bottom). - * - * Sets the alignment of the widget. - * - * Deprecated: 3.14: Use #GtkWidget's alignment (#GtkWidget:halign and #GtkWidget:valign) and margin properties or #GtkLabel's #GtkLabel:xalign and #GtkLabel:yalign properties. - */ -void -gtk_misc_set_alignment (GtkMisc *misc, - gfloat xalign, - gfloat yalign) -{ - GtkMiscPrivate *priv; - GtkWidget *widget; - - g_return_if_fail (GTK_IS_MISC (misc)); - - priv = misc->priv; - - if (xalign < 0.0) - xalign = 0.0; - else if (xalign > 1.0) - xalign = 1.0; - - if (yalign < 0.0) - yalign = 0.0; - else if (yalign > 1.0) - yalign = 1.0; - - if ((xalign != priv->xalign) || (yalign != priv->yalign)) - { - g_object_freeze_notify (G_OBJECT (misc)); - if (xalign != priv->xalign) - g_object_notify (G_OBJECT (misc), "xalign"); - - if (yalign != priv->yalign) - g_object_notify (G_OBJECT (misc), "yalign"); - - priv->xalign = xalign; - priv->yalign = yalign; - - if (GTK_IS_LABEL (misc)) - { - gtk_label_set_xalign (GTK_LABEL (misc), xalign); - gtk_label_set_yalign (GTK_LABEL (misc), yalign); - } - - /* clear the area that was allocated before the change - */ - widget = GTK_WIDGET (misc); - if (gtk_widget_is_drawable (widget)) - gtk_widget_queue_draw (widget); - - g_object_thaw_notify (G_OBJECT (misc)); - } -} - -/** - * gtk_misc_get_alignment: - * @misc: a #GtkMisc - * @xalign: (out) (allow-none): location to store X alignment of @misc, or %NULL - * @yalign: (out) (allow-none): location to store Y alignment of @misc, or %NULL - * - * Gets the X and Y alignment of the widget within its allocation. - * See gtk_misc_set_alignment(). - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties. - **/ -void -gtk_misc_get_alignment (GtkMisc *misc, - gfloat *xalign, - gfloat *yalign) -{ - GtkMiscPrivate *priv; - - g_return_if_fail (GTK_IS_MISC (misc)); - - priv = misc->priv; - - if (xalign) - *xalign = priv->xalign; - if (yalign) - *yalign = priv->yalign; -} - -/** - * gtk_misc_set_padding: - * @misc: a #GtkMisc. - * @xpad: the amount of space to add on the left and right of the widget, - * in pixels. - * @ypad: the amount of space to add on the top and bottom of the widget, - * in pixels. - * - * Sets the amount of space to add around the widget. - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties. - */ -void -gtk_misc_set_padding (GtkMisc *misc, - gint xpad, - gint ypad) -{ - GtkMiscPrivate *priv; - - g_return_if_fail (GTK_IS_MISC (misc)); - - priv = misc->priv; - - if (xpad < 0) - xpad = 0; - if (ypad < 0) - ypad = 0; - - if ((xpad != priv->xpad) || (ypad != priv->ypad)) - { - g_object_freeze_notify (G_OBJECT (misc)); - if (xpad != priv->xpad) - g_object_notify (G_OBJECT (misc), "xpad"); - - if (ypad != priv->ypad) - g_object_notify (G_OBJECT (misc), "ypad"); - - priv->xpad = xpad; - priv->ypad = ypad; - - if (gtk_widget_is_drawable (GTK_WIDGET (misc))) - gtk_widget_queue_resize (GTK_WIDGET (misc)); - - g_object_thaw_notify (G_OBJECT (misc)); - } -} - -/** - * gtk_misc_get_padding: - * @misc: a #GtkMisc - * @xpad: (out) (allow-none): location to store padding in the X - * direction, or %NULL - * @ypad: (out) (allow-none): location to store padding in the Y - * direction, or %NULL - * - * Gets the padding in the X and Y directions of the widget. - * See gtk_misc_set_padding(). - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties. - **/ -void -gtk_misc_get_padding (GtkMisc *misc, - gint *xpad, - gint *ypad) -{ - GtkMiscPrivate *priv; - - g_return_if_fail (GTK_IS_MISC (misc)); - - priv = misc->priv; - - if (xpad) - *xpad = priv->xpad; - if (ypad) - *ypad = priv->ypad; -} - -static void -gtk_misc_realize (GtkWidget *widget) -{ - GtkAllocation allocation; - GdkWindow *window; - GdkWindowAttr attributes; - gint attributes_mask; - - gtk_widget_set_realized (widget, TRUE); - - if (!gtk_widget_get_has_window (widget)) - { - window = gtk_widget_get_parent_window (widget); - gtk_widget_set_window (widget, window); - g_object_ref (window); - } - else - { - gtk_widget_get_allocation (widget, &allocation); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = allocation.x; - attributes.y = allocation.y; - attributes.width = allocation.width; - attributes.height = allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.event_mask = gtk_widget_get_events (widget); - attributes_mask = GDK_WA_X | GDK_WA_Y; - - window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); - gtk_widget_set_window (widget, window); - gtk_widget_register_window (widget, window); - } -} - -/* Semi-private function used by gtk widgets inheriting from - * GtkMisc that takes into account both css padding and border - * and the padding specified with the GtkMisc properties. - */ -void -_gtk_misc_get_padding_and_border (GtkMisc *misc, - GtkBorder *border) -{ - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder tmp; - gint xpad, ypad; - - g_return_if_fail (GTK_IS_MISC (misc)); - - context = gtk_widget_get_style_context (GTK_WIDGET (misc)); - state = gtk_widget_get_state_flags (GTK_WIDGET (misc)); - - gtk_style_context_get_padding (context, state, border); - - gtk_misc_get_padding (misc, &xpad, &ypad); - border->top += ypad; - border->left += xpad; - border->bottom += ypad; - border->right += xpad; - - gtk_style_context_get_border (context, state, &tmp); - border->top += tmp.top; - border->right += tmp.right; - border->bottom += tmp.bottom; - border->left += tmp.left; -} - diff --git a/gtk/deprecated/gtkmisc.h b/gtk/deprecated/gtkmisc.h deleted file mode 100644 index b8d9d46c1b..0000000000 --- a/gtk/deprecated/gtkmisc.h +++ /dev/null @@ -1,93 +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, see <http://www.gnu.org/licenses/>. - */ - -/* - * 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_MISC_H__ -#define __GTK_MISC_H__ - - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only <gtk/gtk.h> can be included directly." -#endif - -#include <gtk/gtkwidget.h> - - -G_BEGIN_DECLS - -#define GTK_TYPE_MISC (gtk_misc_get_type ()) -#define GTK_MISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MISC, GtkMisc)) -#define GTK_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MISC, GtkMiscClass)) -#define GTK_IS_MISC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MISC)) -#define GTK_IS_MISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC)) -#define GTK_MISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass)) - - -typedef struct _GtkMisc GtkMisc; -typedef struct _GtkMiscPrivate GtkMiscPrivate; -typedef struct _GtkMiscClass GtkMiscClass; - -struct _GtkMisc -{ - GtkWidget widget; - - /*< private >*/ - GtkMiscPrivate *priv; -}; - -struct _GtkMiscClass -{ - GtkWidgetClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - -GDK_DEPRECATED_IN_3_14 -GType gtk_misc_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_14 -void gtk_misc_set_alignment (GtkMisc *misc, - gfloat xalign, - gfloat yalign); -GDK_DEPRECATED_IN_3_14 -void gtk_misc_get_alignment (GtkMisc *misc, - gfloat *xalign, - gfloat *yalign); -GDK_DEPRECATED_IN_3_14 -void gtk_misc_set_padding (GtkMisc *misc, - gint xpad, - gint ypad); -GDK_DEPRECATED_IN_3_14 -void gtk_misc_get_padding (GtkMisc *misc, - gint *xpad, - gint *ypad); - -void _gtk_misc_get_padding_and_border (GtkMisc *misc, - GtkBorder *border); - -G_END_DECLS - -#endif /* __GTK_MISC_H__ */ @@ -260,7 +260,6 @@ #include <gtk/deprecated/gtkhseparator.h> #include <gtk/deprecated/gtkiconfactory.h> #include <gtk/deprecated/gtkimagemenuitem.h> -#include <gtk/deprecated/gtkmisc.h> #include <gtk/deprecated/gtkradioaction.h> #include <gtk/deprecated/gtkrecentaction.h> #include <gtk/deprecated/gtkstock.h> |