quartz: remove gdkmain-quartz.c

5 files changed, 16 insertions, 52 deletions

diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index aa0b717b1f..cfbe55d9cb 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -35,7 +35,6 @@ libgdk_quartz_la_SOURCES =    	\
 	gdkgeometry-quartz.c	\
 	gdkglobals-quartz.c	\
 	gdkkeys-quartz.c	\
-	gdkmain-quartz.c	\
 	gdkprivate-quartz.h	\
 	gdkproperty-quartz.c	\
 	gdkquartz.h		\
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 6a667c911e..9c8b8cb72d 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -261,6 +261,14 @@ _gdk_quartz_display_get_next_serial (GdkDisplay *display)
   return 0;
 }
 
+static void
+_gdk_quartz_display_notify_startup_complete (GdkDisplay  *display,
+                                             const gchar *startup_id)
+{
+  /* FIXME: Implement? */
+}
+
+
 G_DEFINE_TYPE (GdkQuartzDisplay, _gdk_quartz_display, GDK_TYPE_DISPLAY)
 
 static void
diff --git a/gdk/quartz/gdkmain-quartz.c b/gdk/quartz/gdkmain-quartz.c
deleted file mode 100644
index cb2184ab27..0000000000
--- a/gdk/quartz/gdkmain-quartz.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* gdkmain-quartz.c
- *
- * Copyright (C) 2005 Imendio AB
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * 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.
- */
-
-#include "config.h"
-
-#include "gdk.h"
-
-const GOptionEntry _gdk_windowing_args[] = {
-  { NULL }
-};
-
-void
-_gdk_windowing_init (void)
-{
-}
-
-void
-_gdk_quartz_display_notify_startup_complete (GdkDisplay  *display,
-                                             const gchar *startup_id)
-{
-  /* FIXME: Implement? */
-}
-
-void
-_gdk_quartz_window_set_startup_id (GdkWindow   *window,
-                                   const gchar *startup_id)
-{
-  /* FIXME: Implement? */
-}
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 3395d4c4ca..43dd621e3b 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -124,8 +124,6 @@ void        _gdk_quartz_window_translate   (GdkWindow       *window,
 gboolean    _gdk_quartz_window_queue_antiexpose  (GdkWindow *window,
                                                   cairo_region_t *area);
 
-void        _gdk_quartz_window_set_startup_id    (GdkWindow   *window,
-                                                  const gchar *startup_id);
 void        _gdk_quartz_window_register_dnd      (GdkWindow   *window);
 GdkDragContext * _gdk_quartz_window_drag_begin   (GdkWindow   *window,
                                                   GdkDevice   *device,
@@ -155,8 +153,6 @@ void       _gdk_quartz_display_get_maximal_cursor_size (GdkDisplay *display,
                                                         guint      *height);
 void       _gdk_quartz_display_before_process_all_updates (GdkDisplay *display);
 void       _gdk_quartz_display_after_process_all_updates  (GdkDisplay *display);
-void       _gdk_quartz_display_notify_startup_complete    (GdkDisplay *display,
-                                                           const gchar *id);
 void       _gdk_quartz_display_event_data_copy (GdkDisplay     *display,
                                                 const GdkEvent *src,
                                                 GdkEvent       *dst);
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index eb3687f7cc..bdcc5a81b1 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2143,6 +2143,13 @@ gdk_quartz_window_set_role (GdkWindow   *window,
 }
 
 static void
+gdk_quartz_window_set_startup_id (GdkWindow   *window,
+                                  const gchar *startup_id)
+{
+  /* FIXME: Implement? */
+}
+
+static void
 gdk_quartz_window_set_transient_for (GdkWindow *window,
                                      GdkWindow *parent)
 {
@@ -2982,7 +2989,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
   impl_class->set_geometry_hints = gdk_quartz_window_set_geometry_hints;
   impl_class->set_title = gdk_quartz_window_set_title;
   impl_class->set_role = gdk_quartz_window_set_role;
-  impl_class->set_startup_id = _gdk_quartz_window_set_startup_id;
+  impl_class->set_startup_id = gdk_quartz_window_set_startup_id;
   impl_class->set_transient_for = gdk_quartz_window_set_transient_for;
   impl_class->get_root_origin = gdk_quartz_window_get_root_origin;
   impl_class->get_frame_extents = gdk_quartz_window_get_frame_extents;