[gtk] menu: Make final
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] menu: Make final
- Date: Tue, 28 May 2019 23:38:47 +0000 (UTC)
commit 8695e8c1b80ae9f01623df4890d0399fdd0ba53b
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 28 23:37:31 2019 +0000
menu: Make final
gtk/gtkmenu.h | 27 +--------------------------
gtk/gtkmenuprivate.h | 15 +++++++++++++++
gtk/gtktreemenu.h | 2 +-
3 files changed, 17 insertions(+), 27 deletions(-)
---
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index eec8b531b8..c0d8f116a4 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -36,15 +36,10 @@ G_BEGIN_DECLS
#define GTK_TYPE_MENU (gtk_menu_get_type ())
#define GTK_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
-#define GTK_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU, GtkMenuClass))
#define GTK_IS_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU))
-#define GTK_IS_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU))
-#define GTK_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU, GtkMenuClass))
-typedef struct _GtkMenu GtkMenu;
-typedef struct _GtkMenuClass GtkMenuClass;
-typedef struct _GtkMenuPrivate GtkMenuPrivate;
+typedef struct _GtkMenu GtkMenu;
/**
* GtkArrowPlacement:
@@ -72,26 +67,6 @@ typedef enum
typedef void (*GtkMenuDetachFunc) (GtkWidget *attach_widget,
GtkMenu *menu);
-struct _GtkMenu
-{
- GtkMenuShell menu_shell;
-
- /*< private >*/
- GtkMenuPrivate *priv;
-};
-
-struct _GtkMenuClass
-{
- GtkMenuShellClass parent_class;
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
-};
-
-
GDK_AVAILABLE_IN_ALL
GType gtk_menu_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h
index b0b0c41233..c8a029a28c 100644
--- a/gtk/gtkmenuprivate.h
+++ b/gtk/gtkmenuprivate.h
@@ -31,6 +31,21 @@
G_BEGIN_DECLS
+typedef struct _GtkMenuClass GtkMenuClass;
+typedef struct _GtkMenuPrivate GtkMenuPrivate;
+
+struct _GtkMenu
+{
+ GtkMenuShell menu_shell;
+
+ GtkMenuPrivate *priv;
+};
+
+struct _GtkMenuClass
+{
+ GtkMenuShellClass parent_class;
+};
+
struct _GtkMenuPrivate
{
GtkWidget *parent_menu_item;
diff --git a/gtk/gtktreemenu.h b/gtk/gtktreemenu.h
index dc80a5d7e8..360a28dceb 100644
--- a/gtk/gtktreemenu.h
+++ b/gtk/gtktreemenu.h
@@ -26,7 +26,7 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuprivate.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtkcellarea.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]