diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-11 10:41:31 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-11 12:09:11 +0100 |
commit | ab30f3367686f37c18a5c11e3621e29e37b11409 (patch) | |
tree | 8a4edc198e40553ec4e92cdbd03100a1c27e826c /vcl/unx | |
parent | fcc2543d567fbab2396dc3ce4f4513c0c1d38108 (diff) |
gtk[3]: the frame argument is now unused
Change-Id: Ib9989545495a8682d7cac97c02ab73d7c622aecf
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/gtk/gloactiongroup.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx index 00b0ccc3567e..fe946f08957f 100644 --- a/vcl/unx/gtk/gloactiongroup.cxx +++ b/vcl/unx/gtk/gloactiongroup.cxx @@ -100,7 +100,6 @@ g_lo_action_class_init (GLOActionClass *klass) struct GLOActionGroupPrivate { GHashTable *table; /* string -> GLOAction */ - GtkSalFrame *frame; /* Frame to which GActionGroup is associated. */ }; static void g_lo_action_group_iface_init (GActionGroupInterface *); @@ -318,7 +317,6 @@ g_lo_action_group_init (GLOActionGroup *group) GLOActionGroupPrivate); group->priv->table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); - group->priv->frame = nullptr; } static void @@ -341,11 +339,9 @@ g_lo_action_group_iface_init (GActionGroupInterface *iface) } GLOActionGroup * -g_lo_action_group_new (gpointer frame) +g_lo_action_group_new() { GLOActionGroup* group = G_LO_ACTION_GROUP (g_object_new (G_TYPE_LO_ACTION_GROUP, nullptr)); - group->priv->frame = static_cast< GtkSalFrame* > (frame); - return group; } diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 7e118f099e54..83e8836dff49 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -583,7 +583,7 @@ gboolean ensure_dbus_setup( gpointer data ) // Create menu model and action group attached to this frame. GMenuModel* pMenuModel = G_MENU_MODEL( g_lo_menu_new() ); - GActionGroup* pActionGroup = reinterpret_cast<GActionGroup*>(g_lo_action_group_new( static_cast< gpointer >( pSalFrame ) )); + GActionGroup* pActionGroup = reinterpret_cast<GActionGroup*>(g_lo_action_group_new()); // Generate menu paths. ::Window windowId = GDK_WINDOW_XID( gdkWindow ); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index b6deecf000d6..3f1a7fb3d706 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -368,7 +368,7 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const Rectangle& rRec Point aPos = FloatingWindow::ImplCalcPos(pWin, rRect, nFlags, nArrangeIndex); aPos = FloatingWindow::ImplConvertToAbsPos(xParent, aPos); - GLOActionGroup* pActionGroup = g_lo_action_group_new(static_cast<gpointer>(mpFrame)); + GLOActionGroup* pActionGroup = g_lo_action_group_new(); mpActionGroup = G_ACTION_GROUP(pActionGroup); mpMenuModel = G_MENU_MODEL(g_lo_menu_new()); // Generate the main menu structure, populates mpMenuModel diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index ada90e76cb5f..36754f9f6c2f 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -587,7 +587,7 @@ gboolean ensure_dbus_setup( gpointer data ) // Create menu model and action group attached to this frame. GMenuModel* pMenuModel = G_MENU_MODEL( g_lo_menu_new() ); - GActionGroup* pActionGroup = reinterpret_cast<GActionGroup*>(g_lo_action_group_new( static_cast< gpointer >( pSalFrame ) )); + GActionGroup* pActionGroup = reinterpret_cast<GActionGroup*>(g_lo_action_group_new()); // Generate menu paths. sal_uIntPtr windowId = pSalFrame->GetNativeWindowHandle(pSalFrame->getWindow()); |