[gtkmm] Partially fix the build after large GDK changes in GTK+.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm] Partially fix the build after large GDK changes in GTK+.
Date: Sun, 29 Aug 2010 16:26:11 +0000 (UTC)
commit 184d8da5f2c7f500f943df58089cb6f11da2fdf9
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Aug 29 18:25:32 2010 +0200

    Partially fix the build after large GDK changes in GTK+.
    
    * gdk/src/gdk_methods.defs: Regenerated with h2defs.py.
    * tools/extra_defs_gen/generate_defs_gtk.cc: Removed GDK_TYPE_GC and
    GDK_TYPE_IMAGE because they were removed from GTK+.
    * gdk/src/filelist.am:
    * gdk/src/gc.[hg|ccg]:
    * gdk/src/image.[hg|ccg]:Likewise, remove these.
    * gdk/gdkmm.h:
    * gdk/src/style.hg: Remove includes of gc.h.
    * gdk/src/drawable.[hg|ccg]: Removed draw_*() methods that were removed from GTK+.
    * gdk/src/pixbuf.[hg|ccg]: Remove constructors and create*() methods that

 ChangeLog                                 |   16 +
 gdk/gdkmm.h                               |    2 -
 gdk/src/drawable.ccg                      |   34 --
 gdk/src/drawable.hg                       |   78 +----
 gdk/src/filelist.am                       |    2 -
 gdk/src/gc.ccg                            |   41 --
 gdk/src/gc.hg                             |   97 -----
 gdk/src/gdk_methods.defs                  |  591 ++---------------------------
 gdk/src/image.ccg                         |   32 --
 gdk/src/image.hg                          |   83 ----
 gdk/src/pixbuf.ccg                        |   17 -
 gdk/src/pixbuf.hg                         |   55 ---
 gdk/src/types.hg                          |    2 -
 gtk/src/style.hg                          |    1 -
 tools/extra_defs_gen/generate_defs_gtk.cc |    2 -
 15 files changed, 43 insertions(+), 1010 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 733bddf..da91275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-29  Murray Cumming  <murrayc murrayc com>
+
+	Partially fix the build after large GDK changes in GTK+.
+
+	* gdk/src/gdk_methods.defs: Regenerated with h2defs.py.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Removed GDK_TYPE_GC and 
+	GDK_TYPE_IMAGE because they were removed from GTK+.
+	* gdk/src/filelist.am:
+	* gdk/src/gc.[hg|ccg]:
+	* gdk/src/image.[hg|ccg]:	Likewise, remove these.
+	* gdk/gdkmm.h:
+	* gdk/src/style.hg: Remove includes of gc.h.
+	* gdk/src/drawable.[hg|ccg]: Removed draw_*() methods that were removed from GTK+.
+	* gdk/src/pixbuf.[hg|ccg]: Remove constructors and create*() methods that 
+	took a Gdk::Image.
+
 2010-08-05  Murray Cumming  <murrayc murrayc-x61>
 
 	DeviceManager: Fixed a typo to avoid duplicate GType registration.
diff --git a/gdk/gdkmm.h b/gdk/gdkmm.h
index f9b44bb..afa9043 100644
--- a/gdk/gdkmm.h
+++ b/gdk/gdkmm.h
@@ -26,7 +26,6 @@
 
 #include <gdkmm/types.h>
 #include <gdkmm/visual.h>
-#include <gdkmm/gc.h>
 #include <gdkmm/drawable.h>
 #include <gdkmm/window.h>
 #include <gdkmm/pixbuf.h>
@@ -35,7 +34,6 @@
 #include <gdkmm/pixbufloader.h>
 #include <gdkmm/pixmap.h>
 #include <gdkmm/bitmap.h>
-#include <gdkmm/image.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/rectangle.h>
 #include <gdkmm/display.h>
diff --git a/gdk/src/drawable.ccg b/gdk/src/drawable.ccg
index 1bbb003..94371a5 100644
--- a/gdk/src/drawable.ccg
+++ b/gdk/src/drawable.ccg
@@ -18,7 +18,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/gc.h>
 #include <gdkmm/display.h>
 #include <gdkmm/pixbuf.h>
 #include <gdk/gdk.h>
@@ -26,39 +25,6 @@
 namespace Gdk
 {
 
-void Drawable::draw_points(const Glib::RefPtr<const GC>& gc, const Glib::ArrayHandle<Point>& points)
-{
-  // Don't assume the reinterpret_cast<> works everywhere.  Gdk::Point is *special*.
-  gdk_draw_points(
-      gobj(), const_cast<GdkGC*>(Glib::unwrap<Gdk::GC>(gc)),
-      reinterpret_cast<GdkPoint*>(const_cast<Point*>(points.data())),
-      points.size());
-}
-
-void Drawable::draw_lines(const Glib::RefPtr<const GC>& gc, const Glib::ArrayHandle<Point>& points)
-{
-  // Don't assume the reinterpret_cast<> works everywhere.  Gdk::Point is *special*.
-  gdk_draw_lines(
-      gobj(), const_cast<GdkGC*>(Glib::unwrap<Gdk::GC>(gc)),
-      reinterpret_cast<GdkPoint*>(const_cast<Point*>(points.data())),
-      points.size());
-}
-
-void Drawable::draw_polygon(const Glib::RefPtr<const GC>& gc, bool filled,
-                            const Glib::ArrayHandle<Point>& points)
-{
-  // Don't assume the reinterpret_cast<> works everywhere.  Gdk::Point is *special*.
-  gdk_draw_polygon(
-      gobj(), const_cast<GdkGC*>(Glib::unwrap<Gdk::GC>(gc)), filled,
-      reinterpret_cast<GdkPoint*>(const_cast<Point*>(points.data())),
-      points.size());
-}
-
-void Drawable::copy_to_image(const Glib::RefPtr<Image>& image, int src_x, int src_y, int dest_x, int dest_y, int width, int height) const
-{
-  gdk_drawable_copy_to_image(const_cast<GdkDrawable*>(gobj()), Glib::unwrap(image), src_x, src_y, dest_x, dest_y, width, height);
-}
-
 void Drawable::draw_pixbuf(const Glib::RefPtr<Pixbuf>& pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, RgbDither dither, int x_dither, int y_dither)
 {
 gdk_draw_pixbuf(gobj(), 0, Glib::unwrap(pixbuf), src_x, src_y, dest_x, dest_y, width, height, ((GdkRgbDither)(dither)), x_dither, y_dither); 
diff --git a/gdk/src/drawable.hg b/gdk/src/drawable.hg
index a090aac..0c72d06 100644
--- a/gdk/src/drawable.hg
+++ b/gdk/src/drawable.hg
@@ -22,10 +22,9 @@
 #include <pangomm/layout.h>
 #include <pangomm/layoutline.h>
 #include <pangomm/glyphstring.h>
-#include <gdkmm/gc.h>
-#include <gdkmm/image.h>
 #include <gdkmm/color.h>
 #include <gdkmm/rgbcmap.h>
+#include <gdkmm/visual.h>
 #include <gdkmm/types.h>
 #include <cairomm/context.h>
 #include <cairomm/region.h>
@@ -41,7 +40,6 @@ namespace Gdk
 
 _WRAP_ENUM(RgbDither, GdkRgbDither)
 
-class GC;
 class Pixbuf;
 
 /** Drawing Primitives.
@@ -76,31 +74,6 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Colormap> get_colormap(), gdk_drawable_get_colormap, refreturn)
   _WRAP_METHOD(Glib::RefPtr<Visual> get_visual(), gdk_drawable_get_visual, refreturn)
 
-  _WRAP_METHOD(void draw_point(const Glib::RefPtr<const GC>& gc, int x, int y), gdk_draw_point)
-  void draw_points(const Glib::RefPtr<const GC>& gc, const Glib::ArrayHandle<Point>& points);
-
-  _WRAP_METHOD(void draw_line(const Glib::RefPtr<const GC>& gc, int x1, int y1, int x2, int y2), gdk_draw_line)
-  void draw_lines(const Glib::RefPtr<const GC>& gc, const Glib::ArrayHandle<Point>& points);
-
-  _WRAP_METHOD(void draw_rectangle(const Glib::RefPtr<const GC>& gc, bool filled, int x, int y, int width, int height), gdk_draw_rectangle)
-  _WRAP_METHOD(void draw_arc(const Glib::RefPtr<const GC>& gc, bool filled, int x, int y, int width, int height, int angle1, int angle2), gdk_draw_arc)
-  void draw_polygon(const Glib::RefPtr<const GC>& gc, bool filled, const Glib::ArrayHandle<Point>& points);
-
-  _WRAP_METHOD(void draw_drawable(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Drawable>& src, int xsrc, int ysrc, int xdest, int ydest, int width = -1, int height = -1), gdk_draw_drawable)
-  _WRAP_METHOD(void draw_image(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Image>& image, int xsrc, int ysrc, int xdest, int ydest, int width = -1, int height = -1), gdk_draw_image)
-
-  //segs is an array, and this function will be used so little that it doesn't seem worth wrapping it to use a container of C++ types.
-  _WRAP_METHOD(void draw_segments(const Glib::RefPtr<const GC>& gc, const GdkSegment* segs, int nsegs), gdk_draw_segments) // TODO
-
-  //glyphs is not an array. I went down to pango_xft_render in pango and saw that PangoGlyphString here is not an array. -Bryan
-  _WRAP_METHOD(void draw_glyphs(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Pango::Font>& font, int x, int y, const Pango::GlyphString& glyphs), gdk_draw_glyphs)
-
-  _WRAP_METHOD(void draw_layout_line(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::LayoutLine>& line), gdk_draw_layout_line)
-  _WRAP_METHOD(void draw_layout_line(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::LayoutLine>& line, const Color& foreground, const Color& background), gdk_draw_layout_line_with_colors)
-
-  _WRAP_METHOD(void draw_layout(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::Layout>& layout), gdk_draw_layout)
-  _WRAP_METHOD(void draw_layout(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::Layout>& layout, const Color& foreground, const Color& background), gdk_draw_layout_with_colors)
-
   _WRAP_METHOD(void draw_pixbuf(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Pixbuf>& pixbuf,
     int src_x, int src_y, int dest_x, int dest_y,
     int width, int height,
@@ -138,14 +111,6 @@ public:
     int width, int height,
     RgbDither dither, int x_dither, int y_dither);
 
-  // Note: This has no 'refreturn' because get_image() returns a newly created Image object.
-  _WRAP_METHOD(Glib::RefPtr<Image> get_image(int x, int y, int width, int height) const, gdk_drawable_get_image)
-
-  // gdk_drawable_copy_to_image() returns a new GdkImage when the image parameter is NULL, but that seems to be much the
-  // same as gdk_drawable_get_image().
-  void copy_to_image(const Glib::RefPtr<Image>& image, int src_x, int src_y, int dest_x, int dest_y, int width, int height) const;
-  _IGNORE(gdk_drawable_copy_to_image)
-
  #m4 _CONVERSION(`cairo_region_t*',`Cairo::RefPtr<Cairo::Region>',`Cairo::RefPtr<Cairo::Region>(new Cairo::Region($3, true /* do not take ref */))')
 
   //This is const because it returns a copy (though that is not very clear from the C documentation)
@@ -155,47 +120,6 @@ public:
   _WRAP_METHOD(Cairo::RefPtr<Cairo::Region> get_visible_region() const, gdk_drawable_get_visible_region)
 
 
-  // **** RGB stuff ****
-
-  _WRAP_METHOD(void draw_rgb_image(
-                   const Glib::RefPtr<const GC>& gc,
-                   int x, int y, int width, int height,
-                   RgbDither dith, const guchar* rgb_buf, int rowstride),
-               gdk_draw_rgb_image)
-
-  _WRAP_METHOD(void draw_rgb_image_dithalign(
-                   const Glib::RefPtr<const GC>& gc,
-                   int x, int y, int width, int height,
-                   RgbDither dith, const guchar* rgb_buf, int rowstride,
-                   int xdith, int ydith),
-               gdk_draw_rgb_image_dithalign)
-
-  _WRAP_METHOD(void draw_rgb_32_image(
-                   const Glib::RefPtr<const GC>& gc,
-                   int x, int y, int width, int height,
-                   RgbDither dith, const guchar* rgb_buf, int rowstride),
-               gdk_draw_rgb_32_image)
-
-  _WRAP_METHOD(void draw_rgb_32_image_dithalign(
-                   const Glib::RefPtr<const GC>& gc,
-                   int x, int y, int width, int height,
-                   RgbDither dith, const guchar* buf, int rowstride,
-                   int xdith, int ydith),
-               gdk_draw_rgb_32_image_dithalign)
-
-  _WRAP_METHOD(void draw_gray_image(
-                   const Glib::RefPtr<const GC>& gc,
-                   int x, int y, int width, int height,
-                   RgbDither dith, const guchar* rgb_buf, int rowstride),
-               gdk_draw_gray_image)
-
-  _WRAP_METHOD(void draw_indexed_image(
-                   const Glib::RefPtr<const GC>& gc,
-                   int x, int y, int width, int height,
-                   RgbDither dith, const guchar* rgb_buf, int rowstride,
-                   const RgbCmap& cmap),
-               gdk_draw_indexed_image)
-
   _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_drawable_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_drawable_get_screen, refreturn, constversion)
 
diff --git a/gdk/src/filelist.am b/gdk/src/filelist.am
index b95dda6..ce64065 100644
--- a/gdk/src/filelist.am
+++ b/gdk/src/filelist.am
@@ -23,8 +23,6 @@ gdkmm_files_hg =		\
 	dragcontext.hg		\
 	drawable.hg		\
 	event.hg		\
-	gc.hg			\
-	image.hg		\
 	pixbuf.hg		\
 	pixbufanimation.hg	\
 	pixbufanimationiter.hg	\
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 5b9997b..cae8cec 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -56,13 +56,6 @@
   (gtype-id "GDK_TYPE_KEYMAP")
 )
 
-(define-object PangoRenderer
-  (in-module "Gdk")
-  (parent "PangoRenderer")
-  (c-name "GdkPangoRenderer")
-  (gtype-id "GDK_TYPE_PANGO_RENDERER")
-)
-
 (define-object PixmapObject
   (in-module "Gdk")
   (parent "GdkDrawable")
@@ -630,7 +623,6 @@
     '("root" "GDK_WINDOW_ROOT")
     '("toplevel" "GDK_WINDOW_TOPLEVEL")
     '("child" "GDK_WINDOW_CHILD")
-    '("dialog" "GDK_WINDOW_DIALOG")
     '("temp" "GDK_WINDOW_TEMP")
     '("foreign" "GDK_WINDOW_FOREIGN")
     '("offscreen" "GDK_WINDOW_OFFSCREEN")
@@ -958,16 +950,6 @@
   )
 )
 
-(define-method query_color
-  (of-object "GdkColormap")
-  (c-name "gdk_colormap_query_color")
-  (return-type "none")
-  (parameters
-    '("gulong" "pixel")
-    '("GdkColor*" "result")
-  )
-)
-
 (define-method get_visual
   (of-object "GdkColormap")
   (c-name "gdk_colormap_get_visual")
@@ -1453,6 +1435,12 @@
   (return-type "none")
 )
 
+(define-method is_closed
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_is_closed")
+  (return-type "gboolean")
+)
+
 (define-method list_devices
   (of-object "GdkDisplay")
   (c-name "gdk_display_list_devices")
@@ -1990,273 +1978,6 @@
   (return-type "GdkDisplay*")
 )
 
-(define-function gdk_draw_point
-  (c-name "gdk_draw_point")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-function gdk_draw_line
-  (c-name "gdk_draw_line")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x1_")
-    '("gint" "y1_")
-    '("gint" "x2_")
-    '("gint" "y2_")
-  )
-)
-
-(define-function gdk_draw_rectangle
-  (c-name "gdk_draw_rectangle")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gboolean" "filled")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
-(define-function gdk_draw_arc
-  (c-name "gdk_draw_arc")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gboolean" "filled")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "angle1")
-    '("gint" "angle2")
-  )
-)
-
-(define-function gdk_draw_polygon
-  (c-name "gdk_draw_polygon")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gboolean" "filled")
-    '("const-GdkPoint*" "points")
-    '("gint" "n_points")
-  )
-)
-
-(define-function gdk_draw_drawable
-  (c-name "gdk_draw_drawable")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("GdkDrawable*" "src")
-    '("gint" "xsrc")
-    '("gint" "ysrc")
-    '("gint" "xdest")
-    '("gint" "ydest")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
-(define-function gdk_draw_image
-  (c-name "gdk_draw_image")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("GdkImage*" "image")
-    '("gint" "xsrc")
-    '("gint" "ysrc")
-    '("gint" "xdest")
-    '("gint" "ydest")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
-(define-function gdk_draw_points
-  (c-name "gdk_draw_points")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("const-GdkPoint*" "points")
-    '("gint" "n_points")
-  )
-)
-
-(define-function gdk_draw_segments
-  (c-name "gdk_draw_segments")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("const-GdkSegment*" "segs")
-    '("gint" "n_segs")
-  )
-)
-
-(define-function gdk_draw_lines
-  (c-name "gdk_draw_lines")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("const-GdkPoint*" "points")
-    '("gint" "n_points")
-  )
-)
-
-(define-function gdk_draw_pixbuf
-  (c-name "gdk_draw_pixbuf")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("const-GdkPixbuf*" "pixbuf")
-    '("gint" "src_x")
-    '("gint" "src_y")
-    '("gint" "dest_x")
-    '("gint" "dest_y")
-    '("gint" "width")
-    '("gint" "height")
-    '("GdkRgbDither" "dither")
-    '("gint" "x_dither")
-    '("gint" "y_dither")
-  )
-)
-
-(define-function gdk_draw_glyphs
-  (c-name "gdk_draw_glyphs")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("PangoFont*" "font")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoGlyphString*" "glyphs")
-  )
-)
-
-(define-function gdk_draw_layout_line
-  (c-name "gdk_draw_layout_line")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayoutLine*" "line")
-  )
-)
-
-(define-function gdk_draw_layout
-  (c-name "gdk_draw_layout")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayout*" "layout")
-  )
-)
-
-(define-function gdk_draw_layout_line_with_colors
-  (c-name "gdk_draw_layout_line_with_colors")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayoutLine*" "line")
-    '("const-GdkColor*" "foreground")
-    '("const-GdkColor*" "background")
-  )
-)
-
-(define-function gdk_draw_layout_with_colors
-  (c-name "gdk_draw_layout_with_colors")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayout*" "layout")
-    '("const-GdkColor*" "foreground")
-    '("const-GdkColor*" "background")
-  )
-)
-
-(define-function gdk_draw_glyphs_transformed
-  (c-name "gdk_draw_glyphs_transformed")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("const-PangoMatrix*" "matrix")
-    '("PangoFont*" "font")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoGlyphString*" "glyphs")
-  )
-)
-
-(define-function gdk_draw_trapezoids
-  (c-name "gdk_draw_trapezoids")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("const-GdkTrapezoid*" "trapezoids")
-    '("gint" "n_trapezoids")
-  )
-)
-
-(define-method get_image
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_image")
-  (return-type "GdkImage*")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
-(define-method copy_to_image
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_copy_to_image")
-  (return-type "GdkImage*")
-  (parameters
-    '("GdkImage*" "image")
-    '("gint" "src_x")
-    '("gint" "src_y")
-    '("gint" "dest_x")
-    '("gint" "dest_y")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
 (define-method get_clip_region
   (of-object "GdkDrawable")
   (c-name "gdk_drawable_get_clip_region")
@@ -2363,56 +2084,11 @@
   (return-type "GType")
 )
 
-(define-function gdk_cap_style_get_type
-  (c-name "gdk_cap_style_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_fill_get_type
-  (c-name "gdk_fill_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_function_get_type
-  (c-name "gdk_function_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_join_style_get_type
-  (c-name "gdk_join_style_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_line_style_get_type
-  (c-name "gdk_line_style_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_subwindow_mode_get_type
-  (c-name "gdk_subwindow_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_gc_values_mask_get_type
-  (c-name "gdk_gc_values_mask_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_image_type_get_type
-  (c-name "gdk_image_type_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_prop_mode_get_type
   (c-name "gdk_prop_mode_get_type")
   (return-type "GType")
 )
 
-(define-function gdk_rgb_dither_get_type
-  (c-name "gdk_rgb_dither_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_byte_order_get_type
   (c-name "gdk_byte_order_get_type")
   (return-type "GType")
@@ -3694,66 +3370,6 @@
 
 ;; From gdkpango.h
 
-(define-function gdk_pango_renderer_get_type
-  (c-name "gdk_pango_renderer_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pango_renderer_new
-  (c-name "gdk_pango_renderer_new")
-  (is-constructor-of "GdkPangoRenderer")
-  (return-type "PangoRenderer*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_pango_renderer_get_default
-  (c-name "gdk_pango_renderer_get_default")
-  (return-type "PangoRenderer*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-method set_drawable
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_drawable")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-  )
-)
-
-(define-method set_gc
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_gc")
-  (return-type "none")
-  (parameters
-    '("GdkGC*" "gc")
-  )
-)
-
-(define-method set_stipple
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_stipple")
-  (return-type "none")
-  (parameters
-    '("PangoRenderPart" "part")
-    '("GdkBitmap*" "stipple")
-  )
-)
-
-(define-method set_override_color
-  (of-object "GdkPangoRenderer")
-  (c-name "gdk_pango_renderer_set_override_color")
-  (return-type "none")
-  (parameters
-    '("PangoRenderPart" "part")
-    '("const-GdkColor*" "color")
-  )
-)
-
 (define-function gdk_pango_context_get_for_screen
   (c-name "gdk_pango_context_get_for_screen")
   (return-type "PangoContext*")
@@ -3791,33 +3407,6 @@
   )
 )
 
-(define-function gdk_pango_attr_stipple_new
-  (c-name "gdk_pango_attr_stipple_new")
-  (is-constructor-of "GdkPangoAttrStipple")
-  (return-type "PangoAttribute*")
-  (parameters
-    '("GdkBitmap*" "stipple")
-  )
-)
-
-(define-function gdk_pango_attr_embossed_new
-  (c-name "gdk_pango_attr_embossed_new")
-  (is-constructor-of "GdkPangoAttrEmbossed")
-  (return-type "PangoAttribute*")
-  (parameters
-    '("gboolean" "embossed")
-  )
-)
-
-(define-function gdk_pango_attr_emboss_color_new
-  (c-name "gdk_pango_attr_emboss_color_new")
-  (is-constructor-of "GdkPangoAttrEmbossColor")
-  (return-type "PangoAttribute*")
-  (parameters
-    '("const-GdkColor*" "color")
-  )
-)
-
 
 
 ;; From gdkpixbuf.h
@@ -3877,13 +3466,12 @@
   )
 )
 
-(define-method get_from_image
+(define-method get_from_surface
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_from_image")
+  (c-name "gdk_pixbuf_get_from_surface")
   (return-type "GdkPixbuf*")
   (parameters
-    '("GdkImage*" "src")
-    '("GdkColormap*" "cmap")
+    '("cairo_surface_t*" "surface")
     '("int" "src_x")
     '("int" "src_y")
     '("int" "dest_x")
@@ -3914,77 +3502,6 @@
   )
 )
 
-(define-function gdk_bitmap_create_from_data
-  (c-name "gdk_bitmap_create_from_data")
-  (return-type "GdkBitmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("const-gchar*" "data")
-    '("gint" "width")
-    '("gint" "height")
-  )
-)
-
-(define-function gdk_pixmap_create_from_data
-  (c-name "gdk_pixmap_create_from_data")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("const-gchar*" "data")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "depth")
-    '("const-GdkColor*" "fg")
-    '("const-GdkColor*" "bg")
-  )
-)
-
-(define-function gdk_pixmap_create_from_xpm
-  (c-name "gdk_pixmap_create_from_xpm")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkBitmap**" "mask")
-    '("const-GdkColor*" "transparent_color")
-    '("const-gchar*" "filename")
-  )
-)
-
-(define-function gdk_pixmap_colormap_create_from_xpm
-  (c-name "gdk_pixmap_colormap_create_from_xpm")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkColormap*" "colormap")
-    '("GdkBitmap**" "mask")
-    '("const-GdkColor*" "transparent_color")
-    '("const-gchar*" "filename")
-  )
-)
-
-(define-function gdk_pixmap_create_from_xpm_d
-  (c-name "gdk_pixmap_create_from_xpm_d")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkBitmap**" "mask")
-    '("const-GdkColor*" "transparent_color")
-    '("gchar**" "data")
-  )
-)
-
-(define-function gdk_pixmap_colormap_create_from_xpm_d
-  (c-name "gdk_pixmap_colormap_create_from_xpm_d")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkColormap*" "colormap")
-    '("GdkBitmap**" "mask")
-    '("const-GdkColor*" "transparent_color")
-    '("gchar**" "data")
-  )
-)
-
 (define-function gdk_pixmap_foreign_new
   (c-name "gdk_pixmap_foreign_new")
   (is-constructor-of "GdkPixmapForeign")
@@ -4636,18 +4153,6 @@
   (return-type "GdkVisual*")
 )
 
-(define-method get_rgb_colormap
-  (of-object "GdkScreen")
-  (c-name "gdk_screen_get_rgb_colormap")
-  (return-type "GdkColormap*")
-)
-
-(define-method get_rgb_visual
-  (of-object "GdkScreen")
-  (c-name "gdk_screen_get_rgb_visual")
-  (return-type "GdkVisual*")
-)
-
 (define-method get_rgba_colormap
   (of-object "GdkScreen")
   (c-name "gdk_screen_get_rgba_colormap")
@@ -5761,15 +5266,6 @@
   )
 )
 
-(define-method get_background
-  (of-object "GdkWindow")
-  (c-name "gdk_window_get_background")
-  (return-type "none")
-  (parameters
-    '("GdkColor*" "color")
-  )
-)
-
 (define-method set_background
   (of-object "GdkWindow")
   (c-name "gdk_window_set_background")
@@ -5779,16 +5275,6 @@
   )
 )
 
-(define-method get_back_pixmap
-  (of-object "GdkWindow")
-  (c-name "gdk_window_get_back_pixmap")
-  (return-type "none")
-  (parameters
-    '("GdkPixmap**" "pixmap")
-    '("gboolean*" "parent_relative")
-  )
-)
-
 (define-method set_back_pixmap
   (of-object "GdkWindow")
   (c-name "gdk_window_set_back_pixmap")
@@ -5799,6 +5285,12 @@
   )
 )
 
+(define-method get_background_pattern
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_background_pattern")
+  (return-type "cairo_pattern_t*")
+)
+
 (define-method set_cursor
   (of-object "GdkWindow")
   (c-name "gdk_window_set_cursor")
@@ -6104,6 +5596,17 @@
   )
 )
 
+(define-method create_similar_surface
+  (of-object "GdkWindow")
+  (c-name "gdk_window_create_similar_surface")
+  (return-type "cairo_surface_t*")
+  (parameters
+    '("cairo_content_t" "content")
+    '("int" "width")
+    '("int" "height")
+  )
+)
+
 (define-method beep
   (of-object "GdkWindow")
   (c-name "gdk_window_beep")
@@ -6236,16 +5739,6 @@
   )
 )
 
-(define-method invalidate_maybe_recurse
-  (of-object "GdkWindow")
-  (c-name "gdk_window_invalidate_maybe_recurse")
-  (return-type "none")
-  (parameters
-    '("const-cairo_region_t*" "region")
-    '("somefunc*" "child_func")
-  )
-)
-
 (define-method get_update_area
   (of-object "GdkWindow")
   (c-name "gdk_window_get_update_area")
@@ -6450,22 +5943,6 @@
   )
 )
 
-(define-function gdk_x11_image_get_xdisplay
-  (c-name "gdk_x11_image_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkImage*" "image")
-  )
-)
-
-(define-function gdk_x11_image_get_ximage
-  (c-name "gdk_x11_image_get_ximage")
-  (return-type "XImage*")
-  (parameters
-    '("GdkImage*" "image")
-  )
-)
-
 (define-function gdk_x11_colormap_get_xdisplay
   (c-name "gdk_x11_colormap_get_xdisplay")
   (return-type "Display*")
@@ -6514,22 +5991,6 @@
   )
 )
 
-(define-function gdk_x11_gc_get_xdisplay
-  (c-name "gdk_x11_gc_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkGC*" "gc")
-  )
-)
-
-(define-function gdk_x11_gc_get_xgc
-  (c-name "gdk_x11_gc_get_xgc")
-  (return-type "GC")
-  (parameters
-    '("GdkGC*" "gc")
-  )
-)
-
 (define-function gdk_x11_screen_get_xscreen
   (c-name "gdk_x11_screen_get_xscreen")
   (return-type "Screen*")
diff --git a/gdk/src/pixbuf.ccg b/gdk/src/pixbuf.ccg
index 32400a6..719cd16 100644
--- a/gdk/src/pixbuf.ccg
+++ b/gdk/src/pixbuf.ccg
@@ -48,23 +48,6 @@ static void pixbuf_destroy_data_callback(guint8* pixels, void* user_data)
 namespace Gdk
 {
 
-Pixbuf::Pixbuf(const Glib::RefPtr<Image>& src,
-               const Glib::RefPtr<Colormap>& cmap,
-               int src_x, int src_y,
-               int width, int height)
-:
-  Object((GObject*) gdk_pixbuf_get_from_image(
-      0, src->gobj(), cmap->gobj(), src_x, src_y, 0, 0, width, height))
-{}
-
-Pixbuf::Pixbuf(const Glib::RefPtr<Image>& src,
-               int src_x, int src_y,
-               int width, int height)
-:
-  Object((GObject*) gdk_pixbuf_get_from_image(
-      0, src->gobj(), 0, src_x, src_y, 0, 0, width, height))
-{}
-
 Pixbuf::Pixbuf(const Glib::RefPtr<Drawable>& src,
                const Glib::RefPtr<Colormap>& cmap,
                int src_x, int src_y,
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 96b2576..53015a0 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -20,7 +20,6 @@
 _CONFIGINCLUDE(gdkmmconfig.h)
 
 #include <gdkmm/drawable.h>
-#include <gdkmm/image.h>
 #include <gdkmm/pixmap.h>
 #include <gdkmm/bitmap.h>
 #include <gdkmm/pixbufformat.h>
@@ -132,33 +131,6 @@ protected:
    Pixbuf(const Glib::RefPtr<Drawable>& src,
          int src_x, int src_y, int width, int height);
 
-  /** Creates a pixbuf object from an image.
-   *
-   * @param src Source Image.
-   * @param cmap A colormap.
-   * @param src_x Source X coordinate within the image.
-   * @param src_y Source Y coordinate within the image.
-   * @param width Width in pixels of region to get.
-   * @param height Height in pixels of region to get.
-   *
-   * @newin{2,12}
-   */
-  Pixbuf(const Glib::RefPtr<Image>& src, const Glib::RefPtr<Colormap>& cmap,
-         int src_x, int src_y, int width, int height);
-
-  /** Creates a pixbuf object from an image, using the colormap from the image.
-   *
-   * @param src Source Image.
-   * @param src_x Source X coordinate within the image.
-   * @param src_y Source Y coordinate within the image.
-   * @param width Width in pixels of region to get.
-   * @param height Height in pixels of region to get.
-   *
-   * @newinp212
-   */
-  Pixbuf(const Glib::RefPtr<Image>& src,
-         int src_x, int src_y, int width, int height);
-
 public:
   typedef sigc::slot<void, const guint8*> SlotDestroyData;
 
@@ -226,33 +198,6 @@ public:
   _WRAP_CREATE(const Glib::RefPtr<Drawable>& src,
                int src_x, int src_y, int width, int height)
 
-  /** Creates a pixbuf object from an image.
-   *
-   * @param src Source Image.
-   * @param cmap A colormap.
-   * @param src_x Source X coordinate within the image.
-   * @param src_y Source Y coordinate within the image.
-   * @param width Width in pixels of region to get.
-   * @param height Height in pixels of region to get.
-   *
-   * @newin{2,12}
-   */
-  _WRAP_CREATE(const Glib::RefPtr<Image>& src, const Glib::RefPtr<Colormap>& cmap,
-               int src_x, int src_y, int width, int height)
-
-  /** Creates a pixbuf object from an image, using the colormap from the image.
-   *
-   * @param src Source Image.
-   * @param src_x Source X coordinate within the image.
-   * @param src_y Source Y coordinate within the image.
-   * @param width Width in pixels of region to get.
-   * @param height Height in pixels of region to get.
-   *
-   * @newinp212
-   */
-  _WRAP_CREATE(const Glib::RefPtr<Image>& src,
-               int src_x, int src_y, int width, int height)
-
   _WRAP_METHOD(Glib::RefPtr<Pixbuf> copy() const, gdk_pixbuf_copy)
 
   _WRAP_METHOD(static Glib::RefPtr<Pixbuf> create(
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index 2a41d6d..9efef53 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -58,9 +58,7 @@ class Colormap;
 class Pixmap;
 class Window;
 class Font;
-class GC;
 class Color;
-class Image;
 
 _WRAP_ENUM(ByteOrder, GdkByteOrder)
 _WRAP_ENUM(ModifierType, GdkModifierType)
diff --git a/gtk/src/style.hg b/gtk/src/style.hg
index 19627a7..ee5c10b 100644
--- a/gtk/src/style.hg
+++ b/gtk/src/style.hg
@@ -48,7 +48,6 @@ _POP()
 #include <pangomm/fontdescription.h>
 #include <pangomm/layout.h>
 
-#include <gdkmm/gc.h>
 #include <gdkmm/pixmap.h>
 #include <gdkmm/types.h>
 #include <gdkmm/window.h>
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 195237b..93b935d 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -43,8 +43,6 @@ int main(int argc, char** argv)
             << get_defs( GDK_TYPE_DISPLAY_MANAGER )
 #endif /* G_OS_WIN32 */
             << get_defs( GDK_TYPE_DRAWABLE )
-            << get_defs( GDK_TYPE_GC )
-            << get_defs( GDK_TYPE_IMAGE )
             << get_defs( GDK_TYPE_PIXBUF )
             << get_defs( GDK_TYPE_PIXBUF_ANIMATION )
             << get_defs( GDK_TYPE_PIXBUF_LOADER )
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]