[gtkmm] Display: Fix build error in get_protocol_for_disply().



commit 2e7f947859eceb60ad862081aefd4f67c5bc1d5a
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 15 21:14:25 2010 +0200

    Display: Fix build error in get_protocol_for_disply().
    
    * gdk/src/display.[hg|ccg]: get_protocol_for_display(): Remove the ifdef
    around this, because this remaining version is not win32-only. Remove the
     implementation for the win32-only version with no remaining declaration.
    Remove the win32-only version of selection_send_notify() because it too
    existed only to maintain ABI in gtkmm 2.4.

 ChangeLog           |   10 ++++++++++
 gdk/src/display.ccg |   12 ------------
 gdk/src/display.hg  |   20 --------------------
 3 files changed, 10 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 16fbabd..3928b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-09-15  Murray Cumming  <murrayc murrayc com>
 
+	Display: Fix build error in get_protocol_for_disply().
+
+	* gdk/src/display.[hg|ccg]: get_protocol_for_display(): Remove the ifdef 
+	around this, because this remaining version is not win32-only. Remove the 
+	 implementation for the win32-only version with no remaining declaration.
+	Remove the win32-only version of selection_send_notify() because it too 
+	existed only to maintain ABI in gtkmm 2.4.
+
+2010-09-15  Murray Cumming  <murrayc murrayc com>
+
 	Demos: Adapt to ALIGN_* rename.
 
 	* demos/gtk-demo/example_colorsel.cc:
diff --git a/gdk/src/display.ccg b/gdk/src/display.ccg
index 93b136c..d982c57 100644
--- a/gdk/src/display.ccg
+++ b/gdk/src/display.ccg
@@ -36,18 +36,6 @@ Glib::RefPtr<Window> Display::get_selection_owner(const Glib::ustring& selection
   return Glib::wrap( (GdkWindowObject*)gdk_selection_owner_get_for_display(gobj(), Gdk::AtomString::to_c_type(selection)) , true);
 }
 
-#ifdef G_OS_WIN32
-guint32 Display::get_drag_protocol(guint32 xid, GdkDragProtocol& protocol)
-{
-  return GPOINTER_TO_UINT(gdk_drag_get_protocol_for_display(gobj(), GUINT_TO_POINTER(xid), &(protocol)));
-}
-
-void Display::selection_send_notify(guint32 requestor, Glib::ustring& selection, Glib::ustring& target, Glib::ustring& property, guint32 time_)
-{
-  gdk_selection_send_notify_for_display(gobj(), GUINT_TO_POINTER(requestor), Gdk::AtomString::to_c_type(selection), Gdk::AtomString::to_c_type(target), Gdk::AtomString::to_c_type(property), time_);
-}
-#endif
-
 void Display::selection_send_notify(GdkNativeWindow requestor, Glib::ustring& selection, Glib::ustring& target, Glib::ustring& property, guint32 time_)
 {
   gdk_selection_send_notify_for_display(gobj(), requestor, Gdk::AtomString::to_c_type(selection), Gdk::AtomString::to_c_type(target), Gdk::AtomString::to_c_type(property), time_);
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 58bd1ac..1b2ea3d 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -153,7 +153,6 @@ public:
 
   _WRAP_METHOD(static Glib::RefPtr<Display> open_default_libgtk_only(), gdk_display_open_default_libgtk_only, refreturn)
 
-#ifdef G_OS_WIN32
   /** Finds out the DND protocol supported by a window.
    *
    * @newin{2,2}
@@ -164,7 +163,6 @@ public:
    * support Drag and Drop.
    */
   _WRAP_METHOD(GdkNativeWindow get_drag_protocol(GdkNativeWindow xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display)
-#endif
 
   _WRAP_METHOD(GdkKeymap* get_keymap(), gdk_keymap_get_for_display)
   _WRAP_METHOD(const GdkKeymap* get_keymap() const, gdk_keymap_get_for_display, constversion)
@@ -172,24 +170,6 @@ public:
   bool set_selection_owner(const Glib::RefPtr<Window>& owner, Glib::ustring& selection, guint32 time_, bool send_event);
   Glib::RefPtr<Window> get_selection_owner(const Glib::ustring& selection);
 
-#ifdef G_OS_WIN32
-  /** Send a response to SelectionRequest event.
-   *
-   * @newin{2,2}
-   * @param requestor Window to which to deliver response.
-   * @param selection Selection that was requested.
-   * @param target Target that was selected.
-   * @param property Property in which the selection owner stored the data,
-   * or "None" to indicate that the request was rejected.
-   * @param time_ Timestamp.
-   *
-   * On Windows, GdkNativeWindow is not the same as guint32, so we keep the
-   * guint32 variant for ABI compatibility. On Linux, it is the same, and they
-   * can't be overloaded therefore. But the ABI stays the same anyway.
-   */
-  void selection_send_notify(guint32 requestor, Glib::ustring& selection, Glib::ustring& target, Glib::ustring& property, guint32 time_);
-#endif
-
   /** Send a response to SelectionRequest event.
    *
    * @newin{2,2}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]