GtkApplication: Allow passing windows on non-X11 targets

[~andy/gtk] / gdk / quartz / gdkdevice-core-quartz.c

diff --git a/gdk/quartz/gdkdevice-core-quartz.c b/gdk/quartz/gdkdevice-core-quartz.c
index ff90c4a595063e3a77cc43569243bfc0cc676c28..8598cf62a72bdbcc072e19cc76191825e3c02190 100644 (file)
--- a/gdk/quartz/gdkdevice-core-quartz.c
+++ b/gdk/quartz/gdkdevice-core-quartz.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -56,15 +54,15 @@ static void gdk_quartz_device_core_warp (GdkDevice *device,
                                          GdkScreen *screen,
                                          gint       x,
                                          gint       y);
-static gboolean gdk_quartz_device_core_query_state (GdkDevice        *device,
-                                                    GdkWindow        *window,
-                                                    GdkWindow       **root_window,
-                                                    GdkWindow       **child_window,
-                                                    gint             *root_x,
-                                                    gint             *root_y,
-                                                    gint             *win_x,
-                                                    gint             *win_y,
-                                                    GdkModifierType  *mask);
+static void gdk_quartz_device_core_query_state (GdkDevice        *device,
+                                                GdkWindow        *window,
+                                                GdkWindow       **root_window,
+                                                GdkWindow       **child_window,
+                                                gint             *root_x,
+                                                gint             *root_y,
+                                                gint             *win_x,
+                                                gint             *win_y,
+                                                GdkModifierType  *mask);
 static GdkGrabStatus gdk_quartz_device_core_grab   (GdkDevice     *device,
                                                     GdkWindow     *window,
                                                     gboolean       owner_events,
@@ -257,7 +255,7 @@ gdk_quartz_device_core_query_state_helper (GdkWindow       *window,
   return found_window;
 }
 
-static gboolean
+static void
 gdk_quartz_device_core_query_state (GdkDevice        *device,
                                     GdkWindow        *window,
                                     GdkWindow       **root_window,
@@ -268,7 +266,6 @@ gdk_quartz_device_core_query_state (GdkDevice        *device,
                                     gint             *win_y,
                                     GdkModifierType  *mask)
 {
-  GdkDisplay *display;
   GdkWindow *found_window;
   NSPoint point;
   gint x_tmp, y_tmp;
@@ -276,10 +273,6 @@ gdk_quartz_device_core_query_state (GdkDevice        *device,
   found_window = gdk_quartz_device_core_query_state_helper (window, device,
                                                             win_x, win_y,
                                                             mask);
-  if (!found_window)
-    return FALSE;
-
-  display = gdk_window_get_display (window);
 
   if (root_window)
     *root_window = _gdk_root;
@@ -295,8 +288,6 @@ gdk_quartz_device_core_query_state (GdkDevice        *device,
 
   if (root_y)
     *root_y = y_tmp;
-
-  return TRUE;
 }
 
 static GdkGrabStatus