GNOME.org
 

[gtkmm] demos/gtk-demo/example_change_display.cc

commit 7b46c40f9c8bb09a39e8eccb4f7e4a71cb80a684
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Dec 22 11:08:15 2010 +0100

    demos/gtk-demo/example_change_display.cc

 ChangeLog                                |   24 +
 demos/gtk-demo/example_change_display.cc |    7 +-
 gdk/src/color.hg                         |    2 -
 gdk/src/cursor.ccg                       |   15 +-
 gdk/src/cursor.hg                        |   10 +-
 gdk/src/device.hg                        |    2 +-
 gdk/src/display.hg                       |    8 +-
 gdk/src/displaymanager.hg                |    6 +-
 gdk/src/gdk_methods.defs                 |  783 +++++-------------------------
 gdk/src/screen.hg                        |    6 +-
 gdk/src/window.ccg                       |   16 -
 gdk/src/window.hg                        |   42 +--
 gtk/src/cellarea.hg                      |    2 +-
 gtk/src/cellareabox.hg                   |    5 +-
 gtk/src/cellareacontext.hg               |    2 +-
 gtk/src/gtk_methods.defs                 |    8 +-
 tools/m4/convert_gdk.m4                  |   13 +-
 17 files changed, 200 insertions(+), 751 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8eda9a5..7433ec6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2010-12-22  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with latest GTK+.
+
+	* gdk/src/gdk_methods.defs: Regenerated with h2defs.py.
+	* gdk/src/cursor.[hg|ccg]: This should now be used via RefPtr.
+	* gdk/src/display.hg:  Remove warp_device().
+	* gdk/src/device.hg:
+	* gdk/src/displaymanager.hg:
+	* gdk/src/screen.hg: Remove default signal handlers, because they are 
+	now private in the C API.
+	* gdk/src/window.hg: Use Cursor via RefPtr.
+	* tools/m4/convert_gdk.m4: Add necessary conversions, removing some 
+	now-unnecessary ones.
+	
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/cellareabox.hg: pack_start(), pack_end(): Add a bool fixed 
+	parameter, matching the change in the C API.
+	* gtk/src/cellareacontext.hg:	Add get_preferred_height().
+	
+	* demos/gtk-demo/example_change_display.cc: Comment out the use of 
+	gdk_pointer_grab() until the C demo is ported to use gdk_device_grab(), 
+	so we know what to do instead.
+
 2010-12-21  Murray Cumming  <murrayc murrayc com>
 
 	Fix totally broken type registration.
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 8a29ef9..82a99d8 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -388,8 +388,11 @@ Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::S
 
   Gtk::Window* toplevel = 0;
 
-  if( m_pPopup->get_window()->pointer_grab(false, Gdk::BUTTON_RELEASE_MASK, cursor, GDK_CURRENT_TIME)
-     == Gdk::GRAB_SUCCESS )
+  //TODO: Find a suitable replacement for this:
+  //const GdkGrabStatus grabbed =  m_pPopup->get_window()->grab(false, Gdk::BUTTON_RELEASE_MASK, cursor, GDK_CURRENT_TIME);
+  //Check it when the GTK+ example has been updated and file a bug about the unhelpful deprecation comment.
+  const Gdk::GrabStatus grabbed = Gdk::GRAB_SUCCESS;
+  if(grabbed == Gdk::GRAB_SUCCESS )
   {
     m_popup_clicked = false;
     m_pPopup->signal_button_release_event().connect( sigc::mem_fun(*this, &Example_ChangeDisplay::on_popup_button_release_event) );
diff --git a/gdk/src/color.hg b/gdk/src/color.hg
index 50384a3..12faa94 100644
--- a/gdk/src/color.hg
+++ b/gdk/src/color.hg
@@ -28,8 +28,6 @@ _DEFS(gdkmm,gdk)
 namespace Gdk
 {
 
-class Colormap;
-
 //TODO: Deprecate this? https://bugzilla.gnome.org/show_bug.cgi?id=636695
 
 /** Gdk::Color is used to describe an allocated or unallocated color.
diff --git a/gdk/src/cursor.ccg b/gdk/src/cursor.ccg
index 7f75edf..c7754d0 100644
--- a/gdk/src/cursor.ccg
+++ b/gdk/src/cursor.ccg
@@ -25,24 +25,31 @@
 namespace Gdk
 {
 
+
+//We don't use the _CONSTRUCT macro because the gdk_cursor_new()* functions 
+//don't just call g_object_new() 
 Cursor::Cursor(CursorType cursor_type)
+:
+  Object((GObject*) gdk_cursor_new((GdkCursorType)cursor_type))
 {
-  gobject_ = gdk_cursor_new((GdkCursorType)cursor_type);
 }
 
 Cursor::Cursor(const Glib::RefPtr<Display>& display, CursorType cursor_type)
+:
+  Object((GObject*) gdk_cursor_new_for_display(Glib::unwrap(display), (GdkCursorType)cursor_type))
 {
-  gobject_ = gdk_cursor_new_for_display(Glib::unwrap(display), (GdkCursorType)cursor_type);
 }
 
 Cursor::Cursor(const Glib::RefPtr<Display>& display, const Glib::RefPtr<Pixbuf>& pixbuf, int x, int y)
+:
+  Object((GObject*) gdk_cursor_new_from_pixbuf(Glib::unwrap(display), pixbuf->gobj(), x, y))
 {
-  gobject_ = gdk_cursor_new_from_pixbuf(Glib::unwrap(display), pixbuf->gobj(), x, y);
 }
 
 Cursor::Cursor(const Glib::RefPtr<Display>& display, const Glib::ustring& name)
+:
+  Object((GObject*) gdk_cursor_new_from_name(Glib::unwrap(display), name.c_str()))
 {
-  gobject_ = gdk_cursor_new_from_name(Glib::unwrap(display), name.c_str());
 }
 
 } //namespace Gdk
diff --git a/gdk/src/cursor.hg b/gdk/src/cursor.hg
index 6924eaf..a1fd54f 100644
--- a/gdk/src/cursor.hg
+++ b/gdk/src/cursor.hg
@@ -34,19 +34,23 @@ _WRAP_ENUM(CursorType, GdkCursorType)
 
 /** This represents a cursor.
  */
-class Cursor
+class Cursor : public Glib::Object
 {
-  _CLASS_BOXEDTYPE(Cursor, GdkCursor, NONE, gdk_cursor_ref, gdk_cursor_unref)
-  _IGNORE(gdk_cursor_ref, gdk_cursor_unref)
+  _CLASS_GOBJECT(Cursor, GdkCursor, GDK_CURSOR, Glib::Object, GObject)
+  _IGNORE(gdk_cursor_ref, gdk_cursor_unref) //deprecated
 
 public:
   explicit Cursor(CursorType cursor_type);
+  _IGNORE(gdk_cursor_new)
 
   explicit Cursor(const Glib::RefPtr<Display>& display, CursorType cursor_type);
+  _IGNORE(gdk_cursor_new_for_display)
 
   Cursor(const Glib::RefPtr<Display>& display, const Glib::RefPtr<Pixbuf>& pixbuf, int x, int y);
+  _IGNORE(gdk_cursor_new_from_pixbuf)
 
   explicit Cursor(const Glib::RefPtr<Display>& display, const Glib::ustring& name);
+  _IGNORE(gdk_cursor_new_from_name)
 
   _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_cursor_get_display, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_cursor_get_display, refreturn, constversion)
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index 4b5ec29..8bb5ba2 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -80,7 +80,7 @@ public:
 
   _WRAP_METHOD(DeviceType get_device_type() const, gdk_device_get_device_type)
 
-  _WRAP_METHOD(GdkGrabStatus grab(const Glib::RefPtr<Window>& window, GrabOwnership grab_ownership,  bool owner_events,  EventMask event_mask, const Cursor& cursor,  guint32 time_), gdk_device_grab)
+  _WRAP_METHOD(GrabStatus grab(const Glib::RefPtr<Window>& window, GrabOwnership grab_ownership, bool owner_events, EventMask event_mask, const Glib::RefPtr<Cursor>& cursor, guint32 time_), gdk_device_grab)
 
   _WRAP_METHOD(void ungrab(guint32 time_), gdk_device_ungrab)
 };
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 7d20770..37c0fda 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -142,7 +142,6 @@ public:
   _IGNORE(gdk_display_get_device_state)
 
   _WRAP_METHOD(Glib::RefPtr<const Window> get_window_at_device_position(const Glib::RefPtr<Device>& device, int& win_x, int& win_y), gdk_display_get_window_at_device_position)
-  _WRAP_METHOD(void warp_device(const Glib::RefPtr<Device>& device, const Glib::RefPtr<Screen>& screen, int x, int y), gdk_display_warp_device)
 
 
   _WRAP_METHOD(void warp_pointer(const Glib::RefPtr<Screen>& screen, int x, int y), gdk_display_warp_pointer)
@@ -228,13 +227,16 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const DeviceManager> get_device_manager() const, gdk_display_get_device_manager, refreturn, constversion)
 
 
-
+  //We use no_default_handler because GdkDisplayClass is private.
+  
   /** The closed signal is emitted when the connection to the windowing
    * system for this display is closed.
    *
    * @param is_error true if the display was closed due to an error
    */
