Patches for object tracking

The following patches implement object tracking.  Note nasty
games I 
play to make the tracking global.  SWIG 1.3.30 won't need
this.  I also 
updated the minimum required SWIG version to 1.3.29.

Roy

C:\RubyDev>diff -b -u wxruby2_old/swig/typemap.i
wxruby2/swig/typemap.i  
--- wxruby2_old/swig/typemap.i	2006-04-20 21:56:04.000000000
-0400
+++ wxruby2/swig/typemap.i	2006-04-23 02:35:03.758764800
-0400
 -1,6
+1,7 
 #   Copyright 2004-2005 by Kevin Smith
 #   released under the MIT-style wxruby2 license

+%trackobjects;

 ###########################################################
###
 %typemap(in) wxString& {
 -45,11
+46,11 
 }

 %typemap(out) wxString& {
-	$result = rb_str_new2((const char
*)$1.mb_str(wxConvUTF8));
+	$result = rb_str_new2((const char
*)(*$1).mb_str(wxConvUTF8));
 }

 %typemap(out) const wxString& {
-	$result = rb_str_new2((const char
*)$1.mb_str(wxConvUTF8));
+	$result = rb_str_new2((const char
*)(*$1).mb_str(wxConvUTF8));
 }

 %apply wxString& { wxString* }
 -75,11
+76,6 
 	$1 = (TYPE($input) == T_STRING);
 }

-%typemap(out) void * {
-  $result = INT2NUM((int)$1);
-}
-
-
 ###########################################################
###

 %typemap(in) void* {
 -90,6
+86,10 
     $result = (VALUE)($1);
 }

+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) void
* {
+	$1 = TRUE;
+}
+
 ###########################################################
###

 ###########################################################
###

C:\RubyDev>diff -b -u wxruby2_old/swig/fixmainmodule.rb
wxruby2/swig/fixmainmodule.rb  
--- wxruby2_old/swig/fixmainmodule.rb	2005-08-06
11:25:16.000000000 -0400
+++ wxruby2/swig/fixmainmodule.rb	2006-04-21
01:01:59.199670400 -0400
 -33,6
+33,28 
             line = "VALUE #{$main_module};"
 			found_main_module = true
         end
+
+        # Fix 1.3.29's ruby tracking
+        if(ENV['SWIGVER'] == 'SWIG Version 1.3.29')
+          if(line.index("static VALUE
swig_ruby_trackings"))
+            line = "VALUE swig_ruby_trackings =
0;"
+          end
+
+          if(line.index("static ID
swig_ruby_hash_delete"))
+            line = "ID swig_ruby_hash_delete =
0;"
+          end
+
+          if(line.index("swig_ruby_trackings =
rb_hash_new();"))
+            line = "  if(swig_ruby_trackings == 0)
{\n" +
+                   line;
+          end
+			
+          if(line.index("swig_ruby_hash_delete =
rb_intern(\"delete\");"))
+            line = line + "\n" +
+                   "  }";
+          end
+        end
+
         out.puts(line)
     end
 	if(!found_main_module)

C:\RubyDev>diff -b -u wxruby2_old/swig/fixmodule.rb
wxruby2/swig/fixmodule.rb  
--- wxruby2_old/swig/fixmodule.rb	2006-04-20
21:56:04.000000000 -0400
+++ wxruby2/swig/fixmodule.rb	2006-04-21 01:02:46.037019200
-0400
 -55,6
+55,27 
 				line = "//" + line
 			end

+                        # Fix 1.3.29's ruby tracking
+                        if(ENV['SWIGVER'] == 'SWIG
Version 1.3.29')
+
+			  if(line.index("static VALUE
swig_ruby_trackings"))
+				line = "extern VALUE swig_ruby_trackings;"
+			  end
+                          if(line.index("static ID
swig_ruby_hash_delete"))
+				line = "extern ID swig_ruby_hash_delete;"
+			  end
+
+                         
if(line.index("swig_ruby_trackings =
rb_hash_new();"))
+				line = "  if(swig_ruby_trackings == 0)
{\n" +
+                                       line;
+			  end
+			
+                         
if(line.index("swig_ruby_hash_delete =
rb_intern(\"delete\");"))
+				line = line + "\n" +
+                                       "  }";
+			  end
+                        end
+
 			# instead of defining a new module,
 			if(line.index("rb_define_module(\"Wx"
))
 				# set this module equal to the real main module

C:\RubyDev>diff -b -u wxruby2_old/rake/rakewx.rb
wxruby2/rake/rakewx.rb  
--- wxruby2_old/rake/rakewx.rb	2006-04-20 21:56:04.000000000
-0400
+++ wxruby2/rake/rakewx.rb	2006-04-21 00:59:14.372660800
-0400
 -24,10
+24,11 
 		return false
 	end
 	if(!version || version.empty?)
-		puts('Doing slower check for SWIG 1.3.24')
+		puts('Doing slower check for SWIG 1.3.29')
 		version = `ruby swig/swigver.rb`
 	end
-	return (version >= "SWIG Version 1.3.24"
&& version < "SWIG Version 2")
+        ENV['SWIGVER'] = version
+	return (version >= "SWIG Version 1.3.29"
&& version < "SWIG Version 2")
 end

 def wx_config(opt)
_______________________________________________
wxruby-users mailing list
wxruby-usersrubyforge.org
ht
tp://rubyforge.org/mailman/listinfo/wxruby-users

Patches for object tracking

Thread: Patches for object tracking