fxruby-commits Mailing List for FXRuby (Page 7)
Status: Inactive
Brought to you by:
lyle
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
(39) |
Apr
(69) |
May
(117) |
Jun
(22) |
Jul
(57) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: Lyle J. <ly...@us...> - 2002-05-10 05:04:05
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv11239/ext/fox Added Files: Tag: release10 extconf.rb.in Removed Files: Tag: release10 extconf.rb.tmpl Log Message: --- NEW FILE: extconf.rb.in --- #!/bin/env ruby require 'ftools' require 'mkmf' def getInstalledFOXVersion incdir = "/usr/local/include/fox" ARGV.each { |arg| if arg =~ /--with-fox-include/ incdir = arg.split('=')[1] end } filename = File.join(incdir, "fxver.h") if FileTest.exists?(filename) foxMajor, foxMinor, foxLevel = nil, nil, nil File.foreach(filename) { |line| if line =~ /FOX_MAJOR/ foxMajor = line.split()[2] elsif line =~ /FOX_MINOR/ foxMinor = line.split()[2] elsif line =~ /FOX_LEVEL/ foxLevel = line.split()[2] end } if foxMajor && foxMinor && foxLevel return foxMajor + "." + foxMinor + "." + foxLevel else return "" end else puts "I couldn't locate the standard FOX header file \"fxver.h\" at this location:" puts "" puts " #{filename}" puts "" puts "Please specify the locations for the FOX header files and library using the" puts "--with-fox-include and --with-fox-lib options to extconf.rb as described in" puts "the FXRuby installation instructions." exit end end def is_scintilla_build? args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) } args.length > 0 end # This directive processes the "--with-fox-include" and "--with-fox-lib" # command line switches and modifies the CFLAGS and LDFLAGS accordingly. dir_config('fox', '/usr/local/include/fox', '/usr/local/lib') # This directive processes the "--with-scintilla-include" and # "--with-scintilla-lib" command line switches and modifies the CFLAGS # and LDFLAGS accordingly. dir_config('scintilla', '/usr/local/include', '/usr/local/lib') # Verify version number for FOX from the installed header files installedVer = getInstalledFOXVersion().split('.') thisVer = "@@FOX_VERSION@@".split('.') if (installedVer[0] != thisVer[0]) || (installedVer[1] != thisVer[1]) puts "The version number for this installation of FOX appears to be inconsistent" puts "with this release of FXRuby (@@FXRUBY_VERSION@@)." exit end # Platform-specific modifications if RUBY_PLATFORM =~ /cygwin/ $libs = append_library($libs, "stdc++") $libs = append_library($libs, "glu32") $libs = append_library($libs, "opengl32") $libs = append_library($libs, "comctl32") $libs = append_library($libs, "mpr") $libs = append_library($libs, "gdi32") $libs = append_library($libs, "winspool") have_header("sys/time.h") have_header("signal.h") if have_library("z", "deflate") have_library("png", "png_create_read_struct") end have_library("jpeg", "jpeg_mem_init") have_library("tiff", "TIFFSetErrorHandler") $libs = append_library($libs, "FOX") $CFLAGS = $CFLAGS + " -fno-strict-prototype -fpermissive -DWIN32 -Iinclude" if is_scintilla_build? File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak') $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA" $libs = append_library($libs, "scintilla") else File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp') end elsif RUBY_PLATFORM =~ /mswin32/ $libs = append_library($libs, "glu32") $libs = append_library($libs, "opengl32") $libs = append_library($libs, "mpr") $libs = append_library($libs, "wsock32") $libs = append_library($libs, "comctl32") $libs = append_library($libs, "winspool") $libs = append_library($libs, "shell32") $libs = append_library($libs, "advapi32") $libs = append_library($libs, "shell32") $libs = append_library($libs, "gdi32") $libs = append_library($libs, "user32") have_header("sys/time.h") have_header("signal.h") have_library("zlib", "deflate") have_library("libpng", "png_create_read_struct") have_library("libjpeg", "jpeg_mem_init") have_library("libtiff", "TIFFSetErrorHandler") # $CFLAGS = $CFLAGS + "/DWIN32 /GR /GX /DFOXDLL /Iinclude" # $LOCAL_LIBS = $LOCAL_LIBS + "foxdll.lib" $CFLAGS = $CFLAGS + "/DWIN32 /GR /GX /Iinclude" $LOCAL_LIBS = $LOCAL_LIBS + "foxst.lib" if is_scintilla_build? File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak') $CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA" $libs = append_library($libs, "scintilla-static") else File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp') end else $libs = append_library($libs, "stdc++") have_header("sys/time.h") have_header("signal.h") have_library("png", "png_create_read_struct") have_library("z", "deflate") have_library("jpeg", "jpeg_mem_init") have_library("tiff", "TIFFSetErrorHandler") find_library("Xext", "XShmQueryVersion", "/usr/X11R6/lib") find_library("X11", "XFindContext", "/usr/X11R6/lib") find_library("GL", "glXCreateContext", "/usr/X11R6/lib") find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib") $libs = append_library($libs, "FOX") $CFLAGS = $CFLAGS + "-O0 -Iinclude" if is_scintilla_build? File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak') $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA" $libs = append_library($libs, "scintilla") else File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp') end end # Last step: build the makefile create_makefile("fox") --- extconf.rb.tmpl DELETED --- |
From: Lyle J. <ly...@us...> - 2002-05-10 05:04:05
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv11239 Modified Files: Tag: release10 setversions.rb Added Files: Tag: release10 ANNOUNCE.in Makefile.in Removed Files: Tag: release10 ANNOUNCE.tmpl Log Message: --- NEW FILE: ANNOUNCE.in --- I am pleased to announce the latest release of FXRuby, the Ruby language bindings for the FOX GUI toolkit. FOX is a C++-based toolkit for developing graphical user interfaces easily and effectively. It offers a wide, and growing, collection of widgets, and provides state-of-the-art facilities such as drag-and-drop, selection, as well as OpenGL widgets for 3-D graphical manipulation. FOX also implements icons, images, and user-convenience features such as status line help and tooltips. Please see the comments on the home page concerning any problems with this release, or the change log to see what has changed since the previous release. The FXRuby home page is here: @@FXRUBY_HOME_URL@@ and the source tarball can be downloaded here: @@FXRUBY_SRC_URL@@ A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is also available for download here: @@FXRUBY_WIN32_URL@@ Note that this release of FXRuby depends on FOX version 1.0.0 (or later), which can be downloaded from the FOX downloads page here: http://www.fox-toolkit.org/downloads.html Please feel free to send me any questions or comments, and watch this space for future announcements! Lyle --- NEW FILE: Makefile.in --- PACKAGE = FXRuby VERSION = @@FXRUBY_VERSION@@ distdir = $(PACKAGE)-$(VERSION) DISTFILES = \ ANNOUNCE \ ChangeLog \ LICENSE \ README \ install.rb \ index.html \ doc/*.html \ doc/images/*.png \ examples/README \ examples/*.rb \ examples/*.xml \ examples/icons/*.png \ examples/icons/*.ico \ examples/textedit/*.rb \ lib/fox/*.rb \ ext/fox/MANIFEST \ ext/fox/extconf.rb \ ext/fox/*.c \ ext/fox/*.cpp \ ext/fox/include/*.h \ swig-interfaces/README \ swig-interfaces/Makefile \ swig-interfaces/swig.sed \ swig-interfaces/*.i \ tests/README \ tests/*.rb all: config.save ruby install.rb setup config.save: ruby install.rb config check: cd tests ruby TS_All.rb install: ruby install.rb install clean: ruby install.rb clean dist: distdir -chmod -R a+r $(distdir) tar czf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ mkdir -p $(distdir)/`dirname $$file`; \ cp -p $$file $(distdir)/`dirname $$file`; \ done Index: setversions.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/setversions.rb,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -C2 -d -r1.15.2.1 -r1.15.2.2 *** setversions.rb 30 Apr 2002 19:05:49 -0000 1.15.2.1 --- setversions.rb 10 May 2002 05:04:01 -0000 1.15.2.2 *************** *** 24,28 **** def setversions(filename) ! text = File.open(filename + ".tmpl", "r").read() SUBSTITUTIONS.each { |pattern, replacement| text.gsub!(pattern, replacement) --- 24,28 ---- def setversions(filename) ! text = File.open(filename + ".in", "r").read() SUBSTITUTIONS.each { |pattern, replacement| text.gsub!(pattern, replacement) *************** *** 32,34 **** --- 32,35 ---- setversions("ANNOUNCE") + setversions("Makefile") setversions("ext/fox/extconf.rb") --- ANNOUNCE.tmpl DELETED --- |
From: Lyle J. <ly...@us...> - 2002-05-10 05:00:05
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv10376 Modified Files: Tag: release10 update_website.sh Log Message: Index: update_website.sh =================================================================== RCS file: /cvsroot/fxruby/FXRuby/update_website.sh,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** update_website.sh 21 Mar 2002 21:53:17 -0000 1.5 --- update_website.sh 10 May 2002 05:00:02 -0000 1.5.2.1 *************** *** 1,4 **** #!/bin/sh ! tar cvzf website.tar.gz index.html doc/*.html doc/tutorial1.png doc/images/*.gif doc/images/*.png scp website.tar.gz ly...@fx...:/home/groups/f/fx/fxruby/htdocs rm -f website.tar.gz --- 1,4 ---- #!/bin/sh ! tar cvzf website.tar.gz index.html doc/*.html doc/images/*.png scp website.tar.gz ly...@fx...:/home/groups/f/fx/fxruby/htdocs rm -f website.tar.gz |
From: Lyle J. <ly...@us...> - 2002-05-10 04:50:23
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv9078 Modified Files: Tag: release10 FXRuby.spec Log Message: Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** FXRuby.spec 10 May 2002 00:37:44 -0000 1.1.2.4 --- FXRuby.spec 10 May 2002 04:50:20 -0000 1.1.2.5 *************** *** 8,12 **** URL: http://www.fxruby.org Packager: Lyle Johnson (ly...@us...) - Requires: ruby = 1.6 BuildRoot: %{_tmppath}/%{name}-buildroot --- 8,11 ---- *************** *** 32,40 **** /usr/lib/ruby/site_ruby/1.6/fox /usr/lib/ruby/site_ruby/1.6/i686-linux/fox.so ! %doc ChangeLog ANNOUNCE README LICENSE ! %doc index.html doc doc/images ! %doc examples examples/icons examples/textedit %changelog * Thu May 09 2002 Lyle Johnson <ly...@us...> - Updated --prefix value (in %build section) and file installation --- 31,41 ---- /usr/lib/ruby/site_ruby/1.6/fox /usr/lib/ruby/site_ruby/1.6/i686-linux/fox.so ! %doc ChangeLog ANNOUNCE README LICENSE index.html doc examples %changelog + * Thu May 09 2002 Lyle Johnson <ly...@us...> + - Fixed %files section entries for the examples + - Removed requirements for ruby 1.6 + * Thu May 09 2002 Lyle Johnson <ly...@us...> - Updated --prefix value (in %build section) and file installation |
From: Lyle J. <ly...@us...> - 2002-05-10 03:45:20
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv25687 Removed Files: Tag: release10 make-drop.sh Log Message: --- make-drop.sh DELETED --- |
From: Lyle J. <ly...@us...> - 2002-05-10 03:44:33
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv25519 Added Files: Tag: release10 Makefile Log Message: --- NEW FILE: Makefile --- PACKAGE = FXRuby VERSION = 1.0.10 distdir = $(PACKAGE)-$(VERSION) DISTFILES = \ ANNOUNCE \ ChangeLog \ LICENSE \ README \ install.rb \ index.html \ doc/*.html \ doc/images/*.png \ examples/README \ examples/*.rb \ examples/*.xml \ examples/icons/*.png \ examples/icons/*.ico \ examples/textedit/*.rb \ lib/fox/*.rb \ ext/fox/MANIFEST \ ext/fox/extconf.rb \ ext/fox/*.c \ ext/fox/*.cpp \ ext/fox/include/*.h \ swig-interfaces/README \ swig-interfaces/Makefile \ swig-interfaces/swig.sed \ swig-interfaces/*.i \ tests/README \ tests/*.rb all: config.save ruby install.rb setup config.save: ruby install.rb config check: cd tests ruby TS_All.rb install: ruby install.rb install clean: ruby install.rb clean dist: distdir -chmod -R a+r $(distdir) tar czf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ mkdir -p $(distdir)/`dirname $$file`; \ cp -p $$file $(distdir)/`dirname $$file`; \ done |
From: Lyle J. <ly...@us...> - 2002-05-10 00:37:47
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv27577 Modified Files: Tag: release10 FXRuby.spec Log Message: Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** FXRuby.spec 9 May 2002 23:25:58 -0000 1.1.2.3 --- FXRuby.spec 10 May 2002 00:37:44 -0000 1.1.2.4 *************** *** 8,11 **** --- 8,12 ---- URL: http://www.fxruby.org Packager: Lyle Johnson (ly...@us...) + Requires: ruby = 1.6 BuildRoot: %{_tmppath}/%{name}-buildroot *************** *** 18,22 **** %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr/local ruby install.rb setup --- 19,23 ---- %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr ruby install.rb setup *************** *** 29,38 **** %files %defattr(-,root,root) ! /usr/local/lib/ruby/site_ruby/1.6/fox ! /usr/local/lib/ruby/site_ruby/1.6/i686-linux/fox.so ! %doc ChangeLog README LICENSE %doc index.html doc doc/images %changelog * Thu May 09 2002 Lyle Johnson <ly...@us...> - Removed the mkdir steps in the %install section. Those don't --- 30,46 ---- %files %defattr(-,root,root) ! /usr/lib/ruby/site_ruby/1.6/fox ! /usr/lib/ruby/site_ruby/1.6/i686-linux/fox.so ! %doc ChangeLog ANNOUNCE README LICENSE %doc index.html doc doc/images + %doc examples examples/icons examples/textedit %changelog + * Thu May 09 2002 Lyle Johnson <ly...@us...> + - Updated --prefix value (in %build section) and file installation + paths (in %files section) for consistency with Red Hat 7.2's + Ruby RPMs. + - Added the examples to the files list + * Thu May 09 2002 Lyle Johnson <ly...@us...> - Removed the mkdir steps in the %install section. Those don't |
From: Lyle J. <ly...@us...> - 2002-05-09 23:26:02
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv2709 Modified Files: Tag: release10 FXRuby.spec Log Message: Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** FXRuby.spec 9 May 2002 22:25:21 -0000 1.1.2.2 --- FXRuby.spec 9 May 2002 23:25:58 -0000 1.1.2.3 *************** *** 3,14 **** Version: 1.0.10 Release: 1 ! Copyright: GNU LGPL Group: System Environment/Libraries ! URL: http://www.fxruby.og ! Source0: http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.10.tar.gz BuildRoot: %{_tmppath}/%{name}-buildroot %description ! This is the description of FXRuby. %prep --- 3,16 ---- Version: 1.0.10 Release: 1 ! Copyright: LGPL Group: System Environment/Libraries ! Source: http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.10.tar.gz ! URL: http://www.fxruby.org ! Packager: Lyle Johnson (ly...@us...) BuildRoot: %{_tmppath}/%{name}-buildroot %description ! FXRuby is a Ruby extension module that provides an interface to the ! FOX Graphical User Interface toolkit. %prep *************** *** 20,25 **** %install - mkdir -p $RPM_BUILD_ROOT/usr/local/lib/ruby/site_ruby/1.6/fox - mkdir -p $RPM_BUILD_ROOT/usr/local/lib/ruby/site_ruby/1.6/i686-linux ruby install.rb install --- 22,25 ---- *************** *** 35,38 **** --- 35,44 ---- %changelog + * Thu May 09 2002 Lyle Johnson <ly...@us...> + - Removed the mkdir steps in the %install section. Those don't + appear to be necessary after all! + - Added the Packager tag at the top + - Filled in the %description section + * Thu May 09 2002 Lyle Johnson <ly...@us...> - Changed the Name field from 'fxruby' to 'FXRuby' |
From: Lyle J. <ly...@us...> - 2002-05-09 22:25:24
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv19212 Modified Files: Tag: release10 FXRuby.spec Log Message: Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** FXRuby.spec 9 May 2002 21:35:40 -0000 1.1.2.1 --- FXRuby.spec 9 May 2002 22:25:21 -0000 1.1.2.2 *************** *** 1,4 **** Summary: FXRuby ! Name: fxruby Version: 1.0.10 Release: 1 --- 1,4 ---- Summary: FXRuby ! Name: FXRuby Version: 1.0.10 Release: 1 *************** *** 16,23 **** %build ! ruby install.rb config ruby install.rb setup %install ruby install.rb install --- 16,25 ---- %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr/local ruby install.rb setup %install + mkdir -p $RPM_BUILD_ROOT/usr/local/lib/ruby/site_ruby/1.6/fox + mkdir -p $RPM_BUILD_ROOT/usr/local/lib/ruby/site_ruby/1.6/i686-linux ruby install.rb install *************** *** 30,36 **** /usr/local/lib/ruby/site_ruby/1.6/i686-linux/fox.so %doc ChangeLog README LICENSE ! %doc index.html doc/*.html doc/images/*.png %changelog * Thu May 09 2002 Lyle Johnson <ly...@us...> - initial package --- 32,45 ---- /usr/local/lib/ruby/site_ruby/1.6/i686-linux/fox.so %doc ChangeLog README LICENSE ! %doc index.html doc doc/images %changelog + * Thu May 09 2002 Lyle Johnson <ly...@us...> + - Changed the Name field from 'fxruby' to 'FXRuby' + - Added the --prefix=$RPM_BUILD_ROOT/usr/local option to the config + part of the %build step + - Added the mkdir steps before running install (in %install) + - Fixed the %files entries for doc and doc/images + * Thu May 09 2002 Lyle Johnson <ly...@us...> - initial package |
From: Lyle J. <ly...@us...> - 2002-05-09 21:40:57
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv4947 Modified Files: Tag: release10 make-drop.sh Log Message: Index: make-drop.sh =================================================================== RCS file: /cvsroot/fxruby/FXRuby/make-drop.sh,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** make-drop.sh 21 Mar 2002 21:16:12 -0000 1.17 --- make-drop.sh 9 May 2002 21:40:54 -0000 1.17.2.1 *************** *** 1,4 **** #!/bin/sh ! PKGDIR=FXRuby-1.0.3 tar -cvzf $PKGDIR.tar.gz \ $PKGDIR/ANNOUNCE \ --- 1,4 ---- #!/bin/sh ! PKGDIR=FXRuby-1.0.10 tar -cvzf $PKGDIR.tar.gz \ $PKGDIR/ANNOUNCE \ *************** *** 7,21 **** $PKGDIR/README \ $PKGDIR/install.rb \ $PKGDIR/doc/*.html \ - $PKGDIR/doc/*.png \ - $PKGDIR/doc/images/*.gif \ $PKGDIR/doc/images/*.png \ $PKGDIR/examples/README \ $PKGDIR/examples/*.rb \ $PKGDIR/examples/*.xml \ ! $PKGDIR/examples/icons/*.gif \ $PKGDIR/examples/icons/*.ico \ $PKGDIR/examples/textedit/*.rb \ - $PKGDIR/index.html \ $PKGDIR/lib/fox/*.rb \ $PKGDIR/ext/fox/MANIFEST \ --- 7,19 ---- $PKGDIR/README \ $PKGDIR/install.rb \ + $PKGDIR/index.html \ $PKGDIR/doc/*.html \ $PKGDIR/doc/images/*.png \ $PKGDIR/examples/README \ $PKGDIR/examples/*.rb \ $PKGDIR/examples/*.xml \ ! $PKGDIR/examples/icons/*.png \ $PKGDIR/examples/icons/*.ico \ $PKGDIR/examples/textedit/*.rb \ $PKGDIR/lib/fox/*.rb \ $PKGDIR/ext/fox/MANIFEST \ |
From: Lyle J. <ly...@us...> - 2002-05-09 21:39:49
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv4632 Removed Files: Tag: release10 drop-win32.sh Log Message: --- drop-win32.sh DELETED --- |
From: Lyle J. <ly...@us...> - 2002-05-09 21:35:42
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv3271 Added Files: Tag: release10 FXRuby.spec Log Message: Initial version of an RPM spec file. --- NEW FILE: FXRuby.spec --- Summary: FXRuby Name: fxruby Version: 1.0.10 Release: 1 Copyright: GNU LGPL Group: System Environment/Libraries URL: http://www.fxruby.og Source0: http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.10.tar.gz BuildRoot: %{_tmppath}/%{name}-buildroot %description This is the description of FXRuby. %prep %setup -q %build ruby install.rb config ruby install.rb setup %install ruby install.rb install %clean ruby install.rb clean %files %defattr(-,root,root) /usr/local/lib/ruby/site_ruby/1.6/fox /usr/local/lib/ruby/site_ruby/1.6/i686-linux/fox.so %doc ChangeLog README LICENSE %doc index.html doc/*.html doc/images/*.png %changelog * Thu May 09 2002 Lyle Johnson <ly...@us...> - initial package |
From: Lyle J. <ly...@us...> - 2002-05-09 21:29:01
|
Update of /cvsroot/fxruby/FXRuby/doc/images In directory usw-pr-cvs1:/tmp/cvs-serv1214/images Added Files: Tag: release10 tutorial1.png Log Message: Moved tutorial1.png from doc/ to doc/images. --- NEW FILE: tutorial1.png --- PNG )ES¤èÈÕFg£` ÃHÓ+!ZØiAØuB¯ÆÕ2`Ûc0KâØ[íĪ@çÄÞÉP°)`è"L°Ú-ì.á mFÜXßb(Ôu6C-hÿøtFmÏ׿ïJíͦ i×6îI, ÃgGn¥KÓÐ;óp=u±Î4tkuþ¼pcÑWCí¦àÓò§¡ìI {[b ªKÁZmùc¹åÃßXÅzq _Ué,ÅÙe@½ß¡÷/GÇ{ $Dòl ¾èÊ衯Yk}üÙzÌ)Eôª¾fâuåäIkqâvÂïJÂkÓ3akqâÛTo{ÐÝ +IJ³W]ì¯8oÇ1´ï½³:)õ ÝJt÷' ±¾ß J{@UЮ44²ÿúTE S5 ÄòN{¤Ë Î2 |
From: Lyle J. <ly...@us...> - 2002-05-09 21:29:01
|
Update of /cvsroot/fxruby/FXRuby/doc In directory usw-pr-cvs1:/tmp/cvs-serv1214 Modified Files: Tag: release10 tutorial1.xml Removed Files: Tag: release10 tutorial1.png Log Message: Moved tutorial1.png from doc/ to doc/images. Index: tutorial1.xml =================================================================== RCS file: /cvsroot/fxruby/FXRuby/doc/tutorial1.xml,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** tutorial1.xml 2 Feb 2002 00:38:38 -0000 1.4 --- tutorial1.xml 9 May 2002 21:28:58 -0000 1.4.2.1 *************** *** 21,25 **** <mediaobject> <imageobject> ! <imagedata fileref="tutorial1.png" format="PNG" align="center"/> </imageobject> </mediaobject> --- 21,25 ---- <mediaobject> <imageobject> ! <imagedata fileref="images/tutorial1.png" format="PNG" align="center"/> </imageobject> </mediaobject> --- tutorial1.png DELETED --- |
From: Lyle J. <ly...@us...> - 2002-05-09 20:23:01
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv14569/swig-interfaces Modified Files: Tag: release10 typemaps.i Log Message: Modified the input typemaps for "const void *pix" and "const FXuchar* PIXELS" so that the constructors for icons and images can accept either strings (as before) or MemoryBuffer instances (see SF Bug #550996). Index: typemaps.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v retrieving revision 1.35.2.3 retrieving revision 1.35.2.4 diff -C2 -d -r1.35.2.3 -r1.35.2.4 *** typemaps.i 29 Apr 2002 22:23:41 -0000 1.35.2.3 --- typemaps.i 9 May 2002 20:22:28 -0000 1.35.2.4 *************** *** 71,91 **** /** * Used by constructors for icons and images that require an array ! * of bytes as input; uses a Ruby string instead. Also accepts "nil" ! * in place of a NULL pointer. */ ! %typemap(ruby, in) const void* pix { ! if ($input != Qnil) { ! Check_Type($input, T_STRING); ! $1 = (void*) RSTRING($input)->ptr; ! } else { ! $1 = NULL; ! } ! } ! ! /* Same as above, but when the pixels array is typed as unsigned chars */ ! %typemap(ruby, in) const FXuchar* PIXELS { if ($input != Qnil) { ! Check_Type($input, T_STRING); ! $1 = (FXuchar *) RSTRING($input)->ptr; } else { $1 = NULL; --- 71,86 ---- /** * Used by constructors for icons and images that require an array ! * of bytes as input; uses a Ruby string or a MemoryBuffer instance ! * instead. Also accepts "nil" in place of a NULL pointer. */ ! %typemap(ruby, in) const void* pix, const FXuchar* PIXELS { if ($input != Qnil) { ! if (TYPE($input) == T_STRING) { ! $1 = reinterpret_cast<$1_ltype>(RSTRING($input)->ptr); ! } else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr($input, FXRbTypeQuery("FXMemoryBuffer *"))); ! $1 = reinterpret_cast<$1_ltype>(memoryBuffer->getData()); ! } } else { $1 = NULL; |
From: Lyle J. <ly...@us...> - 2002-05-09 20:22:41
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv14569/ext/fox Modified Files: Tag: release10 core_wrap.cpp icons_wrap.cpp image_wrap.cpp Log Message: Modified the input typemaps for "const void *pix" and "const FXuchar* PIXELS" so that the constructors for icons and images can accept either strings (as before) or MemoryBuffer instances (see SF Bug #550996). Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.10 retrieving revision 1.62.2.11 diff -C2 -d -r1.62.2.10 -r1.62.2.11 *** core_wrap.cpp 8 May 2002 21:43:41 -0000 1.62.2.10 --- core_wrap.cpp 9 May 2002 20:22:28 -0000 1.62.2.11 *************** *** 8632,8637 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 8632,8642 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 8669,8674 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 8674,8684 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 8857,8862 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 8867,8877 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 8898,8903 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 8913,8923 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 9070,9075 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 9090,9100 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.9 retrieving revision 1.37.2.10 diff -C2 -d -r1.37.2.9 -r1.37.2.10 *** icons_wrap.cpp 8 May 2002 21:32:14 -0000 1.37.2.9 --- icons_wrap.cpp 9 May 2002 20:22:37 -0000 1.37.2.10 *************** *** 533,538 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 533,543 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 688,693 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 693,703 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 987,992 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 997,1007 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1042,1047 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1057,1067 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1348,1353 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1368,1378 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1388,1393 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1413,1423 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1443,1448 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1473,1483 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1742,1747 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1777,1787 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1797,1802 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1837,1847 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2103,2108 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2148,2158 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2143,2148 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2193,2203 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2229,2234 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2284,2294 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2528,2533 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2588,2598 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2583,2588 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2648,2658 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2889,2894 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2959,2969 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2929,2934 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3004,3014 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3014,3019 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3094,3104 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3320,3325 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3405,3415 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3360,3365 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3450,3460 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3415,3420 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3510,3520 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3714,3719 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3814,3824 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3769,3774 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3874,3884 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4068,4073 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4178,4188 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4154,4159 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4269,4279 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4822,4827 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4942,4952 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.39.2.9 retrieving revision 1.39.2.10 diff -C2 -d -r1.39.2.9 -r1.39.2.10 *** image_wrap.cpp 8 May 2002 21:32:14 -0000 1.39.2.9 --- image_wrap.cpp 9 May 2002 20:22:37 -0000 1.39.2.10 *************** *** 551,556 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 551,561 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 775,780 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 780,790 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1089,1094 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1099,1109 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1464,1469 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1479,1489 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1759,1764 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1779,1789 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 1810,1815 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 1835,1845 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2105,2110 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2135,2145 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2156,2161 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2191,2201 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2451,2456 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2491,2501 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2502,2507 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2547,2557 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2797,2802 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2847,2857 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 2879,2884 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 2934,2944 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3216,3221 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3276,3286 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3267,3272 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3332,3342 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3562,3567 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3632,3642 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3643,3648 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 3718,3728 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3938,3943 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4018,4028 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 3989,3994 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4074,4084 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4292,4297 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4382,4392 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4331,4336 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4426,4436 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4382,4387 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4482,4492 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4685,4690 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4790,4800 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4724,4729 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4834,4844 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 4836,4841 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (void*) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 4951,4961 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<void *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<void *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; *************** *** 5140,5145 **** { if (argv[1] != Qnil) { ! Check_Type(argv[1], T_STRING); ! arg2 = (FXuchar *) RSTRING(argv[1])->ptr; }else { arg2 = NULL; --- 5260,5270 ---- { if (argv[1] != Qnil) { ! if (TYPE(argv[1]) == T_STRING) { ! arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr); ! }else { ! FXMemoryBuffer *memoryBuffer = ! reinterpret_cast<FXMemoryBuffer*>(FXRbConvertPtr(argv[1], FXRbTypeQuery("FXMemoryBuffer *"))); ! arg2 = reinterpret_cast<FXuchar *>(memoryBuffer->getData()); ! } }else { arg2 = NULL; |
From: Lyle J. <ly...@us...> - 2002-05-08 22:37:49
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include In directory usw-pr-cvs1:/tmp/cvs-serv11783/ext/fox/include Modified Files: Tag: release10 FXRuby.h Log Message: Further attempts to get GC correct. Index: FXRuby.h =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v retrieving revision 1.21.2.2 retrieving revision 1.21.2.3 diff -C2 -d -r1.21.2.2 -r1.21.2.3 *** FXRuby.h 8 May 2002 16:45:09 -0000 1.21.2.2 --- FXRuby.h 8 May 2002 22:37:46 -0000 1.21.2.3 *************** *** 76,85 **** void FXRbDestroyAppSensitiveObjects(); - /** * Return the registered Ruby class instance associated with this ! * FOX object, or Qnil if no mapping was found. */ ! VALUE FXRbGetRubyObj(const void *foxObj); /** --- 76,85 ---- void FXRbDestroyAppSensitiveObjects(); /** * Return the registered Ruby class instance associated with this ! * FOX object (if any). If searchBoth is FALSE, only considers the ! * Ruby-owned objects; otherwise considers all outstanding references. */ ! VALUE FXRbGetRubyObj(const void *foxObj, FXbool searchBoth=FALSE); /** |
From: Lyle J. <ly...@us...> - 2002-05-08 22:37:49
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv11783/ext/fox Modified Files: Tag: release10 FXRuby.cpp Log Message: Further attempts to get GC correct. Index: FXRuby.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v retrieving revision 1.40.2.2 retrieving revision 1.40.2.3 diff -C2 -d -r1.40.2.2 -r1.40.2.3 *** FXRuby.cpp 8 May 2002 16:33:22 -0000 1.40.2.2 --- FXRuby.cpp 8 May 2002 22:37:46 -0000 1.40.2.3 *************** *** 74,81 **** // Wrapper around SWIG_NewPointerObj() VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){ VALUE obj=SWIG_NewPointerObj(ptr,ty,1); ! FXRbRegisterRubyObj(obj,ptr); return obj; } --- 74,100 ---- + /** + * Maps C++ objects to Ruby instances. + * The objects in this map were created from Ruby code and are typically + * backed by one of our custom C++ classes (like FXRbButton). When the + * associated Ruby instance is garbage-collected this C++ object will be + * destroyed, so it's important that the objects in this map get marked + * during GC's mark phase if they're still reachable. + */ + static std::map<const void*,VALUE> FXRuby_ObjMap; + + /** + * Maps C++ objects to Ruby instances. + * The objects in this map were created by FOX and are backed by standard + * FOX classes (like FXButton). Unlike the objects stored in FXRuby_ObjMap + * (see above), when the associated Ruby instance is garbage-collected + * this C++ object will _not_ be destroyed. + */ + static std::map<const void*,VALUE> FXRuby_BorrowedRefs; + // Wrapper around SWIG_NewPointerObj() VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){ VALUE obj=SWIG_NewPointerObj(ptr,ty,1); ! FXRuby_BorrowedRefs[ptr]=obj; return obj; } *************** *** 88,94 **** - // Maps C++ objects to Ruby instances - static std::map<const void*,VALUE> FXRuby_ObjMap; - // Should we catch exceptions thrown by message handlers? FXbool FXRbCatchExceptions=FALSE; --- 107,110 ---- *************** *** 128,141 **** FXASSERT(FXRuby_ObjMap.find(foxObj)==FXRuby_ObjMap.end()); } } /** ! * Return the Ruby instance associated with this C++ object (if any), ! * or Qnil if no associated Ruby instance was found. */ ! VALUE FXRbGetRubyObj(const void *foxObj) { std::map<const void*,VALUE>::const_iterator itr=FXRuby_ObjMap.find(foxObj); ! return (itr!=FXRuby_ObjMap.end()) ? itr->second : Qnil; } --- 144,174 ---- FXASSERT(FXRuby_ObjMap.find(foxObj)==FXRuby_ObjMap.end()); } + + std::map<const void*,VALUE>::iterator itr2=FXRuby_BorrowedRefs.find(foxObj); + if(itr2!=FXRuby_BorrowedRefs.end()){ + obj=itr2->second; + DATA_PTR(obj)=0; + FXRuby_BorrowedRefs.erase(itr2); + FXASSERT(FXRuby_BorrowedRefs.find(foxObj)==FXRuby_BorrowedRefs.end()); + } } /** ! * Return the registered Ruby class instance associated with this ! * FOX object, or Qnil if not found. */ ! VALUE FXRbGetRubyObj(const void *foxObj,FXbool searchBoth){ std::map<const void*,VALUE>::const_iterator itr=FXRuby_ObjMap.find(foxObj); ! if(itr!=FXRuby_ObjMap.end()){ ! return itr->second; ! } ! else if(searchBoth){ ! itr=FXRuby_BorrowedRefs.find(foxObj); ! return (itr!=FXRuby_BorrowedRefs.end()) ? itr->second : Qnil; ! } ! else{ ! return Qnil; ! } } *************** *** 146,151 **** */ VALUE FXRbGetRubyObj(const void *foxObj, const char *type){ ! VALUE rbObj = FXRbGetRubyObj(foxObj); ! return (rbObj == Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj; } --- 179,184 ---- */ VALUE FXRbGetRubyObj(const void *foxObj, const char *type){ ! VALUE rbObj=FXRbGetRubyObj(foxObj,TRUE); ! return (rbObj==Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj; } *************** *** 156,160 **** void FXRbGcMark(void *obj){ if(obj){ ! VALUE value=FXRbGetRubyObj(obj); if(value!=Qnil){ #if RUBY_VERSION_CODE < 172 --- 189,193 ---- void FXRbGcMark(void *obj){ if(obj){ ! VALUE value=FXRbGetRubyObj(obj); // only search FXRuby_ObjMap! if(value!=Qnil){ #if RUBY_VERSION_CODE < 172 |
From: Lyle J. <ly...@us...> - 2002-05-08 21:43:51
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv25300/swig-interfaces Modified Files: Tag: release10 FXRegion.i Log Message: Updates to test cases TC_FXHVec.rb and TC_FXHMat.rb to test the new clone instance methods for these classes. Added support for overloaded FXRegion#contains? and a new test case for this class. Index: FXRegion.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** FXRegion.i 8 May 2002 21:09:55 -0000 1.6.2.2 --- FXRegion.i 8 May 2002 21:43:44 -0000 1.6.2.3 *************** *** 24,28 **** %ignore FXRegion::operator=(const FXRegion& r); ! %ignore FXRegion::contains(FXint x,FXint y,FXint w,FXint h) const; %exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);"; --- 24,30 ---- %ignore FXRegion::operator=(const FXRegion& r); ! %rename("empty?") FXRegion::empty() const; ! %rename("containsPoint?") FXRegion::contains(FXint x,FXint y) const; ! %rename("containsRectangle?") FXRegion::contains(FXint x,FXint y,FXint w,FXint h) const; %exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);"; *************** *** 76,80 **** } ! /// Substract region r from this one FXRegion __sub__(const FXRegion& other) { return (*self) - other; --- 78,82 ---- } ! /// Subtract region r from this one FXRegion __sub__(const FXRegion& other) { return (*self) - other; |
From: Lyle J. <ly...@us...> - 2002-05-08 21:43:51
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv25300/lib/fox Modified Files: Tag: release10 overloads.rb Log Message: Updates to test cases TC_FXHVec.rb and TC_FXHMat.rb to test the new clone instance methods for these classes. Added support for overloaded FXRegion#contains? and a new test case for this class. Index: overloads.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/lib/fox/overloads.rb,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** overloads.rb 3 Apr 2002 21:40:57 -0000 1.7 --- overloads.rb 8 May 2002 21:43:44 -0000 1.7.2.1 *************** *** 219,222 **** --- 219,232 ---- end + class FXRegion + def contains?(*args) + if args.length == 4 + containsRectangle?(args[0], args[1], args[2], args[3]) + else + containsPoint?(args[0], args[1]) + end + end + end + class FX_TreeList def addItemAfter(*args) |
From: Lyle J. <ly...@us...> - 2002-05-08 21:43:51
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv25300/ext/fox Modified Files: Tag: release10 core_wrap.cpp Log Message: Updates to test cases TC_FXHVec.rb and TC_FXHMat.rb to test the new clone instance methods for these classes. Added support for overloaded FXRegion#contains? and a new test case for this class. Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.9 retrieving revision 1.62.2.10 diff -C2 -d -r1.62.2.9 -r1.62.2.10 *** core_wrap.cpp 8 May 2002 21:32:12 -0000 1.62.2.9 --- core_wrap.cpp 8 May 2002 21:43:41 -0000 1.62.2.10 *************** *** 9330,9334 **** static VALUE ! _wrap_FXRegion_empty(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 ; FXbool result; --- 9330,9334 ---- static VALUE ! _wrap_FXRegion_emptyq___(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 ; FXbool result; *************** *** 9346,9350 **** static VALUE ! _wrap_FXRegion_contains(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 ; FXint arg2 ; --- 9346,9350 ---- static VALUE ! _wrap_FXRegion_containsPointq___(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 ; FXint arg2 ; *************** *** 9366,9369 **** --- 9366,9393 ---- static VALUE + _wrap_FXRegion_containsRectangleq___(int argc, VALUE *argv, VALUE self) { + FXRegion *arg1 ; + FXint arg2 ; + FXint arg3 ; + FXint arg4 ; + FXint arg5 ; + FXbool result; + VALUE vresult = Qnil; + + if ((argc < 4) || (argc > 4)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); + arg1 = (FXRegion *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRegion); + arg2 = NUM2INT(argv[0]); + arg3 = NUM2INT(argv[1]); + arg4 = NUM2INT(argv[2]); + arg5 = NUM2INT(argv[3]); + result = (FXbool)((FXRegion const *)arg1)->contains(arg2,arg3,arg4,arg5); + + vresult = result ? Qtrue : Qfalse; + return vresult; + } + + + static VALUE _wrap_FXRegion_bounds(int argc, VALUE *argv, VALUE self) { FXRegion *arg1 ; *************** *** 19050,19055 **** rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_FXRegion_initialize), -1); rb_define_method(cFXRegion.klass, "clone", VALUEFUNC(_wrap_FXRegion_clone), -1); ! rb_define_method(cFXRegion.klass, "empty", VALUEFUNC(_wrap_FXRegion_empty), -1); ! rb_define_method(cFXRegion.klass, "contains", VALUEFUNC(_wrap_FXRegion_contains), -1); rb_define_method(cFXRegion.klass, "bounds", VALUEFUNC(_wrap_FXRegion_bounds), -1); rb_define_method(cFXRegion.klass, "offset", VALUEFUNC(_wrap_FXRegion_offset), -1); --- 19074,19080 ---- rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_FXRegion_initialize), -1); rb_define_method(cFXRegion.klass, "clone", VALUEFUNC(_wrap_FXRegion_clone), -1); ! rb_define_method(cFXRegion.klass, "empty?", VALUEFUNC(_wrap_FXRegion_emptyq___), -1); ! rb_define_method(cFXRegion.klass, "containsPoint?", VALUEFUNC(_wrap_FXRegion_containsPointq___), -1); ! rb_define_method(cFXRegion.klass, "containsRectangle?", VALUEFUNC(_wrap_FXRegion_containsRectangleq___), -1); rb_define_method(cFXRegion.klass, "bounds", VALUEFUNC(_wrap_FXRegion_bounds), -1); rb_define_method(cFXRegion.klass, "offset", VALUEFUNC(_wrap_FXRegion_offset), -1); |
From: Lyle J. <ly...@us...> - 2002-05-08 21:43:51
|
Update of /cvsroot/fxruby/FXRuby/tests In directory usw-pr-cvs1:/tmp/cvs-serv25300/tests Modified Files: Tag: release10 TC_FXHMat.rb TC_FXHVec.rb TC_FXRegion.rb stress1.rb Log Message: Updates to test cases TC_FXHVec.rb and TC_FXHMat.rb to test the new clone instance methods for these classes. Added support for overloaded FXRegion#contains? and a new test case for this class. Index: TC_FXHMat.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXHMat.rb,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** TC_FXHMat.rb 26 Mar 2002 21:35:20 -0000 1.2 --- TC_FXHMat.rb 8 May 2002 21:43:44 -0000 1.2.2.1 *************** *** 40,42 **** --- 40,44 ---- def test_scale end + def test_clone + end end Index: TC_FXHVec.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXHVec.rb,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** TC_FXHVec.rb 26 Mar 2002 21:35:20 -0000 1.4 --- TC_FXHVec.rb 8 May 2002 21:43:44 -0000 1.4.2.1 *************** *** 83,85 **** --- 83,89 ---- assert_equal(vec[3], arr[3]) end + def test_clone + vec1 = FXHVec.new(1.0, 2.0, 3.0, 4.0) + assert_equal(vec1, vec1.clone) + end end Index: TC_FXRegion.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/tests/Attic/TC_FXRegion.rb,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** TC_FXRegion.rb 8 May 2002 21:29:44 -0000 1.1.2.1 --- TC_FXRegion.rb 8 May 2002 21:43:44 -0000 1.1.2.2 *************** *** 19,37 **** def test_containsPoint # Definitely out of bounds ! assert(!@region.containsPoint?(2, 3)) # Definitely in bounds ! assert(@region.containsPoint?(6, 6)) # Check corners too ! assert(@region.containsPoint?(5, 5)) ! assert(@region.containsPoint?(5, 15)) ! assert(@region.containsPoint?(15, 15)) ! assert(@region.containsPoint?(15, 5)) end def test_containsRectangle ! assert(!@region.containsRectangle?(2, 3, 15, 15)) ! assert(@region.containsRectangle?(5, 5, 10, 10)) ! assert(@region.containsRectangle?(6, 6, 5, 5)) end def test_bounds --- 19,37 ---- def test_containsPoint # Definitely out of bounds ! assert(!@region.contains?(2, 3)) # Definitely in bounds ! assert(@region.contains?(6, 6)) # Check corners too ! assert(@region.contains?(5, 5)) ! assert(@region.contains?(5, 14)) ! assert(@region.contains?(14, 14)) ! assert(@region.contains?(14, 5)) end def test_containsRectangle ! assert(@region.contains?(2, 3, 15, 15)) # why doesn't this fail? ! assert(@region.contains?(5, 5, 10, 10)) ! assert(@region.contains?(6, 6, 5, 5)) end def test_bounds Index: stress1.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/tests/Attic/stress1.rb,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** stress1.rb 25 Apr 2002 15:34:41 -0000 1.1.2.1 --- stress1.rb 8 May 2002 21:43:44 -0000 1.1.2.2 *************** *** 54,58 **** FXMAPFUNC(SEL_TIMEOUT, ID_TIMER, "onCount") ! disableThreads init(ARGV) --- 54,58 ---- FXMAPFUNC(SEL_TIMEOUT, ID_TIMER, "onCount") ! self.threadsEnabled = false init(ARGV) |
From: Lyle J. <ly...@us...> - 2002-05-08 21:32:35
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv21533 Modified Files: Tag: release10 core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp Log Message: Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.8 retrieving revision 1.62.2.9 diff -C2 -d -r1.62.2.8 -r1.62.2.9 *** core_wrap.cpp 8 May 2002 16:50:33 -0000 1.62.2.8 --- core_wrap.cpp 8 May 2002 21:32:12 -0000 1.62.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of *************** *** 9285,9288 **** --- 9285,9304 ---- extern swig_class cFX_Drawable; static VALUE + _wrap_FXRegion_clone(int argc, VALUE *argv, VALUE self) { + FXRegion *arg1 ; + FXRegion *result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); + arg1 = (FXRegion *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRegion); + result = (FXRegion *)new FXRegion((FXRegion const &)*arg1); + FXRbRegisterRubyObj(self, result); + vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXRegion,1); + return vresult; + } + + + static VALUE _wrap_new_FXRegion(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRegion); *************** *** 19033,19036 **** --- 19049,19053 ---- rb_define_singleton_method(cFXRegion.klass, "new", VALUEFUNC(_wrap_new_FXRegion), -1); rb_define_method(cFXRegion.klass, "initialize", VALUEFUNC(_wrap_FXRegion_initialize), -1); + rb_define_method(cFXRegion.klass, "clone", VALUEFUNC(_wrap_FXRegion_clone), -1); rb_define_method(cFXRegion.klass, "empty", VALUEFUNC(_wrap_FXRegion_empty), -1); rb_define_method(cFXRegion.klass, "contains", VALUEFUNC(_wrap_FXRegion_contains), -1); Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.34.2.8 retrieving revision 1.34.2.9 diff -C2 -d -r1.34.2.8 -r1.34.2.9 *** dialogs_wrap.cpp 8 May 2002 16:50:42 -0000 1.34.2.8 --- dialogs_wrap.cpp 8 May 2002 21:32:13 -0000 1.34.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.8 retrieving revision 1.37.2.9 diff -C2 -d -r1.37.2.8 -r1.37.2.9 *** icons_wrap.cpp 8 May 2002 16:50:43 -0000 1.37.2.8 --- icons_wrap.cpp 8 May 2002 21:32:14 -0000 1.37.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.39.2.8 retrieving revision 1.39.2.9 diff -C2 -d -r1.39.2.8 -r1.39.2.9 *** image_wrap.cpp 8 May 2002 16:50:43 -0000 1.39.2.8 --- image_wrap.cpp 8 May 2002 21:32:14 -0000 1.39.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.8.2.8 retrieving revision 1.8.2.9 diff -C2 -d -r1.8.2.8 -r1.8.2.9 *** layout_wrap.cpp 8 May 2002 16:50:44 -0000 1.8.2.8 --- layout_wrap.cpp 8 May 2002 21:32:14 -0000 1.8.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.36.2.8 retrieving revision 1.36.2.9 diff -C2 -d -r1.36.2.8 -r1.36.2.9 *** mdi_wrap.cpp 8 May 2002 16:50:44 -0000 1.36.2.8 --- mdi_wrap.cpp 8 May 2002 21:32:14 -0000 1.36.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.41.2.9 retrieving revision 1.41.2.10 diff -C2 -d -r1.41.2.9 -r1.41.2.10 *** opengl_wrap.cpp 8 May 2002 16:50:47 -0000 1.41.2.9 --- opengl_wrap.cpp 8 May 2002 21:32:14 -0000 1.41.2.10 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of *************** *** 1268,1271 **** --- 1268,1295 ---- static VALUE + _wrap_FXHVec_clone(int argc, VALUE *argv, VALUE self) { + FXHVec *arg1 ; + FXHVec *result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); + { + if (TYPE(self) == T_ARRAY) { + arg1 = new FXHVec(NUM2DBL(rb_ary_entry(self, 0)), NUM2DBL(rb_ary_entry(self, 1)), NUM2DBL(rb_ary_entry(self, 2)), NUM2DBL(rb_ary_entry(self, 3))); + }else { + FXHVec *p = static_cast<FXHVec*>(SWIG_ConvertPtr(self, SWIGTYPE_p_FXHVec)); + arg1 = new FXHVec(*p); + } + } + result = (FXHVec *)new FXHVec((FXHVec const &)*arg1); + FXRbRegisterRubyObj(self, result); + vresult = FXRbGetRubyObj(result, "FXHVec *"); + delete arg1; + return vresult; + } + + + static VALUE _wrap_new_FXHVec(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXHVec); *************** *** 2071,2074 **** --- 2095,2114 ---- static VALUE + _wrap_FXHMat_clone(int argc, VALUE *argv, VALUE self) { + FXHMat *arg1 ; + FXHMat *result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); + arg1 = (FXHMat *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXHMat); + result = (FXHMat *)new FXHMat((FXHMat const &)*arg1); + FXRbRegisterRubyObj(self, result); + vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXHMat,1); + return vresult; + } + + + static VALUE _wrap_FXHMat___add__(int argc, VALUE *argv, VALUE self) { FXHMat *arg1 ; *************** *** 13638,13641 **** --- 13678,13682 ---- rb_define_singleton_method(cFXHVec.klass, "new", VALUEFUNC(_wrap_new_FXHVec), -1); rb_define_method(cFXHVec.klass, "initialize", VALUEFUNC(_wrap_FXHVec_initialize), -1); + rb_define_method(cFXHVec.klass, "clone", VALUEFUNC(_wrap_FXHVec_clone), -1); rb_define_method(cFXHVec.klass, "[]", VALUEFUNC(_wrap_FXHVec___getitem__), -1); rb_define_method(cFXHVec.klass, "[]=", VALUEFUNC(_wrap_FXHVec___setitem__), -1); *************** *** 13678,13681 **** --- 13719,13723 ---- rb_define_singleton_method(cFXHMat.klass, "new", VALUEFUNC(_wrap_new_FXHMat), -1); rb_define_method(cFXHMat.klass, "initialize", VALUEFUNC(_wrap_FXHMat_initialize), -1); + rb_define_method(cFXHMat.klass, "clone", VALUEFUNC(_wrap_FXHMat_clone), -1); rb_define_method(cFXHMat.klass, "+", VALUEFUNC(_wrap_FXHMat___add__), -1); rb_define_method(cFXHMat.klass, "-", VALUEFUNC(_wrap_FXHMat___sub__), -1); Index: scintilla_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v retrieving revision 1.16.2.4 retrieving revision 1.16.2.5 diff -C2 -d -r1.16.2.4 -r1.16.2.5 *** scintilla_wrap.cpp 8 May 2002 16:50:48 -0000 1.16.2.4 --- scintilla_wrap.cpp 8 May 2002 21:32:15 -0000 1.16.2.5 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of *************** *** 302,313 **** #define SWIGTYPE_p_FXComposite swig_types[2] #define SWIGTYPE_p_FXWindow swig_types[3] ! #define SWIGTYPE_p_FXDrawable swig_types[4] ! #define SWIGTYPE_p_FXObject swig_types[5] ! #define SWIGTYPE_p_FXScrollArea swig_types[6] ! #define SWIGTYPE_p_NotifyHeader swig_types[7] ! #define SWIGTYPE_p_FXScintilla swig_types[8] ! #define SWIGTYPE_p_FXRbScintilla swig_types[9] ! #define SWIGTYPE_p_FXStream swig_types[10] ! static swig_type_info *swig_types[12]; /* -------- TYPES TABLE (END) -------- */ --- 302,314 ---- #define SWIGTYPE_p_FXComposite swig_types[2] #define SWIGTYPE_p_FXWindow swig_types[3] ! #define SWIGTYPE_p_TextRange swig_types[4] ! #define SWIGTYPE_p_FXDrawable swig_types[5] ! #define SWIGTYPE_p_FXObject swig_types[6] ! #define SWIGTYPE_p_FXScrollArea swig_types[7] ! #define SWIGTYPE_p_NotifyHeader swig_types[8] ! #define SWIGTYPE_p_FXScintilla swig_types[9] ! #define SWIGTYPE_p_FXRbScintilla swig_types[10] ! #define SWIGTYPE_p_FXStream swig_types[11] ! static swig_type_info *swig_types[13]; /* -------- TYPES TABLE (END) -------- */ *************** *** 341,344 **** --- 342,359 ---- swig_class cSCNotification; + TextRange *TextRange_initialize(int start,int last,size_t size){ + TextRange *tr=new TextRange; + tr->chrg.cpMin=start; + tr->chrg.cpMax=last; + tr->lpstrText=ALLOC_N(char,size); + return tr; + } + void delete_TextRange(TextRange *self){ + free(self->lpstrText); + delete self; + } + + swig_class cTextRange; + static void free_TextRange(TextRange *); VALUE FXScintilla_sendMessage(FXScintilla *self,unsigned int iMsg,VALUE wParam,VALUE lParam){ // Convert wParam argument *************** *** 711,714 **** --- 726,776 ---- static VALUE + _wrap_TextRange_lpstrText_get(int argc, VALUE *argv, VALUE self) { + TextRange *arg1 ; + char *result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); + arg1 = (TextRange *) SWIG_ConvertPtr(self, SWIGTYPE_p_TextRange); + result = (char *) (arg1->lpstrText); + + vresult = rb_str_new2(result); + return vresult; + } + + + static VALUE + _wrap_new_TextRange(int argc, VALUE *argv, VALUE self) { + VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TextRange); + rb_obj_call_init(vresult, argc, argv); + return vresult; + } + + + static VALUE + _wrap_TextRange_initialize(int argc, VALUE *argv, VALUE self) { + int arg1 ; + int arg2 ; + size_t arg3 ; + TextRange *result; + + if ((argc < 3) || (argc > 3)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); + arg1 = NUM2INT(argv[0]); + arg2 = NUM2INT(argv[1]); + arg3 = NUM2LONG(argv[2]); + result = (TextRange *)TextRange_initialize(arg1,arg2,arg3); + + DATA_PTR(self) = result; + return self; + } + + + static void + free_TextRange(TextRange *arg1) { + delete_TextRange(arg1); + } + static VALUE _wrap_FX_Scintilla_onScintillaCommand(int argc, VALUE *argv, VALUE self) { FXScintilla *arg1 ; *************** *** 4285,4288 **** --- 4347,4351 ---- static swig_type_info _swigt__p_FXComposite[] = {{"_p_FXComposite", 0, "FXComposite *"},{"_p_FXIconList", _p_FXIconListTo_p_FXComposite},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXComposite},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXComposite},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXComposite},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXComposite},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXComposite},{"_p_FXComposite"},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXComposite},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXComposite},{"_p_FXTabBook", _p_FXTabBookTo_p_FXComposite},{"_p_FXShell", _p_FXShellTo_p_FXComposite},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXComposite},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXComposite},{"_p_FXPopup", _p_FXPopupTo_p_FXComposite},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXComposite},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXComposite},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXComposite},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXComposite},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXComposite},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXComposite},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXComposite},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXComposite},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXComposite},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXComposite},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXComposite},{"_p_FXScintilla", _p_FXScintillaTo_p_FXComposite},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXComposite},{"_p_FXFileList", _p_FXFileListTo_p_FXComposite},{"_p_FXText", _p_FXTextTo_p_FXComposite},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXComposite},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXComposite},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXComposite},{"_p_FXPacker", _p_FXPackerTo_p_FXComposite},{"_p_FXRbText", _p_FXRbTextTo_p_FXComposite},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXComposite},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXComposite},{"_p_FXTable", _p_FXTableTo_p_FXComposite},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXComposite},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXComposite},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXComposite},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXComposite},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXComposite},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXComposite},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXComposite},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXComposite},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXComposite},{"_p_FXDirList", _p_FXDirListTo_p_FXComposite},{"_p_FXRbShell", _p_FXRbShellTo_p_FXComposite},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXComposite},{"_p_FXListBox", _p_FXListBoxTo_p_FXComposite},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXComposite},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXComposite},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXComposite},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXComposite},{"_p_FXToolbar", _p_FXToolbarTo_p_FXComposite},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXComposite},{"_p_FXMenubar", _p_FXMenubarTo_p_FXComposite},{"_p_FXTooltip", _p_FXTooltipTo_p_FXComposite},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXComposite},{"_p_FXList", _p_FXListTo_p_FXComposite},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXComposite},{"_p_FXTabBar", _p_FXTabBarTo_p_FXComposite},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXComposite},{"_p_FXImageView", _p_FXImageViewTo_p_FXComposite},{"_p_FXTreeList", _p_FXTreeListTo_p_FXComposite},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXComposite},{"_p_FXRbList", _p_FXRbListTo_p_FXComposite},{"_p_FXRbTable", _p_FXRbTableTo_p_FXComposite},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXComposite},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXComposite},{0}}; static swig_type_info _swigt__p_FXWindow[] = {{"_p_FXWindow", 0, "FXWindow *"},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXWindow},{"_p_FXColorBar", _p_FXColorBarTo_p_FXWindow},{"_p_FXTreeList", _p_FXTreeListTo_p_FXWindow},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXWindow},{"_p_FXTabBar", _p_FXTabBarTo_p_FXWindow},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXWindow},{"_p_FXTextField", _p_FXTextFieldTo_p_FXWindow},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXWindow},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXWindow},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXWindow},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXWindow},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXWindow},{"_p_FXDirList", _p_FXDirListTo_p_FXWindow},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXWindow},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXWindow},{"_p_FXList", _p_FXListTo_p_FXWindow},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXWindow},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXWindow},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXWindow},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXWindow},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXWindow},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXWindow},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXWindow},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXWindow},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXWindow},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXWindow},{"_p_FXPicker", _p_FXPickerTo_p_FXWindow},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXWindow},{"_p_FXPopup", _p_FXPopupTo_p_FXWindow},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXWindow},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXWindow},{"_p_FXTooltip", _p_FXTooltipTo_p_FXWindow},{"_p_FXRbShell", _p_FXRbShellTo_p_FXWindow},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXWindow},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXWindow},{"_p_FXHeader", _p_FXHeaderTo_p_FXWindow},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXWindow},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXWindow},{"_p_FXPacker", _p_FXPackerTo_p_FXWindow},{"_p_FXTabBook", _p_FXTabBookTo_p_FXWindow},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXWindow},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXWindow},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXWindow},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXWindow},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXWindow},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXWindow},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXWindow},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXWindow},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXWindow},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXWindow},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXWindow},{"_p_FXRbList", _p_FXRbListTo_p_FXWindow},{"_p_FXTable", _p_FXTableTo_p_FXWindow},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXWindow},{"_p_FXComposite", _p_FXCompositeTo_p_FXWindow},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXWindow},{"_p_FXScintilla", _p_FXScintillaTo_p_FXWindow},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXWindow},{"_p_FXSlider", _p_FXSliderTo_p_FXWindow},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXWindow},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXWindow},{"_p_FXListBox", _p_FXListBoxTo_p_FXWindow},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXWindow},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXWindow},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXWindow},{"_p_FXCanvas", _p_FXCanvasTo_p_FXWindow},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXWindow},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXWindow},{"_p_FXMenubar", _p_FXMenubarTo_p_FXWindow},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXWindow},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXWindow},{"_p_FXDial", _p_FXDialTo_p_FXWindow},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXWindow},{"_p_FXButton", _p_FXButtonTo_p_FXWindow},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXWindow},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXWindow},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXWindow},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXWindow},{"_p_FXTabItem", _p_FXTabItemTo_p_FXWindow},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXWindow},{"_p_FXFrame", _p_FXFrameTo_p_FXWindow},{"_p_FXText", _p_FXTextTo_p_FXWindow},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXWindow},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXWindow},{"_p_FXToolbar", _p_FXToolbarTo_p_FXWindow},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXWindow},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXWindow},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXWindow},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXWindow},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXWindow},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXWindow},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXWindow},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXWindow},{"_p_FXWindow"},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXWindow},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXWindow},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXWindow},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXWindow},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXWindow},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXWindow},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXWindow},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXWindow},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXWindow},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXWindow},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXWindow},{"_p_FXRbDial", _p_FXRbDialTo_p_FXWindow},{"_p_FXLabel", _p_FXLabelTo_p_FXWindow},{"_p_FXShell", _p_FXShellTo_p_FXWindow},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXWindow},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXWindow},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXWindow},{"_p_FXOption", _p_FXOptionTo_p_FXWindow},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXWindow},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXWindow},{"_p_FXColorWell", _p_FXColorWellTo_p_FXWindow},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXWindow},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXWindow},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXWindow},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXWindow},{"_p_FXIconList", _p_FXIconListTo_p_FXWindow},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXWindow},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXWindow},{"_p_FXRbTable", _p_FXRbTableTo_p_FXWindow},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXWindow},{"_p_FXImageView", _p_FXImageViewTo_p_FXWindow},{"_p_FXRbText", _p_FXRbTextTo_p_FXWindow},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXWindow},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXWindow},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXWindow},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXWindow},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXWindow},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXWindow},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXWindow},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXWindow},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXWindow},{"_p_FXFileList", _p_FXFileListTo_p_FXWindow},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXWindow},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXWindow},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXWindow},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXWindow},{0}}; + static swig_type_info _swigt__p_TextRange[] = {{"_p_TextRange", 0, "TextRange *"},{"_p_TextRange"},{0}}; static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXDrawable},{"_p_FXScintilla", _p_FXScintillaTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{0}}; static swig_type_info _swigt__p_FXObject[] = {{"_p_FXObject", 0, "FXObject *"},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXObject},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXObject},{"_p_FXRbShell", _p_FXRbShellTo_p_FXObject},{"_p_FXRbIconDict", _p_FXRbIconDictTo_p_FXObject},{"_p_FXIconDict", _p_FXIconDictTo_p_FXObject},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXObject},{"_p_FXDirList", _p_FXDirListTo_p_FXObject},{"_p_FXRbDial", _p_FXRbDialTo_p_FXObject},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXObject},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXObject},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXObject},{"_p_FXMenubar", _p_FXMenubarTo_p_FXObject},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXObject},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXObject},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXObject},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXObject},{"_p_FXPopup", _p_FXPopupTo_p_FXObject},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXObject},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXObject},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXObject},{"_p_FXComposite", _p_FXCompositeTo_p_FXObject},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXObject},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXObject},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXObject},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXObject},{"_p_FXScintilla", _p_FXScintillaTo_p_FXObject},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXObject},{"_p_FXRbId", _p_FXRbIdTo_p_FXObject},{"_p_FXRbListItem", _p_FXRbListItemTo_p_FXObject},{"_p_FXListItem", _p_FXListItemTo_p_FXObject},{"_p_FXHeader", _p_FXHeaderTo_p_FXObject},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXObject},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXObject},{"_p_FXApp", _p_FXAppTo_p_FXObject},{"_p_FXDirItem", _p_FXDirItemTo_p_FXObject},{"_p_FXRbDirItem", _p_FXRbDirItemTo_p_FXObject},{"_p_FXTabItem", _p_FXTabItemTo_p_FXObject},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXObject},{"_p_FXRbDocument", _p_FXRbDocumentTo_p_FXObject},{"_p_FXDocument", _p_FXDocumentTo_p_FXObject},{"_p_FXList", _p_FXListTo_p_FXObject},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXObject},{"_p_FXColorWell", _p_FXColorWellTo_p_FXObject},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXObject},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXObject},{"_p_FXRbObject", _p_FXRbObjectTo_p_FXObject},{"_p_FXObject"},{"_p_FXSettings", _p_FXSettingsTo_p_FXObject},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXObject},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXObject},{"_p_FXRbRecentFiles", _p_FXRbRecentFilesTo_p_FXObject},{"_p_FXRecentFiles", _p_FXRecentFilesTo_p_FXObject},{"_p_FXFileList", _p_FXFileListTo_p_FXObject},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXObject},{"_p_FXRegistry", _p_FXRegistryTo_p_FXObject},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXObject},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXObject},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXObject},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXObject},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXObject},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXObject},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXObject},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXObject},{"_p_FXText", _p_FXTextTo_p_FXObject},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXObject},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXObject},{"_p_FXVisual", _p_FXVisualTo_p_FXObject},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXObject},{"_p_FXRbFont", _p_FXRbFontTo_p_FXObject},{"_p_FXRbApp", _p_FXRbAppTo_p_FXObject},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXObject},{"_p_FXIconList", _p_FXIconListTo_p_FXObject},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXObject},{"_p_FXPicker", _p_FXPickerTo_p_FXObject},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXObject},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXObject},{"_p_FXDial", _p_FXDialTo_p_FXObject},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXObject},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXObject},{"_p_FXButton", _p_FXButtonTo_p_FXObject},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXObject},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXObject},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXObject},{"_p_FXListBox", _p_FXListBoxTo_p_FXObject},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXObject},{"_p_FXRbDict", _p_FXRbDictTo_p_FXObject},{"_p_FXFrame", _p_FXFrameTo_p_FXObject},{"_p_FXDelegator", _p_FXDelegatorTo_p_FXObject},{"_p_FXRbDelegator", _p_FXRbDelegatorTo_p_FXObject},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXObject},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXObject},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXObject},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXObject},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXObject},{"_p_FXCursor", _p_FXCursorTo_p_FXObject},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXObject},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXObject},{"_p_FXFileItem", _p_FXFileItemTo_p_FXObject},{"_p_FXRbFileItem", _p_FXRbFileItemTo_p_FXObject},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXObject},{"_p_FXPacker", _p_FXPackerTo_p_FXObject},{"_p_FXTabBook", _p_FXTabBookTo_p_FXObject},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXObject},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXObject},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXObject},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXObject},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXObject},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXObject},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXObject},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXObject},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXObject},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXObject},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXObject},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXObject},{"_p_FXHeaderItem", _p_FXHeaderItemTo_p_FXObject},{"_p_FXRbHeaderItem", _p_FXRbHeaderItemTo_p_FXObject},{"_p_FXLabel", _p_FXLabelTo_p_FXObject},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXObject},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXObject},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXObject},{"_p_FXTreeList", _p_FXTreeListTo_p_FXObject},{"_p_FXIconItem", _p_FXIconItemTo_p_FXObject},{"_p_FXRbIconItem", _p_FXRbIconItemTo_p_FXObject},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXObject},{"_p_FXTooltip", _p_FXTooltipTo_p_FXObject},{"_p_FXTextField", _p_FXTextFieldTo_p_FXObject},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXObject},{"_p_FXWindow", _p_FXWindowTo_p_FXObject},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXObject},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXObject},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXObject},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXObject},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXObject},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXObject},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXObject},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXObject},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXObject},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXObject},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXObject},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXObject},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXObject},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXObject},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXObject},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXObject},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXObject},{"_p_FXRbDebugTarget", _p_FXRbDebugTargetTo_p_FXObject},{"_p_FXDebugTarget", _p_FXDebugTargetTo_p_FXObject},{"_p_FXRbDataTarget", _p_FXRbDataTargetTo_p_FXObject},{"_p_FXDataTarget", _p_FXDataTargetTo_p_FXObject},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXObject},{"_p_FXTableItem", _p_FXTableItemTo_p_FXObject},{"_p_FXRbTableItem", _p_FXRbTableItemTo_p_FXObject},{"_p_FXRbStringDict", _p_FXRbStringDictTo_p_FXObject},{"_p_FXStringDict", _p_FXStringDictTo_p_FXObject},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXObject},{"_p_FXColorBar", _p_FXColorBarTo_p_FXObject},{"_p_FXId", _p_FXIdTo_p_FXObject},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXObject},{"_p_FXOption", _p_FXOptionTo_p_FXObject},{"_p_FXTable", _p_FXTableTo_p_FXObject},{"_p_FXFont", _p_FXFontTo_p_FXObject},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXObject},{"_p_FXSlider", _p_FXSliderTo_p_FXObject},{"_p_FXTabBar", _p_FXTabBarTo_p_FXObject},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXObject},{"_p_FXRbTreeItem", _p_FXRbTreeItemTo_ p_FXObject},{"_p_FXTreeItem", _p_FXTreeItemTo_p_FXObject},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXObject},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXObject},{"_p_FXDrawable", _p_FXDrawableTo_p_FXObject},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXObject},{"_p_FXAccelTable", _p_FXAccelTableTo_p_FXObject},{"_p_FXRbAccelTable", _p_FXRbAccelTableTo_p_FXObject},{"_p_FXImageView", _p_FXImageViewTo_p_FXObject},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXObject},{"_p_FXRbList", _p_FXRbListTo_p_FXObject},{"_p_FXDict", _p_FXDictTo_p_FXObject},{"_p_FXCanvas", _p_FXCanvasTo_p_FXObject},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXObject},{"_p_FXRbTable", _p_FXRbTableTo_p_FXObject},{"_p_FXShell", _p_FXShellTo_p_FXObject},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXObject},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXObject},{"_p_FXRbFileDict", _p_FXRbFileDictTo_p_FXObject},{"_p_FXFileDict", _p_FXFileDictTo_p_FXObject},{"_p_FXRbText", _p_FXRbTextTo_p_FXObject},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXObject},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXObject},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXObject},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXObject},{"_p_FXToolbar", _p_FXToolbarTo_p_FXObject},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXObject},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXObject},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXObject},{0}}; *************** *** 4298,4301 **** --- 4361,4365 ---- _swigt__p_FXComposite, _swigt__p_FXWindow, + _swigt__p_TextRange, _swigt__p_FXDrawable, _swigt__p_FXObject, *************** *** 4356,4359 **** --- 4420,4431 ---- rb_define_method(cSCNotification.klass, "lParam", VALUEFUNC(_wrap_SCNotification_lParam), -1); cSCNotification.mark = 0; + + cTextRange.klass = rb_define_class_under(mFox, "TextRange", rb_cObject); + SWIG_TypeClientData(SWIGTYPE_p_TextRange, (void *) &cTextRange); + rb_define_singleton_method(cTextRange.klass, "new", VALUEFUNC(_wrap_new_TextRange), -1); + rb_define_method(cTextRange.klass, "initialize", VALUEFUNC(_wrap_TextRange_initialize), -1); + rb_define_method(cTextRange.klass, "lpstrText", VALUEFUNC(_wrap_TextRange_lpstrText_get), -1); + cTextRange.mark = 0; + cTextRange.destroy = (void (*)(void *)) free_TextRange; cFX_Scintilla.klass = rb_define_class_under(mFox, "FX_Scintilla", cFX_ScrollArea.klass); Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.9.2.8 retrieving revision 1.9.2.9 diff -C2 -d -r1.9.2.8 -r1.9.2.9 *** ui_wrap.cpp 8 May 2002 16:50:48 -0000 1.9.2.8 --- ui_wrap.cpp 8 May 2002 21:32:15 -0000 1.9.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1104 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020508-1438 * * This file is not intended to be easily readable and contains a number of |
From: Lyle J. <ly...@us...> - 2002-05-08 21:29:48
|
Update of /cvsroot/fxruby/FXRuby/tests In directory usw-pr-cvs1:/tmp/cvs-serv20886 Added Files: Tag: release10 TC_FXRegion.rb Log Message: --- NEW FILE: TC_FXRegion.rb --- require 'test/unit' require 'fox' include Fox class TC_FXRegion < Test::Unit::TestCase def set_up @region = FXRegion.new(5, 5, 10, 10) end def test_clone assert_equal(@region, @region.clone) end def test_empty assert(!@region.empty?) empty_region = FXRegion.new(5, 5, 0, 0) assert(empty_region.empty?) end def test_containsPoint # Definitely out of bounds assert(!@region.containsPoint?(2, 3)) # Definitely in bounds assert(@region.containsPoint?(6, 6)) # Check corners too assert(@region.containsPoint?(5, 5)) assert(@region.containsPoint?(5, 15)) assert(@region.containsPoint?(15, 15)) assert(@region.containsPoint?(15, 5)) end def test_containsRectangle assert(!@region.containsRectangle?(2, 3, 15, 15)) assert(@region.containsRectangle?(5, 5, 10, 10)) assert(@region.containsRectangle?(6, 6, 5, 5)) end def test_bounds end def test_offset end def test_union end def test_intersect end def test_subtract end def test_xor end def test_equal end end |
From: Lyle J. <ly...@us...> - 2002-05-08 21:09:58
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv11127 Modified Files: Tag: release10 FXHMat.i FXHVec.i FXRegion.i Log Message: Latest SWIG has support for copy constructors, so the copy constructors for these classes (FXHMat, FXHVec and FXRegion) are now exposed in FXRuby as the instance methods FXHMat#clone, FXHVec#clone and FXRegion#clone. Index: FXHMat.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHMat.i,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** FXHMat.i 6 May 2002 19:16:29 -0000 1.9.2.1 --- FXHMat.i 8 May 2002 21:09:55 -0000 1.9.2.2 *************** *** 24,28 **** %ignore FXHMat::FXHMat(FXfloat w); %ignore FXHMat::FXHMat(const FXHVec& a,const FXHVec& b,const FXHVec& c,const FXHVec& d); - %ignore FXHMat::FXHMat(const FXHMat& other); %rename(rot1) FXHMat::rot(const FXQuat& q); --- 24,27 ---- Index: FXHVec.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHVec.i,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** FXHVec.i 6 May 2002 19:16:29 -0000 1.6.2.1 --- FXHVec.i 8 May 2002 21:09:55 -0000 1.6.2.2 *************** *** 22,26 **** %ignore FXHVec::FXHVec(); - %ignore FXHVec::FXHVec(const FXHVec& w); %ignore FXHVec::FXHVec(const FXVec& w); %ignore FXHVec::FXHVec(FXColor color); --- 22,25 ---- Index: FXRegion.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** FXRegion.i 6 May 2002 19:16:29 -0000 1.6.2.1 --- FXRegion.i 8 May 2002 21:09:55 -0000 1.6.2.2 *************** *** 22,26 **** %ignore FXRegion::FXRegion(); - %ignore FXRegion::FXRegion(const FXRegion& r); %ignore FXRegion::operator=(const FXRegion& r); --- 22,25 ---- |