summaryrefslogtreecommitdiff
path: root/mate-panel/panel-menu-bar.c
diff options
context:
space:
mode:
authorWu Xiaotian <[email protected]>2019-05-09 15:39:36 +0800
committerZenWalker <[email protected]>2019-05-16 11:38:50 +0200
commit985bd4ed7b4341aea9b85a232969140708150972 (patch)
tree78fb8a604cf7b40fe5424324ec137803bfd9a37a /mate-panel/panel-menu-bar.c
parent2c838847a593718f230d4f9bf17fe707d6390b81 (diff)
downloadmate-panel-985bd4ed7b4341aea9b85a232969140708150972.tar.bz2
mate-panel-985bd4ed7b4341aea9b85a232969140708150972.tar.xz
[mate-panel] Avoid deprecated g_type_class_add_private
Diffstat (limited to 'mate-panel/panel-menu-bar.c')
-rw-r--r--mate-panel/panel-menu-bar.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index e570892d..b88c6ffb 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -54,10 +54,6 @@
#include "panel-icon-names.h"
#include "panel-schemas.h"
-G_DEFINE_TYPE (PanelMenuBar, panel_menu_bar, GTK_TYPE_MENU_BAR)
-
-#define PANEL_MENU_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_MENU_BAR, PanelMenuBarPrivate))
-
struct _PanelMenuBarPrivate {
AppletInfo* info;
PanelWidget* panel;
@@ -81,6 +77,8 @@ enum {
PROP_ORIENTATION,
};
+G_DEFINE_TYPE_WITH_PRIVATE (PanelMenuBar, panel_menu_bar, GTK_TYPE_MENU_BAR)
+
static void panel_menu_bar_update_text_gravity(PanelMenuBar* menubar);
static gboolean panel_menu_bar_reinit_tooltip(GtkWidget* widget, PanelMenuBar* menubar)
@@ -170,7 +168,7 @@ static void panel_menu_bar_init(PanelMenuBar* menubar)
{
GtkCssProvider *provider;
- menubar->priv = PANEL_MENU_BAR_GET_PRIVATE(menubar);
+ menubar->priv = panel_menu_bar_get_instance_private(menubar);
provider = gtk_css_provider_new ();
gtk_css_provider_load_from_data (provider,
@@ -329,8 +327,6 @@ static void panel_menu_bar_class_init(PanelMenuBarClass* klass)
widget_class->parent_set = panel_menu_bar_parent_set;
widget_class->size_allocate = panel_menu_bar_size_allocate;
- g_type_class_add_private(klass, sizeof(PanelMenuBarPrivate));
-
g_object_class_install_property(gobject_class, PROP_ORIENTATION, g_param_spec_enum("orientation", "Orientation", "The PanelMenuBar orientation", PANEL_TYPE_ORIENTATION, PANEL_ORIENTATION_TOP, G_PARAM_READWRITE));
}