[gtkmm] Plug, Socket: Use the X11 Window type. Not my idea.

[Murray Cumming <murrayc src gnome org>]

commit 86ba25145eebb0fd355e5bf8ac9b92727107c29c
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Feb 1 10:03:41 2011 +0100

    Plug, Socket: Use the X11 Window type. Not my idea.
    
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * gtk/src/plug.hg:
    * gtk/src/socket.hg: Use the (awfully, stupidly, no-namespacingly named, but
    historical) Window X11 type instead of GdkNativeWindow, as now done in the C
    API. Anyone including these headers may now expect compiler and linker
    confusion. Luckily they are not included by gtkmm.h.

 ChangeLog                |   11 +++++++++++
 gtk/src/gtk_methods.defs |   39 ++++++++++++++++++++++++++-------------
 gtk/src/plug.hg          |   10 +++++++---
 gtk/src/socket.hg        |    8 ++++++--
 4 files changed, 50 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2de3cd6..ef9822c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-01  Murray Cumming  <murrayc murrayc com>
+
+	Plug, Socket: Use the X11 Window type. Not my idea.
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/plug.hg:
+	* gtk/src/socket.hg: Use the (awfully, stupidly, no-namespacingly named, but 
+	historical) Window X11 type instead of GdkNativeWindow, as now done in the C 
+	API. Anyone including these headers may now expect compiler and linker 
+	confusion. Luckily they are not included by gtkmm.h. 
+
 2011-01-30  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with the latest GTK+ from git master.
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 755e7c5..7e04bd1 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -4722,6 +4722,15 @@
   )
 )
 
+(define-function gtk_binding_entry_add_signal_from_string
+  (c-name "gtk_binding_entry_add_signal_from_string")
+  (return-type "GTokenType")
+  (parameters
+    '("GtkBindingSet*" "binding_set")
+    '("const-gchar*" "signal_desc")
+  )
+)
+
 (define-function gtk_binding_entry_remove
   (c-name "gtk_binding_entry_remove")
   (return-type "none")
@@ -16198,7 +16207,7 @@
   (c-name "gtk_plug_construct")
   (return-type "none")
   (parameters
-    '("GdkNativeWindow" "socket_id")
+    '("Window" "socket_id")
   )
 )
 
@@ -16207,7 +16216,7 @@
   (is-constructor-of "GtkPlug")
   (return-type "GtkWidget*")
   (parameters
-    '("GdkNativeWindow" "socket_id")
+    '("Window" "socket_id")
   )
 )
 
@@ -16217,7 +16226,7 @@
   (return-type "none")
   (parameters
     '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "socket_id")
+    '("Window" "socket_id")
   )
 )
 
@@ -16226,14 +16235,14 @@
   (return-type "GtkWidget*")
   (parameters
     '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "socket_id")
+    '("Window" "socket_id")
   )
 )
 
 (define-method get_id
   (of-object "GtkPlug")
   (c-name "gtk_plug_get_id")
-  (return-type "GdkNativeWindow")
+  (return-type "Window")
 )
 
 (define-method get_embedded
@@ -20014,14 +20023,14 @@
   (c-name "gtk_socket_add_id")
   (return-type "none")
   (parameters
-    '("GdkNativeWindow" "window_id")
+    '("Window" "window")
   )
 )
 
 (define-method get_id
   (of-object "GtkSocket")
   (c-name "gtk_socket_get_id")
-  (return-type "GdkNativeWindow")
+  (return-type "Window")
 )
 
 (define-method get_plug_window
@@ -31004,6 +31013,12 @@
   )
 )
 
+(define-method reset_style
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_reset_style")
+  (return-type "none")
+)
+
 (define-method style_attach
   (of-object "GtkWidget")
   (c-name "gtk_widget_style_attach")
@@ -31117,12 +31132,6 @@
   (return-type "none")
 )
 
-(define-method reset_style
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_reset_style")
-  (return-type "none")
-)
-
 (define-function gtk_widget_get_default_style
   (c-name "gtk_widget_get_default_style")
   (return-type "GtkStyle*")
@@ -32636,6 +32645,10 @@
 
 
 
+;; From gtkx.h
+
+
+
 ;; From gtkpagesetupunixdialog.h
 
 (define-function gtk_page_setup_unix_dialog_get_type
diff --git a/gtk/src/plug.hg b/gtk/src/plug.hg
index 768b25e..ba7182a 100644
--- a/gtk/src/plug.hg
+++ b/gtk/src/plug.hg
@@ -24,6 +24,10 @@ _PINCLUDE(gtkmm/private/window_p.h)
 namespace Gtk
 {
 
+//Note that Window is the (awfully named) type from the X11 header.
+//gtkx.h (needed to get GtkPlug and GtkSocket) pulls this in,
+//assuming that you will be careful when doing so.
+  
 //TODO: Documentation
 class Plug : public Window
 {
@@ -33,10 +37,10 @@ class Plug : public Window
   _GTKMMPROC_WIN32_NO_WRAP
 public:
   Plug();
-  explicit Plug(GdkNativeWindow socket_id);
-  Plug(const Glib::RefPtr<Gdk::Display>& display, GdkNativeWindow socket_id);
+  explicit Plug(Window socket_id);
+  Plug(const Glib::RefPtr<Gdk::Display>& display, Window socket_id);
 
-  _WRAP_METHOD(GdkNativeWindow get_id() const, gtk_plug_get_id)
+  _WRAP_METHOD(Window get_id() const, gtk_plug_get_id)
 
   _WRAP_METHOD(bool get_embedded() const, gtk_plug_get_embedded)
 
diff --git a/gtk/src/socket.hg b/gtk/src/socket.hg
index f79391a..6c105b6 100644
--- a/gtk/src/socket.hg
+++ b/gtk/src/socket.hg
@@ -25,6 +25,10 @@ _PINCLUDE(gtkmm/private/container_p.h)
 namespace Gtk
 {
 
+//Note that Window is the (awfully named) type from the X11 header.
+//gtkx.h (needed to get GtkPlug and GtkSocket) pulls this in,
+//assuming that you will be careful when doing so.
+  
 /** Container for widgets from other processes.
  * Together with Gtk::Plug, Gtk::Socket provides the ability to embed
  * widgets from one process into another process in a fashion that is
@@ -80,8 +84,8 @@ public:
   _CTOR_DEFAULT
   
 
-  _WRAP_METHOD(void add_id(Gdk::NativeWindow window_id), gtk_socket_add_id)
-  _WRAP_METHOD(Gdk::NativeWindow get_id() const, gtk_socket_get_id)
+  _WRAP_METHOD(void add_id(Window window_id), gtk_socket_add_id)
+  _WRAP_METHOD(Window get_id() const, gtk_socket_get_id)
 
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_plug_window(), gtk_socket_get_plug_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_plug_window() const, gtk_socket_get_plug_window, refreturn, constversion)