Author: cazfi
Date: Wed May 11 15:20:44 2016
New Revision: 32666
URL: http://svn.gna.org/viewcvs/freeciv?rev=32666&view=rev
Log:
Corrected placement for variable declaration in gtk3- and gtk3x-client
create_line_at_mouse_pos()
See patch #7206
Modified:
trunk/client/gui-gtk-3.0/mapctrl.c
trunk/client/gui-gtk-3.x/mapctrl.c
trunk/client/gui-qt/mapctrl.cpp
trunk/client/gui-stub/mapctrl.c
Modified: trunk/client/gui-gtk-3.0/mapctrl.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapctrl.c?rev=32666&r1=32665&r2=32666&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/mapctrl.c (original)
+++ trunk/client/gui-gtk-3.0/mapctrl.c Wed May 11 15:20:44 2016
@@ -356,14 +356,16 @@
void create_line_at_mouse_pos(void)
{
int x, y;
+ GdkWindow *window;
GdkDeviceManager *manager =
gdk_display_get_device_manager(gtk_widget_get_display(toplevel));
GdkDevice *pointer = gdk_device_manager_get_client_pointer(manager);
+
if (!pointer) {
return;
}
- GdkWindow *window = gdk_device_get_window_at_position(pointer, &x, &y);
+ window = gdk_device_get_window_at_position(pointer, &x, &y);
if (window) {
if (window == gtk_widget_get_window(map_canvas)) {
update_line(x, y);
Modified: trunk/client/gui-gtk-3.x/mapctrl.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/mapctrl.c?rev=32666&r1=32665&r2=32666&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/mapctrl.c (original)
+++ trunk/client/gui-gtk-3.x/mapctrl.c Wed May 11 15:20:44 2016
@@ -356,14 +356,16 @@
void create_line_at_mouse_pos(void)
{
int x, y;
+ GdkWindow *window;
GdkDeviceManager *manager =
gdk_display_get_device_manager(gtk_widget_get_display(toplevel));
GdkDevice *pointer = gdk_device_manager_get_client_pointer(manager);
+
if (!pointer) {
return;
}
- GdkWindow *window = gdk_device_get_window_at_position(pointer, &x, &y);
+ window = gdk_device_get_window_at_position(pointer, &x, &y);
if (window) {
if (window == gtk_widget_get_window(map_canvas)) {
update_line(x, y);
Modified: trunk/client/gui-qt/mapctrl.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapctrl.cpp?rev=32666&r1=32665&r2=32666&view=diff
==============================================================================
--- trunk/client/gui-qt/mapctrl.cpp (original)
+++ trunk/client/gui-qt/mapctrl.cpp Wed May 11 15:20:44 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -82,6 +82,7 @@
{
QPoint global_pos, local_pos;
int x, y;
+
global_pos = QCursor::pos();
local_pos = gui()->mapview_wdg->mapFromGlobal(global_pos);
x = local_pos.x();
Modified: trunk/client/gui-stub/mapctrl.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-stub/mapctrl.c?rev=32666&r1=32665&r2=32666&view=diff
==============================================================================
--- trunk/client/gui-stub/mapctrl.c (original)
+++ trunk/client/gui-stub/mapctrl.c Wed May 11 15:20:44 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
