[glom] Use gdk_window_get_device_position() instead of gdk_window_get_pointer().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Use gdk_window_get_device_position() instead of gdk_window_get_pointer().
- Date: Mon, 10 Oct 2011 20:48:24 +0000 (UTC)
commit 2e970052eec274a4bce4aa018694c7bed6b44ca2
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Oct 10 22:48:16 2011 +0200
Use gdk_window_get_device_position() instead of gdk_window_get_pointer().
* glom/mode_data/box_data_calendar_related.cc:
* glom/mode_data/buttonglom.cc:
* glom/mode_data/datawidget/checkbutton.cc:
* glom/mode_data/datawidget/combo.cc:
* glom/mode_data/datawidget/combo_as_radio_buttons.cc:
* glom/mode_data/datawidget/datawidget.cc:
* glom/mode_data/datawidget/entry.cc:
* glom/mode_data/datawidget/label.cc:
* glom/mode_data/datawidget/textview.cc:
* glom/mode_data/db_adddel/db_adddel.cc:
* glom/mode_data/flowtablewithfields.cc:
* glom/utility_widgets/adddel/adddel.cc:
* glom/utility_widgets/imageglom.cc:
* glom/utility_widgets/notebooklabelglom.cc: A fairly simple search/replace.
ChangeLog | 19 +++++++++++++++++++
glom/mode_data/box_data_calendar_related.cc | 2 +-
glom/mode_data/buttonglom.cc | 2 +-
glom/mode_data/datawidget/checkbutton.cc | 2 +-
glom/mode_data/datawidget/combo.cc | 2 +-
.../mode_data/datawidget/combo_as_radio_buttons.cc | 2 +-
glom/mode_data/datawidget/datawidget.cc | 2 +-
glom/mode_data/datawidget/entry.cc | 2 +-
glom/mode_data/datawidget/label.cc | 2 +-
glom/mode_data/datawidget/textview.cc | 2 +-
glom/mode_data/db_adddel/db_adddel.cc | 2 +-
glom/mode_data/flowtablewithfields.cc | 2 +-
glom/utility_widgets/adddel/adddel.cc | 2 +-
glom/utility_widgets/imageglom.cc | 2 +-
glom/utility_widgets/notebooklabelglom.cc | 2 +-
15 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8569a7b..2458c9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2011-10-10 Murray Cumming <murrayc localhost localdomain>
+
+ reviewed by: <delete if not using a buddy>
+
+ * glom/mode_data/box_data_calendar_related.cc:
+ * glom/mode_data/buttonglom.cc:
+ * glom/mode_data/datawidget/checkbutton.cc:
+ * glom/mode_data/datawidget/combo.cc:
+ * glom/mode_data/datawidget/combo_as_radio_buttons.cc:
+ * glom/mode_data/datawidget/datawidget.cc:
+ * glom/mode_data/datawidget/entry.cc:
+ * glom/mode_data/datawidget/label.cc:
+ * glom/mode_data/datawidget/textview.cc:
+ * glom/mode_data/db_adddel/db_adddel.cc:
+ * glom/mode_data/flowtablewithfields.cc:
+ * glom/utility_widgets/adddel/adddel.cc:
+ * glom/utility_widgets/imageglom.cc:
+ * glom/utility_widgets/notebooklabelglom.cc:
+
1.19.12:
2011-10-10 Murray Cumming <murrayc murrayc com>
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index 0d31405..593270f 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -556,7 +556,7 @@ void Box_Data_Calendar_Related::on_calendar_button_press_event(GdkEventButton *e
#endif
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window(Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window(Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/buttonglom.cc b/glom/mode_data/buttonglom.cc
index 462ef85..1c139f2 100644
--- a/glom/mode_data/buttonglom.cc
+++ b/glom/mode_data/buttonglom.cc
@@ -88,7 +88,7 @@ bool ButtonGlom::on_button_press_event(GdkEventButton *event)
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/checkbutton.cc b/glom/mode_data/datawidget/checkbutton.cc
index 22b1e80..4f1a2ad 100644
--- a/glom/mode_data/datawidget/checkbutton.cc
+++ b/glom/mode_data/datawidget/checkbutton.cc
@@ -71,7 +71,7 @@ bool CheckButton::on_button_press_event(GdkEventButton *event)
if(pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/combo.cc b/glom/mode_data/datawidget/combo.cc
index 46caf52..f5028d1 100644
--- a/glom/mode_data/datawidget/combo.cc
+++ b/glom/mode_data/datawidget/combo.cc
@@ -296,7 +296,7 @@ g_warning("ComboGlom::on_button_press_event()");
if(pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.cc b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
index c1d379c..157555f 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.cc
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
@@ -278,7 +278,7 @@ void ComboAsRadioButtons::show_context_menu(GdkEventButton *event)
if(pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/datawidget.cc b/glom/mode_data/datawidget/datawidget.cc
index 4b13036..f3b2864 100644
--- a/glom/mode_data/datawidget/datawidget.cc
+++ b/glom/mode_data/datawidget/datawidget.cc
@@ -411,7 +411,7 @@ bool DataWidget::on_button_press_event(GdkEventButton *event)
if(pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/entry.cc b/glom/mode_data/datawidget/entry.cc
index 3f62dbd..43616e6 100644
--- a/glom/mode_data/datawidget/entry.cc
+++ b/glom/mode_data/datawidget/entry.cc
@@ -207,7 +207,7 @@ bool Entry::on_button_press_event(GdkEventButton *event)
if(pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/label.cc b/glom/mode_data/datawidget/label.cc
index 17cd5d4..9357fc5 100644
--- a/glom/mode_data/datawidget/label.cc
+++ b/glom/mode_data/datawidget/label.cc
@@ -106,7 +106,7 @@ bool Label::on_button_press_event(GdkEventButton *event)
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/datawidget/textview.cc b/glom/mode_data/datawidget/textview.cc
index e1cb63a..603546f 100644
--- a/glom/mode_data/datawidget/textview.cc
+++ b/glom/mode_data/datawidget/textview.cc
@@ -193,7 +193,7 @@ bool TextView::on_button_press_event(GdkEventButton *event)
if(pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index 292af5b..927bf02 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -304,7 +304,7 @@ bool DbAddDel::on_button_press_event_Popup(GdkEventButton *event)
#endif
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window(Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 8a07d72..0d357ae 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -1391,7 +1391,7 @@ bool FlowTableWithFields::on_button_press_event(GdkEventButton *event)
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/utility_widgets/adddel/adddel.cc b/glom/utility_widgets/adddel/adddel.cc
index 68c6b2e..02855fd 100644
--- a/glom/utility_widgets/adddel/adddel.cc
+++ b/glom/utility_widgets/adddel/adddel.cc
@@ -274,7 +274,7 @@ void AddDel::setup_menu()
bool AddDel::on_button_press_event_Popup(GdkEventButton *event)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 6dbcf17..6767ddc 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -98,7 +98,7 @@ void ImageGlom::set_layout_item(const sharedptr<LayoutItem>& layout_item, const
bool ImageGlom::on_button_press_event(GdkEventButton *event)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
diff --git a/glom/utility_widgets/notebooklabelglom.cc b/glom/utility_widgets/notebooklabelglom.cc
index 8514ca6..8421ba2 100644
--- a/glom/utility_widgets/notebooklabelglom.cc
+++ b/glom/utility_widgets/notebooklabelglom.cc
@@ -152,7 +152,7 @@ bool NotebookLabel::on_button_press_event(GdkEventButton *event)
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
- gdk_window_get_pointer( gtk_widget_get_window (Gtk::Widget::gobj()), 0, 0, &mods );
+ gdk_window_get_device_position( gtk_widget_get_window (Gtk::Widget::gobj()), event->device, 0, 0, &mods );
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]