-  _WRAP_SIGNAL(void closed(bool is_error), closed)
+  _WRAP_SIGNAL(void closed(bool is_error), closed, no_default_handler)
+  
+  _WRAP_SIGNAL(void opened(), opened, no_default_handler)
 };
 
 } /* namespace Gdk */
diff --git a/gdk/src/displaymanager.hg b/gdk/src/displaymanager.hg
index 94c66fd..2944004 100644
--- a/gdk/src/displaymanager.hg
+++ b/gdk/src/displaymanager.hg
@@ -52,13 +52,17 @@ public:
 
 #m4 _CONVERSION(`GdkDisplay*',`const Glib::RefPtr<Display>&', Glib::wrap($3, true))
 
+
+  //We use no_default_handler because GdkDisplayManagerClass is private.
+  
+  
   /** The display_opened signal is emitted when a display is opened.
    *
    * @newin{2,2}
    *
    * @param display the opened display
    */
-  _WRAP_SIGNAL(void display_opened(const Glib::RefPtr<Display>& display), display-opened)
+  _WRAP_SIGNAL(void display_opened(const Glib::RefPtr<Display>& display), display-opened, no_default_handler)
 };
 
 } /* namespace Gdk */
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index ea3c1a6..ad44da0 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -1,54 +1,5 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object DeviceManager
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkDeviceManager")
-  (gtype-id "GDK_TYPE_DEVICE_MANAGER")
-)
-
-(define-object Display
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkDisplay")
-  (gtype-id "GDK_TYPE_DISPLAY")
-)
-
-(define-object DisplayManager
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkDisplayManager")
-  (gtype-id "GDK_TYPE_DISPLAY_MANAGER")
-)
-
-(define-object DragContext
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkDragContext")
-  (gtype-id "GDK_TYPE_DRAG_CONTEXT")
-)
-
-(define-object Keymap
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkKeymap")
-  (gtype-id "GDK_TYPE_KEYMAP")
-)
-
-(define-object PixmapObject
-  (in-module "Gdk")
-  (parent "GdkDrawable")
-  (c-name "GdkPixmapObject")
-  (gtype-id "GDK_TYPE_PIXMAP_OBJECT")
-)
-
-(define-object Screen
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkScreen")
-  (gtype-id "GDK_TYPE_SCREEN")
-)
-
 ;; Enumerations and flags ...
 
 (define-enum ExtensionMode
@@ -775,6 +726,10 @@
 
 
 
+;; From gdkconfig.h
+
+
+
 ;; From gdkcursor.h
 
 (define-function gdk_cursor_get_type
@@ -811,6 +766,15 @@
   )
 )
 
+(define-function gdk_cursor_new_from_name
+  (c-name "gdk_cursor_new_from_name")
+  (return-type "GdkCursor*")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("const-gchar*" "name")
+  )
+)
+
 (define-method get_display
   (of-object "GdkCursor")
   (c-name "gdk_cursor_get_display")
@@ -829,15 +793,6 @@
   (return-type "none")
 )
 
