990126

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 26 insertions, 19 deletions

diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index f4cb5c726f..d7aa0a6149 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -54,35 +54,35 @@ Win32API_initialize(self, dllname, proc, import, export)
     if (!hdll) {
 	hdll = LoadLibrary(RSTRING(dllname)->ptr);
 	if (!hdll)
-	    Fail("LoadLibrary: %s\n", RSTRING(dllname)->ptr);
+	    rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
 	Data_Wrap_Struct(self, 0, Win32API_FreeLibrary, hdll);
     }
     hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
     if (!hproc) {
-	str = str_new3(proc);
-	str = str_cat(str, "A", 1);
+	str = rb_str_new3(proc);
+	str = rb_str_cat(str, "A", 1);
 	hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
 	if (!hproc)
-	    Fail("GetProcAddress: %s or %s\n",
+	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
 		RSTRING(proc)->ptr, RSTRING(str)->ptr);
     }
     rb_iv_set(self, "__dll__", INT2NUM((int)hdll));
     rb_iv_set(self, "__dllname__", dllname);
     rb_iv_set(self, "__proc__", INT2NUM((int)hproc));
 
-    a_import = ary_new();
+    a_import = rb_ary_new();
     ptr = RARRAY(import)->ptr;
     for (i = 0, len = RARRAY(import)->len; i < len; i++) {
 	int c = *(char *)RSTRING(ptr[i])->ptr;
 	switch (c) {
 	case 'N': case 'n': case 'L': case 'l':
-	    ary_push(a_import, INT2FIX(_T_NUMBER));
+	    rb_ary_push(a_import, INT2FIX(_T_NUMBER));
 	    break;
 	case 'P': case 'p':
-	    ary_push(a_import, INT2FIX(_T_POINTER));
+	    rb_ary_push(a_import, INT2FIX(_T_POINTER));
 	    break;
 	case 'I': case 'i':
-	    ary_push(a_import, INT2FIX(_T_INTEGER));
+	    rb_ary_push(a_import, INT2FIX(_T_INTEGER));
 	    break;
 	}
     }
@@ -146,18 +146,18 @@ Win32API_Call(argc, argv, obj)
     texport = FIX2INT(obj_export);
 
     if (items != nimport)
-	Fail("Wrong number of parameters: expected %d, got %d.\n",
+	rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
 	    nimport, items);
 
     if (0 < nimport) {
 	for (i = nimport - 1; 0 <= i; i--) {
 	    VALUE str;
-	    import_type = ary_entry(obj_import, i);
+	    import_type = rb_ary_entry(obj_import, i);
 	    timport = FIX2INT(import_type);
 	    switch (timport) {
 	    case _T_NUMBER:
 	    case _T_INTEGER:
-		lParam = NUM2INT(ary_entry(args, i));
+		lParam = NUM2INT(rb_ary_entry(args, i));
 #if defined(_MSC_VER) || defined(__LCC__)
 		_asm {
 		    mov     eax, lParam
@@ -170,9 +170,9 @@ Win32API_Call(argc, argv, obj)
 #endif
 		break;
 	    case _T_POINTER:
-		str = ary_entry(args, i);
+		str = rb_ary_entry(args, i);
 		Check_Type(str, T_STRING);
-		str_modify(str);
+		rb_str_modify(str);
 		pParam = RSTRING(str)->ptr;
 #if defined(_MSC_VER) || defined(__LCC__)
 		_asm {
@@ -197,7 +197,7 @@ Win32API_Call(argc, argv, obj)
 	break;
     case _T_POINTER:
 	ApiFunctionPointer = (ApiPointer *) ApiFunction;
-	Return = str_new2((char *)ApiFunctionPointer());
+	Return = rb_str_new2((char *)ApiFunctionPointer());
 	break;
     case _T_INTEGER:
 	ApiFunctionInteger = (ApiInteger *) ApiFunction;
@@ -216,7 +216,7 @@ Win32API_Call(argc, argv, obj)
 void
 Init_Win32API()
 {
-    VALUE cWin32API = rb_define_class("Win32API", cObject);
+    VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
     rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
     rb_define_method(cWin32API, "call", Win32API_Call, -1);
     rb_define_alias(cWin32API,  "Call", "call");
diff --git a/ext/etc/MANIFEST b/ext/etc/MANIFEST
index a0f521b386..79fb1ff34c 100644
--- a/ext/etc/MANIFEST
+++ b/ext/etc/MANIFEST
@@ -1,5 +1,6 @@
 MANIFEST
 etc.c
-etc.doc
+etc.txt
+etc.txt.jp
 depend
 extconf.rb
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 058c144f94..d729fd8467 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -288,7 +288,7 @@ CC = @CC@
 
 prefix = @prefix@
 CFLAGS   = %s -I#{$topdir} -I#{$top_srcdir} -I@includedir@ #{CFLAGS} #$CFLAGS %s
-DLDFLAGS = #$DLDFLAGS @LDFLAGS@ #$LDFLAGS
+DLDFLAGS = #$DLDFLAGS #$LDFLAGS
 LDSHARED = @LDSHARED@
 ", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ")
 
diff --git a/ext/md5/MANIFEST b/ext/md5/MANIFEST
index e4f0004b4a..8057ebb06c 100644
--- a/ext/md5/MANIFEST
+++ b/ext/md5/MANIFEST
@@ -1,6 +1,7 @@
 MANIFEST
 depend
-md5.doc
+md5.txt
+md5.txt.jp
 md5.h
 md5c.c
 md5init.c
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index e32723be96..bd896639fc 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -2412,6 +2412,9 @@ class TkMenubutton<TkLabel
 end
 
 module TkComposite
+  include Tk
+  extend Tk
+
   def initialize(parent=nil, *args)
     @frame = TkFrame.new(parent)
     @path = @epath = @frame.path
diff --git a/ext/tk/lib/tkscrollbox.rb b/ext/tk/lib/tkscrollbox.rb
index 8d129b2f4b..be7799240e 100644
--- a/ext/tk/lib/tkscrollbox.rb
+++ b/ext/tk/lib/tkscrollbox.rb
@@ -8,7 +8,7 @@ require 'tk.rb'
 
 class TkScrollbox<TkListbox
   include TkComposite
-  def initialize_composite
+  def initialize_composite(keys=nil)
     list = TkListbox.new(@frame)
     scroll = TkScrollbar.new(@frame)
     @path = list.path
@@ -23,5 +23,7 @@ class TkScrollbox<TkListbox
     delegate('background', list, scroll)
     delegate('borderwidth', @frame)
     delegate('relief', @frame)
+
+    configure keys if keys
   end
 end