summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-06-26 08:08:47 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1998-06-26 08:08:47 +0000
commit839f4c5f3fdb4ea6b270fce17f1c3881060087d4 (patch)
tree6aabe222668154252ccc2f0f5a845afb47093c64
parentfdfa583944cbe769f2085b0cfdce9ffd3ce8a3c8 (diff)
*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/gtk/extconf.rb2
-rw-r--r--ext/gtk/gtk.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/gtk/extconf.rb b/ext/gtk/extconf.rb
index 5839fac..43c90c0 100644
--- a/ext/gtk/extconf.rb
+++ b/ext/gtk/extconf.rb
@@ -1,7 +1,7 @@
require "mkmf"
# may need to be changed
-$LDFLAGS="-L/usr/X11R6/lib -L/usr/local/lib"
+$LDFLAGS=`gtk-config --libs`.chomp!
$CFLAGS=`gtk-config --cflags`.chomp!
have_library("X11", "XOpenDisplay")
diff --git a/ext/gtk/gtk.c b/ext/gtk/gtk.c
index cc552c1..c001590 100644
--- a/ext/gtk/gtk.c
+++ b/ext/gtk/gtk.c
@@ -9,7 +9,7 @@
************************************************/
#include "ruby.h"
-#include "sig.h"
+#include "rubysig.h"
#include <gtk/gtk.h>
#include <signal.h>
@@ -6051,7 +6051,7 @@ Init_gtk()
rb_define_method(gWidget, "draw_default", widget_draw_default, 0);
rb_define_method(gWidget, "draw_children", widget_draw_children, 0);
rb_define_method(gWidget, "size_request", widget_size_request, 1);
- rb_define_method(gWidget, "size_alocate", widget_size_allocate, 1);
+ rb_define_method(gWidget, "size_allocate", widget_size_allocate, 1);
rb_define_method(gWidget, "install_accelerator", widget_inst_accel, 4);
rb_define_method(gWidget, "remove_accelerator", widget_rm_accel, 4);
rb_define_method(gWidget, "event", widget_event, 1);
@@ -6208,7 +6208,7 @@ Init_gtk()
rb_define_method(gBBox, "set_child_ipadding", bbox_set_child_ipadding, 2);
/* CList */
- rb_define_method(gCList, "initialize", clist_initialize, -1);
+ rb_define_method(gCList, "initialize", clist_initialize, 1);
rb_define_method(gCList, "set_border", clist_set_border, 1);
rb_define_method(gCList, "set_selection_mode", clist_set_sel_mode, 1);
rb_define_method(gCList, "set_policy", clist_set_policy, 2);