-(define-function gdk_cursor_new_from_name
-  (c-name "gdk_cursor_new_from_name")
-  (return-type "GdkCursor*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "name")
-  )
-)
-
 (define-method get_image
   (of-object "GdkCursor")
   (c-name "gdk_cursor_get_image")
@@ -1027,6 +982,12 @@
   (return-type "GdkDevice*")
 )
 
+(define-method list_slave_devices
+  (of-object "GdkDevice")
+  (c-name "gdk_device_list_slave_devices")
+  (return-type "GList*")
+)
+
 (define-method get_device_type
   (of-object "GdkDevice")
   (c-name "gdk_device_get_device_type")
@@ -1056,6 +1017,17 @@
   )
 )
 
+(define-method warp
+  (of-object "GdkDevice")
+  (c-name "gdk_device_warp")
+  (return-type "none")
+  (parameters
+    '("GdkScreen*" "screen")
+    '("gint" "x")
+    '("gint" "y")
+  )
+)
+
 (define-function gdk_device_grab_info_libgtk_only
   (c-name "gdk_device_grab_info_libgtk_only")
   (return-type "gboolean")
@@ -1231,6 +1203,12 @@
   )
 )
 
+(define-method has_pending
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_has_pending")
+  (return-type "gboolean")
+)
+
 (define-method add_client_message_filter
   (of-object "GdkDisplay")
   (c-name "gdk_display_add_client_message_filter")
@@ -1265,12 +1243,6 @@
   (return-type "GdkDisplay*")
 )
 
-(define-method get_core_pointer
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_core_pointer")
-  (return-type "GdkDevice*")
-)
-
 (define-method get_pointer
   (of-object "GdkDisplay")
   (c-name "gdk_display_get_pointer")
@@ -1328,18 +1300,6 @@
   )
 )
 
-(define-method warp_device
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_warp_device")
-  (return-type "none")
-  (parameters
-    '("GdkDevice*" "device")
-    '("GdkScreen*" "screen")
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
 (define-method set_pointer_hooks
   (of-object "GdkDisplay")
   (c-name "gdk_display_set_pointer_hooks")
@@ -1448,12 +1408,27 @@
   (return-type "gboolean")
 )
 
+(define-method notify_startup_complete
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_notify_startup_complete")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "startup_id")
+  )
+)
+
 (define-method get_device_manager
   (of-object "GdkDisplay")
   (c-name "gdk_display_get_device_manager")
   (return-type "GdkDeviceManager*")
 )
 
+(define-method get_app_launch_context
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_app_launch_context")
+  (return-type "GdkAppLaunchContext*")
+)
+
 
 
 ;; From gdkdisplaymanager.h
@@ -1489,6 +1464,15 @@
   (return-type "GSList*")
 )
 
+(define-method open_display
+  (of-object "GdkDisplayManager")
+  (c-name "gdk_display_manager_open_display")
+  (return-type "GdkDisplay*")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
 
 
 ;; From gdkdnd.h
@@ -1498,12 +1482,6 @@
   (return-type "GType")
 )
 
-(define-function gdk_drag_context_new
-  (c-name "gdk_drag_context_new")
-  (is-constructor-of "GdkDragContext")
-  (return-type "GdkDragContext*")
-)
-
 (define-method set_device
   (of-object "GdkDragContext")
   (c-name "gdk_drag_context_set_device")
@@ -1549,6 +1527,18 @@
   (return-type "GdkWindow*")
 )
 
+(define-method get_dest_window
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_context_get_dest_window")
+  (return-type "GdkWindow*")
+)
+
+(define-method get_protocol
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_context_get_protocol")
+  (return-type "GdkDragProtocol")
+)
+
 (define-function gdk_drag_status
   (c-name "gdk_drag_status")
   (return-type "none")
@@ -1564,7 +1554,7 @@
   (return-type "none")
   (parameters
     '("GdkDragContext*" "context")
-    '("gboolean" "ok")
+    '("gboolean" "accepted")
     '("guint32" "time_")
   )
 )
@@ -1596,6 +1586,16 @@
   )
 )
 
+(define-function gdk_drag_begin_for_device
+  (c-name "gdk_drag_begin_for_device")
+  (return-type "GdkDragContext*")
+  (parameters
+    '("GdkWindow*" "window")
+    '("GdkDevice*" "device")
+    '("GList*" "targets")
+  )
+)
+
 (define-function gdk_drag_get_protocol_for_display
   (c-name "gdk_drag_get_protocol_for_display")
   (return-type "GdkNativeWindow")
@@ -1620,28 +1620,6 @@
   )
 )
 
-(define-function gdk_drag_get_protocol
-  (c-name "gdk_drag_get_protocol")
-  (return-type "GdkNativeWindow")
-  (parameters
-    '("GdkNativeWindow" "xid")
-    '("GdkDragProtocol*" "protocol")
-  )
-)
-
-(define-function gdk_drag_find_window
-  (c-name "gdk_drag_find_window")
-  (return-type "none")
-  (parameters
-    '("GdkDragContext*" "context")
-    '("GdkWindow*" "drag_window")
-    '("gint" "x_root")
-    '("gint" "y_root")
-    '("GdkWindow**" "dest_window")
-    '("GdkDragProtocol*" "protocol")
-  )
-)
-
 (define-function gdk_drag_motion
   (c-name "gdk_drag_motion")
   (return-type "gboolean")
@@ -1973,6 +1951,21 @@
   (return-type "GdkDevice*")
 )
 
+(define-method set_source_device
+  (of-object "GdkEvent")
+  (c-name "gdk_event_set_source_device")
+  (return-type "none")
+  (parameters
+    '("GdkDevice*" "device")
+  )
+)
+
+(define-method get_source_device
+  (of-object "GdkEvent")
+  (c-name "gdk_event_get_source_device")
+  (return-type "GdkDevice*")
+)
+
 (define-function gdk_event_request_motions
   (c-name "gdk_event_request_motions")
   (return-type "none")
@@ -2359,11 +2352,6 @@
   (return-type "none")
 )
 
-(define-function gdk_set_locale
-  (c-name "gdk_set_locale")
-  (return-type "gchar*")
-)
-
 (define-function gdk_enable_multidevice
   (c-name "gdk_enable_multidevice")
   (return-type "none")
@@ -2497,6 +2485,11 @@
   (return-type "none")
 )
 
+(define-function gdk_disable_multidevice
+  (c-name "gdk_disable_multidevice")
+  (return-type "none")
+)
+
 
 
 ;; From gdkpango.h
@@ -2568,74 +2561,6 @@
 
 
 
-;; From gdkpixmap.h
-
-(define-function gdk_pixmap_get_type
-  (c-name "gdk_pixmap_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixmap_new
-  (c-name "gdk_pixmap_new")
-  (is-constructor-of "GdkPixmap")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "depth")
-  )
-)
-
-(define-function gdk_pixmap_foreign_new
-  (c-name "gdk_pixmap_foreign_new")
-  (is-constructor-of "GdkPixmapForeign")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_pixmap_lookup
-  (c-name "gdk_pixmap_lookup")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_pixmap_foreign_new_for_display
-  (c-name "gdk_pixmap_foreign_new_for_display")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_pixmap_lookup_for_display
-  (c-name "gdk_pixmap_lookup_for_display")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_pixmap_foreign_new_for_screen
-  (c-name "gdk_pixmap_foreign_new_for_screen")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("GdkNativeWindow" "anid")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "depth")
-  )
-)
-
-
-
 ;; From gdkprivate.h
 
 (define-method destroy_notify
@@ -2721,67 +2646,6 @@
   )
 )
 
-(define-function gdk_text_property_to_text_list
-  (c-name "gdk_text_property_to_text_list")
-  (return-type "gint")
-  (parameters
-    '("GdkAtom" "encoding")
-    '("gint" "format")
-    '("const-guchar*" "text")
-    '("gint" "length")
-    '("gchar***" "list")
-  )
-)
-
-(define-function gdk_text_property_to_utf8_list
-  (c-name "gdk_text_property_to_utf8_list")
-  (return-type "gint")
-  (parameters
-    '("GdkAtom" "encoding")
-    '("gint" "format")
-    '("const-guchar*" "text")
-    '("gint" "length")
-    '("gchar***" "list")
-  )
-)
-
-(define-function gdk_utf8_to_compound_text
-  (c-name "gdk_utf8_to_compound_text")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "str")
-    '("GdkAtom*" "encoding")
-    '("gint*" "format")
-    '("guchar**" "ctext")
-    '("gint*" "length")
-  )
-)
-
-(define-function gdk_string_to_compound_text
-  (c-name "gdk_string_to_compound_text")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "str")
-    '("GdkAtom*" "encoding")
-    '("gint*" "format")
-    '("guchar**" "ctext")
-    '("gint*" "length")
-  )
-)
-
-(define-function gdk_text_property_to_text_list_for_display
-  (c-name "gdk_text_property_to_text_list_for_display")
-  (return-type "gint")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkAtom" "encoding")
-    '("gint" "format")
-    '("const-guchar*" "text")
-    '("gint" "length")
-    '("gchar***" "list")
-  )
-)
-
 (define-function gdk_text_property_to_utf8_list_for_display
   (c-name "gdk_text_property_to_utf8_list_for_display")
   (return-type "gint")
@@ -2803,48 +2667,6 @@
   )
 )
 
-(define-function gdk_string_to_compound_text_for_display
-  (c-name "gdk_string_to_compound_text_for_display")
-  (return-type "gint")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "str")
-    '("GdkAtom*" "encoding")
-    '("gint*" "format")
-    '("guchar**" "ctext")
-    '("gint*" "length")
-  )
-)
-
-(define-function gdk_utf8_to_compound_text_for_display
-  (c-name "gdk_utf8_to_compound_text_for_display")
-  (return-type "gboolean")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "str")
-    '("GdkAtom*" "encoding")
-    '("gint*" "format")
-    '("guchar**" "ctext")
-    '("gint*" "length")
-  )
-)
-
-(define-function gdk_free_text_list
-  (c-name "gdk_free_text_list")
-  (return-type "none")
-  (parameters
-    '("gchar**" "list")
-  )
-)
-
-(define-function gdk_free_compound_text
-  (c-name "gdk_free_compound_text")
-  (return-type "none")
-  (parameters
-    '("guchar*" "ctext")
-  )
-)
-
 
 
 ;; From gdkrectangle.h
@@ -3925,41 +3747,6 @@
   )
 )
 
-(define-function gdk_window_foreign_new
-  (c-name "gdk_window_foreign_new")
-  (is-constructor-of "GdkWindowForeign")
-  (return-type "GdkWindow*")
-  (parameters
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_window_lookup
-  (c-name "gdk_window_lookup")
-  (return-type "GdkWindow*")
-  (parameters
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_window_foreign_new_for_display
-  (c-name "gdk_window_foreign_new_for_display")
-  (return-type "GdkWindow*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "anid")
-  )
-)
-
-(define-function gdk_window_lookup_for_display
-  (c-name "gdk_window_lookup_for_display")
-  (return-type "GdkWindow*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "anid")
-  )
-)
-
 (define-method has_native
   (of-object "GdkWindow")
   (c-name "gdk_window_has_native")
@@ -4033,14 +3820,6 @@
   )
 )
 
-(define-function gdk_set_sm_client_id
-  (c-name "gdk_set_sm_client_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "sm_client_id")
-  )
-)
-
 (define-method get_clip_region
   (of-object "GdkWindow")
   (c-name "gdk_window_get_clip_region")
@@ -4387,6 +4166,25 @@
   )
 )
 
+(define-method set_source_events
+  (of-object "GdkWindow")
+  (c-name "gdk_window_set_source_events")
+  (return-type "none")
+  (parameters
+    '("GdkInputSource" "source")
+    '("GdkEventMask" "event_mask")
+  )
+)
+
+(define-method get_source_events
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_source_events")
+  (return-type "GdkEventMask")
+  (parameters
+    '("GdkInputSource" "source")
+  )
+)
+
 (define-method set_icon_list
   (of-object "GdkWindow")
   (c-name "gdk_window_set_icon_list")
@@ -4741,341 +4539,4 @@
 
 ;; From gdkx.h
 
-(define-function gdk_x11_window_get_xid
-  (c-name "gdk_x11_window_get_xid")
-  (return-type "Window")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
-(define-function gdk_x11_cursor_get_xdisplay
-  (c-name "gdk_x11_cursor_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkCursor*" "cursor")
-  )
-)
-
-(define-function gdk_x11_cursor_get_xcursor
-  (c-name "gdk_x11_cursor_get_xcursor")
-  (return-type "Cursor")
-  (parameters
-    '("GdkCursor*" "cursor")
-  )
-)
-
-(define-function gdk_x11_display_get_xdisplay
-  (c-name "gdk_x11_display_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_visual_get_xvisual
-  (c-name "gdk_x11_visual_get_xvisual")
-  (return-type "Visual*")
-  (parameters
-    '("GdkVisual*" "visual")
-  )
-)
-
-(define-function gdk_x11_screen_get_xscreen
-  (c-name "gdk_x11_screen_get_xscreen")
-  (return-type "Screen*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_x11_screen_get_screen_number
-  (c-name "gdk_x11_screen_get_screen_number")
-  (return-type "int")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_x11_window_set_user_time
-  (c-name "gdk_x11_window_set_user_time")
-  (return-type "none")
-  (parameters
-    '("GdkWindow*" "window")
-    '("guint32" "timestamp")
-  )
-)
-
-(define-function gdk_x11_window_move_to_current_desktop
-  (c-name "gdk_x11_window_move_to_current_desktop")
-  (return-type "none")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
-(define-function gdk_x11_screen_get_window_manager_name
-  (c-name "gdk_x11_screen_get_window_manager_name")
-  (return-type "const-char*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_x11_get_default_root_xwindow
-  (c-name "gdk_x11_get_default_root_xwindow")
-  (return-type "Window")
-)
-
-(define-function gdk_x11_get_default_xdisplay
-  (c-name "gdk_x11_get_default_xdisplay")
-  (return-type "Display*")
-)
-
-(define-function gdk_x11_get_default_screen
-  (c-name "gdk_x11_get_default_screen")
-  (return-type "gint")
-)
-
-(define-function gdk_x11_screen_lookup_visual
-  (c-name "gdk_x11_screen_lookup_visual")
-  (return-type "GdkVisual*")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("VisualID" "xvisualid")
-  )
-)
-
-(define-function gdkx_visual_get
-  (c-name "gdkx_visual_get")
-  (return-type "GdkVisual*")
-  (parameters
-    '("VisualID" "xvisualid")
-  )
-)
-
-(define-function gdk_xid_table_lookup_for_display
-  (c-name "gdk_xid_table_lookup_for_display")
-  (return-type "gpointer")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("XID" "xid")
-  )
-)
-
-(define-function gdk_x11_get_server_time
-  (c-name "gdk_x11_get_server_time")
-  (return-type "guint32")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
-(define-function gdk_x11_display_get_user_time
-  (c-name "gdk_x11_display_get_user_time")
-  (return-type "guint32")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_get_startup_notification_id
-  (c-name "gdk_x11_display_get_startup_notification_id")
-  (return-type "const-gchar*")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_set_startup_notification_id
-  (c-name "gdk_x11_display_set_startup_notification_id")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "startup_id")
-  )
-)
-
-(define-function gdk_x11_display_set_cursor_theme
-  (c-name "gdk_x11_display_set_cursor_theme")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "theme")
-    '("const-gint" "size")
-  )
-)
-
-(define-function gdk_x11_display_broadcast_startup_message
-  (c-name "gdk_x11_display_broadcast_startup_message")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-char*" "message_type")
-  )
-  (varargs #t)
-)
-
-(define-function gdk_x11_screen_supports_net_wm_hint
-  (c-name "gdk_x11_screen_supports_net_wm_hint")
-  (return-type "gboolean")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("GdkAtom" "property")
-  )
-)
-
-(define-function gdk_x11_screen_get_monitor_output
-  (c-name "gdk_x11_screen_get_monitor_output")
-  (return-type "XID")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("gint" "monitor_num")
-  )
-)
-
-(define-function gdk_xid_table_lookup
-  (c-name "gdk_xid_table_lookup")
-  (return-type "gpointer")
-  (parameters
-    '("XID" "xid")
-  )
-)
-
-(define-function gdk_net_wm_supports
-  (c-name "gdk_net_wm_supports")
-  (return-type "gboolean")
-  (parameters
-    '("GdkAtom" "property")
-  )
-)
-
-(define-function gdk_x11_grab_server
-  (c-name "gdk_x11_grab_server")
-  (return-type "none")
-)
-
-(define-function gdk_x11_ungrab_server
-  (c-name "gdk_x11_ungrab_server")
-  (return-type "none")
-)
-
-(define-function gdk_x11_lookup_xdisplay
-  (c-name "gdk_x11_lookup_xdisplay")
-  (return-type "GdkDisplay*")
-  (parameters
-    '("Display*" "xdisplay")
-  )
-)
-
-(define-function gdk_x11_atom_to_xatom_for_display
-  (c-name "gdk_x11_atom_to_xatom_for_display")
-  (return-type "Atom")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkAtom" "atom")
-  )
-)
-
-(define-function gdk_x11_xatom_to_atom_for_display
-  (c-name "gdk_x11_xatom_to_atom_for_display")
-  (return-type "GdkAtom")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_get_xatom_by_name_for_display
-  (c-name "gdk_x11_get_xatom_by_name_for_display")
-  (return-type "Atom")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "atom_name")
-  )
-)
-
-(define-function gdk_x11_get_xatom_name_for_display
-  (c-name "gdk_x11_get_xatom_name_for_display")
-  (return-type "const-gchar*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_atom_to_xatom
-  (c-name "gdk_x11_atom_to_xatom")
-  (return-type "Atom")
-  (parameters
-    '("GdkAtom" "atom")
-  )
-)
-
-(define-function gdk_x11_xatom_to_atom
-  (c-name "gdk_x11_xatom_to_atom")
-  (return-type "GdkAtom")
-  (parameters
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_get_xatom_by_name
-  (c-name "gdk_x11_get_xatom_by_name")
-  (return-type "Atom")
-  (parameters
-    '("const-gchar*" "atom_name")
-  )
-)
-
-(define-function gdk_x11_get_xatom_name
-  (c-name "gdk_x11_get_xatom_name")
-  (return-type "const-gchar*")
-  (parameters
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_display_grab
-  (c-name "gdk_x11_display_grab")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_ungrab
-  (c-name "gdk_x11_display_ungrab")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_error_trap_push
-  (c-name "gdk_x11_display_error_trap_push")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_error_trap_pop_ignored
-  (c-name "gdk_x11_display_error_trap_pop_ignored")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_register_standard_event_type
-  (c-name "gdk_x11_register_standard_event_type")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("gint" "event_base")
-    '("gint" "n_events")
-  )
-)
-
 
diff --git a/gdk/src/screen.hg b/gdk/src/screen.hg
index 76d796f..3957178 100644
--- a/gdk/src/screen.hg
+++ b/gdk/src/screen.hg
@@ -112,12 +112,12 @@ public:
 #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<Window> >',`$2($3, Glib::OWNERSHIP_DEEP)')
   _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<Window> > get_window_stack(), gdk_screen_get_window_stack)
 
+  //We use no_default_handler because GdkDisplayManagerClass is private.
+ 
   /** The size_changed signal is emitted when the pixel width or
    * height of a screen changes.
    */
-  _WRAP_SIGNAL(void size_changed(), size-changed)
-
-  //TODO: Remove no_default_handler when we can break ABI:
+  _WRAP_SIGNAL(void size_changed(), size-changed, no_default_handler)
   _WRAP_SIGNAL(void composited_changed(), composited-changed, no_default_handler)
   _WRAP_SIGNAL(void monitors_changed(), size-changed, no_default_handler)
 
diff --git a/gdk/src/window.ccg b/gdk/src/window.ccg
index 3924f5f..50517b8 100644
--- a/gdk/src/window.ccg
+++ b/gdk/src/window.ccg
@@ -44,22 +44,6 @@ void Window::set_device_cursor(const Glib::RefPtr<Gdk::Device>& device)
   gdk_window_set_device_cursor(gobj(), Glib::unwrap(device), 0);
 }
 
-GrabStatus Window::pointer_grab(bool owner_events, EventMask event_mask, const Cursor& cursor, guint32 timestamp)
-{
-  return ((GrabStatus)(gdk_pointer_grab(gobj(), static_cast<int>(owner_events), ((GdkEventMask)(event_mask)), 0, (cursor).gobj_copy(), timestamp)));
-}
-
-GrabStatus Window::pointer_grab(bool owner_events, EventMask event_mask, guint32 timestamp)
-{
-  return ((GrabStatus)(gdk_pointer_grab(gobj(), static_cast<int>(owner_events), ((GdkEventMask)(event_mask)), 0, 0, timestamp)));
-}
-
-//static
-void Window::unset_sm_client_id()
-{
-  gdk_set_sm_client_id(0 /* see GDK docs */);
-}
-
 void Window::unset_icon()
 {
   gdk_window_set_icon_name(gobj(), 0); /* See GDK docs */
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index d37a509..d498705 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -138,8 +138,6 @@ public:
   _WRAP_METHOD(bool get_modal_hint() const, gdk_window_get_modal_hint)
   _WRAP_METHOD(void set_modal_hint(bool modal = true), gdk_window_set_modal_hint)
   _WRAP_METHOD(void set_geometry_hints(const Geometry& geometry, WindowHints geom_mask), gdk_window_set_geometry_hints)
-  _WRAP_METHOD(static void set_sm_client_id(const Glib::ustring& sm_client_id), gdk_set_sm_client_id)
-  static void unset_sm_client_id();
   _WRAP_METHOD(void begin_paint_rect(const Rectangle& rectangle), gdk_window_begin_paint_rect)
   _WRAP_METHOD(void begin_paint_region(const Cairo::RefPtr<Cairo::Region>& region), gdk_window_begin_paint_region)
   _WRAP_METHOD(void end_paint(), gdk_window_end_paint)
@@ -160,25 +158,22 @@ public:
   _WRAP_METHOD(Cairo::RefPtr<const Cairo::Pattern> get_background_pattern() const, gdk_window_get_background_pattern)
 
 
-#m4 _CONVERSION(const Cursor&,GdkCursor*,const_cast<GdkCursor*>(($3).gobj()))
-  _WRAP_METHOD(void set_cursor(const Cursor& cursor), gdk_window_set_cursor)
+  _WRAP_METHOD(void set_cursor(const Glib::RefPtr<Cursor>& cursor), gdk_window_set_cursor)
 
   /** Use the parent window's cursor.
    * For top-level windows this means that it will use the default cursor for the ROOT window.
    */
   void set_cursor();
 
-  _WRAP_METHOD(void set_device_cursor(const Glib::RefPtr<Device>& device, const Cursor& cursor), gdk_window_set_device_cursor)
+  _WRAP_METHOD(void set_device_cursor(const Glib::RefPtr<Device>& device, const Glib::RefPtr<Cursor>& cursor), gdk_window_set_device_cursor)
 
   /** Use the parent window's cursor.
    * For top-level windows this means that it will use the default cursor for the ROOT window.
    */
   void set_device_cursor(const Glib::RefPtr<Device>& device);
 
-  //TODO: GdkCursor is a ref-counted boxed type,
-  //so we could add a copy constructor and then return by value.
-  //We would also need a Cursor::operator bool() to check for a null value.
-  //TODO: _WRAP_METHOD(Cursor get_cursor(), gdk_window_get_cursor)
+  _WRAP_METHOD(Glib::RefPtr<Cursor> get_cursor(), gdk_window_get_cursor, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Cursor> get_cursor() const, gdk_window_get_cursor, refreturn, constversion)
 
   _WRAP_METHOD(void get_user_data(gpointer* data), gdk_window_get_user_data)
   _WRAP_METHOD(void get_geometry(int& x, int& y, int& width, int& height) const, gdk_window_get_geometry)
@@ -289,32 +284,7 @@ public:
   _WRAP_METHOD(void fullscreen(), gdk_window_fullscreen)
   _WRAP_METHOD(void unfullscreen(), gdk_window_unfullscreen)
 
-  _WRAP_METHOD(GrabStatus pointer_grab(bool owner_events, EventMask event_mask, const Glib::RefPtr<const Window>& confine_to, const Cursor& cursor, guint32 time_), gdk_pointer_grab)
-
-  /** Grabs the pointer to a specific window.
-   * Requires a corresponding call to pointer_ungrab().
-   *
-   * Arguments:
-   * @param owner_events Specifies whether events will be reported as is, or relative to the window.
-   * @param event_mask Masks only interesting events.
-   * @param cursor Changes the cursor for the duration of the grab.
-   * @param timestamp Specifies the time.
-   */
-  GrabStatus pointer_grab(bool owner_events, EventMask event_mask, const Cursor& cursor, guint32 timestamp);
-
-  /** Grabs the pointer to a specific window.
-   * Requires a corresponding call to pointer_ungrab().
-   *
-   * Arguments:
-   * @param owner_events Specifies whether events will be reported as is, or relative to the window.
-   * @param event_mask Masks only interesting events.
-   * @param timestamp Specifies the time.
-   */
-  GrabStatus pointer_grab(bool owner_events, EventMask event_mask, guint32 timestamp);
-
-  _WRAP_METHOD(static void pointer_ungrab(guint32 timestamp), gdk_pointer_ungrab)
-  _WRAP_METHOD(GrabStatus keyboard_grab(bool owner_events, guint32 timestamp), gdk_keyboard_grab)
-  _WRAP_METHOD(static void keyboard_ungrab(guint32 timestamp), gdk_keyboard_ungrab)
+  _IGNORE(gdk_pointer_grab, gdk_pointer_ungrab, gdk_keyboard_grab, gdk_keyboard_ungrab) //deprecated
 
   _WRAP_METHOD(void set_keep_above(bool setting = true), gdk_window_set_keep_above)
   _WRAP_METHOD(void set_keep_below(bool setting = true), gdk_window_set_keep_below)
@@ -359,7 +329,7 @@ public:
   //_WRAP_SIGNAL(Glib::RefPtr<Gdk::Window> from_embedder(double embedder_x, double embedder_y, double& offscreen_x, double& offscreen_y), from-embedder, no_default_handler)
 
 
-  //TODO: _WRAP_PROPERTY("cursor", Cursor)
+  _WRAP_PROPERTY("cursor", Glib::RefPtr<Cursor>)
 };
 
 } // namespace Gdk
diff --git a/gtk/src/cellarea.hg b/gtk/src/cellarea.hg
index a0d50ac..ea57c10 100644
--- a/gtk/src/cellarea.hg
+++ b/gtk/src/cellarea.hg
@@ -67,7 +67,7 @@ public:
   _WRAP_METHOD(SizeRequestMode get_request_mode() const, gtk_cell_area_get_request_mode)
   _WRAP_METHOD(void get_preferred_width(const Glib::RefPtr<CellAreaContext>& context,  Widget& widget,  int& minimum_width, int& natural_width), gtk_cell_area_get_preferred_width)
   _WRAP_METHOD(void get_preferred_height_for_width (const Glib::RefPtr<CellAreaContext>& context,  Widget& widget,  int width,  int& minimum_height, int& natural_height), gtk_cell_area_get_preferred_height_for_width)
-  _WRAP_METHOD(void get_preferred_height( const Glib::RefPtr<CellAreaContext>& context,    Widget& widget,  int& minimum_height, int& natural_height), gtk_cell_area_get_preferred_height)
+  _WRAP_METHOD(void get_preferred_height( const Glib::RefPtr<CellAreaContext>& context, Widget& widget,  int& minimum_height, int& natural_height), gtk_cell_area_get_preferred_height)
   _WRAP_METHOD(void get_preferred_width_for_height(const Glib::RefPtr<CellAreaContext>& context, Widget& widget,  int height,  int& minimum_width, int& natural_width), gtk_cell_area_get_preferred_width_for_height)
   _WRAP_METHOD(Glib::ustring get_current_path_string () const, gtk_cell_area_get_current_path_string)
 
diff --git a/gtk/src/cellareabox.hg b/gtk/src/cellareabox.hg
index 5c7851c..ff0651c 100644
--- a/gtk/src/cellareabox.hg
+++ b/gtk/src/cellareabox.hg
@@ -40,8 +40,9 @@ protected:
   _IGNORE(gtk_cell_area_box_new)
 public:
 
-  _WRAP_METHOD(void pack_start(CellRenderer& renderer,  bool expand, bool align), gtk_cell_area_box_pack_start)
-  _WRAP_METHOD(void pack_end(CellRenderer& renderer, bool expand, bool align), gtk_cell_area_box_pack_end)
+  //TODO: Are these good default values:
+  _WRAP_METHOD(void pack_start(CellRenderer& renderer,  bool expand = false, bool align = true, bool fixed = false), gtk_cell_area_box_pack_start)
+  _WRAP_METHOD(void pack_end(CellRenderer& renderer, bool expand = false, bool align = true, bool fixed = false), gtk_cell_area_box_pack_end)
   _WRAP_METHOD(int get_spacing() const, gtk_cell_area_box_get_spacing)
   _WRAP_METHOD(void set_spacing(int spacing), gtk_cell_area_box_set_spacing)
 };
diff --git a/gtk/src/cellareacontext.hg b/gtk/src/cellareacontext.hg
index 5c6e299..72ef78d 100644
--- a/gtk/src/cellareacontext.hg
+++ b/gtk/src/cellareacontext.hg
@@ -58,7 +58,7 @@ public:
   _WRAP_METHOD(void reset(), gtk_cell_area_context_reset)
 
   _WRAP_METHOD(void get_preferred_width(int& minimum_width, int& natural_width) const, gtk_cell_area_context_get_preferred_width)
-  //TODO: _WRAP_METHOD(void get_preferred_height(int& minimum_height, int& natural_height) const, gtk_cell_area_context_get_preferred_height)
+  _WRAP_METHOD(void get_preferred_height(int& minimum_height, int& natural_height) const, gtk_cell_area_context_get_preferred_height)
   _WRAP_METHOD(void get_preferred_height_for_width(int width, int& minimum_height, int& natural_height) const, gtk_cell_area_context_get_preferred_height_for_width)
   _WRAP_METHOD(void get_preferred_width_for_height(int height, int& minimum_width, int& natural_width) const, gtk_cell_area_context_get_preferred_width_for_height)
                                                                    
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 29a4bea..26ad8c7 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -5477,6 +5477,7 @@
     '("GtkCellAreaBoxContext*" "box_context")
     '("guint" "n_groups")
     '("gboolean*" "expand_groups")
+    '("gboolean*" "align_groups")
   )
 )
 
@@ -5622,6 +5623,7 @@
     '("GtkCellRenderer*" "renderer")
     '("gboolean" "expand")
     '("gboolean" "align")
+    '("gboolean" "fixed")
   )
 )
 
@@ -5633,6 +5635,7 @@
     '("GtkCellRenderer*" "renderer")
     '("gboolean" "expand")
     '("gboolean" "align")
+    '("gboolean" "fixed")
   )
 )
 
@@ -14113,11 +14116,6 @@
   (return-type "none")
 )
 
-(define-function gtk_set_locale
-  (c-name "gtk_set_locale")
-  (return-type "gchar*")
-)
-
 (define-function gtk_get_default_language
   (c-name "gtk_get_default_language")
   (return-type "PangoLanguage*")
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 3b92093..1f74eac 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -97,7 +97,6 @@ _CONVERSION(`Gdk::RGBA&',`GdkRGBA*',`($3).gobj()')
 _CONVERSION(`const RGBA&',`GdkRGBA*',`const_cast<RGBA&>($3).gobj()')
 _CONVERSION(`const Gdk::RGBA&',`const GdkRGBA*',`($3).gobj()')
 _CONVERSION(`const Color&',`const GdkColor*',`($3).gobj()')
-_CONVERSION(`const Cursor&',`GdkCursor*',const_cast<GdkCursor*>(($3).gobj()))
 _CONVERSION(`Rectangle&',`GdkRectangle*',($3).gobj())
 _CONVERSION(`Gdk::Rectangle&',`GdkRectangle*',($3).gobj())
 _CONVERSION(`const Rectangle&',`const GdkRectangle*',($3).gobj())
@@ -106,7 +105,8 @@ _CONVERSION(`Font&',`GdkFont*',($3).gobj())
 _CONVERSION(`const Cairo::RefPtr<Cairo::Region>&',`const cairo_region_t*',`(($3) ? ($3)->cobj() : 0)')
 _CONVERSION(`const Cairo::RefPtr<const Cairo::Region>&',`cairo_region_t*',`const_cast<cairo_region_t*>(($3) ? ($3)->cobj() : 0)')
 
-_CONVERSION(`const Glib::RefPtr<Gdk::Colormap>&',`GdkColormap*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<Cursor>&',`GdkCursor*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<const Cursor>&',`GdkCursor*',__CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Gdk::Pixmap>&',`GdkPixmap*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Gdk::Window>&',`GdkWindow*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Window>&',`GdkWindow*',__CONVERT_REFPTR_TO_P)
@@ -114,11 +114,6 @@ _CONVERSION(`const Glib::RefPtr<Pixmap>&',`GdkPixmap*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Gdk::Pixmap>&',`GdkPixmap*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Bitmap>&',`GdkBitmap*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Gdk::Bitmap>&',`GdkBitmap*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<Colormap>&',`GdkColormap*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<const Colormap>&',`GdkColormap*',__CONVERT_CONST_REFPTR_TO_P_SUN(Colormap))
-_CONVERSION(`const Glib::RefPtr<GC>&',`GdkGC*',`Glib::unwrap<Gdk::GC>($3)')
-_CONVERSION(`const Glib::RefPtr<const GC>&',`GdkGC*',__CONVERT_CONST_REFPTR_TO_P_SUN(GC))
-_CONVERSION(`const Glib::RefPtr<Gdk::GC>&',`GdkGC*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Drawable>&',`GdkDrawable*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Gdk::Drawable>&',`GdkDrawable*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<const Drawable>&',`GdkDrawable*',__CONVERT_CONST_REFPTR_TO_P_SUN(Drawable))
@@ -192,9 +187,7 @@ _CONVERSION(`GdkPixmap*',`Glib::RefPtr<Pixmap>', `Glib::wrap((GdkPixmapObject*)(
 _CONVERSION(`GdkPixmap*',`Glib::RefPtr<const Pixmap>', `Glib::wrap((GdkPixmapObject*)($3))')
 _CONVERSION(`GdkPixmap*',`Glib::RefPtr<const Gdk::Pixmap>', `Glib::wrap((GdkPixmapObject*)($3))')
 _CONVERSION(`GdkPixmap*',`Glib::RefPtr<Gdk::Pixmap>', `Glib::wrap((GdkPixmapObject*)($3))')
-_CONVERSION(`GdkColormap*',`Glib::RefPtr<Colormap>', `Glib::wrap($3)')
-_CONVERSION(`GdkColormap*',`Glib::RefPtr<const Colormap>', `Glib::wrap($3)')
-_CONVERSION(`GdkColormap*',`Glib::RefPtr<Gdk::Colormap>', `Glib::wrap($3)')
+_CONVERSION(`GdkCursor*',`Glib::RefPtr<Cursor>', `Glib::wrap($3)')
 _CONVERSION(`GdkVisual*',`Glib::RefPtr<Gdk::Visual>', `Glib::wrap($3)')
 _CONVERSION(`GdkVisual*',`Glib::RefPtr<Visual>', `Glib::wrap($3)')
 _CONVERSION(`GdkVisual*',`Glib::RefPtr<const Visual>', `Glib::wrap($3)')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]