Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
glom
Commits
90cf6540
Unverified
Commit
90cf6540
authored
Jun 21, 2017
by
Murray Cumming
Browse files
Use Gtk::Menu::popup_at_pointer() instead of (deprecated) popup().
Strangely, popup() is not deprecated in GTK+ 4.
parent
0bc8bf73
Changes
25
Hide whitespace changes
Inline
Side-by-side
glom/mode_data/box_data_calendar_related.cc
View file @
90cf6540
...
...
@@ -521,7 +521,7 @@ void Box_Data_Calendar_Related::on_calendar_button_press_event(GdkEventButton *b
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
;
//handled.
}
else
...
...
glom/mode_data/buttonglom.cc
View file @
90cf6540
...
...
@@ -87,10 +87,11 @@ bool ButtonGlom::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_popup_menu_utils
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_popup_menu_utils
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
return
Gtk
::
Button
::
on_button_press_event
(
button_event
);
}
#endif
...
...
glom/mode_data/datawidget/checkbutton.cc
View file @
90cf6540
...
...
@@ -61,7 +61,7 @@ bool CheckButton::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_data/datawidget/combo.cc
View file @
90cf6540
...
...
@@ -324,7 +324,7 @@ g_warning("ComboGlom::on_button_press_event()");
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_data/datawidget/combo_as_radio_buttons.cc
View file @
90cf6540
...
...
@@ -272,7 +272,7 @@ void ComboAsRadioButtons::show_context_menu(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
}
}
}
...
...
glom/mode_data/datawidget/datawidget.cc
View file @
90cf6540
...
...
@@ -442,7 +442,7 @@ bool DataWidget::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_data/datawidget/entry.cc
View file @
90cf6540
...
...
@@ -201,7 +201,7 @@ bool Entry::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_data/datawidget/label.cc
View file @
90cf6540
...
...
@@ -105,7 +105,7 @@ bool Label::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_popup_menu_utils
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_popup_menu_utils
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_data/datawidget/textview.cc
View file @
90cf6540
...
...
@@ -160,7 +160,7 @@ bool TextView::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_data/db_adddel/db_adddel.cc
View file @
90cf6540
...
...
@@ -292,7 +292,7 @@ bool DbAddDel::on_button_press_event_Popup(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//handled.
}
else
...
...
glom/mode_data/flowtablewithfields.cc
View file @
90cf6540
...
...
@@ -1318,7 +1318,7 @@ bool FlowTableWithFields::on_button_press_event(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_popup_menu_utils
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_popup_menu_utils
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
return
true
;
//We handled this event.
}
}
...
...
glom/mode_design/print_layouts/window_print_layout_edit.cc
View file @
90cf6540
...
...
@@ -726,13 +726,13 @@ bool Window_PrintLayout_Edit::on_canvas_motion_notify_event(GdkEventMotion* moti
return
false
;
}
void
Window_PrintLayout_Edit
::
on_canvas_show_context_menu
(
guint
button
,
guint32
activate_time
)
void
Window_PrintLayout_Edit
::
on_canvas_show_context_menu
(
GdkEventButton
*
event
)
{
//TODO: This is never called when right-clicking on the canvas.
//std::cout << G_STRFUNC << ": debug\n";
if
(
m_context_menu
)
m_context_menu
->
popup
(
button
,
activate_time
);
m_context_menu
->
popup
_at_pointer
((
GdkEvent
*
)
event
);
}
bool
Window_PrintLayout_Edit
::
get_is_item_at
(
double
x
,
double
y
)
const
...
...
glom/mode_design/print_layouts/window_print_layout_edit.h
View file @
90cf6540
...
...
@@ -93,7 +93,7 @@ private:
void
on_menu_align_right
();
bool
on_canvas_motion_notify_event
(
GdkEventMotion
*
motion_event
);
void
on_canvas_show_context_menu
(
guint
button
,
guint32
activate_time
);
void
on_canvas_show_context_menu
(
GdkEventButton
*
event
);
void
on_context_menu_insert_field
();
void
on_context_menu_insert_text
();
...
...
glom/mode_design/relationships_overview/window_relationships_overview.cc
View file @
90cf6540
...
...
@@ -406,7 +406,7 @@ void Window_RelationshipsOverview::on_table_moved(const Glib::RefPtr<CanvasItemM
draw_lines
();
}
void
Window_RelationshipsOverview
::
on_table_show_context
(
guint
button
,
guint32
activate_time
,
const
Glib
::
WeakRef
<
CanvasGroupDbTable
>&
table_weak
)
void
Window_RelationshipsOverview
::
on_table_show_context
(
GdkEventButton
*
event
,
const
Glib
::
WeakRef
<
CanvasGroupDbTable
>&
table_weak
)
{
const
auto
table
=
table_weak
.
get
();
if
(
!
table
)
...
...
@@ -426,7 +426,7 @@ void Window_RelationshipsOverview::on_table_show_context(guint button, guint32 a
}
if
(
m_context_menu
)
m_context_menu
->
popup
(
button
,
activate_time
);
m_context_menu
->
popup
_at_pointer
((
GdkEvent
*
)
event
);
}
void
Window_RelationshipsOverview
::
setup_context_menu
()
...
...
glom/mode_design/relationships_overview/window_relationships_overview.h
View file @
90cf6540
...
...
@@ -69,7 +69,7 @@ private:
void
on_menu_view_showgrid
(
const
Glib
::
VariantBase
&
/* parameter */
);
void
on_table_moved
(
const
Glib
::
RefPtr
<
CanvasItemMovable
>&
item
,
double
x_offset
,
double
y_offset
);
void
on_table_show_context
(
guint
button
,
guint32
activate_time
,
const
Glib
::
WeakRef
<
CanvasGroupDbTable
>&
table
);
void
on_table_show_context
(
GdkEventButton
*
event
,
const
Glib
::
WeakRef
<
CanvasGroupDbTable
>&
table
);
void
on_context_menu_edit_fields
(
const
Glib
::
VariantBase
&
parameter
,
const
Glib
::
WeakRef
<
CanvasGroupDbTable
>&
table
);
void
on_context_menu_edit_relationships
(
const
Glib
::
VariantBase
&
parameter
,
const
Glib
::
WeakRef
<
CanvasGroupDbTable
>&
table
);
...
...
glom/print_layout/canvas_print_layout.cc
View file @
90cf6540
...
...
@@ -291,7 +291,7 @@ void Canvas_PrintLayout::setup_context_menu()
}
void
Canvas_PrintLayout
::
on_item_show_context_menu
(
guint
button
,
guint32
activate_time
,
const
Glib
::
WeakRef
<
CanvasLayoutItem
>&
item_weak
)
void
Canvas_PrintLayout
::
on_item_show_context_menu
(
GdkEventButton
*
event
,
const
Glib
::
WeakRef
<
CanvasLayoutItem
>&
item_weak
)
{
const
auto
item
=
item_weak
.
get
();
if
(
!
item
)
...
...
@@ -312,7 +312,7 @@ void Canvas_PrintLayout::on_item_show_context_menu(guint button, guint32 activat
m_action_formatting
->
set_enabled
(
enable_formatting
);
m_context_menu
->
popup
(
button
,
activate_time
);
m_context_menu
->
popup
_at_pointer
((
GdkEvent
*
)
event
);
}
bool
Canvas_PrintLayout
::
on_background_button_press_event
(
const
Glib
::
RefPtr
<
Goocanvas
::
Item
>&
/* target */
,
GdkEventButton
*
/* event */
)
...
...
glom/print_layout/canvas_print_layout.h
View file @
90cf6540
...
...
@@ -120,7 +120,7 @@ private:
std
::
shared_ptr
<
LayoutItem_Line
>
offer_line
(
const
std
::
shared_ptr
<
LayoutItem_Line
>&
portal
,
Gtk
::
Window
*
parent
);
//TODO: Make the signal send the item, so we can pass it by const reference:
void
on_item_show_context_menu
(
guint
button
,
guint32
activate_time
,
const
Glib
::
WeakRef
<
CanvasLayoutItem
>&
item
);
void
on_item_show_context_menu
(
GdkEventButton
*
event
,
const
Glib
::
WeakRef
<
CanvasLayoutItem
>&
item
);
void
on_context_menu_edit
();
void
on_context_menu_formatting
();
void
on_context_menu_delete
();
...
...
glom/utility_widgets/adddel/adddel.cc
View file @
90cf6540
...
...
@@ -224,7 +224,7 @@ bool AddDel::on_button_press_event_Popup(GdkEventButton *button_event)
if
(
mods
&
GDK_BUTTON3_MASK
)
{
//Give user choices of actions on this item:
m_menu_popup
->
popup
(
button_event
->
button
,
button_event
->
time
);
m_menu_popup
->
popup
_at_pointer
((
GdkEvent
*
)
button_event
);
}
else
{
...
...
glom/utility_widgets/canvas/canvas_editable.h
View file @
90cf6540
...
...
@@ -84,7 +84,7 @@ public:
//TODO: Actually emit this, so we actually show the context menu when clicking on blank space:
/** void on_show_context(guint button, guint32 activate_time);
*/
typedef
sigc
::
signal
<
void
(
guint
,
guint32
)
>
type_signal_show_context
;
typedef
sigc
::
signal
<
void
(
GdkEventButton
*
)
>
type_signal_show_context
;
type_signal_show_context
signal_show_context
();
...
...
glom/utility_widgets/canvas/canvas_item_movable.cc
View file @
90cf6540
...
...
@@ -111,7 +111,7 @@ bool CanvasItemMovable::on_button_press_event(const Glib::RefPtr<Goocanvas::Item
}
case
3
:
{
m_signal_show_context
.
emit
(
event
->
button
,
event
->
time
);
m_signal_show_context
.
emit
(
event
);
return
false
;
// Not fully Handled.
}
default:
...
...
Prev
1
2
Next
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