Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
ab30f336
Kaydet (Commit)
ab30f336
authored
May 11, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gtk[3]: the frame argument is now unused
Change-Id: Ib9989545495a8682d7cac97c02ab73d7c622aecf
üst
fcc2543d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
9 deletions
+5
-9
gloactiongroup.h
vcl/inc/unx/gtk/gloactiongroup.h
+1
-1
gloactiongroup.cxx
vcl/unx/gtk/gloactiongroup.cxx
+1
-5
gtksalframe.cxx
vcl/unx/gtk/gtksalframe.cxx
+1
-1
gtksalmenu.cxx
vcl/unx/gtk/gtksalmenu.cxx
+1
-1
gtk3gtkframe.cxx
vcl/unx/gtk3/gtk3gtkframe.cxx
+1
-1
No files found.
vcl/inc/unx/gtk/gloactiongroup.h
Dosyayı görüntüle @
ab30f336
...
@@ -42,7 +42,7 @@ struct GLOActionGroupClass
...
@@ -42,7 +42,7 @@ struct GLOActionGroupClass
GType
g_lo_action_group_get_type
(
void
)
G_GNUC_CONST
;
GType
g_lo_action_group_get_type
(
void
)
G_GNUC_CONST
;
GLOActionGroup
*
g_lo_action_group_new
(
gpointer
frame
);
GLOActionGroup
*
g_lo_action_group_new
(
void
);
void
g_lo_action_group_set_top_menu
(
GLOActionGroup
*
group
,
void
g_lo_action_group_set_top_menu
(
GLOActionGroup
*
group
,
gpointer
top_menu
);
gpointer
top_menu
);
...
...
vcl/unx/gtk/gloactiongroup.cxx
Dosyayı görüntüle @
ab30f336
...
@@ -100,7 +100,6 @@ g_lo_action_class_init (GLOActionClass *klass)
...
@@ -100,7 +100,6 @@ g_lo_action_class_init (GLOActionClass *klass)
struct
GLOActionGroupPrivate
struct
GLOActionGroupPrivate
{
{
GHashTable
*
table
;
/* string -> GLOAction */
GHashTable
*
table
;
/* string -> GLOAction */
GtkSalFrame
*
frame
;
/* Frame to which GActionGroup is associated. */
};
};
static
void
g_lo_action_group_iface_init
(
GActionGroupInterface
*
);
static
void
g_lo_action_group_iface_init
(
GActionGroupInterface
*
);
...
@@ -318,7 +317,6 @@ g_lo_action_group_init (GLOActionGroup *group)
...
@@ -318,7 +317,6 @@ g_lo_action_group_init (GLOActionGroup *group)
GLOActionGroupPrivate
);
GLOActionGroupPrivate
);
group
->
priv
->
table
=
g_hash_table_new_full
(
g_str_hash
,
g_str_equal
,
group
->
priv
->
table
=
g_hash_table_new_full
(
g_str_hash
,
g_str_equal
,
g_free
,
g_object_unref
);
g_free
,
g_object_unref
);
group
->
priv
->
frame
=
nullptr
;
}
}
static
void
static
void
...
@@ -341,11 +339,9 @@ g_lo_action_group_iface_init (GActionGroupInterface *iface)
...
@@ -341,11 +339,9 @@ g_lo_action_group_iface_init (GActionGroupInterface *iface)
}
}
GLOActionGroup
*
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
));
GLOActionGroup
*
group
=
G_LO_ACTION_GROUP
(
g_object_new
(
G_TYPE_LO_ACTION_GROUP
,
nullptr
));
group
->
priv
->
frame
=
static_cast
<
GtkSalFrame
*
>
(
frame
);
return
group
;
return
group
;
}
}
...
...
vcl/unx/gtk/gtksalframe.cxx
Dosyayı görüntüle @
ab30f336
...
@@ -583,7 +583,7 @@ gboolean ensure_dbus_setup( gpointer data )
...
@@ -583,7 +583,7 @@ gboolean ensure_dbus_setup( gpointer data )
// Create menu model and action group attached to this frame.
// Create menu model and action group attached to this frame.
GMenuModel
*
pMenuModel
=
G_MENU_MODEL
(
g_lo_menu_new
()
);
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.
// Generate menu paths.
::
Window
windowId
=
GDK_WINDOW_XID
(
gdkWindow
);
::
Window
windowId
=
GDK_WINDOW_XID
(
gdkWindow
);
...
...
vcl/unx/gtk/gtksalmenu.cxx
Dosyayı görüntüle @
ab30f336
...
@@ -368,7 +368,7 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const Rectangle& rRec
...
@@ -368,7 +368,7 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow* pWin, const Rectangle& rRec
Point
aPos
=
FloatingWindow
::
ImplCalcPos
(
pWin
,
rRect
,
nFlags
,
nArrangeIndex
);
Point
aPos
=
FloatingWindow
::
ImplCalcPos
(
pWin
,
rRect
,
nFlags
,
nArrangeIndex
);
aPos
=
FloatingWindow
::
ImplConvertToAbsPos
(
xParent
,
aPos
);
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
);
mpActionGroup
=
G_ACTION_GROUP
(
pActionGroup
);
mpMenuModel
=
G_MENU_MODEL
(
g_lo_menu_new
());
mpMenuModel
=
G_MENU_MODEL
(
g_lo_menu_new
());
// Generate the main menu structure, populates mpMenuModel
// Generate the main menu structure, populates mpMenuModel
...
...
vcl/unx/gtk3/gtk3gtkframe.cxx
Dosyayı görüntüle @
ab30f336
...
@@ -587,7 +587,7 @@ gboolean ensure_dbus_setup( gpointer data )
...
@@ -587,7 +587,7 @@ gboolean ensure_dbus_setup( gpointer data )
// Create menu model and action group attached to this frame.
// Create menu model and action group attached to this frame.
GMenuModel
*
pMenuModel
=
G_MENU_MODEL
(
g_lo_menu_new
()
);
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.
// Generate menu paths.
sal_uIntPtr
windowId
=
pSalFrame
->
GetNativeWindowHandle
(
pSalFrame
->
getWindow
());
sal_uIntPtr
windowId
=
pSalFrame
->
GetNativeWindowHandle
(
pSalFrame
->
getWindow
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment