From 8581fa1549787fc64e0d8a198838fe47104726c1 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 23 Apr 1998 07:38:03 +0000
Subject: gdk_draw_bitmap

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/gtk/extconf.rb |  7 +++++++
 ext/gtk/gtk.c      | 36 ++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'ext/gtk')

diff --git a/ext/gtk/extconf.rb b/ext/gtk/extconf.rb
index 621e0739a5..9d4a8d201a 100644
--- a/ext/gtk/extconf.rb
+++ b/ext/gtk/extconf.rb
@@ -1,4 +1,11 @@
 require "mkmf"
+
+# may need to be changed
+$LDFLAGS="-L/usr/X11R6/lib -L/usr/local/lib"
+$CFLAGS="-I/usr/X11R6/include -L/usr/local/include"
+
+have_library("X11", "XOpenDisplay")
+have_library("Xext", "XShmQueryVersion")
 if have_library("glib", "g_print") and
     have_library("gdk", "gdk_init") and
     have_library("gtk", "gtk_init")
diff --git a/ext/gtk/gtk.c b/ext/gtk/gtk.c
index 418c677460..5f1eeb6187 100644
--- a/ext/gtk/gtk.c
+++ b/ext/gtk/gtk.c
@@ -904,7 +904,7 @@ arg_to_value(arg)
 #endif
 #ifdef GTK_TYPE_TOOLTIPS
 	else if (arg->type == GTK_TYPE_TOOLTIPS) {
-	    return make_ttips(gTooltips, GTK_VALUE_BOXED(*arg));
+	    return make_gobject(gTooltips, GTK_OBJECT(GTK_VALUE_BOXED(*arg)));
 	}
 #endif
 	else {
@@ -3877,13 +3877,14 @@ ttips_initialize(self)
 }
 
 static VALUE
-ttips_set_tips(self, win, text)
+ttips_set_tip(self, win, text,priv)
     VALUE self, win, text;
 {
     Check_Type(text, T_STRING);
-    gtk_tooltips_set_tips(GTK_TOOLTIPS(get_widget(self)),
-			  get_widget(win),
-			  RSTRING(text)->ptr);
+    gtk_tooltips_set_tip(GTK_TOOLTIPS(get_widget(self)),
+			 get_widget(win),
+			 RSTRING(text)->ptr,
+			 RSTRING(priv)->ptr);
 
     return self;
 }
@@ -3897,6 +3898,16 @@ ttips_set_delay(self, delay)
     return self;
 }
 
+static VALUE
+ttips_set_colors(self, back, fore)
+    VALUE self, back, fore;
+{
+    gtk_tooltips_set_colors(GTK_TOOLTIPS(get_widget(self)),
+			    get_gdkcolor(back),
+			    get_gdkcolor(fore));
+    return self;
+}
+
 static VALUE
 ttips_enable(self)
     VALUE self;
@@ -4930,14 +4941,6 @@ range_default_vmotion(self, xdelta, ydelta)
     return self;
 }
 
-static VALUE
-range_calc_value(self, pos)
-    VALUE self, pos;
-{
-    gtk_range_calc_value(GTK_RANGE(get_widget(self)), NUM2INT(pos));
-    return self;
-}
-
 static VALUE
 scale_set_digits(self, digits)
     VALUE self, digits;
@@ -5468,7 +5471,8 @@ static VALUE
 gdkdraw_draw_bmap(self, gc, src, xsrc, ysrc, xdst, ydst, w, h)
     VALUE self, gc, src, xsrc, ysrc, xdst, ydst, w, h;
 {
-    gdk_draw_bitmap(get_gdkdrawable(self), get_gdkgc(gc),
+    /* why there's no gdk_draw_bitmap()?? */
+    gdk_draw_pixmap(get_gdkdrawable(self), get_gdkgc(gc),
 		    get_gdkdrawable(src),
 		    NUM2INT(xsrc), NUM2INT(ysrc),
 		    NUM2INT(xdst), NUM2INT(ydst),
@@ -6147,7 +6151,6 @@ Init_gtk()
     rb_define_method(gRange, "default_vtrough_click", range_default_vtrough_click, 2);
     rb_define_method(gRange, "default_hmotion", range_default_hmotion, 2);
     rb_define_method(gRange, "default_vmotion", range_default_vmotion, 2);
-    rb_define_method(gRange, "calc_value", range_calc_value, 1);
 
     /* Scale */
     rb_define_method(gScale, "set_digits", scale_set_digits, 1);
@@ -6347,8 +6350,9 @@ Init_gtk()
 
     /* Tooltips */
     rb_define_method(gTooltips, "initialize", ttips_initialize, 0);
-    rb_define_method(gTooltips, "set_tips", ttips_set_tips, 2);
+    rb_define_method(gTooltips, "set_tip", ttips_set_tip, 3);
     rb_define_method(gTooltips, "set_delay", ttips_set_delay, 1);
+    rb_define_method(gTooltips, "set_colors", ttips_set_colors, 2);
     rb_define_method(gTooltips, "enable", ttips_enable, 0);
     rb_define_method(gTooltips, "disable", ttips_disable, 0);
 
-- 
cgit v1.2.3