fxruby-commits Mailing List for FXRuby (Page 2)
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
fxruby-commits — All commits to FXRuby's CVS repository
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-07-11 16:40:33
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv23364
Modified Files:
FXRuby.cpp
Log Message:
Corrected spelling of FXScrollBar and FXToolBarTab in a few places.
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** FXRuby.cpp 11 Jul 2002 13:32:57 -0000 1.41
--- FXRuby.cpp 11 Jul 2002 16:40:30 -0000 1.42
***************
*** 412,416 ****
if(type==SEL_COMMAND) return to_ruby((const FXchar*)ptr);
}
! else if(sender->isMemberOf(FXMETACLASS(FXScrollbar))){
if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby((FXint)ptr);
}
--- 412,416 ----
if(type==SEL_COMMAND) return to_ruby((const FXchar*)ptr);
}
! else if(sender->isMemberOf(FXMETACLASS(FXScrollBar))){
if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby((FXint)ptr);
}
***************
*** 470,474 ****
if(type==SEL_COMMAND) return to_ruby((FXuchar)(long)ptr);
}
! else if(sender->isMemberOf(FXMETACLASS(FXToolbarTab))){
if (type==SEL_CLICKED ||
type==SEL_DOUBLECLICKED ||
--- 470,474 ----
if(type==SEL_COMMAND) return to_ruby((FXuchar)(long)ptr);
}
! else if(sender->isMemberOf(FXMETACLASS(FXToolBarTab))){
if (type==SEL_CLICKED ||
type==SEL_DOUBLECLICKED ||
***************
*** 681,685 ****
obj->isMemberOf(FXMETACLASS(FXTabBar)) ||
obj->isMemberOf(FXMETACLASS(FXToggleButton)) ||
! obj->isMemberOf(FXMETACLASS(FXScrollbar)) ||
obj->isMemberOf(FXMETACLASS(FXSlider)) ||
obj->isMemberOf(FXMETACLASS(FXSwitcher))){
--- 681,685 ----
obj->isMemberOf(FXMETACLASS(FXTabBar)) ||
obj->isMemberOf(FXMETACLASS(FXToggleButton)) ||
! obj->isMemberOf(FXMETACLASS(FXScrollBar)) ||
obj->isMemberOf(FXMETACLASS(FXSlider)) ||
obj->isMemberOf(FXMETACLASS(FXSwitcher))){
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:39:53
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv23115
Modified Files:
extconf.rb
Log Message:
Updated version to 1.1.13.
Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** extconf.rb 11 Jul 2002 13:33:08 -0000 1.28
--- extconf.rb 11 Jul 2002 16:39:50 -0000 1.29
***************
*** 66,73 ****
# Verify version number for FOX from the installed header files
instMajor, instMinor, instLevel = getInstalledFOXVersion().split('.')
! thisMajor, thisMinor, thisLevel = "1.0.11".split('.')
unless (instMajor == thisMajor) && (instMinor == thisMinor)
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.0.11)."
exit
end
--- 66,73 ----
# Verify version number for FOX from the installed header files
instMajor, instMinor, instLevel = getInstalledFOXVersion().split('.')
! thisMajor, thisMinor, thisLevel = "1.1.13".split('.')
unless (instMajor == thisMajor) && (instMinor == thisMinor)
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.1.13)."
exit
end
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:39:09
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv22793 Modified Files: ANNOUNCE FXRuby-ruby1.6-i586-mswin32.iss FXRuby-ruby1.7-i386-mswin32.iss FXRuby.spec Makefile Makefile.in Log Message: Updated the version number for these files to 1.1.13. Index: ANNOUNCE =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ANNOUNCE,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ANNOUNCE 11 Jul 2002 13:32:53 -0000 1.27 --- ANNOUNCE 11 Jul 2002 16:39:06 -0000 1.28 *************** *** 9,21 **** and the source tarball can be downloaded here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11.tar.gz A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is available for download here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11-win32.exe and a Linux RPM (for Ruby 1.6) is available for download here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11-1.i386.rpm Note that this release of FXRuby depends on FOX version 1.0.0 (or later), which --- 9,21 ---- and the source tarball can be downloaded here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.1.13.tar.gz A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is available for download here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.1.13-win32.exe and a Linux RPM (for Ruby 1.6) is available for download here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.1.13-1.i386.rpm Note that this release of FXRuby depends on FOX version 1.0.0 (or later), which Index: FXRuby-ruby1.6-i586-mswin32.iss =================================================================== RCS file: /cvsroot/fxruby/FXRuby/FXRuby-ruby1.6-i586-mswin32.iss,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FXRuby-ruby1.6-i586-mswin32.iss 11 Jul 2002 13:32:53 -0000 1.2 --- FXRuby-ruby1.6-i586-mswin32.iss 11 Jul 2002 16:39:06 -0000 1.3 *************** *** 4,8 **** [Setup] AppName=FXRuby ! AppVerName=FXRuby 1.0.11 AppPublisherURL=http://www.fxruby.org AppSupportURL=http://www.fxruby.org --- 4,8 ---- [Setup] AppName=FXRuby ! AppVerName=FXRuby 1.1.13 AppPublisherURL=http://www.fxruby.org AppSupportURL=http://www.fxruby.org *************** *** 14,18 **** InfoBeforeFile=C:\src\FXRuby\README.win32.txt OutputDir=. ! OutputBaseFilename=FXRuby-1.0.11-win32 [Files] --- 14,18 ---- InfoBeforeFile=C:\src\FXRuby\README.win32.txt OutputDir=. ! OutputBaseFilename=FXRuby-1.1.13-win32 [Files] Index: FXRuby-ruby1.7-i386-mswin32.iss =================================================================== RCS file: /cvsroot/fxruby/FXRuby/FXRuby-ruby1.7-i386-mswin32.iss,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FXRuby-ruby1.7-i386-mswin32.iss 11 Jul 2002 13:32:53 -0000 1.2 --- FXRuby-ruby1.7-i386-mswin32.iss 11 Jul 2002 16:39:06 -0000 1.3 *************** *** 4,8 **** [Setup] AppName=FXRuby ! AppVerName=FXRuby 1.0.11 AppPublisherURL=http://www.fxruby.org AppSupportURL=http://www.fxruby.org --- 4,8 ---- [Setup] AppName=FXRuby ! AppVerName=FXRuby 1.1.13 AppPublisherURL=http://www.fxruby.org AppSupportURL=http://www.fxruby.org *************** *** 14,18 **** InfoBeforeFile=C:\src\FXRuby\README.win32.txt OutputDir=. ! OutputBaseFilename=FXRuby-1.0.11-win32 [Files] --- 14,18 ---- InfoBeforeFile=C:\src\FXRuby\README.win32.txt OutputDir=. ! OutputBaseFilename=FXRuby-1.1.13-win32 [Files] Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/FXRuby.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FXRuby.spec 11 Jul 2002 13:32:53 -0000 1.2 --- FXRuby.spec 11 Jul 2002 16:39:06 -0000 1.3 *************** *** 1,9 **** Summary: FXRuby Name: FXRuby ! Version: 1.0.11 Release: 1 Copyright: LGPL Group: System Environment/Libraries ! Source: http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11.tar.gz URL: http://www.fxruby.org Packager: Lyle Johnson (ly...@us...) --- 1,9 ---- Summary: FXRuby Name: FXRuby ! Version: 1.1.13 Release: 1 Copyright: LGPL Group: System Environment/Libraries ! Source: http://prdownloads.sourceforge.net/fxruby/FXRuby-1.1.13.tar.gz URL: http://www.fxruby.org Packager: Lyle Johnson (ly...@us...) Index: Makefile =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 11 Jul 2002 13:32:53 -0000 1.2 --- Makefile 11 Jul 2002 16:39:06 -0000 1.3 *************** *** 1,4 **** PACKAGE = FXRuby ! VERSION = 1.0.11 distdir = $(PACKAGE)-$(VERSION) --- 1,4 ---- PACKAGE = FXRuby ! VERSION = 1.1.13 distdir = $(PACKAGE)-$(VERSION) *************** *** 38,45 **** -strip ext/fox/fox.so config.save: ruby install.rb config -- \ ! --with-fxscintilla-include=/usr/local/include/fxscintilla \ ! --with-fxscintilla-lib=/usr/local/lib check: --- 38,50 ---- -strip ext/fox/fox.so + #config.save: + ## ruby install.rb config -- \ + # --with-fxscintilla-include=/usr/local/include/fxscintilla \ + # --with-fxscintilla-lib=/usr/local/lib + config.save: ruby install.rb config -- \ ! --with-fox-include=/home/jlj/src/fox-1.1.13/include \ ! --with-fox-lib=/home/jlj/src/fox-1.1.13/src/.libs check: *************** *** 69,73 **** changelog: ! @cvs2cl.pl -F release10 website: --- 74,78 ---- changelog: ! @cvs2cl.pl website: Index: Makefile.in =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 11 Jul 2002 13:32:53 -0000 1.2 --- Makefile.in 11 Jul 2002 16:39:06 -0000 1.3 *************** *** 38,45 **** -strip ext/fox/fox.so config.save: ruby install.rb config -- \ ! --with-fxscintilla-include=/usr/local/include/fxscintilla \ ! --with-fxscintilla-lib=/usr/local/lib check: --- 38,50 ---- -strip ext/fox/fox.so + #config.save: + ## ruby install.rb config -- \ + # --with-fxscintilla-include=/usr/local/include/fxscintilla \ + # --with-fxscintilla-lib=/usr/local/lib + config.save: ruby install.rb config -- \ ! --with-fox-include=/home/jlj/src/fox-1.1.13/include \ ! --with-fox-lib=/home/jlj/src/fox-1.1.13/src/.libs check: *************** *** 69,73 **** changelog: ! @cvs2cl.pl -F release10 website: --- 74,78 ---- changelog: ! @cvs2cl.pl website: |
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:03:38
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv11949/ext/fox/include
Added Files:
FXRbRuler.h FXRbWizard.h FXRbImageFrame.h
Log Message:
Added initial files for new FXImageFrame, FXRuler and FXWizard classes.
--- NEW FILE: FXRbRuler.h ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/***********************************************************************
* $Id: FXRbRuler.h,v 1.1 2002/07/11 16:03:35 lyle Exp $
***********************************************************************/
#ifndef FXRBRULER_H
#define FXRBRULER_H
class FXRbRuler : public FXRuler {
FXDECLARE(FXRbRuler)
protected:
FXRbRuler();
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct label with given text and icon
FXRbRuler(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=RULER_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=DEFAULT_PAD,FXint pr=DEFAULT_PAD,FXint pt=DEFAULT_PAD,FXint pb=DEFAULT_PAD) : FXRuler(p,tgt,sel,opts,x,y,w,h,pl,pr,pt,pb) {}
// Mark dependencies for the GC
static void markfunc(FXRuler* self);
// Destructor
virtual ~FXRbRuler(){
FXRbUnregisterRubyObject(this);
}
};
#endif
--- NEW FILE: FXRbWizard.h ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/***********************************************************************
* $Id: FXRbWizard.h,v 1.1 2002/07/11 16:03:35 lyle Exp $
***********************************************************************/
#ifndef FXRBWIZARD_H
#define FXRBWIZARD_H
class FXRbWizard : public FXWizard {
FXDECLARE(FXRbWizard)
protected:
FXRbWizard();
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
#include "FXRbTopWindowVirtuals.h"
#include "FXRbDialogBoxVirtuals.h"
public:
/// Construct free-floating Wizard
FXRbWizard(FXApp* a,const FXString& name,FXImage *image,FXuint opts=DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=10,FXint pr=10,FXint pt=10,FXint pb=10,FXint hs=10,FXint vs=10) : FXWizard(a,name,image,opts,x,y,w,h,pl,pr,pt,pb,hs,vs) {}
/// Construct Wizard which will always float over the owner window
FXRbWizard(FXWindow* owner,const FXString& name,FXImage *image,FXuint opts=DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=10,FXint pr=10,FXint pt=10,FXint pb=10,FXint hs=10,FXint vs=10) : FXWizard(owner,name,image,opts,x,y,w,h,pl,pr,pt,pb,hs,vs) {}
// Mark dependencies for the GC
static void markfunc(FXWizard* self);
// Destructor
virtual ~FXRbWizard(){
FXRbUnregisterRubyObject(this);
}
};
#endif
--- NEW FILE: FXRbImageFrame.h ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/***********************************************************************
* $Id: FXRbImageFrame.h,v 1.1 2002/07/11 16:03:35 lyle Exp $
***********************************************************************/
#ifndef FXRBIMAGEFRAME_H
#define FXRBIMAGEFRAME_H
class FXRbImageFrame : public FXImageFrame {
FXDECLARE(FXRbImageFrame)
protected:
FXRbImageFrame();
#include "FXRbObjectVirtuals.h"
#include "FXRbIdVirtuals.h"
#include "FXRbDrawableVirtuals.h"
#include "FXRbWindowVirtuals.h"
public:
/// Construct image frame and pass it an image
FXRbImageFrame(FXComposite* p,FXImage *img,FXuint opts=FRAME_SUNKEN|FRAME_THICK,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0) : FXImageFrame(p,img,opts,x,y,w,h,pl,pr,pt,pb) {}
// Mark dependencies for the GC
static void markfunc(FXImageFrame* self);
/// Destroy the widget, but do not destroy the image
virtual ~FXRbImageFrame();
};
#endif
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 16:03:37
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv11949/swig-interfaces
Added Files:
FXRuler.i FXWizard.i FXImageFrame.i
Log Message:
Added initial files for new FXImageFrame, FXRuler and FXWizard classes.
--- NEW FILE: FXRuler.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXRuler::FXRuler {
$action
FXRbRegisterRubyObj(self, result);
}
%include "FXRuler.h"
%exception FXRbRuler::FXRbRuler {
$action
FXRbRegisterRubyObj(self, result);
}
class FXRbRuler : public FXRuler {
public:
/// Construct label with given text and icon
FXRbRuler(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=RULER_NORMAL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=DEFAULT_PAD,FXint pr=DEFAULT_PAD,FXint pt=DEFAULT_PAD,FXint pb=DEFAULT_PAD);
/// Destructor
virtual ~FXRbRuler();
};
--- NEW FILE: FXWizard.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXWizard::FXWizard {
$action
FXRbRegisterRubyObj(self, result);
}
%include "FXWizard.h"
%exception FXRbWizard::FXRbWizard {
$action
FXRbRegisterRubyObj(self, result);
}
class FXRbWizard : public FXRbWizard {
public:
/// Construct free-floating Wizard
FXRbWizard(FXApp* a,const FXString& name,FXImage *image,FXuint opts=DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=10,FXint pr=10,FXint pt=10,FXint pb=10,FXint hs=10,FXint vs=10);
/// Construct Wizard which will always float over the owner window
FXRbWizard(FXWindow* owner,const FXString& name,FXImage *image,FXuint opts=DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=10,FXint pr=10,FXint pt=10,FXint pb=10,FXint hs=10,FXint vs=10);
// Destroy
virtual ~FXWizard();
};
--- NEW FILE: FXImageFrame.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%exception FXImageFrame::FXImageFrame {
$action
FXRbRegisterRubyObj(self, result);
}
%include "FXImageFrame.h"
%exception FXRbImageFrame::FXRbImageFrame {
$action
FXRbRegisterRubyObj(self, result);
}
class FXRbImageFrame : public FXImageFrame {
public:
/// Construct image frame and pass it an image
FXRbImageFrame(FXComposite* p,FXImage *img,FXuint opts=FRAME_SUNKEN|FRAME_THICK,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0);
/// Destroy the widget, but do not destroy the image
virtual ~FXRbImageFrame();
};
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:34:22
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv26972/ext/fox
Modified Files:
FXRbApp.cpp FXRuby.cpp core_wrap.cpp dialogs_wrap.cpp
extconf.rb icons_wrap.cpp image_wrap.cpp impl.cpp
layout_wrap.cpp librb.c markfuncs.cpp mdi_wrap.cpp
opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp
Added Files:
extconf.rb.in
Removed Files:
extconf.rb.tmpl
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: FXRbApp.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRbApp.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXRbApp.cpp 28 Feb 2002 01:01:45 -0000 1.9
--- FXRbApp.cpp 11 Jul 2002 13:32:57 -0000 1.10
***************
*** 60,65 ****
// Constructor
! FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),threadsEnabled(TRUE),sleepTime(100),threadsChore(0){
! if(threadsEnabled){
FXASSERT(threadsChore==0);
threadsChore=addChore(this,ID_CHORE_THREADS);
--- 60,65 ----
// Constructor
! FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),m_bThreadsEnabled(TRUE),sleepTime(100),threadsChore(0){
! if(m_bThreadsEnabled){
FXASSERT(threadsChore==0);
threadsChore=addChore(this,ID_CHORE_THREADS);
***************
*** 68,85 ****
! // Enable threads
! void FXRbApp::enableThreads(){
! if(!threadsEnabled){
! threadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
}
! }
!
!
! // Disable threads
! void FXRbApp::disableThreads(){
! if(threadsEnabled){
! threadsEnabled=FALSE;
if(threadsChore!=0){
removeChore(threadsChore);
--- 68,82 ----
! // Enable (or disable) threads
! void FXRbApp::setThreadsEnabled(FXbool enabled){
! if(enabled){
! if(!m_bThreadsEnabled){
! m_bThreadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
! }
}
! else{
! m_bThreadsEnabled=FALSE;
if(threadsChore!=0){
removeChore(threadsChore);
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** FXRuby.cpp 3 Apr 2002 21:40:27 -0000 1.40
--- FXRuby.cpp 11 Jul 2002 13:32:57 -0000 1.41
***************
*** 50,60 ****
struct swig_type_info;
- // SWIG runtime functions we need
- extern "C" {
- swig_type_info * SWIG_TypeQuery(const char *);
- VALUE SWIG_NewPointerObj(void *ptr, swig_type_info *type, int own);
- void * SWIG_ConvertPtr(VALUE obj, swig_type_info *ty);
- }
-
// Wrapper around SWIG_TypeQuery() that caches results for performance
swig_type_info *FXRbTypeQuery(const char *desc){
--- 50,53 ----
***************
*** 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;
}
--- 67,93 ----
+ /**
+ * 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;
}
***************
*** 84,94 ****
// Wrapper around SWIG_ConvertPtr()
void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
! return SWIG_ConvertPtr(obj,ty);
}
- // 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;
--- 96,105 ----
// Wrapper around SWIG_ConvertPtr()
void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
! void *ptr;
! SWIG_ConvertPtr(obj,&ptr,ty,1);
! return ptr;
}
// Should we catch exceptions thrown by message handlers?
FXbool FXRbCatchExceptions=FALSE;
***************
*** 128,151 ****
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;
}
-
/**
* Return the registered Ruby class instance associated with this
* FOX object, or a new registered instance if not found.
*/
! VALUE FXRbGetRubyObj(const void *foxObj, const char *type){
! VALUE rbObj = FXRbGetRubyObj(foxObj);
! return (rbObj == Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj;
}
--- 139,178 ----
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;
! }
}
/**
* Return the registered Ruby class instance associated with this
* FOX object, or a new registered instance if not found.
*/
! 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,162 ****
void FXRbGcMark(void *obj){
if(obj){
! VALUE value=FXRbGetRubyObj(obj);
if(value!=Qnil){
rb_gc_mark(value);
}
}
--- 183,193 ----
void FXRbGcMark(void *obj){
if(obj){
! VALUE value=FXRbGetRubyObj(obj); // only search FXRuby_ObjMap!
if(value!=Qnil){
+ #if RUBY_VERSION_CODE < 172
+ rb_gc_mark(reinterpret_cast<void *>(value));
+ #else
rb_gc_mark(value);
+ #endif
}
}
***************
*** 406,410 ****
type == SEL_DESELECTED ||
type == SEL_INSERTED ||
! type == SEL_DELETED) return to_ruby((FXTableRange*)ptr);
}
else if(sender->isMemberOf(FXMETACLASS(FXText))){
--- 437,443 ----
type == SEL_DESELECTED ||
type == SEL_INSERTED ||
! type == SEL_DELETED){
! return to_ruby(reinterpret_cast<FXTableRange*>(ptr));
! }
}
else if(sender->isMemberOf(FXMETACLASS(FXText))){
***************
*** 496,499 ****
--- 529,533 ----
void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
FXEvent* ev;
+ void *ptr;
static FXint intValue;
static FXint intRange[2];
***************
*** 559,563 ****
case SEL_DND_REQUEST:
case SEL_PICKED:
! return SWIG_ConvertPtr(value, FXRbTypeQuery("FXEvent *"));
case SEL_IO_READ:
case SEL_IO_WRITE:
--- 593,598 ----
case SEL_DND_REQUEST:
case SEL_PICKED:
! SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
! return ptr;
case SEL_IO_READ:
case SEL_IO_WRITE:
***************
*** 825,828 ****
--- 860,881 ----
//----------------------------------------------------------------------
+ void FXRbRange2LoHi(VALUE range,FXint& lo,FXint& hi){
+ if(Qtrue!=rb_obj_is_instance_of(range,rb_cRange)){
+ rb_raise(rb_eTypeError,"wrong argument type %s (expected %s)",rb_class2name(CLASS_OF(range)),rb_class2name(rb_cRange));
+ }
+ else{
+ VALUE beg=rb_funcall(range,rb_intern("begin"),0,NULL);
+ VALUE end=rb_funcall(range,rb_intern("end"),0,NULL);
+ VALUE excl=rb_funcall(range,rb_intern("exclude_end?"),0,NULL);
+ lo=NUM2INT(beg);
+ hi=NUM2INT(end);
+ if(excl==Qtrue){
+ hi--;
+ }
+ }
+ }
+
+ //----------------------------------------------------------------------
+
void FXRbCallVoidMethod(FXObject* recv, const char *func) {
/*
***************
*** 1153,1161 ****
Init_scintilla();
#endif
! rb_f_require(Qnil, rb_str_new2("fox/aliases"));
! rb_f_require(Qnil, rb_str_new2("fox/core"));
! rb_f_require(Qnil, rb_str_new2("fox/iterators"));
! rb_f_require(Qnil, rb_str_new2("fox/keys"));
! rb_f_require(Qnil, rb_str_new2("fox/overloads"));
! rb_f_require(Qnil, rb_str_new2("fox/responder2"));
}
--- 1206,1214 ----
Init_scintilla();
#endif
! rb_require("fox/core");
! rb_require("fox/iterators");
! rb_require("fox/keys");
! rb_require("fox/overloads");
! rb_require("fox/aliases");
! rb_require("fox/responder2");
}
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** core_wrap.cpp 3 Apr 2002 21:40:27 -0000 1.62
--- core_wrap.cpp 11 Jul 2002 13:32:57 -0000 1.63
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...18963 lines suppressed...]
rb_define_method(cFX_Document.klass, "onUpdFilename", VALUEFUNC(_wrap_FX_Document_onUpdFilename), -1);
***************
*** 19434,19441 ****
cFX_Document.destroy = (void (*)(void *)) free_FXDocument;
! cFXDocument.klass = rb_define_class_under(mFox, "FXDocument", cFX_Document.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbDocument, (void *) &cFXDocument);
! rb_define_singleton_method(cFXDocument.klass, "new", VALUEFUNC(_wrap_new_FXDocument), -1);
! rb_define_method(cFXDocument.klass, "initialize", VALUEFUNC(_wrap_FXDocument_initialize), -1);
rb_define_method(cFXDocument.klass, "onDefault", VALUEFUNC(_wrap_FXDocument_onDefault), -1);
rb_define_method(cFXDocument.klass, "save", VALUEFUNC(_wrap_FXDocument_save), -1);
--- 20714,20721 ----
cFX_Document.destroy = (void (*)(void *)) free_FXDocument;
! cFXDocument.klass = rb_define_class_under(mFox, "FXDocument", ((swig_class *) SWIGTYPE_p_FXDocument->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbDocument, (void *) &cFXDocument);
! rb_define_singleton_method(cFXDocument.klass, "new", VALUEFUNC(_wrap_FXDocument_allocate), -1);
! rb_define_method(cFXDocument.klass, "initialize", VALUEFUNC(_wrap_new_FXDocument), -1);
rb_define_method(cFXDocument.klass, "onDefault", VALUEFUNC(_wrap_FXDocument_onDefault), -1);
rb_define_method(cFXDocument.klass, "save", VALUEFUNC(_wrap_FXDocument_save), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** dialogs_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.34
--- dialogs_wrap.cpp 11 Jul 2002 13:33:08 -0000 1.35
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...11491 lines suppressed...]
rb_define_method(cFX_MessageBox.klass, "onCmdCancel", VALUEFUNC(_wrap_FX_MessageBox_onCmdCancel), -1);
***************
*** 14010,14017 ****
cFX_MessageBox.mark = (void (*)(void *)) FXRbMessageBox::markfunc;
! cFXMessageBox.klass = rb_define_class_under(mFox, "FXMessageBox", cFX_MessageBox.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMessageBox, (void *) &cFXMessageBox);
! rb_define_singleton_method(cFXMessageBox.klass, "new", VALUEFUNC(_wrap_new_FXMessageBox), -1);
! rb_define_method(cFXMessageBox.klass, "initialize", VALUEFUNC(_wrap_FXMessageBox_initialize), -1);
rb_define_method(cFXMessageBox.klass, "onDefault", VALUEFUNC(_wrap_FXMessageBox_onDefault), -1);
rb_define_method(cFXMessageBox.klass, "save", VALUEFUNC(_wrap_FXMessageBox_save), -1);
--- 14637,14644 ----
cFX_MessageBox.mark = (void (*)(void *)) FXRbMessageBox::markfunc;
! cFXMessageBox.klass = rb_define_class_under(mFox, "FXMessageBox", ((swig_class *) SWIGTYPE_p_FXMessageBox->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMessageBox, (void *) &cFXMessageBox);
! rb_define_singleton_method(cFXMessageBox.klass, "new", VALUEFUNC(_wrap_FXMessageBox_allocate), -1);
! rb_define_method(cFXMessageBox.klass, "initialize", VALUEFUNC(_wrap_new_FXMessageBox), -1);
rb_define_method(cFXMessageBox.klass, "onDefault", VALUEFUNC(_wrap_FXMessageBox_onDefault), -1);
rb_define_method(cFXMessageBox.klass, "save", VALUEFUNC(_wrap_FXMessageBox_save), -1);
Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** extconf.rb 21 Mar 2002 23:00:40 -0000 1.27
--- extconf.rb 11 Jul 2002 13:33:08 -0000 1.28
***************
*** 4,45 ****
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
--- 4,55 ----
require 'mkmf'
+ def read_fox_version(filename)
+ foxMajor, foxMinor, foxLevel = nil, nil, nil
+ File.foreach(filename) do |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
+ end
+ [foxMajor, foxMinor, foxLevel]
+ end
+
def getInstalledFOXVersion
! # incdirs is an array of directories that we'll search (in order)
! # looking for the FOX header files
! incdirs = ["/usr/include/fox", "/usr/local/include/fox"]
! ARGV.each do |arg|
if arg =~ /--with-fox-include/
! option, value = arg.split('=')
! incdirs = [ value ] + incdirs
end
! end
!
! incdirs.each do |incdir|
! filename = File.join(incdir, "fxver.h")
! if FileTest.exists?(filename)
! foxMajor, foxMinor, foxLevel = read_fox_version(filename)
! idircflag = "-I" + incdir
! $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
! return [foxMajor, foxMinor, foxLevel].join('.')
end
! end
!
! # Couldn't find it
! puts "I couldn't locate \"fxver.h\" in any of the following directories:"
! puts ""
! incdirs.each { |incdir| puts " #{incdir}" }
! 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
def is_scintilla_build?
! args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) }
args.length > 0
end
***************
*** 47,63 ****
# 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 = "1.0.3".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 (1.0.3)."
exit
end
--- 57,73 ----
# This directive processes the "--with-fox-include" and "--with-fox-lib"
# command line switches and modifies the CFLAGS and LDFLAGS accordingly.
! dir_config('fox', nil, '/usr/local/lib')
! # This directive processes the "--with-fxscintilla-include" and
! # "--with-fxscintilla-lib" command line switches and modifies the CFLAGS
# and LDFLAGS accordingly.
! dir_config('fxscintilla', '/usr/local/include', '/usr/local/lib')
# Verify version number for FOX from the installed header files
! instMajor, instMinor, instLevel = getInstalledFOXVersion().split('.')
! thisMajor, thisMinor, thisLevel = "1.0.11".split('.')
! unless (instMajor == thisMajor) && (instMinor == thisMinor)
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.0.11)."
exit
end
***************
*** 84,88 ****
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')
--- 94,98 ----
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
! $libs = append_library($libs, "fxscintilla")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 102,107 ****
have_header("sys/time.h")
have_header("signal.h")
- have_library("libpng", "png_create_read_struct")
have_library("zlib", "deflate")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
--- 112,117 ----
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")
***************
*** 113,117 ****
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')
--- 123,127 ----
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
! $libs = append_library($libs, "fxscintilla-static")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 134,138 ****
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')
--- 144,148 ----
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
! $libs = append_library($libs, "fxscintilla")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** icons_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.37
--- icons_wrap.cpp 11 Jul 2002 13:33:08 -0000 1.38
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...4412 lines suppressed...]
! rb_define_singleton_method(cFXXPMIcon.klass, "new", VALUEFUNC(_wrap_new_FXXPMIcon), -1);
! rb_define_method(cFXXPMIcon.klass, "initialize", VALUEFUNC(_wrap_FXXPMIcon_initialize), -1);
rb_define_method(cFXXPMIcon.klass, "onDefault", VALUEFUNC(_wrap_FXXPMIcon_onDefault), -1);
rb_define_method(cFXXPMIcon.klass, "save", VALUEFUNC(_wrap_FXXPMIcon_save), -1);
--- 7320,7334 ----
cFXTIFIcon.destroy = (void (*)(void *)) free_FXRbTIFIcon;
! cFX_XPMIcon.klass = rb_define_class_under(mFox, "FX_XPMIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXXPMIcon, (void *) &cFX_XPMIcon);
! rb_define_singleton_method(cFX_XPMIcon.klass, "new", VALUEFUNC(_wrap_FX_XPMIcon_allocate), -1);
! rb_define_method(cFX_XPMIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_XPMIcon), -1);
cFX_XPMIcon.mark = (void (*)(void *)) FXRbXPMIcon::markfunc;
cFX_XPMIcon.destroy = (void (*)(void *)) free_FXXPMIcon;
! cFXXPMIcon.klass = rb_define_class_under(mFox, "FXXPMIcon", ((swig_class *) SWIGTYPE_p_FXXPMIcon->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbXPMIcon, (void *) &cFXXPMIcon);
! rb_define_singleton_method(cFXXPMIcon.klass, "new", VALUEFUNC(_wrap_FXXPMIcon_allocate), -1);
! rb_define_method(cFXXPMIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXXPMIcon), -1);
rb_define_method(cFXXPMIcon.klass, "onDefault", VALUEFUNC(_wrap_FXXPMIcon_onDefault), -1);
rb_define_method(cFXXPMIcon.klass, "save", VALUEFUNC(_wrap_FXXPMIcon_save), -1);
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** image_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.39
--- image_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.40
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...5224 lines suppressed...]
! rb_define_singleton_method(cFXXPMImage.klass, "new", VALUEFUNC(_wrap_new_FXXPMImage), -1);
! rb_define_method(cFXXPMImage.klass, "initialize", VALUEFUNC(_wrap_FXXPMImage_initialize), -1);
rb_define_method(cFXXPMImage.klass, "onDefault", VALUEFUNC(_wrap_FXXPMImage_onDefault), -1);
rb_define_method(cFXXPMImage.klass, "save", VALUEFUNC(_wrap_FXXPMImage_save), -1);
--- 7746,7760 ----
rb_define_module_function(mFox, "fxsaveTIF", VALUEFUNC(_wrap_fxsaveTIF), -1);
! cFX_XPMImage.klass = rb_define_class_under(mFox, "FX_XPMImage", ((swig_class *) SWIGTYPE_p_FXImage->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXXPMImage, (void *) &cFX_XPMImage);
! rb_define_singleton_method(cFX_XPMImage.klass, "new", VALUEFUNC(_wrap_FX_XPMImage_allocate), -1);
! rb_define_method(cFX_XPMImage.klass, "initialize", VALUEFUNC(_wrap_new_FX_XPMImage), -1);
cFX_XPMImage.mark = (void (*)(void *)) FXRbXPMImage::markfunc;
cFX_XPMImage.destroy = (void (*)(void *)) free_FXXPMImage;
! cFXXPMImage.klass = rb_define_class_under(mFox, "FXXPMImage", ((swig_class *) SWIGTYPE_p_FXXPMImage->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbXPMImage, (void *) &cFXXPMImage);
! rb_define_singleton_method(cFXXPMImage.klass, "new", VALUEFUNC(_wrap_FXXPMImage_allocate), -1);
! rb_define_method(cFXXPMImage.klass, "initialize", VALUEFUNC(_wrap_new_FXXPMImage), -1);
rb_define_method(cFXXPMImage.klass, "onDefault", VALUEFUNC(_wrap_FXXPMImage_onDefault), -1);
rb_define_method(cFXXPMImage.klass, "save", VALUEFUNC(_wrap_FXXPMImage_save), -1);
Index: impl.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/impl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** impl.cpp 2 Mar 2002 01:39:49 -0000 1.12
--- impl.cpp 11 Jul 2002 13:33:09 -0000 1.13
***************
*** 19,28 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbArrowButton, FXArrowButton)
- /* Start stub implementations for class FXRbBitmap */
- IMPLEMENT_FXOBJECT_STUBS(FXRbBitmap, FXBitmap)
- IMPLEMENT_FXID_STUBS(FXRbBitmap, FXBitmap)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbBitmap, FXBitmap)
- IMPLEMENT_FXBITMAP_STUBS(FXRbBitmap, FXBitmap)
-
/* Start stub implementations for class FXRbBMPIcon */
IMPLEMENT_FXOBJECT_STUBS(FXRbBMPIcon, FXBMPIcon)
--- 19,22 ----
***************
*** 37,40 ****
--- 31,40 ----
IMPLEMENT_FXIMAGE_STUBS(FXRbBMPImage, FXBMPImage)
+ /* Start stub implementations for class FXRbBitmap */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbBitmap, FXBitmap)
+ IMPLEMENT_FXID_STUBS(FXRbBitmap, FXBitmap)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbBitmap, FXBitmap)
+ IMPLEMENT_FXBITMAP_STUBS(FXRbBitmap, FXBitmap)
+
/* Start stub implementations for class FXRbButton */
IMPLEMENT_FXOBJECT_STUBS(FXRbButton, FXButton)
***************
*** 43,46 ****
--- 43,51 ----
IMPLEMENT_FXWINDOW_STUBS(FXRbButton, FXButton)
+ /* Start stub implementations for class FXRbCURCursor */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbCURCursor, FXCURCursor)
+ IMPLEMENT_FXID_STUBS(FXRbCURCursor, FXCURCursor)
+ IMPLEMENT_FXCURSOR_STUBS(FXRbCURCursor, FXCURCursor)
+
/* Start stub implementations for class FXRbCanvas */
IMPLEMENT_FXOBJECT_STUBS(FXRbCanvas, FXCanvas)
***************
*** 99,107 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbComposite, FXComposite)
- /* Start stub implementations for class FXRbCURCursor */
- IMPLEMENT_FXOBJECT_STUBS(FXRbCURCursor, FXCURCursor)
- IMPLEMENT_FXID_STUBS(FXRbCURCursor, FXCURCursor)
- IMPLEMENT_FXCURSOR_STUBS(FXRbCURCursor, FXCURCursor)
-
/* Start stub implementations for class FXRbCursor */
IMPLEMENT_FXOBJECT_STUBS(FXRbCursor, FXCursor)
--- 104,107 ----
***************
*** 109,115 ****
IMPLEMENT_FXCURSOR_STUBS(FXRbCursor, FXCursor)
- /* Start stub implementations for class FXRbDataTarget */
- IMPLEMENT_FXOBJECT_STUBS(FXRbDataTarget, FXDataTarget)
-
/* Start stub implementations for class FXRbDC */
IMPLEMENT_FXDC_STUBS(FXRbDC, FXDC)
--- 109,112 ----
***************
*** 121,124 ****
--- 118,124 ----
IMPLEMENT_FXDC_STUBS(FXRbDCWindow, FXDCWindow)
+ /* Start stub implementations for class FXRbDataTarget */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbDataTarget, FXDataTarget)
+
/* Start stub implementations for class FXRbDebugTarget */
IMPLEMENT_FXOBJECT_STUBS(FXRbDebugTarget, FXDebugTarget)
***************
*** 416,432 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbListBox, FXListBox)
- /* Start stub implementations for class FXRbMainWindow */
- IMPLEMENT_FXOBJECT_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXID_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXTOPWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
-
- /* Start stub implementations for class FXRbMatrix */
- IMPLEMENT_FXOBJECT_STUBS(FXRbMatrix, FXMatrix)
- IMPLEMENT_FXID_STUBS(FXRbMatrix, FXMatrix)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbMatrix, FXMatrix)
- IMPLEMENT_FXWINDOW_STUBS(FXRbMatrix, FXMatrix)
-
/* Start stub implementations for class FXRbMDIDeleteButton */
IMPLEMENT_FXOBJECT_STUBS(FXRbMDIDeleteButton, FXMDIDeleteButton)
--- 416,419 ----
***************
*** 480,489 ****
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbMDIClient, FXMDIClient)
! /* Start stub implementations for class FXRbMenubar */
! IMPLEMENT_FXOBJECT_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXID_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXDRAWABLE_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXWINDOW_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXTOOLBAR_STUBS(FXRbMenubar, FXMenubar)
/* Start stub implementations for class FXRbMenuButton */
--- 467,482 ----
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbMDIClient, FXMDIClient)
! /* Start stub implementations for class FXRbMainWindow */
! IMPLEMENT_FXOBJECT_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXID_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXDRAWABLE_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXTOPWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
!
! /* Start stub implementations for class FXRbMatrix */
! IMPLEMENT_FXOBJECT_STUBS(FXRbMatrix, FXMatrix)
! IMPLEMENT_FXID_STUBS(FXRbMatrix, FXMatrix)
! IMPLEMENT_FXDRAWABLE_STUBS(FXRbMatrix, FXMatrix)
! IMPLEMENT_FXWINDOW_STUBS(FXRbMatrix, FXMatrix)
/* Start stub implementations for class FXRbMenuButton */
***************
*** 530,533 ****
--- 523,533 ----
IMPLEMENT_FXWINDOW_STUBS(FXRbMenuTitle, FXMenuTitle)
+ /* Start stub implementations for class FXRbMenubar */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXID_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXTOOLBAR_STUBS(FXRbMenubar, FXMenubar)
+
/* Start stub implementations for class FXRbMessageBox */
IMPLEMENT_FXOBJECT_STUBS(FXRbMessageBox, FXMessageBox)
***************
*** 553,562 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbOptionMenu, FXOptionMenu)
- /* Start stub implementations for class FXRbPacker */
- IMPLEMENT_FXOBJECT_STUBS(FXRbPacker, FXPacker)
- IMPLEMENT_FXID_STUBS(FXRbPacker, FXPacker)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbPacker, FXPacker)
- IMPLEMENT_FXWINDOW_STUBS(FXRbPacker, FXPacker)
-
/* Start stub implementations for class FXRbPCXIcon */
IMPLEMENT_FXOBJECT_STUBS(FXRbPCXIcon, FXPCXIcon)
--- 553,556 ----
***************
*** 571,580 ****
IMPLEMENT_FXIMAGE_STUBS(FXRbPCXImage, FXPCXImage)
- /* Start stub implementations for class FXRbPicker */
- IMPLEMENT_FXOBJECT_STUBS(FXRbPicker, FXPicker)
- IMPLEMENT_FXID_STUBS(FXRbPicker, FXPicker)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbPicker, FXPicker)
- IMPLEMENT_FXWINDOW_STUBS(FXRbPicker, FXPicker)
-
/* Start stub implementations for class FXRbPNGIcon */
IMPLEMENT_FXOBJECT_STUBS(FXRbPNGIcon, FXPNGIcon)
--- 565,568 ----
***************
*** 589,592 ****
--- 577,592 ----
IMPLEMENT_FXIMAGE_STUBS(FXRbPNGImage, FXPNGImage)
+ /* Start stub implementations for class FXRbPacker */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbPacker, FXPacker)
+ IMPLEMENT_FXID_STUBS(FXRbPacker, FXPacker)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbPacker, FXPacker)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbPacker, FXPacker)
+
+ /* Start stub implementations for class FXRbPicker */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbPicker, FXPicker)
+ IMPLEMENT_FXID_STUBS(FXRbPicker, FXPicker)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbPicker, FXPicker)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbPicker, FXPicker)
+
/* Start stub implementations for class FXRbPopup */
IMPLEMENT_FXOBJECT_STUBS(FXRbPopup, FXPopup)
***************
*** 618,621 ****
--- 618,633 ----
IMPLEMENT_FXDIALOGBOX_STUBS(FXRbProgressDialog, FXProgressDialog)
+ /* Start stub implementations for class FXRbRGBIcon */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbRGBIcon, FXRGBIcon)
+ IMPLEMENT_FXID_STUBS(FXRbRGBIcon, FXRGBIcon)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBIcon, FXRGBIcon)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbRGBIcon, FXRGBIcon)
+
+ /* Start stub implementations for class FXRbRGBImage */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbRGBImage, FXRGBImage)
+ IMPLEMENT_FXID_STUBS(FXRbRGBImage, FXRGBImage)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBImage, FXRGBImage)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbRGBImage, FXRGBImage)
+
/* Start stub implementations for class FXRbRadioButton */
IMPLEMENT_FXOBJECT_STUBS(FXRbRadioButton, FXRadioButton)
***************
*** 635,650 ****
IMPLEMENT_FXDIALOGBOX_STUBS(FXRbReplaceDialog, FXReplaceDialog)
- /* Start stub implementations for class FXRbRGBIcon */
- IMPLEMENT_FXOBJECT_STUBS(FXRbRGBIcon, FXRGBIcon)
- IMPLEMENT_FXID_STUBS(FXRbRGBIcon, FXRGBIcon)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBIcon, FXRGBIcon)
- IMPLEMENT_FXIMAGE_STUBS(FXRbRGBIcon, FXRGBIcon)
-
- /* Start stub implementations for class FXRbRGBImage */
- IMPLEMENT_FXOBJECT_STUBS(FXRbRGBImage, FXRGBImage)
- IMPLEMENT_FXID_STUBS(FXRbRGBImage, FXRGBImage)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBImage, FXRGBImage)
- IMPLEMENT_FXIMAGE_STUBS(FXRbRGBImage, FXRGBImage)
-
/* Start stub implementations for class FXRbRootWindow */
IMPLEMENT_FXOBJECT_STUBS(FXRbRootWindow, FXRootWindow)
--- 647,650 ----
***************
*** 662,666 ****
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScintilla, FXScintilla)
! #endif
/* Start stub implementations for class FXRbScrollArea */
--- 662,666 ----
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScintilla, FXScintilla)
! #endif /* WITH_FXSCINTILLA */
/* Start stub implementations for class FXRbScrollArea */
***************
*** 671,674 ****
--- 671,681 ----
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScrollArea, FXScrollArea)
+ /* Start stub implementations for class FXRbScrollWindow */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXID_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScrollWindow, FXScrollWindow)
+
/* Start stub implementations for class FXRbScrollbar */
IMPLEMENT_FXOBJECT_STUBS(FXRbScrollbar, FXScrollbar)
***************
*** 683,693 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbScrollCorner, FXScrollCorner)
- /* Start stub implementations for class FXRbScrollWindow */
- IMPLEMENT_FXOBJECT_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXID_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXWINDOW_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScrollWindow, FXScrollWindow)
-
/* Start stub implementations for class FXRbSearchDialog */
IMPLEMENT_FXOBJECT_STUBS(FXRbSearchDialog, FXSearchDialog)
--- 690,693 ----
***************
*** 778,781 ****
--- 778,805 ----
IMPLEMENT_FXWINDOW_STUBS(FXRbSwitcher, FXSwitcher)
+ /* Start stub implementations for class FXRbTGAIcon */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTGAIcon, FXTGAIcon)
+ IMPLEMENT_FXID_STUBS(FXRbTGAIcon, FXTGAIcon)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAIcon, FXTGAIcon)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTGAIcon, FXTGAIcon)
+
+ /* Start stub implementations for class FXRbTGAImage */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTGAImage, FXTGAImage)
+ IMPLEMENT_FXID_STUBS(FXRbTGAImage, FXTGAImage)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAImage, FXTGAImage)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTGAImage, FXTGAImage)
+
+ /* Start stub implementations for class FXRbTIFIcon */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTIFIcon, FXTIFIcon)
+ IMPLEMENT_FXID_STUBS(FXRbTIFIcon, FXTIFIcon)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTIFIcon, FXTIFIcon)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTIFIcon, FXTIFIcon)
+
+ /* Start stub implementations for class FXRbTIFImage */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTIFImage, FXTIFImage)
+ IMPLEMENT_FXID_STUBS(FXRbTIFImage, FXTIFImage)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTIFImage, FXTIFImage)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTIFImage, FXTIFImage)
+
/* Start stub implementations for class FXRbTabBar */
IMPLEMENT_FXOBJECT_STUBS(FXRbTabBar, FXTabBar)
***************
*** 823,850 ****
IMPLEMENT_FXDRAWABLE_STUBS(FXRbTextField, FXTextField)
IMPLEMENT_FXWINDOW_STUBS(FXRbTextField, FXTextField)
-
- /* Start stub implementations for class FXRbTGAIcon */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTGAIcon, FXTGAIcon)
- IMPLEMENT_FXID_STUBS(FXRbTGAIcon, FXTGAIcon)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAIcon, FXTGAIcon)
- IMPLEMENT_FXIMAGE_STUBS(FXRbTGAIcon, FXTGAIcon)
-
- /* Start stub implementations for class FXRbTGAImage */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTGAImage, FXTGAImage)
- IMPLEMENT_FXID_STUBS(FXRbTGAImage, FXTGAImage)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAImage, FXTGAImage)
- IMPLEMENT_FXIMAGE_STUBS(FXRbTGAImage, FXTGAImage)
-
- /* Start stub implementations for class FXRbTIFIcon */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTIFIcon, FXTIFIcon)
- IMPLEMENT_FXID_STUBS(FXRbTIFIcon, FXTIFIcon)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbTIFIcon, FXTIFIcon)
- IMPLEMENT_FXIMAGE_STUBS(FXRbTIFIcon, FXTIFIcon)
-
- /* Start stub implementations for class FXRbTIFImage */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTIFImage, FXTIFImage)
- IMPLEMENT_FXID_STUBS(FXRbTIFImage, FXTIFImage)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbTIFImage, FXTIFImage)
- IMPLEMENT_FXIMAGE_STUBS(FXRbTIFImage, FXTIFImage)
/* Start stub implementations for class FXRbToggleButton */
--- 847,850 ----
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** layout_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.8
--- layout_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.9
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...8447 lines suppressed...]
rb_define_method(cFX_Statusbar.klass, "getCornerStyle", VALUEFUNC(_wrap_FX_Statusbar_getCornerStyle), -1);
***************
*** 11778,11785 ****
cFX_Statusbar.destroy = (void (*)(void *)) free_FXStatusbar;
! cFXStatusbar.klass = rb_define_class_under(mFox, "FXStatusbar", cFX_Statusbar.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbStatusbar, (void *) &cFXStatusbar);
! rb_define_singleton_method(cFXStatusbar.klass, "new", VALUEFUNC(_wrap_new_FXStatusbar), -1);
! rb_define_method(cFXStatusbar.klass, "initialize", VALUEFUNC(_wrap_FXStatusbar_initialize), -1);
rb_define_method(cFXStatusbar.klass, "onDefault", VALUEFUNC(_wrap_FXStatusbar_onDefault), -1);
rb_define_method(cFXStatusbar.klass, "save", VALUEFUNC(_wrap_FXStatusbar_save), -1);
--- 12156,12163 ----
cFX_Statusbar.destroy = (void (*)(void *)) free_FXStatusbar;
! cFXStatusbar.klass = rb_define_class_under(mFox, "FXStatusbar", ((swig_class *) SWIGTYPE_p_FXStatusbar->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbStatusbar, (void *) &cFXStatusbar);
! rb_define_singleton_method(cFXStatusbar.klass, "new", VALUEFUNC(_wrap_FXStatusbar_allocate), -1);
! rb_define_method(cFXStatusbar.klass, "initialize", VALUEFUNC(_wrap_new_FXStatusbar), -1);
rb_define_method(cFXStatusbar.klass, "onDefault", VALUEFUNC(_wrap_FXStatusbar_onDefault), -1);
rb_define_method(cFXStatusbar.klass, "save", VALUEFUNC(_wrap_FXStatusbar_save), -1);
Index: librb.c
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/librb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** librb.c 28 Mar 2002 14:32:31 -0000 1.6
--- librb.c 11 Jul 2002 13:33:09 -0000 1.7
***************
*** 328,359 ****
/* Convert a pointer value */
! SWIGRUNTIME(void *)
! SWIG_ConvertPtr(VALUE obj, swig_type_info *ty)
{
char *c;
- void *ptr = 0;
swig_type_info *tc;
/* Grab the pointer */
! if (NIL_P(obj))
return 0;
! else
! Data_Get_Struct(obj, void, ptr);
/* Do type-checking if type info was provided */
if (ty) {
if (ty->clientdata) {
! if (!rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass))
! rb_raise(rb_eTypeError, "wrong argument type (expected %s)", ty->str);
! if (!ptr) rb_raise(rb_eRuntimeError, "This %s already released", ty->str);
} else {
! if ((c = SWIG_MangleStr(obj)) == NULL)
! rb_raise(rb_eTypeError, "Expected %s", ty->str);
tc = SWIG_TypeCheck(c, ty);
! if (!tc) rb_raise(rb_eTypeError, "Expected %s", ty->str);
! ptr = SWIG_TypeCast(tc, ptr);
}
}
! return ptr;
}
--- 328,373 ----
/* Convert a pointer value */
! SWIGRUNTIME(int)
! SWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags)
{
char *c;
swig_type_info *tc;
/* Grab the pointer */
! if (NIL_P(obj)) {
! *ptr = 0;
return 0;
! } else
! Data_Get_Struct(obj, void, *ptr);
/* Do type-checking if type info was provided */
if (ty) {
if (ty->clientdata) {
! if (!rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) {
! if (flags)
! rb_raise(rb_eTypeError, "wrong argument type (expected %s)", ty->str);
! else
! return -1;
! }
! if (*ptr == 0)
! rb_raise(rb_eRuntimeError, "This %s already released", ty->str);
} else {
! if ((c = SWIG_MangleStr(obj)) == NULL) {
! if (flags)
! rb_raise(rb_eTypeError, "Expected %s", ty->str);
! else
! return -1;
! }
tc = SWIG_TypeCheck(c, ty);
! if (!tc) {
! if (flags)
! rb_raise(rb_eTypeError, "Expected %s", ty->str);
! else
! return -1;
! }
! *ptr = SWIG_TypeCast(tc, ptr);
}
}
! return 0;
}
***************
*** 386,390 ****
SWIGRUNTIME(char *)
SWIG_UnpackData(char *c, void *ptr, int sz) {
! register unsigned char uu;
register int d;
unsigned char *u = (unsigned char *) ptr;
--- 400,404 ----
SWIGRUNTIME(char *)
SWIG_UnpackData(char *c, void *ptr, int sz) {
! register unsigned char uu = 0;
register int d;
unsigned char *u = (unsigned char *) ptr;
Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** markfuncs.cpp 2 Mar 2002 01:39:49 -0000 1.13
--- markfuncs.cpp 11 Jul 2002 13:33:09 -0000 1.14
***************
*** 5,8 ****
--- 5,14 ----
#include "FXRbCommon.h"
+ #if RUBY_VERSION_CODE < 172
+ #define MARK(p) rb_gc_mark(reinterpret_cast<void *>((p)))
+ #else
+ #define MARK(p) rb_gc_mark(reinterpret_cast<VALUE>((p)))
+ #endif
+
// FIXME: How to get to the target objects stored in the accelerator
// table? This is currently private (not protected) data for the class.
***************
*** 83,87 ****
if(self){
FXRbGcMark(self->getApp());
! if(self->getUserData()) rb_gc_mark((VALUE) self->getUserData());
}
}
--- 89,93 ----
if(self){
FXRbGcMark(self->getApp());
! if(self->getUserData()) MARK(self->getUserData());
}
}
***************
*** 203,207 ****
for(FXint i=0; i<self->getNumItems(); i++){
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
}
--- 209,213 ----
for(FXint i=0; i<self->getNumItems(); i++){
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
}
***************
*** 310,314 ****
FXRbGcMark(self->getClosedIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 316,320 ----
FXRbGcMark(self->getClosedIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 340,344 ****
FXRbGcMark(self->getIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 346,350 ----
FXRbGcMark(self->getIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 360,364 ****
FXRbListItem::markfunc(item);
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
FXRbGcMark(self->getFont());
--- 366,370 ----
FXRbListItem::markfunc(item);
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
FXRbGcMark(self->getFont());
***************
*** 373,377 ****
FXRbGcMark(self->getIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 379,383 ----
FXRbGcMark(self->getIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 393,397 ****
FXRbGcMark(self->getItemIcon(i,j));
if(self->getItemData(i,j))
! rb_gc_mark((VALUE) self->getItemData(i,j));
}
}
--- 399,403 ----
FXRbGcMark(self->getItemIcon(i,j));
if(self->getItemData(i,j))
! MARK(self->getItemData(i,j));
}
}
***************
*** 406,410 ****
FXRbGcMark(self->getIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 412,416 ----
FXRbGcMark(self->getIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 426,430 ****
FXRbHeaderItem::markfunc(item);
if(item->getData())
! rb_gc_mark((VALUE) item->getData());
}
FXRbGcMark(self->getFont());
--- 432,436 ----
FXRbHeaderItem::markfunc(item);
if(item->getData())
! MARK(item->getData());
}
FXRbGcMark(self->getFont());
***************
*** 440,444 ****
FXRbGcMark(self->getMiniIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 446,450 ----
FXRbGcMark(self->getMiniIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 461,465 ****
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
FXRbGcMark(self->getFont());
--- 467,471 ----
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
FXRbGcMark(self->getFont());
***************
*** 745,749 ****
FXRbGcMark(self->getItemIcon(i));
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
}
--- 751,755 ----
FXRbGcMark(self->getItemIcon(i));
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
}
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** mdi_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.36
--- mdi_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.37
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...7127 lines suppressed...]
rb_define_method(cFX_MDIChild.klass, "onFocusSelf", VALUEFUNC(_wrap_FX_MDIChild_onFocusSelf), -1);
***************
*** 10892,10899 ****
cFX_MDIChild.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXMDIChild.klass = rb_define_class_under(mFox, "FXMDIChild", cFX_MDIChild.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMDIChild, (void *) &cFXMDIChild);
! rb_define_singleton_method(cFXMDIChild.klass, "new", VALUEFUNC(_wrap_new_FXMDIChild), -1);
! rb_define_method(cFXMDIChild.klass, "initialize", VALUEFUNC(_wrap_FXMDIChild_initialize), -1);
rb_define_method(cFXMDIChild.klass, "onDefault", VALUEFUNC(_wrap_FXMDIChild_onDefault), -1);
rb_define_method(cFXMDIChild.klass, "save", VALUEFUNC(_wrap_FXMDIChild_save), -1);
--- 10890,10897 ----
cFX_MDIChild.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXMDIChild.klass = rb_define_class_under(mFox, "FXMDIChild", ((swig_class *) SWIGTYPE_p_FXMDIChild->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMDIChild, (void *) &cFXMDIChild);
! rb_define_singleton_method(cFXMDIChild.klass, "new", VALUEFUNC(_wrap_FXMDIChild_allocate), -1);
! rb_define_method(cFXMDIChild.klass, "initialize", VALUEFUNC(_wrap_new_FXMDIChild), -1);
rb_define_method(cFXMDIChild.klass, "onDefault", VALUEFUNC(_wrap_FXMDIChild_onDefault), -1);
rb_define_method(cFXMDIChild.klass, "save", VALUEFUNC(_wrap_FXMDIChild_save), -1);
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** opengl_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.41
--- opengl_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.42
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...13711 lines suppressed...]
rb_define_method(cFX_GLShape.klass, "onDNDMotion", VALUEFUNC(_wrap_FX_GLShape_onDNDMotion), -1);
***************
*** 13765,13772 ****
cFX_GLShape.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXGLShape.klass = rb_define_class_under(mFox, "FXGLShape", cFX_GLShape.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbGLShape, (void *) &cFXGLShape);
! rb_define_singleton_method(cFXGLShape.klass, "new", VALUEFUNC(_wrap_new_FXGLShape), -1);
! rb_define_method(cFXGLShape.klass, "initialize", VALUEFUNC(_wrap_FXGLShape_initialize), -1);
rb_define_method(cFXGLShape.klass, "setRange", VALUEFUNC(_wrap_FXGLShape_setRange), -1);
rb_define_method(cFXGLShape.klass, "onDefault", VALUEFUNC(_wrap_FXGLShape_onDefault), -1);
--- 16500,16507 ----
cFX_GLShape.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXGLShape.klass = rb_define_class_under(mFox, "FXGLShape", ((swig_class *) SWIGTYPE_p_FXGLShape->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbGLShape, (void *) &cFXGLShape);
! rb_define_singleton_method(cFXGLShape.klass, "new", VALUEFUNC(_wrap_FXGLShape_allocate), -1);
! rb_define_method(cFXGLShape.klass, "initialize", VALUEFUNC(_wrap_new_FXGLShape), -1);
rb_define_method(cFXGLShape.klass, "setRange", VALUEFUNC(_wrap_FXGLShape_setRange), -1);
rb_define_method(cFXGLShape.klass, "onDefault", VALUEFUNC(_wrap_FXGLShape_onDefault), -1);
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** scintilla_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.16
--- scintilla_wrap.cpp 11 Jul 2002 13:33:10 -0000 1.17
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...3655 lines suppressed...]
rb_define_method(cFX_Scintilla.klass, "onScintillaCommand", VALUEFUNC(_wrap_FX_Scintilla_onScintillaCommand), -1);
***************
*** 4378,4385 ****
cFX_Scintilla.destroy = (void (*)(void *)) free_FXScintilla;
! cFXScintilla.klass = rb_define_class_under(mFox, "FXScintilla", cFX_Scintilla.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbScintilla, (void *) &cFXScintilla);
! rb_define_singleton_method(cFXScintilla.klass, "new", VALUEFUNC(_wrap_new_FXScintilla), -1);
! rb_define_method(cFXScintilla.klass, "initialize", VALUEFUNC(_wrap_FXScintilla_initialize), -1);
rb_define_method(cFXScintilla.klass, "onDefault", VALUEFUNC(_wrap_FXScintilla_onDefault), -1);
rb_define_method(cFXScintilla.klass, "save", VALUEFUNC(_wrap_FXScintilla_save), -1);
--- 4466,4473 ----
cFX_Scintilla.destroy = (void (*)(void *)) free_FXScintilla;
! cFXScintilla.klass = rb_define_class_under(mFox, "FXScintilla", ((swig_class *) SWIGTYPE_p_FXScintilla->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbScintilla, (void *) &cFXScintilla);
! rb_define_singleton_method(cFXScintilla.klass, "new", VALUEFUNC(_wrap_FXScintilla_allocate), -1);
! rb_define_method(cFXScintilla.klass, "initialize", VALUEFUNC(_wrap_new_FXScintilla), -1);
rb_define_method(cFXScintilla.klass, "onDefault", VALUEFUNC(_wrap_FXScintilla_onDefault), -1);
rb_define_method(cFXScintilla.klass, "save", VALUEFUNC(_wrap_FXScintilla_save), -1);
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ui_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.9
--- ui_wrap.cpp 11 Jul 2002 13:33:10 -0000 1.10
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...99678 lines suppressed...]
rb_define_method(cFX_ToolbarTab.klass, "onUpdate", VALUEFUNC(_wrap_FX_ToolbarTab_onUpdate), -1);
***************
*** 106276,106283 ****
cFX_ToolbarTab.mark = (void (*)(void *)) FXRbToolbarTab::markfunc;
! cFXToolbarTab.klass = rb_define_class_under(mFox, "FXToolbarTab", cFX_ToolbarTab.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbToolbarTab, (void *) &cFXToolbarTab);
! rb_define_singleton_method(cFXToolbarTab.klass, "new", VALUEFUNC(_wrap_new_FXToolbarTab), -1);
! rb_define_method(cFXToolbarTab.klass, "initialize", VALUEFUNC(_wrap_FXToolbarTab_initialize), -1);
rb_define_method(cFXToolbarTab.klass, "onDefault", VALUEFUNC(_wrap_FXToolbarTab_onDefault), -1);
rb_define_method(cFXToolbarTab.klass, "save", VALUEFUNC(_wrap_FXToolbarTab_save), -1);
--- 109406,109413 ----
cFX_ToolbarTab.mark = (void (*)(void *)) FXRbToolbarTab::markfunc;
! cFXToolbarTab.klass = rb_define_class_under(mFox, "FXToolbarTab", ((swig_class *) SWIGTYPE_p_FXToolbarTab->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbToolbarTab, (void *) &cFXToolbarTab);
! rb_define_singleton_method(cFXToolbarTab.klass, "new", VALUEFUNC(_wrap_FXToolbarTab_allocate), -1);
! rb_define_method(cFXToolbarTab.klass, "initialize", VALUEFUNC(_wrap_new_FXToolbarTab), -1);
rb_define_method(cFXToolbarTab.klass, "onDefault", VALUEFUNC(_wrap_FXToolbarTab_onDefault), -1);
rb_define_method(cFXToolbarTab.klass, "save", VALUEFUNC(_wrap_FXToolbarTab_save), -1);
--- extconf.rb.tmpl DELETED ---
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv26972/ext/fox/include
Modified Files:
FXRbApp.h FXRbDrawable.h FXRbGIFCursor.h FXRbShell.h
FXRbStream.h FXRbTopWindow.h FXRbWindow.h FXRuby.h
Added Files:
FXMemoryBuffer.h
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: FXRbApp.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbApp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXRbApp.h 7 Feb 2002 16:53:50 -0000 1.3
--- FXRbApp.h 11 Jul 2002 13:33:12 -0000 1.4
***************
*** 89,93 ****
FXDECLARE(FXRbApp)
protected:
! FXbool threadsEnabled;
FXuint sleepTime;
FXChore* threadsChore;
--- 89,93 ----
FXDECLARE(FXRbApp)
protected:
! FXbool m_bThreadsEnabled;
FXuint sleepTime;
FXChore* threadsChore;
***************
*** 107,115 ****
FXRbApp(const FXchar* name,const FXchar* vendor);
! // Enable support for multithreaded applications
! void enableThreads();
! // Disable support for multithreaded applications
! void disableThreads();
// Set sleep time (in milliseconds)
--- 107,115 ----
FXRbApp(const FXchar* name,const FXchar* vendor);
! // Enable (or disable) support for multithreaded applications
! void setThreadsEnabled(FXbool enabled);
! // Are threads enabled?
! FXbool threadsEnabled() const { return m_bThreadsEnabled; }
// Set sleep time (in milliseconds)
Index: FXRbDrawable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDrawable.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbDrawable.h 12 Jul 2001 19:44:17 -0000 1.1
--- FXRbDrawable.h 11 Jul 2002 13:33:12 -0000 1.2
***************
*** 46,53 ****
FXRbDrawable(){}
// Construct with specified width and height
FXRbDrawable(FXApp* a,FXint w,FXint h) : FXDrawable(a,w,h){}
- public:
// Mark dependencies for the GC
static void markfunc(FXDrawable* drawable);
--- 46,53 ----
FXRbDrawable(){}
+ public:
// Construct with specified width and height
FXRbDrawable(FXApp* a,FXint w,FXint h) : FXDrawable(a,w,h){}
// Mark dependencies for the GC
static void markfunc(FXDrawable* drawable);
Index: FXRbGIFCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbGIFCursor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbGIFCursor.h 12 Jul 2001 19:44:17 -0000 1.1
--- FXRbGIFCursor.h 11 Jul 2002 13:33:12 -0000 1.2
***************
*** 37,41 ****
public:
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1):FXGIFCursor(a,pix,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
--- 37,41 ----
public:
/// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy):FXGIFCursor(a,pix,hx,hy){
FXRbRegisterAppSensitiveObject(this);
}
Index: FXRbShell.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbShell.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbShell.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbShell.h 11 Jul 2002 13:33:12 -0000 1.2
***************
*** 38,41 ****
--- 38,42 ----
FXRbShell(){}
+ public:
// Construct shell with specified application
FXRbShell(FXApp* a,FXuint opts,FXint x,FXint y,FXint w,FXint h) : FXShell(a,opts,x,y,w,h){}
***************
*** 44,48 ****
FXRbShell(FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h) : FXShell(own,opts,x,y,w,h){}
- public:
// Mark dependencies for the GC
static void markfunc(FXShell* shell);
--- 45,48 ----
Index: FXRbStream.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbStream.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbStream.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbStream.h 11 Jul 2002 13:33:12 -0000 1.2
***************
*** 33,37 ****
} \
FXbool cls::position(unsigned long p){ \
! return FXRbCallBoolMethod(this,"position",p); \
}
--- 33,37 ----
} \
FXbool cls::position(unsigned long p){ \
! return FXRbCallBoolMethod(this,"setPosition",p); \
}
Index: FXRbTopWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTopWindow.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbTopWindow.h 12 Jul 2001 19:44:19 -0000 1.1
--- FXRbTopWindow.h 11 Jul 2002 13:33:12 -0000 1.2
***************
*** 58,62 ****
#include "FXRbWindowVirtuals.h"
#include "FXRbTopWindowVirtuals.h"
! protected:
// Construct unowned top-level window
FXRbTopWindow(FXApp* a,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs) : FXTopWindow(a,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
--- 58,62 ----
#include "FXRbWindowVirtuals.h"
#include "FXRbTopWindowVirtuals.h"
! public:
// Construct unowned top-level window
FXRbTopWindow(FXApp* a,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs) : FXTopWindow(a,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
***************
*** 64,68 ****
// Construct owned top-level window
FXRbTopWindow(FXWindow* owner,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs) : FXTopWindow(owner,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
! public:
// Mark dependencies for the GC
static void markfunc(FXTopWindow* top);
--- 64,68 ----
// Construct owned top-level window
FXRbTopWindow(FXWindow* owner,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs) : FXTopWindow(owner,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
!
// Mark dependencies for the GC
static void markfunc(FXTopWindow* top);
Index: FXRbWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbWindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXRbWindow.h 26 Nov 2001 17:47:45 -0000 1.3
--- FXRbWindow.h 11 Jul 2002 13:33:12 -0000 1.4
***************
*** 177,185 ****
protected:
FXRbWindow(){}
- FXRbWindow(FXApp* a,FXVisual *vis):FXWindow(a,vis){}
- FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXWindow(a,own,opts,x,y,w,h){}
public:
// Constructor
FXRbWindow(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXWindow(p,opts,x,y,w,h){}
// Mark dependencies for the GC
--- 177,189 ----
protected:
FXRbWindow(){}
public:
// Constructor
FXRbWindow(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXWindow(p,opts,x,y,w,h){}
+
+ // Another constructor
+ FXRbWindow(FXApp* a,FXVisual *vis):FXWindow(a,vis){}
+
+ // Yet another constructor
+ FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXWindow(a,own,opts,x,y,w,h){}
// Mark dependencies for the GC
Index: FXRuby.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FXRuby.h 4 Apr 2002 02:10:48 -0000 1.22
--- FXRuby.h 11 Jul 2002 13:33:12 -0000 1.23
***************
*** 31,38 ****
struct swig_type_info;
// Helper for overloaded show() functions
template <class TYPE>
VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typeinfo) {
! TYPE *win = static_cast<TYPE *>(SWIG_ConvertPtr(self, typeinfo));
if (argc == 0) {
win->_show();
--- 31,46 ----
struct swig_type_info;
+ // SWIG runtime functions we need
+ extern "C" {
+ swig_type_info * SWIG_TypeQuery(const char *);
+ VALUE SWIG_NewPointerObj(void *ptr, swig_type_info *type, int own);
+ int SWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags);
+ }
+
// Helper for overloaded show() functions
template <class TYPE>
VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typeinfo) {
! TYPE *win;
! SWIG_ConvertPtr(self,(void**)&win,typeinfo,1);
if (argc == 0) {
win->_show();
***************
*** 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);
/**
--- 84,93 ----
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);
/**
***************
*** 176,188 ****
inline VALUE to_ruby(FXObject* obj){
! char type[64];
! sprintf(type,"%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type);
}
inline VALUE to_ruby(const FXObject* obj){
! char type[64];
! sprintf(type,"%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type);
}
--- 184,204 ----
inline VALUE to_ruby(FXObject* obj){
! if(obj){
! FXString type=FXStringFormat("%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type.text());
! }
! else{
! return Qnil;
! }
}
inline VALUE to_ruby(const FXObject* obj){
! if(obj){
! FXString type=FXStringFormat("%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type.text());
! }
! else{
! return Qnil;
! }
}
***************
*** 224,232 ****
inline VALUE to_ruby(FXTablePos* p){
! return FXRbNewPointerObj(static_cast<void*>(p),FXRbTypeQuery("FXTablePos *"));
}
inline VALUE to_ruby(FXTableRange* r){
! return FXRbNewPointerObj(static_cast<void*>(r),FXRbTypeQuery("FXTableRange *"));
}
--- 240,250 ----
inline VALUE to_ruby(FXTablePos* p){
! // return FXRbNewPointerObj(static_cast<void*>(p),FXRbTypeQuery("FXTablePos *"));
! return SWIG_NewPointerObj(static_cast<void*>(p),FXRbTypeQuery("FXTablePos *"),0);
}
inline VALUE to_ruby(FXTableRange* r){
! // return FXRbNewPointerObj(static_cast<void*>(r),FXRbTypeQuery("FXTableRange *"));
! return SWIG_NewPointerObj(static_cast<void*>(r),FXRbTypeQuery("FXTableRange *"),0);
}
***************
*** 239,242 ****
--- 257,263 ----
}
+ // Returns the beginning and ending values (inclusive) for a Range object
+ void FXRbRange2LoHi(VALUE range,FXint& lo,FXint& hi);
+
// Call function with "void" return value
void FXRbCallVoidMethod(FXObject* recv,
***************
*** 431,434 ****
--- 452,456 ----
#include "FXRbDrawable.h"
#include "FXRbBitmap.h"
+ #include "FXMemoryBuffer.h"
#include "FXRbImage.h"
#include "FXRbBMPImage.h"
|
Update of /cvsroot/fxruby/FXRuby/doc
In directory usw-pr-cvs1:/tmp/cvs-serv26972/doc
Modified Files:
Makefile book.html book.xml build.html build.xml changes.html
changes.xml differences.html differences.xml events.html
examples.html goals.html goals.xml library.html library.xml
opengl.html scintilla.html scintilla.xml todo.html todo.xml
tutorial1.html tutorial1.xml
Added Files:
custom.xsl implementation.html implementation.xml
Removed Files:
tutorial1.png
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: Makefile
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile 22 Mar 2002 01:53:30 -0000 1.7
--- Makefile 11 Jul 2002 13:32:54 -0000 1.8
***************
*** 5,10 ****
########################################################################
! SAXON = java -jar C:\saxon-6.5.1\saxon.jar
! DOCBOOK_XSL = C:\docbook\docbook-xsl-customized\html\chunk.xsl
all: xml
--- 5,11 ----
########################################################################
! SAXON = java -jar /home/jlj/saxon-6.5.2/saxon.jar
! #DOCBOOK_XSL = /home/jlj/docbook/docbook-xsl-1.50.0/html/chunk.xsl
! DOCBOOK_XSL = custom.xsl
all: xml
***************
*** 12,16 ****
xml:
$(SAXON) book.xml $(DOCBOOK_XSL)
- move /y index.html book.html
clean:
--- 13,16 ----
Index: book.html
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/book.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** book.html 22 Mar 2002 01:53:30 -0000 1.35
--- book.html 11 Jul 2002 13:32:54 -0000 1.36
***************
*** 1,3 ****
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Developing Graphical User Interfaces with FXRuby</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="next" href="goals.html" title="History and Goals"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Developing Graphical User Interfaces with FXRuby</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr></table><hr></div><div class="book"><div class="titlepage"><div><h1 class="title"><a name="book"></a>Developing Graphical User Interfaces with FXRuby</h1></div><div><div class="author"><h3 class="author">Lyle Johnson</h3></div></div><div><p class="copyright">Copyright © 2001 J. Lyle Johnson</p></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="goals.html">History and Goals</a></dt><dt>1. <a href="build.html">Building from Source Code</a></dt><dt>2. <a href="examples.html">Examples</a></dt><dt>3. <a href="tutorial1.html">Hello, World!</a></dt><dt>4. <a href="opengl.html">Using OpenGL with FXRuby</a></dt><dt>5. <a href="scintilla.html">Using Scintilla with FXRuby</a></dt><dt>6. <a href="differences.html">Differences between FOX and FXRuby</a></dt><dt>7. <a href="events.html">FXRuby's Message-Target System</a></dt><dt>8. <a href="library.html">The FXRuby Standard Library</a></dt><dt>9. <a href="todo.html">To-do list</a></dt><dt>10. <a href="changes.html">Change History</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> History and Goals</td></tr></table></div></body></html>
\ No newline at end of file
--- 1,3 ----
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Developing Graphical User Interfaces with FXRuby</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="book.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="next" href="goals.html" title="History and Goals"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Developing Graphical User Interfaces with FXRuby</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr></table><hr></div><div class="book"><div class="titlepage"><div><h1 class="title"><a name="book"></a>Developing Graphical User Interfaces with FXRuby</h1></div><div><div class="author"><h3 class="author">Lyle Johnson</h3></div></div><div><p class="copyright">Copyright © 2001 J. Lyle Johnson</p></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="goals.html">History and Goals</a></dt><dt>1. <a href="build.html">Building from Source Code</a></dt><dt>2. <a href="examples.html">Examples</a></dt><dt>3. <a href="tutorial1.html">Hello, World!</a></dt><dt>4. <a href="opengl.html">Using OpenGL with FXRuby</a></dt><dt>5. <a href="scintilla.html">Using Scintilla with FXRuby</a></dt><dt>6. <a href="differences.html">Differences between FOX and FXRuby</a></dt><dt>7. <a href="events.html">FXRuby's Message-Target System</a></dt><dt>8. <a href="library.html">The FXRuby Standard Library</a></dt><dt>9. <a href="implementation.html">Implementation</a></dt><dt>10. <a href="todo.html">To-do list</a></dt><dt>11. <a href="changes.html">Change History</a></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="goals.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> History and Goals</td></tr></table></div></body></html>
\ No newline at end of file
Index: book.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/book.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** book.xml 14 Mar 2002 17:03:39 -0000 1.7
--- book.xml 11 Jul 2002 13:32:54 -0000 1.8
***************
*** 10,13 ****
--- 10,14 ----
<!ENTITY events.xml SYSTEM "events.xml">
<!ENTITY goals.xml SYSTEM "goals.xml">
+ <!ENTITY implementation.xml SYSTEM "implementation.xml">
<!ENTITY library.xml SYSTEM "library.xml">
<!ENTITY opengl.xml SYSTEM "opengl.xml">
***************
*** 27,30 ****
--- 28,32 ----
&events.xml;
&library.xml;
+ &implementation.xml;
&todo.xml;
&changes.xml;
Index: build.html
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/build.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** build.html 22 Mar 2002 01:53:30 -0000 1.23
--- build.html 11 Jul 2002 13:32:54 -0000 1.24
***************
*** 1,14 ****
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Chapter 1. Building from Source Code</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="up" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="previous" href="goals.html" title="History and Goals"><link rel="next" href="examples.html" title="Chapter 2. Examples"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Building from Source Code</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="build"></a>Chapter 1. Building from Source Code</h2></div></div><p>If you're planning to use FXRuby on Windows, with the Pragmatic Programmers' Ruby installer for Windows, you may wish to just download the pre-compiled FXRuby binaries. Otherwise, you will need to compile the shared library for FXRuby from the source code.</p><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e59"></a>The Basics</h2></div></div><p>These instructions assume that you've already downloaded, compiled and installed FOX. Next, you'll need to download the FXRuby source code tarball and unpack it by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>tar xzf FXRuby-1.0.3.tar.gz</b></pre></td></tr></table><p>This will create a new directory called <tt>FXRuby-1.0.3</tt>. Change to the top-level directory and configure the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config</b></pre></td></tr></table><p>By default, the <tt>install.rb</tt> script will look for the FOX include files and library in the standard <tt>/usr/local/include/fox</tt> and <tt>/usr/local/lib</tt> directories, respectively. You can override these locations by passing a few additional arguments to <tt>install.rb</tt> during this step, e.g.</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config -- \
! --with-fox-include=/home/lyle/fox-1.0.3/include \
! --with-fox-lib=/home/lyle/fox-1.0.3/src/.libs</b></pre></td></tr></table><p>Once the build has been configured, you can start the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb setup</b></pre></td></tr></table><p>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. If you run into problems during the compilation, please check the <a href="build.html#tragedies" title="Things That Can Go Wrong">list of things that can go wrong</a> for workarounds for those problems.</p><p>Once it's finished compiling, install FXRuby by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb install</b></pre></td></tr></table><p>As a quick sanity check, to make sure that all is well, you should probably fire up <tt>irb</tt> and try to import FXRuby:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
true
! irb(main):002:0></pre></td></tr></table><p>If the import failed (usually with a message along the lines of "Cannot load library"), check the <a href="build.html#tragedies" title="Things That Can Go Wrong">list of things that can go wrong</a> for known problems. If that still doesn't solve your problem, drop me an e-mail or ask around on the Ruby newsgroup or mailing list; it's quite likely that someone else has run into this problem too. Once you do have a working FXRuby installation, you're ready to check out the example programs.</p></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e130"></a>Building with Visual C++</h2></div></div><p>This section describes how to compile FXRuby using Microsoft Visual C++, for use with a Ruby that was also compiled using Visual C++.</p><p>This discussion assumes that you've built Ruby using the instructions and build files distributed with the standard Ruby source code. To review, you should have started by unpacking the source code tarball, changing into the top-level source code directory (e.g. <tt>C:\ruby-1.6.7</tt>) and then typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\ruby-1.6.7><b>win32\configure</b>
type 'nmake' to make ruby for mswin32.
! C:\ruby-1.6.7><b>nmake</b></pre></td></tr></table><p>After the compilation finished, you installed Ruby somewhere by typing, e.g.,</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\ruby-1.6.7><b>nmake DESTDIR=C:\ruby install</b></pre></td></tr></table><p>Similarly, I'm assuming that you built the FOX library using the Developer Studio project files distributed with the standard FOX source code distribution. Although it's possible to build FXRuby against either the static library build of FOX (<tt>fox.lib</tt>) or the DLL build (<tt>foxdll.dll</tt>), these instructions currently cover only the static library build. Before you get started building FXRuby itself, you'll need to rename the static FOX library from its default filename (<tt>fox.lib</tt>) to <tt>foxst.lib</tt>. The reason for this rename is a charming little quirk in Microsoft's LINK utility and the fact that the eventual output name for the FXRuby DLL is also <tt>fox.so</tt>; for now, just take my word for it. So if your FOX source code distribution and build are found in the <tt>C:\fox-1.0.3</tt> directory, you'd need to rename the file:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\fox-1.0.3\lib><b>rename fox.lib foxst.lib</b></pre></td></tr></table><p>Now you can configure the FXRuby build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.3><b>ruby install.rb config --make-prog=nmake -- \
! --with-fox-include=C:\fox-1.0.3\include \
! --with-fox-lib=C:\fox-1.0.3\lib</b></pre></td></tr></table><p>Once the build has been configured, you can start the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.3> <b>ruby install.rb setup</b></pre></td></tr></table><p>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. Because Visual C++ is such a strict compiler (usually a good thing), you will probably run into a few problems with non-ANSI declarations in the Ruby header files. If you do run into problems during the compilation, just check the next section for a list of things that could go wrong, and workarounds for those problems. None of them are showstoppers and none require you to restart the compile from scratch (just type <b>ruby install.rb setup</b> to pick up where you left off).</p><p>Once it's finished compiling, install FXRuby by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.3> <b>ruby install.rb install</b></pre></td></tr></table><p>As a quick sanity check, to make sure that all is well, you should probably fire up <tt>irb</tt> and try to import FXRuby:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.3> <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
true
--- 1,18 ----
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Chapter 1. Building from Source Code</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="book.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="up" href="book.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="previous" href="goals.html" title="History and Goals"><link rel="next" href="examples.html" title="Chapter 2. Examples"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Building from Source Code</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="build"></a>Chapter 1. Building from Source Code</h2></div></div><p>If you're planning to use FXRuby on Windows, with the Pragmatic
! Programmers' Ruby installer for Windows, you may wish to just download the
! pre-compiled FXRuby binaries. Linux RPMs are also available for download.
! Otherwise, you will need to compile the shared library for FXRuby from the
! source code.</p><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e62"></a>The Basics</h2></div></div><p>These instructions assume that you've already downloaded, compiled and installed FOX. Next, you'll need to download the FXRuby source code tarball and unpack it by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>tar xzf FXRuby-1.0.11.tar.gz</b></pre></td></tr></table><p>This will create a new directory called <tt>FXRuby-1.0.11</tt>. Change to the top-level directory and configure the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config</b></pre></td></tr></table><p>By default, the <tt>install.rb</tt> script will look for the FOX include files and library in the standard <tt>/usr/local/include/fox</tt> and <tt>/usr/local/lib</tt> directories, respectively. You can override these locations by passing a few additional arguments to <tt>install.rb</tt> during this step, e.g.</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb config -- \
! --with-fox-include=/home/lyle/fox-1.0.11/include \
! --with-fox-lib=/home/lyle/fox-1.0.11/src/.libs</b></pre></td></tr></table><p>Once the build has been configured, you can start the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb setup</b></pre></td></tr></table><p>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. If you run into problems during the compilation, please check the <a href="build.html#tragedies" title="Things That Can Go Wrong">list of things that can go wrong</a> for workarounds for those problems.</p><p>Once it's finished compiling, install FXRuby by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>ruby install.rb install</b></pre></td></tr></table><p>As a quick sanity check, to make sure that all is well, you should probably fire up <tt>irb</tt> and try to import FXRuby:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
true
! irb(main):002:0></pre></td></tr></table><p>If the import failed (usually with a message along the lines of "Cannot load library"), check the <a href="build.html#tragedies" title="Things That Can Go Wrong">list of things that can go wrong</a> for known problems. If that still doesn't solve your problem, drop me an e-mail or ask around on the Ruby newsgroup or mailing list; it's quite likely that someone else has run into this problem too. Once you do have a working FXRuby installation, you're ready to check out the example programs.</p></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e133"></a>Building with Visual C++</h2></div></div><p>This section describes how to compile FXRuby using Microsoft Visual C++, for use with a Ruby that was also compiled using Visual C++.</p><p>This discussion assumes that you've built Ruby using the instructions and build files distributed with the standard Ruby source code. To review, you should have started by unpacking the source code tarball, changing into the top-level source code directory (e.g. <tt>C:\ruby-1.6.7</tt>) and then typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\ruby-1.6.7><b>win32\configure</b>
type 'nmake' to make ruby for mswin32.
! C:\ruby-1.6.7><b>nmake</b></pre></td></tr></table><p>After the compilation finished, you installed Ruby somewhere by typing, e.g.,</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\ruby-1.6.7><b>nmake DESTDIR=C:\ruby install</b></pre></td></tr></table><p>Similarly, I'm assuming that you built the FOX library using the Developer Studio project files distributed with the standard FOX source code distribution. Although it's possible to build FXRuby against either the static library build of FOX (<tt>fox.lib</tt>) or the DLL build (<tt>foxdll.dll</tt>), these instructions currently cover only the static library build. Before you get started building FXRuby itself, you'll need to rename the static FOX library from its default filename (<tt>fox.lib</tt>) to <tt>foxst.lib</tt>. The reason for this rename is a charming little quirk in Microsoft's LINK utility and the fact that the eventual output name for the FXRuby DLL is also <tt>fox.so</tt>; for now, just take my word for it. So if your FOX source code distribution and build are found in the <tt>C:\fox-1.0.11</tt> directory, you'd need to rename the file:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\fox-1.0.11\lib><b>rename fox.lib foxst.lib</b></pre></td></tr></table><p>Now you can configure the FXRuby build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.11><b>ruby install.rb config --make-prog=nmake -- \
! --with-fox-include=C:\fox-1.0.11\include \
! --with-fox-lib=C:\fox-1.0.11\lib</b></pre></td></tr></table><p>Once the build has been configured, you can start the build by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.11> <b>ruby install.rb setup</b></pre></td></tr></table><p>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. Because Visual C++ is such a strict compiler (usually a good thing), you will probably run into a few problems with non-ANSI declarations in the Ruby header files. If you do run into problems during the compilation, just check the next section for a list of things that could go wrong, and workarounds for those problems. None of them are showstoppers and none require you to restart the compile from scratch (just type <b>ruby install.rb setup</b> to pick up where you left off).</p><p>Once it's finished compiling, install FXRuby by typing:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.11> <b>ruby install.rb install</b></pre></td></tr></table><p>As a quick sanity check, to make sure that all is well, you should probably fire up <tt>irb</tt> and try to import FXRuby:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">C:\FXRuby-1.0.11> <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
true
***************
*** 18,22 ****
make: *** [FXRbApp.o] Error 1</pre></td></tr></table><p>while the error message from Microsoft's Visual C++ compiler looks something like this:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">FXRbApp.cpp(109): error C2660: 'rb_thread_wait_for' : function does not take 1 parameters
NMAKE : fatal error U1077: 'cl' : return code '0x2'
! Stop.</pre></td></tr></table><p>This problem with the Ruby header files appears to have been corrected for Ruby 1.7, but for the time being you should probably do one of two things to work around the problem:</p><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>If you're using gcc version 2.95 or earlier, try modifying the compiler flags (<tt>CFLAGS</tt>) in the FXRuby <tt>Makefile</tt> to include the <tt>-fno-strict-prototype</tt> option; this should instruct the compiler to allow these kinds of discrepancies. Unfortunately, this flag is not supported in more recent versions of gcc (most notably, the questionable "2.96" version shipped with some popular Linux distributions).</p></li><li style="list-style-type: disc"><p>A more direct approach is to just fix the offending declarations in the Ruby include file(s), i.e. change the declaration for <tt>rb_thread_wait_for()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_thread_wait_for(struct timeval);</pre></td></tr></table><p>and change the declaration for <tt>rb_gc_mark()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_gc_mark(VALUE);</pre></td></tr></table></li></ul></div><p><span class="emphasis"><em>"Virtual Memory Exhausted"</em></span></p><p>For FXRuby releases earlier than version 0.99.173 it was common for the compiler to run out of memory trying to compile <tt>core_wrap.cpp</tt>, with an error message like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">core_wrap.cpp: In function 'void Init_core()':
core_wrap.cpp:108596: virtual memory exhausted</pre></td></tr></table><p>This failure was due to the use of optimizations by the compiler; the FXRuby source code makes heavy use of C++ templates and some versions of gcc require a lot of memory to process these. Starting with FXRuby version 0.99.173, the <tt>extconf.rb</tt> script <span class="emphasis"><em>should</em></span> disable compiler optimizations when it generates the FXRuby <tt>Makefile</tt>. If you suspect that it's not disabling optimizations (or can see this by watching the compile command lines), try modifying the compiler flags (<tt>CFLAGS</tt>) in the <tt>Makefile</tt> by hand to do so.</p><p><span class="emphasis"><em>"Cannot load library"</em></span></p><p>On Linux and other Unix systems that support shared libraries, FOX is typically installed as a shared library named <tt>libFOX.so</tt>. After all of the source files for FXRuby are compiled, the last step is to link all of the FXRuby object files together with the FOX library (and possibly other system libraries) to produce a new shared library, named <tt>fox.so</tt>, that Ruby can import as an extension module.</p><p>There are a few things that can go wrong when you try to import this extension into Ruby. A common problem is that the operating system cannot locate the FOX shared library (<tt>libFOX.so</tt>) when it tries to dynamically load the FXRuby extension module; when this happens, the error message will look something like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
--- 22,26 ----
make: *** [FXRbApp.o] Error 1</pre></td></tr></table><p>while the error message from Microsoft's Visual C++ compiler looks something like this:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">FXRbApp.cpp(109): error C2660: 'rb_thread_wait_for' : function does not take 1 parameters
NMAKE : fatal error U1077: 'cl' : return code '0x2'
! Stop.</pre></td></tr></table><p>This problem with the Ruby header files appears to have been corrected for Ruby 1.7, but for the time being you should probably do one of two things to work around the problem:</p><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>If you're using gcc version 2.95 or earlier, try modifying the compiler flags (<tt>CFLAGS</tt>) in the FXRuby <tt>Makefile</tt> to include the <tt>-fno-strict-prototype</tt> option; this should instruct the compiler to allow these kinds of discrepancies. Unfortunately, this flag is not supported in more recent versions of gcc (most notably, the questionable "2.96" version shipped with some popular Linux distributions).</p></li><li style="list-style-type: disc"><p>A more direct approach is to just fix the offending declarations in the Ruby include file(s), i.e. change the declaration for <tt>rb_thread_wait_for()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_thread_wait_for(struct timeval);</pre></td></tr></table><p>and change the declaration for <tt>rb_gc_mark()</tt> in <tt>intern.h</tt> to read:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">void rb_gc_mark(void *);</pre></td></tr></table></li></ul></div><p><span class="emphasis"><em>"Virtual Memory Exhausted"</em></span></p><p>For FXRuby releases earlier than version 0.99.173 it was common for the compiler to run out of memory trying to compile <tt>core_wrap.cpp</tt>, with an error message like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">core_wrap.cpp: In function 'void Init_core()':
core_wrap.cpp:108596: virtual memory exhausted</pre></td></tr></table><p>This failure was due to the use of optimizations by the compiler; the FXRuby source code makes heavy use of C++ templates and some versions of gcc require a lot of memory to process these. Starting with FXRuby version 0.99.173, the <tt>extconf.rb</tt> script <span class="emphasis"><em>should</em></span> disable compiler optimizations when it generates the FXRuby <tt>Makefile</tt>. If you suspect that it's not disabling optimizations (or can see this by watching the compile command lines), try modifying the compiler flags (<tt>CFLAGS</tt>) in the <tt>Makefile</tt> by hand to do so.</p><p><span class="emphasis"><em>"Cannot load library"</em></span></p><p>On Linux and other Unix systems that support shared libraries, FOX is typically installed as a shared library named <tt>libFOX.so</tt>. After all of the source files for FXRuby are compiled, the last step is to link all of the FXRuby object files together with the FOX library (and possibly other system libraries) to produce a new shared library, named <tt>fox.so</tt>, that Ruby can import as an extension module.</p><p>There are a few things that can go wrong when you try to import this extension into Ruby. A common problem is that the operating system cannot locate the FOX shared library (<tt>libFOX.so</tt>) when it tries to dynamically load the FXRuby extension module; when this happens, the error message will look something like:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
***************
*** 27,29 ****
$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
! </pre></td></tr></table><p>If this works, you can of course permanently add the <tt>LD_LIBRARY_PATH</tt> setting to your login file(s) so that you don't have to remember to type it each time. Another approach that should work for Linux is to modify your <tt>/etc/ld.so.conf</tt> file to include the installation directory (e.g. <tt>/usr/local/lib</tt>). If you'd like to do this instead, you'll need to (as root):</p><div class="orderedlist"><ol type="1" compact=""><li><p>Edit your <tt>/etc/ld.so.conf</tt> file and add the directory where <tt>libFOX.so</tt> is installed; and,</p></li><li><p>At the shell prompt, type <b>ldconfig</b> to reload the linker configuration.</p></li></ol></div><p>Another problem that has been reported by users of both Debian GNU/Linux and NetBSD 1.5 is an error message along the lines of:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">/usr/lib/libstdc++.so.2: Undefined symbol "__vt_9exception"...</pre></td></tr></table><p>The fix for this problem is reported to be to modify the FXRuby <tt>Makefile</tt> and add <tt>-lgcc</tt> to the <tt>LIBS</tt> line.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">History and Goals </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Examples</td></tr></table></div></body></html>
\ No newline at end of file
--- 31,33 ----
$ <b>irb</b>
irb(main):001:0> <b><tt>require 'fox'</tt></b>
! </pre></td></tr></table><p>If this works, you can of course permanently add the <tt>LD_LIBRARY_PATH</tt> setting to your login file(s) so that you don't have to remember to type it each time. Another approach that should work for Linux is to modify your <tt>/etc/ld.so.conf</tt> file to include the installation directory (e.g. <tt>/usr/local/lib</tt>). If you'd like to do this instead, you'll need to (as root):</p><div class="orderedlist"><ol type="1" compact=""><li><p>Edit your <tt>/etc/ld.so.conf</tt> file and add the directory where <tt>libFOX.so</tt> is installed; and,</p></li><li><p>At the shell prompt, type <b>ldconfig</b> to reload the linker configuration.</p></li></ol></div><p>Another problem that has been reported by users of both Debian GNU/Linux and NetBSD 1.5 is an error message along the lines of:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="screen">/usr/lib/libstdc++.so.2: Undefined symbol "__vt_9exception"...</pre></td></tr></table><p>The fix for this problem is reported to be to modify the FXRuby <tt>Makefile</tt> and add <tt>-lgcc</tt> to the <tt>LIBS</tt> line.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="goals.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="book.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="examples.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">History and Goals </td><td width="20%" align="center"><a accesskey="h" href="book.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Examples</td></tr></table></div></body></html>
\ No newline at end of file
Index: build.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml 21 Mar 2002 19:09:11 -0000 1.5
--- build.xml 11 Jul 2002 13:32:55 -0000 1.6
***************
*** 1,15 ****
<chapter id="build">
<title>Building from Source Code</title>
! <para>If you're planning to use FXRuby on Windows, with the Pragmatic Programmers' Ruby installer for Windows, you may wish to just download the pre-compiled FXRuby binaries. Otherwise, you will need to compile the shared library for FXRuby from the source code.</para>
<simplesect>
<title>The Basics</title>
<para>These instructions assume that you've already downloaded, compiled and installed FOX. Next, you'll need to download the FXRuby source code tarball and unpack it by typing:</para>
! <screen>$ <command>tar xzf FXRuby-1.0.3.tar.gz</command></screen>
! <para>This will create a new directory called <filename class="directory">FXRuby-1.0.3</filename>. Change to the top-level directory and configure the build by typing:</para>
<screen>$ <command>ruby install.rb config</command></screen>
<para>By default, the <filename>install.rb</filename> script will look for the FOX include files and library in the standard <filename class="directory">/usr/local/include/fox</filename> and <filename class="directory">/usr/local/lib</filename> directories, respectively. You can override these locations by passing a few additional arguments to <filename>install.rb</filename> during this step, e.g.</para>
<screen>$ <command>ruby install.rb config -- \
! --with-fox-include=/home/lyle/fox-1.0.3/include \
! --with-fox-lib=/home/lyle/fox-1.0.3/src/.libs</command></screen>
<para>Once the build has been configured, you can start the build by typing:</para>
<screen>$ <command>ruby install.rb setup</command></screen>
--- 1,19 ----
<chapter id="build">
<title>Building from Source Code</title>
! <para>If you're planning to use FXRuby on Windows, with the Pragmatic
! Programmers' Ruby installer for Windows, you may wish to just download the
! pre-compiled FXRuby binaries. Linux RPMs are also available for download.
! Otherwise, you will need to compile the shared library for FXRuby from the
! source code.</para>
<simplesect>
<title>The Basics</title>
<para>These instructions assume that you've already downloaded, compiled and installed FOX. Next, you'll need to download the FXRuby source code tarball and unpack it by typing:</para>
! <screen>$ <command>tar xzf FXRuby-1.0.11.tar.gz</command></screen>
! <para>This will create a new directory called <filename class="directory">FXRuby-1.0.11</filename>. Change to the top-level directory and configure the build by typing:</para>
<screen>$ <command>ruby install.rb config</command></screen>
<para>By default, the <filename>install.rb</filename> script will look for the FOX include files and library in the standard <filename class="directory">/usr/local/include/fox</filename> and <filename class="directory">/usr/local/lib</filename> directories, respectively. You can override these locations by passing a few additional arguments to <filename>install.rb</filename> during this step, e.g.</para>
<screen>$ <command>ruby install.rb config -- \
! --with-fox-include=/home/lyle/fox-1.0.11/include \
! --with-fox-lib=/home/lyle/fox-1.0.11/src/.libs</command></screen>
<para>Once the build has been configured, you can start the build by typing:</para>
<screen>$ <command>ruby install.rb setup</command></screen>
***************
*** 33,49 ****
<para>After the compilation finished, you installed Ruby somewhere by typing, e.g.,</para>
<screen>C:\ruby-1.6.7><command>nmake DESTDIR=C:\ruby install</command></screen>
! <para>Similarly, I'm assuming that you built the FOX library using the Developer Studio project files distributed with the standard FOX source code distribution. Although it's possible to build FXRuby against either the static library build of FOX (<filename>fox.lib</filename>) or the DLL build (<filename>foxdll.dll</filename>), these instructions currently cover only the static library build. Before you get started building FXRuby itself, you'll need to rename the static FOX library from its default filename (<filename>fox.lib</filename>) to <filename>foxst.lib</filename>. The reason for this rename is a charming little quirk in Microsoft's LINK utility and the fact that the eventual output name for the FXRuby DLL is also <filename>fox.so</filename>; for now, just take my word for it. So if your FOX source code distribution and build are found in the <filename class="directory">C:\fox-1.0.3</filename> directory, you'd need to rename the file:</para>
! <screen>C:\fox-1.0.3\lib><command>rename fox.lib foxst.lib</command></screen>
<para>Now you can configure the FXRuby build by typing:</para>
! <screen>C:\FXRuby-1.0.3><command>ruby install.rb config --make-prog=nmake -- \
! --with-fox-include=C:\fox-1.0.3\include \
! --with-fox-lib=C:\fox-1.0.3\lib</command></screen>
<para>Once the build has been configured, you can start the build by typing:</para>
! <screen>C:\FXRuby-1.0.3> <command>ruby install.rb setup</command></screen>
<para>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. Because Visual C++ is such a strict compiler (usually a good thing), you will probably run into a few problems with non-ANSI declarations in the Ruby header files. If you do run into problems during the compilation, just check the next section for a list of things that could go wrong, and workarounds for those problems. None of them are showstoppers and none require you to restart the compile from scratch (just type <command>ruby install.rb setup</command> to pick up where you left off).</para>
<para>Once it's finished compiling, install FXRuby by typing:</para>
! <screen>C:\FXRuby-1.0.3> <command>ruby install.rb install</command></screen>
<para>As a quick sanity check, to make sure that all is well, you should probably fire up <filename>irb</filename> and try to import FXRuby:</para>
! <screen>C:\FXRuby-1.0.3> <command>irb</command>
irb(main):001:0> <userinput>require 'fox'</userinput>
true
--- 37,53 ----
<para>After the compilation finished, you installed Ruby somewhere by typing, e.g.,</para>
<screen>C:\ruby-1.6.7><command>nmake DESTDIR=C:\ruby install</command></screen>
! <para>Similarly, I'm assuming that you built the FOX library using the Developer Studio project files distributed with the standard FOX source code distribution. Although it's possible to build FXRuby against either the static library build of FOX (<filename>fox.lib</filename>) or the DLL build (<filename>foxdll.dll</filename>), these instructions currently cover only the static library build. Before you get started building FXRuby itself, you'll need to rename the static FOX library from its default filename (<filename>fox.lib</filename>) to <filename>foxst.lib</filename>. The reason for this rename is a charming little quirk in Microsoft's LINK utility and the fact that the eventual output name for the FXRuby DLL is also <filename>fox.so</filename>; for now, just take my word for it. So if your FOX source code distribution and build are found in the <filename class="directory">C:\fox-1.0.11</filename> directory, you'd need to rename the file:</para>
! <screen>C:\fox-1.0.11\lib><command>rename fox.lib foxst.lib</command></screen>
<para>Now you can configure the FXRuby build by typing:</para>
! <screen>C:\FXRuby-1.0.11><command>ruby install.rb config --make-prog=nmake -- \
! --with-fox-include=C:\fox-1.0.11\include \
! --with-fox-lib=C:\fox-1.0.11\lib</command></screen>
<para>Once the build has been configured, you can start the build by typing:</para>
! <screen>C:\FXRuby-1.0.11> <command>ruby install.rb setup</command></screen>
<para>It will take quite awhile to build FXRuby, even on a fast machine, so this might be a good time to take a coffee break. Because Visual C++ is such a strict compiler (usually a good thing), you will probably run into a few problems with non-ANSI declarations in the Ruby header files. If you do run into problems during the compilation, just check the next section for a list of things that could go wrong, and workarounds for those problems. None of them are showstoppers and none require you to restart the compile from scratch (just type <command>ruby install.rb setup</command> to pick up where you left off).</para>
<para>Once it's finished compiling, install FXRuby by typing:</para>
! <screen>C:\FXRuby-1.0.11> <command>ruby install.rb install</command></screen>
<para>As a quick sanity check, to make sure that all is well, you should probably fire up <filename>irb</filename> and try to import FXRuby:</para>
! <screen>C:\FXRuby-1.0.11> <command>irb</command>
irb(main):001:0> <userinput>require 'fox'</userinput>
true
***************
*** 72,76 ****
<programlisting format="linespecific">void rb_thread_wait_for(struct timeval);</programlisting>
<para>and change the declaration for <function>rb_gc_mark()</function> in <filename>intern.h</filename> to read:</para>
! <programlisting format="linespecific">void rb_gc_mark(VALUE);</programlisting>
</listitem>
</itemizedlist>
--- 76,80 ----
<programlisting format="linespecific">void rb_thread_wait_for(struct timeval);</programlisting>
<para>and change the declaration for <function>rb_gc_mark()</function> in <filename>intern.h</filename> to read:</para>
! <programlisting format="linespecific">void rb_gc_mark(void *);</programlisting>
</listitem>
</itemizedlist>
Index: changes.html
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/changes.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** changes.html 22 Mar 2002 01:53:30 -0000 1.42
--- changes.html 11 Jul 2002 13:32:55 -0000 1.43
***************
*** 1,3 ****
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
! <title>Chapter 10. Change History</title><meta name="generator" content="DocBook XSL Stylesheets V1.50.0"><link rel="home" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="up" href="index.html" title="Developing Graphical User Interfaces with FXRuby"><link rel="previous" href="todo.html" title="Chapter 9. To-do list"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 10. Change History</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="todo.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="changes"></a>Chapter 10. Change History</h2></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e1798"></a>Changes Since Version 0.99.189</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Upgraded to the latest version of Minero Aoki's <tt>install.rb</tt> script.</p></li><li style="list-style-type: disc"><p>Switched from using DocBook/SGML to DocBook/XML for the FXRuby documentation. This is mainly a maintenance issue; it's just much less complicated to "publish" documents using DocBook/XML as compared to DocBook/SGML. You should see few (if any) differences in the resulting HTML pages, but let me know if you notice anything squirrely.</p></li><li style="list-style-type: disc"><p>Improved support for customized sorting of list items for the <tt>FXComboBox</tt>, <tt>FXIconList</tt>, <tt>FXList</tt>, <tt>FXListBox</tt>, <tt>FXTreeList</tt> and <tt>FXTreeListBox</tt> classes. The model is different from that used in the C++ FOX library, where you set a global sorting function for each list instance. For FXRuby, you instead just override the list item's <tt><=></tt> method to compare one list item to another. Thanks to Martin Stannard for prompting me to resolve this problem.</p></li><li style="list-style-type: disc"><p>Added instructions about how to modify your <tt>/etc/ld.so.conf</tt> file (on Linux) to include the <tt>libFOX.so</tt> installation directory. Thanks to Giuseppe Cacopardo for providing this information.</p></li><li style="list-style-type: disc"><p>Updated the test cases (again) for use with Nathaniel Talbott's <a href="http://testunit.talbott.ws" target="_top">TestUnit</a>, which is apparently the successor to Lapidary.</p></li><li style="list-style-type: disc"><p>Added support for the <tt>FXCURCursor</tt>, <tt>FXRGBIcon</tt>, <tt>FXRGBImage</tt> classes.</p></li><li style="list-style-type: disc"><p>Fixed a longstanding bug related to the ownership (for garbage collection purposes) of <tt>FXGLGroup</tt> and <tt>FXGLShape</tt> instances. This is the bug that was causing the <tt>glviewer.rb</tt> example program to crash on exit.</p></li><li style="list-style-type: disc"><p>Fixed a different (but also longstanding) bug related to FXRuby's hanging on to "stale" Ruby object references after those Ruby objects had already been garbage-collected. This bug manifested itself in a number of ways, but the most common symptom would be for an object (like an <tt>FXEvent</tt> instance) to suddenly lose its mind and believe it was some other object. Oh, and your program would usually crash at that point. I think this problem is now fixed.</p></li><li style="list-style-type: disc"><p>Added some safeguards for "destructive" functions like <tt>FXList#clearItems</tt>, which can destroy the C++ objects backing-up Ruby objects in FXRuby, so that any outstanding Ruby references to those destroyed C++ objects are left in a safe state when accessed by Ruby's garbage collector.</p></li><li style="list-style-type: disc"><p>Performed a major overhaul on the <tt>shutter.rb</tt> example program, which still demonstrates the <tt>FXShutter</tt> widget but otherwise doesn't resemble its previous incarnation at all.</p></li><li style="list-style-type: disc"><p>Added a new example program (<tt>raabrowser.rb</tt>) that allows you to browse the Ruby Application Archive via its SOAP interface. Requires the <a href="http://www.jin.gr.jp/~nahi/Ruby/SOAP4R" target="_top">SOAP4R</a> extension.</p></li><li style="list-style-type: disc"><p>Added a new example program (<tt>babelfish.rb</tt>) that allows you to use the Babelfish translator web service via its SOAP interface. Requires the <a href="http://www.jin.gr.jp/~nahi/Ruby/SOAP4R" target="_top">SOAP4R</a> extension.</p></li><li style="list-style-type: disc"><p>Added a new page to the documentation to briefly describe each of the example programs (including screenshots).</p></li><li style="list-style-type: disc"><p>The CVS repository for FXRuby is now hosted at the SourceForge site. For those who would like access to the latest version of FXRuby (in-between official releases) this is now an option. For more details, see the instructions at the <a href="http://sourceforge.net/cvs/?group_id=20243" target="_top">SourceForge project CVS page</a>.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="http://www.fox-toolkit.org/ftp/fox-1.0.3.tar.gz" target="_top">fox-1.0.3</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e1928"></a>Changes Since Version 0.99.188</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Fixed a big bug related to the <tt>FXApp#addSignal</tt> and <tt>FXApp#removeSignal</tt> functions, which should accept a string signal name as an argument. The list of recognized signal names was not constructed properly and as a result most any call to these methods with a string signal name would fail. This has been corrected, and the methods now throw exceptions like those thrown from <tt>Process::kill</tt> when the signal name is unrecognized or the argument type is wrong.</p></li><li style="list-style-type: disc"><p>The <tt>imageviewer.rb</tt> example program now supports loading TARGA, ICO and TIFF image files.</p></li><li style="list-style-type: disc"><p>The configuration process on Windows should now detect the presence of <tt>libtiff.lib</tt> properly.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="http://www.fox-toolkit.org/ftp/fox-0.99.189.tar.gz" target="_top">fox-0.99.189</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e1962"></a>Changes Since Version 0.99.181</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Removed the <tt>-fno-strict-prototype</tt> and <tt>-fpermissive</tt> flags from the <tt>CFLAGS</tt> for Linux builds, since these two flags are no longer supported for more recent versions of gcc. Thanks to Thomas Lundqvist for reporting this.</p></li><li style="list-style-type: disc"><p>Some of the source files included in the previous release had DOS-style line endings and this caused gcc to choke while compiling them; this has been fixed. Thanks to Thomas Lundqvist for reporting this.</p></li><li style="list-style-type: disc"><p>Updated the FXRuby test cases (such as they are) to use Nathaniel Talbott's <a href="http://lapidary.sourceforge.net" target="_top">Lapidary</a> unit testing framework.</p></li><li style="list-style-type: disc"><p>Migrated yet more code from the C++ extension to pure Ruby versions. Most of the code for the <tt>FXPoint</tt>, <tt>FXRectangle</tt> and <tt>FXSize</tt> classes is now implemented in Ruby.</p></li><li style="list-style-type: disc"><p>Fixed a bug in the <tt>browser.rb</tt> example. I had meant for the methods and constants lists to be sorted but had failed to use the in-place <tt>sort!</tt> method. Thanks to Robert Gustavsson for reporting this.</p></li><li style="list-style-type: disc"><p>Completed a lot of the initial work for integrating the FXScint
illa widget into FXRuby. This is not usable yet, but I'm working with Rich Kilmer and others to try to make this happen.</p></li><li style="list-style-type: disc"><p>Updated the build instructions to provide more information about building the Visual C++ version of FXRuby (i.e. for use with the Visual C++ build of Ruby) on Windows. Thanks to a final tip from Martin Stannard we now have a working build for this compiler.</p></li><li style="list-style-type: disc"><p>For fun, added a new example program that downloads today's Dilbert cartoon from the <a href="http://www.dilbertzone.com" target="_top">DilbertZone</a> web site and displays it in an <tt>FXImageViewer</tt> widget. Requires the <tt>html-parser</tt> module, listed in the <a href="http://www.ruby-lang.org/en/raa.html" target="_top">Ruby Application Archive</a>.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="http://www.fox-toolkit.org/ftp/fox-0.99.188.tar.gz" target="_top">fox-0.99.188</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2035"></a>Changes Since Version 0.99.180</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Added <tt>slices</tt>, <tt>stacks</tt> and <tt>loops</tt> accessors for the <tt>FXGLCone</tt> and <tt>FXGLCylinder</tt> classes, to provide finer control over the rendering fidelity for these shapes (this was already done for <tt>FXGLSphere</tt> in the previous release).</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.fox-toolkit.org/pub/fox-0.99.181.tar.gz" target="_top">fox-0.99.181</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2066"></a>Changes Since Version 0.99.174</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Moved the class definitions for <tt>FXGLPoint</tt>, <tt>FXGLLine</tt>, <tt>FXGLCube</tt>, <tt>FXGLCylinder</tt>, <tt>FXGLSphere</tt> and <tt>FXGLCone</tt> to a new library module <tt>fox/glshapes.rb</tt>. The interfaces are the same as the C++ versions of these classes, this is just a "pure Ruby" implementation of the classes instead of wrappers around the C++ classes. See <tt>examples/glviewer.rb</tt> for an example of their use.</p></li><li style="list-style-type: disc"><p>Fixed a bug related to object ownership for GL objects added to a <tt>FXGLGroup</tt>.</p></li><li style="list-style-type: disc"><p>Added support for overriding the virtual <tt>layout</tt> method in classes derived from <tt>FXWindow</tt>. This will allow developers to, for example, develop new kinds of layout managers.</p></li><li style="list-style-type: disc"><p>Replaced the previous WISE-based installer for the Windows version with an Inno Setup-based installer and reorganized things to better reflect the organization used in the standard Ruby installer.</p></li><li style="list-style-type: disc"><p>Updated the setup and build script to the latest version of Minero Aoki's scripts (version 3.0.2). The main change for FXRuby end-users is that the name of the build script is now <tt>install.rb</tt> instead of <tt>setup.rb</tt>.</p></li><li style="list-style-type: disc"><p>Added the <tt>colors.rb</tt> library file, for predefined color names in the <tt>FXColor</tt> namespace. The use of this module allows you to use symbolic names like <tt>FXColor::Red</tt> instead of an RGB constant like FXRGB(255, 0, 0). Many thanks to Jeff Heard for this suggestion and the contributed file.</p></li><li style="list-style-type: disc"><p>The <tt>FXRegion</tt> was accidentally being renamed to <tt>FX_Region</tt> (a little behind-the-scenes magic I'm doing in FXRuby) and as a result you couldn't use this class. Thanks to Steven Grady for catching this bug.</p></li><li style="list-style-type: disc"><p>The <tt>FXFileStream</tt> class now supports a Ruby-style <tt>open</tt> singleton method that provides transactional control for closing the file stream when it's done. See the <tt>image.rb</tt> and <tt>imageviewer.rb</tt> examples for how this works.</p></li><li style="list-style-type: disc"><p>After some discussions at RubyConf and follow-up discussions on the comp.lang.ruby newsgroup, the procedure for attaching events handlers to FXRuby widgets has been greatly simplified. Most of the example programs have been updated to reflect these changes, and a new documentation section has been added to describe how it works. For some of the background, please see <a href="http://www.rubygarden.org/ruby?FXRubyComments" target="_top">this page</a> on the RubyGarden Wiki.</p></li><li style="list-style-type: disc"><p>Added support for the <tt>each_row</tt> and <tt>each_column</tt> iterators for the <tt>FXTable</tt> class. These iterators yield an array of references to <tt>FXTableItem</tt> instances, one per row or column, respectively. Note that the <tt>each</tt> method is just an alias for <tt>each_row</tt>.</p></li><li style="list-style-type: disc"><p>Removed the interfaces for <tt>fxrandom</tt>, <tt>fxmalloc</tt>, <tt>fxcalloc</tt>, <tt>fxresize</tt>, <tt>fxmemdump</tt>, and <tt>fxfree</tt>. These utility functions are not relevant for FXRuby.</p></li><li style="list-style-type: disc"><p>Corrected interfaces for <tt>fxhsv_to_rgb</tt> and <tt>fxrgb_to_hsv</tt> so that they return three-element arrays of the converted color components.</p></li><li style="list-style-type: disc"><p>Corrected interfaces for <tt>FXWindow#acquireSelection</tt>, <tt>FXWindow#acquireClipboard</tt> and <tt>FXWindow#beginDrag</tt> to take an array of drag types.</p></li><li style="list-style-type: disc"><p>Corrected interfaces for <tt>fxsaveBMP</tt>, <tt>fxsaveGIF</tt>, <tt>fxsaveICO</tt>, <tt>fxsavePCX</tt>, <tt>fxsavePNG</tt>, <tt>fxsaveTIF</tt> and <tt>fxsaveXPM</tt> so that they expect a Ruby string (containing the image pixel data) as their second argument.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.fox-toolkit.org/pub/fox-0.99.180.tar.gz" target="_top">fox-0.99.180</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2259"></a>Changes Since Version 0.99.173</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Moved all of the method name aliases out of the C interface code and into a new library file (<tt>fox/aliases.rb</tt>). This file is loaded automatically so you don't need to change your code. Similarly, moved all of the iterator methods out of the C code and into a library file (<tt>fox/iterators.rb</tt>). The main purpose of these changes is to reduce the size of the C++ code (especially <tt>core_wrap.cpp</tt>) where possible. Obviously, compared to recompiling the C++ source code, it's also much more efficient to quickly patch the Ruby files and re-run when there are problems.</p></li><li style="list-style-type: disc"><p>A few errors made it into the <tt>undolist.rb</tt> library module and the <tt>textedit.rb</tt> example last time; I think these have been fi...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:30
|
Update of /cvsroot/fxruby/FXRuby/examples/textedit
In directory usw-pr-cvs1:/tmp/cvs-serv26972/examples/textedit
Modified Files:
prefdialog.rb textedit.rb
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: prefdialog.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/textedit/prefdialog.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** prefdialog.rb 2 Apr 2002 22:27:54 -0000 1.4
--- prefdialog.rb 11 Jul 2002 13:32:57 -0000 1.5
***************
*** 166,170 ****
(JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_LEFT|
LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW))
! spinner.setRange(1, 100)
# Button 2
--- 166,170 ----
(JUSTIFY_RIGHT|FRAME_SUNKEN|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_LEFT|
LAYOUT_FILL_COLUMN|LAYOUT_FILL_ROW))
! spinner.range = 1..100
# Button 2
Index: textedit.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/textedit/textedit.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** textedit.rb 2 Apr 2002 22:27:54 -0000 1.11
--- textedit.rb 11 Jul 2002 13:32:57 -0000 1.12
***************
*** 1736,1740 ****
# Make application
application = FXApp.new("TextEdit", "FoxTest")
! application.disableThreads
# Open display
--- 1736,1740 ----
# Make application
application = FXApp.new("TextEdit", "FoxTest")
! application.threadsEnabled = false
# Open display
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:30
|
Update of /cvsroot/fxruby/FXRuby/examples/icons In directory usw-pr-cvs1:/tmp/cvs-serv26972/examples/icons Added Files: capbutt.png capnotlast.png capproj.png capround.png dippy.png double_dash.png jbevel.png jmiter.png jround.png onoff_dash.png solid_line.png Log Message: Merged changes from the release10 branch back onto the main trunk. |
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:30
|
Update of /cvsroot/fxruby/FXRuby/examples
In directory usw-pr-cvs1:/tmp/cvs-serv26972/examples
Modified Files:
datatarget.rb glviewer.rb groupbox.rb iRAA.rb image.rb
inputs.rb raabrowser.rb scintilla-test.rb table.rb
Added Files:
RAA.rb canvasdemo.rb dctest.rb gdchart.rb
Removed Files:
scintilla_wrapper.rb
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: datatarget.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/datatarget.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** datatarget.rb 14 Nov 2001 22:45:23 -0000 1.10
--- datatarget.rb 11 Jul 2002 13:32:56 -0000 1.11
***************
*** 83,87 ****
0, 0, 20, 0)
! # Arange nicely
matrix = FXMatrix.new(self, 7,
MATRIX_BY_COLUMNS|LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
--- 83,87 ----
0, 0, 20, 0)
! # Arrange nicely
matrix = FXMatrix.new(self, 7,
MATRIX_BY_COLUMNS|LAYOUT_SIDE_TOP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
***************
*** 204,208 ****
# Current threads implementation causes problems for this example, so disable
! application.disableThreads
# Open display
--- 204,208 ----
# Current threads implementation causes problems for this example, so disable
! application.threadsEnabled = false
# Open display
Index: glviewer.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/glviewer.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** glviewer.rb 2 Apr 2002 22:27:54 -0000 1.10
--- glviewer.rb 11 Jul 2002 13:32:56 -0000 1.11
***************
*** 558,562 ****
# Make application
application = FXApp.new("GLViewer", "FoxTest")
! application.disableThreads
# Open the display
--- 558,562 ----
# Make application
application = FXApp.new("GLViewer", "FoxTest")
! application.threadsEnabled = false
# Open the display
Index: groupbox.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/groupbox.rb,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** groupbox.rb 2 Apr 2002 22:27:54 -0000 1.12
--- groupbox.rb 11 Jul 2002 13:32:56 -0000 1.13
***************
*** 220,224 ****
slider = FXSlider.new(group2, nil, 0, (LAYOUT_TOP|LAYOUT_FILL_X|
LAYOUT_FIX_HEIGHT|SLIDER_HORIZONTAL|SLIDER_INSIDE_BAR), 0, 0, 200, 20)
! slider.setRange(0, 3)
frame = FXHorizontalFrame.new(group2, LAYOUT_FILL_X|LAYOUT_FILL_Y)
--- 220,224 ----
slider = FXSlider.new(group2, nil, 0, (LAYOUT_TOP|LAYOUT_FILL_X|
LAYOUT_FIX_HEIGHT|SLIDER_HORIZONTAL|SLIDER_INSIDE_BAR), 0, 0, 200, 20)
! slider.range = 0..3
frame = FXHorizontalFrame.new(group2, LAYOUT_FILL_X|LAYOUT_FILL_Y)
***************
*** 279,283 ****
spinner = FXSpinner.new(group3, 20, nil, 0,
SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP)
! spinner.setRange(1, 20)
combobox = FXComboBox.new(group3, 5, 5, nil, 0,
--- 279,283 ----
spinner = FXSpinner.new(group3, 20, nil, 0,
SPIN_NORMAL|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP)
! spinner.range = 1..20
combobox = FXComboBox.new(group3, 5, 5, nil, 0,
Index: iRAA.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/iRAA.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iRAA.rb 21 Mar 2002 23:02:38 -0000 1.1
--- iRAA.rb 11 Jul 2002 13:32:56 -0000 1.2
***************
*** 1,84 ****
! module RAA
- InterfaceNS = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.1"
! class Category
! include SOAP::Marshallable
! @@typeNamespace = InterfaceNS
- attr_reader :major, :minor
! def initialize( major, minor = nil )
! @major = major
! @minor = minor
! end
! def to_s
! "#{ @major }/#{ @minor }"
! end
! def ==( rhs )
! if @major != rhs.major
! false
! elsif !@minor or !rhs.minor
! true
! else
! @minor == rhs.minor
! end
end
end
! class Product
! include SOAP::Marshallable
! @@typeNamespace = InterfaceNS
! attr_reader :name
! attr_accessor :version, :status, :homepage, :download, :license, :description
! def initialize( name, version = nil, status = nil, homepage = nil, download = nil, license = nil, description = nil )
! @name = name
! @version = version
! @status = status
! @homepage = homepage
! @download = download
! @license = license
! @description = description
! end
end
! class Owner
! include SOAP::Marshallable
! @@typeNamespace = InterfaceNS
! attr_reader :id
! attr_accessor :email, :name
! def initialize( email, name )
! @email = email
! @name = name
! @id = "#{ @email }-#{ @name }"
! end
end
! class Info
! include SOAP::Marshallable
! @@typeNamespace = InterfaceNS
! attr_accessor :category, :product, :owner, :update
! def initialize( category = nil, product = nil, owner = nil, update = nil )
! @category = category
! @product = product
! @owner = owner
! @update = update
! end
end
! Methods = {
! 'getAllListings' => [ 'Array' ],
! 'getProductTree' => [ 'Hash' ],
! 'getInfoFromCategory' => [ 'Array', 'category' ],
! 'getModifiedInfoSince' => [ 'Array', 'time' ],
! 'getInfoFromName' => [ 'Info', 'name' ],
! }
end
--- 1,139 ----
! require 'soap/rpcUtils'
! module RAA; extend SOAP
! InterfaceNS = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.1"
! MappingRegistry = SOAP::RPCUtils::MappingRegistry.new
! Methods = [
! [ 'getAllListings', [ 'retval', 'return' ]],
! [ 'getProductTree', [ 'retval', 'return' ]],
! [ 'getInfoFromCategory', [ 'in', 'category' ], [ 'retval', 'return' ]],
! [ 'getModifiedInfoSince', [ 'in', 'time' ], [ 'retval', 'return' ]],
! [ 'getInfoFromName', [ 'in', 'name' ], [ 'retval', 'return' ]],
! ]
! class Category
! include SOAP::Marshallable
!
! attr_reader :major, :minor
!
! def initialize( major, minor = nil )
! @major = major
! @minor = minor
! end
!
! def to_s
! "#{ @major }/#{ @minor }"
! end
!
! def ==( rhs )
! if @major != rhs.major
! false
! elsif !@minor or !rhs.minor
! true
! else
! @minor == rhs.minor
end
end
+ end
! MappingRegistry.set(
! ::RAA::Category,
! ::SOAP::SOAPStruct,
! ::SOAP::RPCUtils::MappingRegistry::TypedStructFactory,
! [ InterfaceNS, "Category" ]
! )
! class Product
! include SOAP::Marshallable
! attr_reader :name
! attr_accessor :version, :status, :homepage, :download, :license, :description
!
! def initialize( name, version = nil, status = nil, homepage = nil, download = nil, license = nil, description = nil )
! @name = name
! @version = version
! @status = status
! @homepage = homepage
! @download = download
! @license = license
! @description = description
end
+ end
! MappingRegistry.set(
! ::RAA::Product,
! ::SOAP::SOAPStruct,
! ::SOAP::RPCUtils::MappingRegistry::TypedStructFactory,
! [ InterfaceNS, "Product" ]
! )
! class Owner
! include SOAP::Marshallable
! attr_reader :id
! attr_accessor :email, :name
!
! def initialize( email, name )
! @email = email
! @name = name
! @id = "#{ @email }-#{ @name }"
end
+ end
! MappingRegistry.set(
! ::RAA::Owner,
! ::SOAP::SOAPStruct,
! ::SOAP::RPCUtils::MappingRegistry::TypedStructFactory,
! [ InterfaceNS, "Owner" ]
! )
! class Info
! include SOAP::Marshallable
! attr_accessor :category, :product, :owner, :update
!
! def initialize( category = nil, product = nil, owner = nil, update = nil )
! @category = category
! @product = product
! @owner = owner
! @update = update
end
! def <=>( rhs )
! @update <=> rhs.update
! end
!
! def eql?( rhs )
! @product.name == rhs.product.name
! end
! end
!
! MappingRegistry.set(
! ::RAA::Info,
! ::SOAP::SOAPStruct,
! ::SOAP::RPCUtils::MappingRegistry::TypedStructFactory,
! [ InterfaceNS, "Info" ]
! )
!
! class StringArray < Array; end
! MappingRegistry.set(
! ::RAA::StringArray,
! ::SOAP::SOAPArray,
! ::SOAP::RPCUtils::MappingRegistry::TypedArrayFactory,
! [ XSD::Namespace, XSD::StringLiteral ]
! )
!
! class InfoArray < Array; end
! MappingRegistry.set(
! ::RAA::InfoArray,
! ::SOAP::SOAPArray,
! ::SOAP::RPCUtils::MappingRegistry::TypedArrayFactory,
! [ InterfaceNS, 'Info' ]
! )
!
!
end
Index: image.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/image.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** image.rb 5 Nov 2001 23:12:22 -0000 1.11
--- image.rb 11 Jul 2002 13:32:56 -0000 1.12
***************
*** 117,138 ****
(0...512).each { |x|
(0...50).each { |y|
! @grey_ramp[3*(y*512+x) ] = (x/2)
! @grey_ramp[3*(y*512+x)+1] = (x/2)
! @grey_ramp[3*(y*512+x)+2] = (x/2)
}
(0...50).each { |y|
! @red_ramp[3*(y*512+x) ] = (x/2)
! @red_ramp[3*(y*512+x)+1] = 0
! @red_ramp[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @green_ramp[3*(y*512+x) ] = 0
! @green_ramp[3*(y*512+x)+1] = (x/2)
! @green_ramp[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @blue_ramp[3*(y*512+x) ] = 0
! @blue_ramp[3*(y*512+x)+1] = 0
! @blue_ramp[3*(y*512+x)+2] = (x/2)
}
}
--- 117,138 ----
(0...512).each { |x|
(0...50).each { |y|
! @grey.data[3*(y*512+x) ] = (x/2)
! @grey.data[3*(y*512+x)+1] = (x/2)
! @grey.data[3*(y*512+x)+2] = (x/2)
}
(0...50).each { |y|
! @red.data[3*(y*512+x) ] = (x/2)
! @red.data[3*(y*512+x)+1] = 0
! @red.data[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @green.data[3*(y*512+x) ] = 0
! @green.data[3*(y*512+x)+1] = (x/2)
! @green.data[3*(y*512+x)+2] = 0
}
(0...50).each { |y|
! @blue.data[3*(y*512+x) ] = 0
! @blue.data[3*(y*512+x)+1] = 0
! @blue.data[3*(y*512+x)+2] = (x/2)
}
}
***************
*** 176,182 ****
# Erase the canvas, color comes from well
! dc.setForeground(@backwell.getRGBA())
! dc.fillRectangle(0, 0, @picture.getWidth(), @picture.getHeight())
# Draw images
--- 176,182 ----
# Erase the canvas, color comes from well
! dc.foreground = @backwell.rgba
! dc.fillRectangle(0, 0, @picture.width, @picture.height)
# Draw images
***************
*** 191,205 ****
# Draw patterns
! dc.setFillStyle(FILL_OPAQUESTIPPLED)
! dc.setForeground(FXColor::Black)
! dc.setBackground(FXColor::White)
(STIPPLE_0..STIPPLE_16).each { |pat|
! dc.setStipple(pat)
dc.fillRectangle(10 + (512*pat)/17, 490, 31, 50)
}
! dc.setFillStyle(FILL_SOLID)
# Draw borders
! dc.setForeground(@borderwell.getRGBA())
dc.drawRectangle(10, 10, 512, 50)
dc.drawRectangle(10, 60, 512, 50)
--- 191,205 ----
# Draw patterns
! dc.fillStyle = FILL_OPAQUESTIPPLED
! dc.foreground = FXColor::Black
! dc.background = FXColor::White
(STIPPLE_0..STIPPLE_16).each { |pat|
! dc.stipple = pat
dc.fillRectangle(10 + (512*pat)/17, 490, 31, 50)
}
! dc.fillStyle = FILL_SOLID
# Draw borders
! dc.foreground = @borderwell.rgba
dc.drawRectangle(10, 10, 512, 50)
dc.drawRectangle(10, 60, 512, 50)
***************
*** 217,227 ****
# Draw text
! dc.setTextFont(@font)
! dc.setForeground(@textwell.getRGBA())
! dc.drawText(540, 60, "Grey", 4)
! dc.drawText(540, 180, "Red", 3)
! dc.drawText(540, 300, "Green", 5)
! dc.drawText(540, 420, "Blue", 4)
! dc.drawText(540, 540, "Patterns", 8)
# Don't wait for the GC to catch up, do it now!
--- 217,227 ----
# Draw text
! dc.textFont = @font
! dc.foreground = @textwell.rgba
! dc.drawText(540, 60, "Grey")
! dc.drawText(540, 180, "Red")
! dc.drawText(540, 300, "Green")
! dc.drawText(540, 420, "Blue")
! dc.drawText(540, 540, "Patterns")
# Don't wait for the GC to catch up, do it now!
***************
*** 234,239 ****
# Clear whole thing
! sdc.setForeground(@backwell.getRGBA())
! sdc.fillRectangle(0, 0, @canvas.getWidth(), @canvas.getHeight())
# Paint image
--- 234,239 ----
# Clear whole thing
! sdc.foreground = @backwell.rgba
! sdc.fillRectangle(0, 0, @canvas.width, @canvas.height)
# Paint image
***************
*** 254,261 ****
saveDialog = FXFileDialog.new(self, "Save as BMP")
if saveDialog.execute != 0
! FXFileStream.open(saveDialog.filename, FXStreamSave) { |outfile|
@picture.restore
@picture.savePixels(outfile)
! }
end
return 1
--- 254,261 ----
saveDialog = FXFileDialog.new(self, "Save as BMP")
if saveDialog.execute != 0
! FXFileStream.open(saveDialog.filename, FXStreamSave) do |outfile|
@picture.restore
@picture.savePixels(outfile)
! end
end
return 1
Index: inputs.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/inputs.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** inputs.rb 27 Nov 2001 15:46:10 -0000 1.4
--- inputs.rb 11 Jul 2002 13:32:56 -0000 1.5
***************
*** 34,40 ****
end
def onCmdText(sender, sel, ptr)
! # Remove previous input (if any)
! getApp().removeInput(@pipe, INPUT_READ|INPUT_EXCEPT) if @pipe
# Clean up the output window
--- 34,48 ----
end
+ # Remove previous input (if any)
+ def closePipe
+ if @pipe
+ getApp().removeInput(@pipe, INPUT_READ|INPUT_EXCEPT)
+ @pipe = nil
+ end
+ end
+
def onCmdText(sender, sel, ptr)
! # Stop previous command
! closePipe
# Clean up the output window
***************
*** 48,52 ****
case SELTYPE(sel)
when SEL_IO_READ
! @cmdOutput.appendText(@pipe.read)
when SEL_IO_EXCEPT
puts 'onPipeExcept'
--- 56,65 ----
case SELTYPE(sel)
when SEL_IO_READ
! text = @pipe.read
! if text
! @cmdOutput.appendText(text)
! else
! closePipe
! end
when SEL_IO_EXCEPT
puts 'onPipeExcept'
Index: raabrowser.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/raabrowser.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** raabrowser.rb 1 Mar 2002 20:15:41 -0000 1.2
--- raabrowser.rb 11 Jul 2002 13:32:56 -0000 1.3
***************
*** 1,129 ****
! require 'fox'
! require 'soap/driver'
! require 'iRAA'
!
! include Fox
!
! URL = 'http://www.ruby-lang.org/~nahi/soap/raa/'
!
! class RAABrowserWindow < FXMainWindow
! def initialize(app)
! # Initialize base class
! super(app, "Ruby Application Archive", nil, nil, DECOR_ALL, 0, 0, 600, 600)
!
! # Contents
! contents = FXHorizontalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y)
!
! # Horizontal splitter
! splitter = FXSplitter.new(contents, (LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
! LAYOUT_FILL_Y|SPLITTER_TRACKING|SPLITTER_HORIZONTAL))
!
! # Create a sunken frame to hold the tree list
! groupbox = FXGroupBox.new(splitter, "Contents",
! LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
! frame = FXHorizontalFrame.new(groupbox,
! LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK)
!
! # Create the empty tree list
! @treeList = FXTreeList.new(frame, 0, nil, 0,
! (TREELIST_BROWSESELECT|TREELIST_SHOWS_LINES|TREELIST_SHOWS_BOXES|
! TREELIST_ROOT_BOXES|LAYOUT_FILL_X|LAYOUT_FILL_Y))
! @treeList.connect(SEL_COMMAND) do |sender, sel, item|
! if @treeList.isItemLeaf(item)
! getApp().beginWaitCursor
! begin
! info = @raa.getInfoFromName(item.text)
! @category.value = info.category.major + "/" + info.category.minor
! @projectName.value = info.product.name
! @version.value = info.product.version
! @status.value = info.product.status
! @lastUpdate.value = info.update.to_s
! @owner.value = "#{info.owner.name} (#{info.owner.email})"
! @homepage.value = info.product.homepage
! @download.value = info.product.download
! @license.value = info.product.license
! @description.value = info.product.description
! rescue SOAP::PostUnavailableError => ex
! getApp().endWaitCursor
! FXMessageBox.error(self, MBOX_OK, "SOAP Error", ex.message)
! ensure
! getApp().endWaitCursor
! end
! end
! end
!
! # Set up data targets for the product-specific information
! @category = FXDataTarget.new("")
! @projectName = FXDataTarget.new("")
! @version = FXDataTarget.new("")
! @status = FXDataTarget.new("")
! @lastUpdate = FXDataTarget.new("")
! @owner = FXDataTarget.new("")
! @homepage = FXDataTarget.new("")
! @download = FXDataTarget.new("")
! @license = FXDataTarget.new("")
! @description = FXDataTarget.new("")
!
! # Information appears on the right-hand side
! infoFrame = FXVerticalFrame.new(splitter, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT|FRAME_SUNKEN|FRAME_THICK)
!
! infoBox = FXGroupBox.new(infoFrame, "Info", GROUPBOX_NORMAL|LAYOUT_FILL_X|FRAME_GROOVE)
! infoMatrix = FXMatrix.new(infoBox, 2, MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
! FXLabel.new(infoMatrix, "Category:")
! FXTextField.new(infoMatrix, 20, @category, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Project name:")
! FXTextField.new(infoMatrix, 20, @projectName, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Version:")
! FXTextField.new(infoMatrix, 20, @version, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Status:")
! FXTextField.new(infoMatrix, 20, @status, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Last update:")
! FXTextField.new(infoMatrix, 20, @lastUpdate, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Owner:")
! FXTextField.new(infoMatrix, 20, @owner, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Homepage:")
! FXTextField.new(infoMatrix, 20, @homepage, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Download:")
! FXTextField.new(infoMatrix, 20, @download, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "License:")
! FXTextField.new(infoMatrix, 20, @license, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
!
! descriptionBox = FXGroupBox.new(infoFrame, "Description", GROUPBOX_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
! descriptionFrame = FXHorizontalFrame.new(descriptionBox, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
! FXText.new(descriptionFrame, @description, FXDataTarget::ID_VALUE, TEXT_READONLY|TEXT_WORDWRAP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
!
! # Initialize the service
! @raa = SOAP::Driver.new(nil, nil, RAA::InterfaceNS, URL)
! RAA::Methods.each do |m, p|
! @raa.addMethod(m, *(p[1..-1]))
! end
!
! # Set up the product tree list
! @productTree = @raa.getProductTree
! @productTree.keys.sort.each do |sectionName|
! sectionHash = @productTree[sectionName]
! sectionItem = @treeList.addItemLast(nil, sectionName)
! sectionHash.keys.sort.each do |categoryName|
! categoryArray = sectionHash[categoryName]
! categoryItem = @treeList.addItemLast(sectionItem, categoryName)
! categoryArray.each do |productName|
! productItem = @treeList.addItemLast(categoryItem, productName)
! end
! end
! end
! end
!
! def create
! super
! @treeList.parent.parent.setWidth(@treeList.font.getTextWidth('M'*24))
! show(PLACEMENT_SCREEN)
! end
! end
!
! if __FILE__ == $0
! app = FXApp.new("RAABrowser", "FoxTest")
! app.init(ARGV)
! RAABrowserWindow.new(app)
! app.create
! app.run
! end
--- 1,128 ----
! require 'cgi'
! require 'fox'
! require 'RAA'
!
! include Fox
!
! class RAABrowserWindow < FXMainWindow
! def initialize(app)
! # Initialize base class
! super(app, "Ruby Application Archive", nil, nil, DECOR_ALL, 0, 0, 600, 600)
!
! # Contents
! contents = FXHorizontalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y)
!
! # Horizontal splitter
! splitter = FXSplitter.new(contents, (LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
! LAYOUT_FILL_Y|SPLITTER_TRACKING|SPLITTER_HORIZONTAL))
!
! # Create a sunken frame to hold the tree list
! groupbox = FXGroupBox.new(splitter, "Contents",
! LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
! frame = FXHorizontalFrame.new(groupbox,
! LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK)
!
! # Create the empty tree list
! @treeList = FXTreeList.new(frame, 0, nil, 0,
! (TREELIST_BROWSESELECT|TREELIST_SHOWS_LINES|TREELIST_SHOWS_BOXES|
! TREELIST_ROOT_BOXES|LAYOUT_FILL_X|LAYOUT_FILL_Y))
! @treeList.connect(SEL_COMMAND) do |sender, sel, item|
! if @treeList.isItemLeaf(item)
! getApp().beginWaitCursor
! begin
! info = @raa.getInfoFromName(item.text)
! @category.value = info.category.major + "/" + info.category.minor
! @projectName.value = info.product.name
! @version.value = info.product.version
! @status.value = info.product.status
! @lastUpdate.value = info.update.strftime("%F %T GMT")
! @owner.value = "#{info.owner.name} (#{info.owner.email})"
! @homepage.value = info.product.homepage
! @download.value = info.product.download
! @license.value = info.product.license
! @description.value =
! CGI::unescapeHTML(info.product.description).gsub(/\r\n/, "\n")
! rescue SOAP::PostUnavailableError => ex
! getApp().endWaitCursor
! FXMessageBox.error(self, MBOX_OK, "SOAP Error", ex.message)
! ensure
! getApp().endWaitCursor
! end
! end
! end
!
! # Set up data targets for the product-specific information
! @category = FXDataTarget.new("")
! @projectName = FXDataTarget.new("")
! @version = FXDataTarget.new("")
! @status = FXDataTarget.new("")
! @lastUpdate = FXDataTarget.new("")
! @owner = FXDataTarget.new("")
! @homepage = FXDataTarget.new("")
! @download = FXDataTarget.new("")
! @license = FXDataTarget.new("")
! @description = FXDataTarget.new("")
!
! # Information appears on the right-hand side
! infoFrame = FXVerticalFrame.new(splitter, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT|FRAME_SUNKEN|FRAME_THICK)
!
! infoBox = FXGroupBox.new(infoFrame, "Info", GROUPBOX_NORMAL|LAYOUT_FILL_X|FRAME_GROOVE)
! infoMatrix = FXMatrix.new(infoBox, 2, MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
! FXLabel.new(infoMatrix, "Category:")
! FXTextField.new(infoMatrix, 20, @category, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Project name:")
! FXTextField.new(infoMatrix, 20, @projectName, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Version:")
! FXTextField.new(infoMatrix, 20, @version, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Status:")
! FXTextField.new(infoMatrix, 20, @status, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Last update:")
! FXTextField.new(infoMatrix, 20, @lastUpdate, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Owner:")
! FXTextField.new(infoMatrix, 20, @owner, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Homepage:")
! FXTextField.new(infoMatrix, 20, @homepage, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "Download:")
! FXTextField.new(infoMatrix, 20, @download, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
! FXLabel.new(infoMatrix, "License:")
! FXTextField.new(infoMatrix, 20, @license, FXDataTarget::ID_VALUE, TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
!
! descriptionBox = FXGroupBox.new(infoFrame, "Description", GROUPBOX_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
! descriptionFrame = FXHorizontalFrame.new(descriptionBox, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
! FXText.new(descriptionFrame, @description, FXDataTarget::ID_VALUE, TEXT_READONLY|TEXT_WORDWRAP|LAYOUT_FILL_X|LAYOUT_FILL_Y)
!
! # Initialize the service
! server = 'http://www.ruby-lang.org/~nahi/soap/raa/'
! proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
! @raa = RAA::Driver.new(server, proxy)
! @raa.setLogDev(nil) # be quiet!
!
! # Set up the product tree list
! @productTree = @raa.getProductTree
! @productTree.keys.sort.each do |sectionName|
! sectionHash = @productTree[sectionName]
! sectionItem = @treeList.addItemLast(nil, sectionName)
! sectionHash.keys.sort.each do |categoryName|
! categoryArray = sectionHash[categoryName]
! categoryItem = @treeList.addItemLast(sectionItem, categoryName)
! categoryArray.each do |productName|
! productItem = @treeList.addItemLast(categoryItem, productName)
! end
! end
! end
! end
!
! def create
! super
! @treeList.parent.parent.setWidth(@treeList.font.getTextWidth('M'*24))
! show(PLACEMENT_SCREEN)
! end
! end
!
! if __FILE__ == $0
! app = FXApp.new("RAABrowser", "FoxTest")
! app.init(ARGV)
! RAABrowserWindow.new(app)
! app.create
! app.run
! end
Index: scintilla-test.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/scintilla-test.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scintilla-test.rb 19 Feb 2002 00:11:21 -0000 1.4
--- scintilla-test.rb 11 Jul 2002 13:32:56 -0000 1.5
***************
*** 2,6 ****
require 'fox'
! require 'scintilla_wrapper'
include Fox
--- 2,6 ----
require 'fox'
! require 'fox/scintilla'
include Fox
***************
*** 12,19 ****
and FXRuby is developed by Lyle Johnson.
EOM
-
- class FXScintilla
- include Scintilla
- end
class ScintillaTest < FXMainWindow
--- 12,15 ----
Index: table.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/table.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** table.rb 2 Apr 2002 22:27:54 -0000 1.9
--- table.rb 11 Jul 2002 13:32:57 -0000 1.10
***************
*** 108,116 ****
puts "SEL_CHANGED row=#{tablePos.row}, col=#{tablePos.col}"
}
! @table.connect(SEL_COMMAND) { |sender, sel, ptr|
! puts "SEL_COMMAND ptr=#{ptr}"
}
! @table.connect(SEL_CLICKED) { |sender, sel, ptr|
! puts "SEL_CLICKED ptr=#{ptr}"
}
--- 108,116 ----
puts "SEL_CHANGED row=#{tablePos.row}, col=#{tablePos.col}"
}
! @table.connect(SEL_COMMAND) { |sender, sel, tablePos|
! puts "SEL_COMMAND row=#{tablePos.row}, col=#{tablePos.col}"
}
! @table.connect(SEL_CLICKED) { |sender, sel, tablePos|
! puts "SEL_CLICKED row=#{tablePos.row}, col=#{tablePos.col}"
}
--- scintilla_wrapper.rb DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:29
|
Update of /cvsroot/fxruby/FXRuby/doc/images In directory usw-pr-cvs1:/tmp/cvs-serv26972/doc/images Added Files: tutorial1.png Log Message: Merged changes from the release10 branch back onto the main trunk. |
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv26972 Modified Files: ANNOUNCE ChangeLog README.win32.txt index.html setversions.rb Added Files: ANNOUNCE.in FXRuby-ruby1.6-i586-mswin32.iss FXRuby-ruby1.6-i586-mswin32.iss.in FXRuby-ruby1.7-i386-mswin32.iss FXRuby-ruby1.7-i386-mswin32.iss.in FXRuby.spec FXRuby.spec.in Makefile Makefile.in Removed Files: ANNOUNCE.tmpl FXRuby.iss drop-win32.sh make-drop.sh update_website.sh Log Message: Merged changes from the release10 branch back onto the main trunk. Index: ANNOUNCE =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ANNOUNCE,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ANNOUNCE 13 Mar 2002 18:18:20 -0000 1.26 --- ANNOUNCE 11 Jul 2002 13:32:53 -0000 1.27 *************** *** 5,22 **** The FXRuby home page is here: ! http://fxruby.sourceforge.net and the source tarball can be downloaded here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.3.tar.gz ! A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is also available for download here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.3-win32.exe 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 --- 5,26 ---- The FXRuby home page is here: ! http://www.fxruby.org and the source tarball can be downloaded here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11.tar.gz ! A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is available for download here: ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11-win32.exe ! ! and a Linux RPM (for Ruby 1.6) is available for download here: ! ! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.11-1.i386.rpm 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/download.html Please feel free to send me any questions or comments, and watch this space Index: ChangeLog =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ChangeLog 21 Mar 2002 23:13:31 -0000 1.24 --- ChangeLog 11 Jul 2002 13:32:53 -0000 1.25 *************** *** 1,2 **** --- 1,1426 ---- + 2002-06-20 09:18 lyle + + * FXRuby-ruby1.7-i386-mswin32.iss.in: file + FXRuby-ruby1.7-i386-mswin32.iss.in was initially added on branch + release10. + + 2002-06-20 09:18 lyle + + * FXRuby-ruby1.6-i586-mswin32.iss.in: file [...4493 lines suppressed...] FXRadioButton.i, FXRecentFiles.i, FXRegion.i, FXRegistry.i, FXRootWindow.i, FXScrollArea.i, FXScrollWindow.i, FXScrollbar.i, FXSeparator.i, FXSpinner.i, FXTab.i, FXTextField.i, FXToggleButton.i, FXToolbar.i, FXTooltip.i, FXTreeList.i, FXURL.i, ! FXVerticalFrame.i, FXXPMIcon.i, FXXPMImage.i: [no log message] 2000-12-19 19:28 lyle *************** *** 4529,4533 **** swig-interfaces/FXStream.i, swig-interfaces/FXTopWindow.i, swig-interfaces/FXVisual.i, swig-interfaces/FXWindow.i, ! swig-interfaces/Makefile, swig-interfaces/fox.i, ! swig-interfaces/fxdefs.i: Initial revision --- 5610,5614 ---- swig-interfaces/FXStream.i, swig-interfaces/FXTopWindow.i, swig-interfaces/FXVisual.i, swig-interfaces/FXWindow.i, ! swig-interfaces/Makefile, swig-interfaces/fxdefs.i: Initial ! revision Index: README.win32.txt =================================================================== RCS file: /cvsroot/fxruby/FXRuby/README.win32.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** README.win32.txt 13 Mar 2002 22:06:48 -0000 1.6 --- README.win32.txt 11 Jul 2002 13:32:54 -0000 1.7 *************** *** 1,5 **** This binary distribution of FXRuby is specifically packaged to work with the Visual C++-based version of ! Ruby 1.6.7, available for download from this page: http://www.pragmaticprogrammer.com/ruby/downloads/ruby-install.html --- 1,5 ---- This binary distribution of FXRuby is specifically packaged to work with the Visual C++-based version of ! Ruby 1.6.6, available for download from this page: http://www.pragmaticprogrammer.com/ruby/downloads/ruby-install.html Index: index.html =================================================================== RCS file: /cvsroot/fxruby/FXRuby/index.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** index.html 21 Mar 2002 21:44:39 -0000 1.19 --- index.html 11 Jul 2002 13:32:54 -0000 1.20 *************** *** 21,39 **** <td ALIGN=LEFT VALIGN=TOP><b>Downloads</b></td> ! <td>The latest version of FXRuby, including the source code distribution ! and binaries for Microsoft Windows, are always available from the ! <a href="http://sourceforge.net/projects/fxruby">SourceForge project page</a>. The SourceForge releases should always have accompanying release notes describing the changes for that release, and a cumulative ! <tt>ChangeLog</tt> ! file is also included in the FXRuby source code distribution. The file ! names will always be of the form <i>FXRuby-version.ext</i>, and the <i>version</i> ! indicates the compatible version of the FOX library that you'll need if ! you're building from source. The binary distribution for Windows is compatible ! with the standard Ruby installer for Windows that's available for download ! from <a href="http://www.pragmaticprogrammer.com/ruby/downloads/ruby-install.html"> The Pragmatic Programmers Site</a>.<p> ! Note that the precompiled binary for Windows is built with OpenGL support, and thus depends on the OpenGL runtime libraries (<tt>opengl32.dll</tt> and <tt>glu32.dll</tt>). These libraries were <i>not</i> included with Windows 95 (earlier than OSR2), so if you're using Ruby and FXRuby on a Windows 95 machine, you may need to download the <a href="http://download.microsoft.com/download/win95upg/info/1/W95/EN-US/Opengl95.exe">OpenGL runtime libraries</a>. You must have these libraries installed even if you don't plan to do anything OpenGL-related with FXRuby. </td> </tr> --- 21,50 ---- <td ALIGN=LEFT VALIGN=TOP><b>Downloads</b></td> ! <td>The latest version of FXRuby, including the source code distribution, ! a binary installer for Microsoft Windows, and Linux RPMs are always available ! from the <a href="http://sourceforge.net/projects/fxruby">SourceForge project page</a>. The SourceForge releases should always have accompanying release notes describing the changes for that release, and a cumulative ! <tt>ChangeLog</tt> file is also included in the FXRuby source code distribution. ! The binary distribution for Windows is compatible with the standard Ruby ! installer for Windows that's available for download from ! <a href="http://www.pragmaticprogrammer.com/ruby/downloads/ruby-install.html"> The Pragmatic Programmers Site</a>.<p> ! Note that the precompiled binary for Windows is built with OpenGL support, and ! thus depends on the OpenGL runtime libraries (<tt>opengl32.dll</tt> and ! <tt>glu32.dll</tt>). These libraries were <i>not</i> included with Windows 95 ! (earlier than OSR2), so if you're using Ruby and FXRuby on a Windows 95 machine, ! you may need to download the <a href="http://download.microsoft.com/download/win95upg/info/1/W95/EN-US/Opengl95.exe">OpenGL runtime libraries</a>. ! You must have these libraries installed even if you don't plan to do anything ! OpenGL-related with FXRuby. </td> + </tr> + + <tr> + <td ALIGN=LEFT VALIGN=TOP> + <b>Versions</b> + </td> + <td>As of the FOX 1.0 release, any FXRuby version 1.0.x release should be + compatible with any FOX 1.0.x release.</td> </tr> Index: setversions.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/setversions.rb,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** setversions.rb 18 Jan 2002 00:01:58 -0000 1.15 --- setversions.rb 11 Jul 2002 13:32:54 -0000 1.16 *************** *** 16,22 **** "@@FOX_VERSION@@" => fox_version, "@@FXRUBY_VERSION@@" => fxruby_version, ! "@@FXRUBY_HOME_URL@@" => "http://fxruby.sourceforge.net", "@@FXRUBY_SRC_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + ".tar.gz", "@@FXRUBY_WIN32_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + "-win32.exe", "@@FOX_HOME_URL@@" => "http://www.fox-toolkit.org", "@@FOX_SRC_URL@@" => "ftp://ftp.fox-toolkit.org/pub/fox-" + fox_version + ".tar.gz" --- 16,23 ---- "@@FOX_VERSION@@" => fox_version, "@@FXRUBY_VERSION@@" => fxruby_version, ! "@@FXRUBY_HOME_URL@@" => "http://www.fxruby.org", "@@FXRUBY_SRC_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + ".tar.gz", "@@FXRUBY_WIN32_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + "-win32.exe", + "@@FXRUBY_LINUX_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + "-1.i386.rpm", "@@FOX_HOME_URL@@" => "http://www.fox-toolkit.org", "@@FOX_SRC_URL@@" => "ftp://ftp.fox-toolkit.org/pub/fox-" + fox_version + ".tar.gz" *************** *** 24,28 **** def setversions(filename) ! text = File.open(filename + ".tmpl", "r").read() SUBSTITUTIONS.each { |pattern, replacement| text.gsub!(pattern, replacement) --- 25,29 ---- def setversions(filename) ! text = File.open(filename + ".in", "r").read() SUBSTITUTIONS.each { |pattern, replacement| text.gsub!(pattern, replacement) *************** *** 32,34 **** --- 33,39 ---- setversions("ANNOUNCE") + setversions("FXRuby.spec") + setversions("Makefile") setversions("ext/fox/extconf.rb") + setversions("FXRuby-ruby1.6-i586-mswin32.iss") + setversions("FXRuby-ruby1.7-i386-mswin32.iss") --- ANNOUNCE.tmpl DELETED --- --- FXRuby.iss DELETED --- --- drop-win32.sh DELETED --- --- make-drop.sh DELETED --- --- update_website.sh DELETED --- |
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv26972/swig-interfaces
Modified Files:
FX4Splitter.i FXApp.i FXColorSelector.i FXComboBox.i
FXCursor.i FXDC.i FXDCWindow.i FXDebugTarget.i FXDial.i
FXDialogBox.i FXDict.i FXDirList.i FXDrawable.i FXFileDialog.i
FXFileDict.i FXFileList.i FXFileSelector.i FXFont.i
FXFontDialog.i FXFontSelector.i FXGIFCursor.i FXGLCanvas.i
FXGLContext.i FXGLObject.i FXGLShape.i FXGLViewer.i FXHMat.i
FXHVec.i FXHeader.i FXIcon.i FXIconList.i FXId.i FXImage.i
FXInputDialog.i FXList.i FXListBox.i FXMenubar.i
FXMessageBox.i FXPrintDialog.i FXQuat.i FXRange.i
FXRecentFiles.i FXRegion.i FXScintilla.i FXScrollArea.i
FXShell.i FXSlider.i FXSpinner.i FXSplitter.i FXStatusline.i
FXStream.i FXTable.i FXText.i FXToolbar.i FXTopWindow.i
FXTreeList.i FXTreeListBox.i FXVec.i FXWindow.i Makefile
core.i dialogs.i freefuncs.i icons.i image.i layout.i
markfuncs.i mdi.i opengl.i renames.i scintilla.i stubs.i
swig.sed typemaps.i ui.i
Added Files:
FXMemoryBuffer.i common.i
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: FX4Splitter.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FX4Splitter.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FX4Splitter.i 19 Mar 2002 23:18:40 -0000 1.13
--- FX4Splitter.i 11 Jul 2002 13:33:13 -0000 1.14
***************
*** 27,31 ****
};
- %ignore FX4Splitter::FX4Splitter(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h);
%exception FX4Splitter::FX4Splitter "$action FXRbRegisterRubyObj(self, result);";
--- 27,30 ----
***************
*** 119,123 ****
};
- %ignore FXRb4Splitter::FXRb4Splitter(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h);
%exception FXRb4Splitter::FXRb4Splitter "$action FXRbRegisterRubyObj(self, result);";
--- 118,121 ----
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FXApp.i 26 Mar 2002 21:38:50 -0000 1.38
--- FXApp.i 11 Jul 2002 13:33:13 -0000 1.39
***************
*** 74,78 ****
/// FOX Event
struct FXEvent {
! %readonly
FXuint type; /// Event type
FXuint time; /// Time of last event
--- 74,78 ----
/// FOX Event
struct FXEvent {
! %immutable;
FXuint type; /// Event type
FXuint time; /// Time of last event
***************
*** 97,101 ****
FXbool synthetic; /// True if synthetic expose event
FXDragType target; /// Target drag type being requested
! %readwrite
};
--- 97,101 ----
FXbool synthetic; /// True if synthetic expose event
FXDragType target; /// Target drag type being requested
! %mutable;
};
***************
*** 116,122 ****
%ignore FXApp::findWindowAt(FXint rx, FXint ry, FXID window) const;
- %rename(stopModalMatching) FXApp::stopModal(FXWindow* window,FXint value);
- %rename(stopModalInnermost) FXApp::stopModal(FXint value);
-
/// Application Object
class FXApp : public FXObject {
--- 116,119 ----
***************
*** 145,149 ****
#ifdef SWIGRUBY
! %addmethods {
// Copyright notice for library
static VALUE copyright() {
--- 142,146 ----
#ifdef SWIGRUBY
! %extend {
// Copyright notice for library
static VALUE copyright() {
***************
*** 221,225 ****
FXChore* removeChore(FXChore *c);
! %addmethods {
/**
* Add signal processing message to be sent to target object when
--- 218,222 ----
FXChore* removeChore(FXChore *c);
! %extend {
/**
* Add signal processing message to be sent to target object when
***************
*** 390,394 ****
*/
// virtual void init(int& argc,char** argv,FXbool connect=TRUE);
! %addmethods {
void init(VALUE arr,FXbool connect=TRUE) {
int i;
--- 387,391 ----
*/
// virtual void init(int& argc,char** argv,FXbool connect=TRUE);
! %extend {
void init(VALUE arr,FXbool connect=TRUE) {
int i;
***************
*** 521,524 ****
--- 518,524 ----
%exception FXRbApp::FXRbApp "$action FXRbRegisterRubyObj(self, result);";
+ %rename("threadsEnabled=") FXRbApp::setThreadsEnabled(FXbool);
+ %rename("threadsEnabled?") FXRbApp::threadsEnabled() const;
+
class FXRbApp : public FXApp {
public:
***************
*** 533,541 ****
FXRbApp(const FXchar *name="Application",const FXchar *vendor="FoxDefault");
! // Enable support for multithreaded applications
! void enableThreads();
! // Disable support for multithreaded applications
! void disableThreads();
// Set the amount of time to sleep
--- 533,541 ----
FXRbApp(const FXchar *name="Application",const FXchar *vendor="FoxDefault");
! // Enable (or disable) support for multithreaded applications
! void setThreadsEnabled(FXbool enabled);
! // Are threads enabled?
! FXbool threadsEnabled() const;
// Set the amount of time to sleep
Index: FXColorSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXColorSelector.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FXColorSelector.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXColorSelector.i 11 Jul 2002 13:33:14 -0000 1.16
***************
*** 61,65 ****
protected:
#ifdef 0
! %addmethods {
// Returns a read-only array of the names, which isn't quite right :(
static VALUE wellname() {
--- 61,65 ----
protected:
#ifdef 0
! %extend {
// Returns a read-only array of the names, which isn't quite right :(
static VALUE wellname() {
Index: FXComboBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXComboBox.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FXComboBox.i 19 Mar 2002 23:18:40 -0000 1.23
--- FXComboBox.i 11 Jul 2002 13:33:14 -0000 1.24
***************
*** 134,138 ****
FXString getItemText(FXint index) const;
! %addmethods {
/// Set data pointer for specified item
void setItemData(FXint index, VALUE ptr) {
--- 134,138 ----
FXString getItemText(FXint index) const;
! %extend {
/// Set data pointer for specified item
void setItemData(FXint index, VALUE ptr) {
Index: FXCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXCursor.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXCursor.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXCursor.i 11 Jul 2002 13:33:14 -0000 1.12
***************
*** 33,37 ****
};
- %ignore FXCursor::FXCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
%exception FXCursor::FXCursor "$action FXRbRegisterRubyObj(self, result);";
--- 33,36 ----
***************
*** 55,59 ****
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=-1,FXint hy=-1);
/// Width of cursor
--- 54,58 ----
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
/// Width of cursor
***************
*** 100,103 ****
--- 99,105 ----
// Constructor
FXRbCursor(FXApp* a,FXStockCursor curid=CURSOR_ARROW);
+
+ // Construct from source and mask
+ FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
// Destructor
Index: FXDC.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXDC.i 3 Apr 2002 21:40:57 -0000 1.21
--- FXDC.i 11 Jul 2002 13:33:14 -0000 1.22
***************
*** 139,145 ****
class FXRegion;
! %rename(setStippleFromBitmap) FXDC::setStipple(FXBitmap *bitmap,FXint dx,FXint dy);
! %rename(setStippleFromPattern) FXDC::setStipple(FXStipplePattern pat,FXint dx,FXint dy);
!
%rename(setClipRectangle1) FXDC::setClipRectangle(const FXRectangle& rectangle);
%rename(setClipRectangle4) FXDC::setClipRectangle(FXint x,FXint y,FXint w,FXint h);
--- 139,144 ----
class FXRegion;
! %rename(setStippleFromBitmap) FXDC::setStipple(FXBitmap *bitmap,FXint dx=0,FXint dy=0);
! %rename(setStippleFromPattern) FXDC::setStipple(FXStipplePattern pat,FXint dx=0,FXint dy=0);
%rename(setClipRectangle1) FXDC::setClipRectangle(const FXRectangle& rectangle);
%rename(setClipRectangle4) FXDC::setClipRectangle(FXint x,FXint y,FXint w,FXint h);
***************
*** 204,208 ****
virtual void drawLine(FXint x1,FXint y1,FXint x2,FXint y2);
#ifdef SWIGPYTHON
! %addmethods {
// points is assumed to be a list of (x, y) tuples
void drawLines(PyObject* pointlist){
--- 203,207 ----
virtual void drawLine(FXint x1,FXint y1,FXint x2,FXint y2);
#ifdef SWIGPYTHON
! %extend {
// points is assumed to be a list of (x, y) tuples
void drawLines(PyObject* pointlist){
***************
*** 312,316 ****
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! %addmethods {
/// Get dash pattern
VALUE getDashPattern() const {
--- 311,315 ----
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! %extend {
/// Get dash pattern
VALUE getDashPattern() const {
Index: FXDCWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDCWindow.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXDCWindow.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXDCWindow.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 29,33 ****
class FXVisual;
- %ignore FXDCWindow::FXDCWindow(FXDrawable* drawable);
%exception FXDCWindow::FXDCWindow "$action FXRbRegisterRubyObj(self, result);";
--- 29,32 ----
***************
*** 62,66 ****
};
- %ignore FXRbDCWindow::FXRbDCWindow(FXDrawable* drawable);
%exception FXRbDCWindow::FXRbDCWindow "$action FXRbRegisterRubyObj(self, result);";
--- 61,64 ----
Index: FXDebugTarget.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDebugTarget.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXDebugTarget.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXDebugTarget.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 35,39 ****
public:
#ifdef SWIGRUBY
! %addmethods {
static VALUE messageTypeName() {
VALUE messageTypeNames = rb_ary_new();
--- 35,39 ----
public:
#ifdef SWIGRUBY
! %extend {
static VALUE messageTypeName() {
VALUE messageTypeNames = rb_ary_new();
Index: FXDial.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDial.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXDial.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDial.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 77,98 ****
FXint getValue() const;
- /// Change the dial's range
- void setRange(FXint lo,FXint hi);
-
#ifdef SWIGRUBY
! %addmethods {
/// Obtain the current range of the dial
VALUE getRange() const {
! FXint lo, hi;
! self->getRange(lo, hi);
! VALUE result = rb_ary_new();
! rb_ary_push(result, INT2NUM(lo));
! rb_ary_push(result, INT2NUM(hi));
! return result;
}
}
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getRange() const {
FXint lo,hi;
--- 77,102 ----
FXint getValue() const;
#ifdef SWIGRUBY
! %extend {
! /// Change the dial's range
! void setRange(VALUE range){
! FXint lo,hi;
! FXRbRange2LoHi(range,lo,hi);
! self->setRange(lo,hi);
! }
!
/// Obtain the current range of the dial
VALUE getRange() const {
! FXint lo,hi;
! self->getRange(lo,hi);
! return rb_range_new(INT2NUM(lo),INT2NUM(hi),0);
}
}
#endif
#ifdef SWIGPYTHON
! /// Change the dial's range
! void setRange(FXint lo,FXint hi)
!
! %extend {
PyObject* getRange() const {
FXint lo,hi;
Index: FXDialogBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDialogBox.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXDialogBox.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDialogBox.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 21,25 ****
***********************************************************************/
- %ignore FXDialogBox::FXDialogBox(FXWindow* owner,const FXString& name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs);
%exception FXDialogBox::FXDialogBox "$action FXRbRegisterRubyObj(self, result);";
--- 21,24 ----
***************
*** 57,61 ****
};
- %ignore FXRbDialogBox::FXRbDialogBox(FXWindow* owner,const FXString& name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs);
%exception FXRbDialogBox::FXRbDialogBox "$action FXRbRegisterRubyObj(self, result);";
--- 56,59 ----
Index: FXDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDict.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXDict.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDict.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 21,28 ****
--- 21,40 ----
***********************************************************************/
+ // Do not wrap these functions
+ %ignore FXDict::size() const;
+ %ignore FXDict::size(FXint m);
%ignore FXDict::insert(const FXchar* ky,const void* ptr,FXbool mrk);
+ %ignore FXDict::remove(const FXchar* ky);
%ignore FXDict::replace(const FXchar* ky,const void* ptr,FXbool mrk);
+ %ignore FXDict::find(const FXchar* ky) const;
%ignore FXDict::data(FXuint pos) const;
+ // Rename this one
+ %rename("length") FXDict::no() const;
+
+ // Mark these as predicate methods
+ %predicate FXDict::empty() const;
+ %predicate FXDict::has_key(const FXchar* ky) const;
+
%exception FXDict::FXDict "$action FXRbRegisterRubyObj(self, result);";
***************
*** 72,81 ****
* Return the size of the table, including the empty slots.
*/
! %name(getSize) FXint size() const;
/**
* Resize the table to the given size.
*/
! %name(setSize) void size(FXint m);
/**
--- 84,93 ----
* Return the size of the table, including the empty slots.
*/
! FXint size() const;
/**
* Resize the table to the given size.
*/
! void size(FXint m);
/**
***************
*** 101,137 ****
* Remove data given key.
*/
! // void* remove(const FXchar* ky); // FIXME
/**
* Find data pointer given key.
*/
! // void* find(const FXchar* ky) const; // FIXME
!
! #ifdef SWIGRUBY
!
! %addmethods {
! // Returns a new array populated with the keys from this hash
! VALUE keys() const {
! VALUE arr = rb_ary_new();
! return arr;
! }
! }
!
! %addmethods {
! // Returns true if the given key is present
! FXbool has_key(const FXchar* ky) {
! return (self->find(ky) != 0);
! }
! }
!
! %addmethods {
! // Returns true if hash contains no key-value pairs
! FXbool empty() const {
! return (self->no() == 0);
! }
! }
- #endif /* SWIGRUBY */
-
/**
* Return key at position pos.
--- 113,123 ----
* Remove data given key.
*/
! void* remove(const FXchar* ky);
/**
* Find data pointer given key.
*/
! void* find(const FXchar* ky) const;
/**
* Return key at position pos.
***************
*** 174,177 ****
--- 160,189 ----
/// Clear all entries
void clear();
+
+ #ifdef SWIGRUBY
+
+ // Add methods similar to those for Ruby's Hash class
+ %extend {
+ // Returns a new array populated with the keys from this hash
+ VALUE keys() const {
+ VALUE arr = rb_ary_new();
+ for(FXint p=self->first(); p<self->size(); p=self->next(p)){
+ rb_ary_push(arr,rb_str_new2(self->key(p)));
+ }
+ return arr;
+ }
+
+ // Returns true if the given key is present
+ FXbool has_key(const FXchar* ky) const {
+ return (self->find(ky) != 0);
+ }
+
+ // Returns true if hash contains no key-value pairs
+ FXbool empty() const {
+ return (self->no() == 0);
+ }
+ }
+
+ #endif /* SWIGRUBY */
/// Destructor
Index: FXDirList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDirList.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FXDirList.i 2 Apr 2002 03:44:27 -0000 1.20
--- FXDirList.i 11 Jul 2002 13:33:14 -0000 1.21
***************
*** 86,89 ****
--- 86,95 ----
};
+ // Rename these methods
+ %rename(getShowFiles) FXDirList::showFiles() const;
+ %rename(setShowFiles) FXDirList::showFiles(FXbool showing);
+ %rename(getShowHiddenFiles) FXDirList::showHiddenFiles() const;
+ %rename(setShowHiddenFiles) FXDirList::showHiddenFiles(FXbool showing);
+
%exception FXDirList::FXDirList "$action FXRbRegisterRubyObj(self, result);";
***************
*** 211,224 ****
/// Return TRUE if showing files as well as directories
! %name(getShowFiles) FXbool showFiles() const;
/// Show or hide normal files
! %name(setShowFiles) void showFiles(FXbool showing);
/// Return TRUE if showing hidden files and directories
! %name(getShowHiddenFiles) FXbool showHiddenFiles() const;
/// Show or hide hidden files and directories
! %name(setShowHiddenFiles) void showHiddenFiles(FXbool showing);
/// Change file associations
--- 217,230 ----
/// Return TRUE if showing files as well as directories
! FXbool showFiles() const;
/// Show or hide normal files
! void showFiles(FXbool showing);
/// Return TRUE if showing hidden files and directories
! FXbool showHiddenFiles() const;
/// Show or hide hidden files and directories
! void showHiddenFiles(FXbool showing);
/// Change file associations
Index: FXDrawable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDrawable.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FXDrawable.i 19 Mar 2002 23:18:40 -0000 1.10
--- FXDrawable.i 11 Jul 2002 13:33:14 -0000 1.11
***************
*** 65,72 ****
FXRbDrawable();
// Construct with this width and height
FXRbDrawable(FXApp* a,FXint w,FXint h);
- public:
// Destructor
virtual ~FXRbDrawable();
--- 65,72 ----
FXRbDrawable();
+ public:
// Construct with this width and height
FXRbDrawable(FXApp* a,FXint w,FXint h);
// Destructor
virtual ~FXRbDrawable();
Index: FXFileDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDialog.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FXFileDialog.i 19 Mar 2002 23:18:40 -0000 1.16
--- FXFileDialog.i 11 Jul 2002 13:33:14 -0000 1.17
***************
*** 43,47 ****
#ifdef SWIGRUBY
! %addmethods {
// Return list of selected file names.
VALUE getFilenames() const {
--- 43,47 ----
#ifdef SWIGRUBY
! %extend {
// Return list of selected file names.
VALUE getFilenames() const {
***************
*** 60,64 ****
}
#else
! %addmethods {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
--- 60,64 ----
}
#else
! %extend {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
***************
*** 104,108 ****
*/
#ifdef SWIGRUBY
! %addmethods {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
--- 104,108 ----
*/
#ifdef SWIGRUBY
! %extend {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
***************
*** 189,193 ****
#ifdef SWIGRUBY
! %addmethods {
// Open multiple existing files
static VALUE getOpenFilenames(FXWindow* owner,
--- 189,193 ----
#ifdef SWIGRUBY
! %extend {
// Open multiple existing files
static VALUE getOpenFilenames(FXWindow* owner,
Index: FXFileDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDict.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FXFileDict.i 28 Mar 2002 16:32:52 -0000 1.19
--- FXFileDict.i 11 Jul 2002 13:33:14 -0000 1.20
***************
*** 45,49 ****
virtual void deleteData(void*);
public:
! %addmethods {
/// Default icon search path
static VALUE defaultIconPath(){
--- 45,49 ----
virtual void deleteData(void*);
public:
! %extend {
/// Default icon search path
static VALUE defaultIconPath(){
***************
*** 55,59 ****
/// Construct an icon dictionary, with given path
! FXIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
/// Get application
--- 55,60 ----
/// Construct an icon dictionary, with given path
! // FXIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
! FXIconDict(FXApp* a,const FXString& p=defaultIconPath);
/// Get application
***************
*** 84,88 ****
public:
// Construct an icon dictionary, with given path
! FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
// Destructor
--- 85,90 ----
public:
// Construct an icon dictionary, with given path
! // FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
! FXRbIconDict(FXApp* a,const FXString& p=defaultIconPath);
// Destructor
***************
*** 93,98 ****
};
- %ignore FXFileDict::FXFileDict(FXApp* a,FXSettings* db);
-
%exception FXFileDict::FXFileDict "$action FXRbRegisterRubyObj(self, result);";
--- 95,98 ----
***************
*** 106,110 ****
public:
#ifdef SWIGRUBY
! %addmethods {
/// Registry key used to find fallback executable icons
static VALUE defaultExecBinding(){
--- 106,110 ----
public:
#ifdef SWIGRUBY
! %extend {
/// Registry key used to find fallback executable icons
static VALUE defaultExecBinding(){
***************
*** 210,215 ****
};
-
- %ignore FXRbFileDict::FXRbFileDict(FXApp* a,FXSettings* db);
%exception FXRbFileDict::FXRbFileDict "$action FXRbRegisterRubyObj(self, result);";
--- 210,213 ----
Index: FXFileList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileList.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXFileList.i 2 Apr 2002 03:44:27 -0000 1.21
--- FXFileList.i 11 Jul 2002 13:33:14 -0000 1.22
***************
*** 106,109 ****
--- 106,116 ----
};
+
+ // Rename these methods
+ %rename(getHiddenFilesShown) FXFileList::showHiddenFiles() const;
+ %rename(setHiddenFilesShown) FXFileList::showHiddenFiles(FXbool showing);
+ %rename(getOnlyDirectoriesShown) FXFileList::showOnlyDirectories() const;
+ %rename(setOnlyDirectoriesShown) FXFileList::showOnlyDirectories(FXbool shown);
+
%exception FXFileList::FXFileList "$action FXRbRegisterRubyObj(self, result);";
Index: FXFileSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileSelector.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FXFileSelector.i 19 Mar 2002 23:18:40 -0000 1.19
--- FXFileSelector.i 11 Jul 2002 13:33:14 -0000 1.20
***************
*** 40,43 ****
--- 40,48 ----
};
+
+ // Rename these methods
+ %rename(setReadOnlyShown) FXFileSelector::showReadOnly(FXbool show);
+ %rename(getReadOnlyShown) FXFileSelector::shownReadOnly() const;
+
%exception FXFileSelector::FXFileSelector "$action FXRbRegisterRubyObj(self, result);";
***************
*** 131,135 ****
#ifdef SWIGRUBY
! %addmethods {
// Return list of selected file names.
VALUE getFilenames() const {
--- 136,140 ----
#ifdef SWIGRUBY
! %extend {
// Return list of selected file names.
VALUE getFilenames() const {
***************
*** 149,153 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
--- 154,158 ----
#endif
#ifdef SWIGPYTHON
! %extend {
PyObject* getFilenames() const {
FXString* filenames=self->getFilenames();
***************
*** 193,197 ****
*/
#ifdef SWIGRUBY
! %addmethods {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
--- 198,202 ----
*/
#ifdef SWIGRUBY
! %extend {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
***************
*** 262,269 ****
/// Show readonly button
! %name(setReadOnlyShown) void showReadOnly(FXbool show);
/// Return TRUE if readonly is shown
! %name(getReadOnlyShown) FXbool shownReadOnly() const;
/// Set initial state of readonly button
--- 267,274 ----
/// Show readonly button
! void showReadOnly(FXbool show);
/// Return TRUE if readonly is shown
! FXbool shownReadOnly() const;
/// Set initial state of readonly button
Index: FXFont.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFont.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FXFont.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXFont.i 11 Jul 2002 13:33:14 -0000 1.16
***************
*** 152,158 ****
};
- %ignore FXFont::FXFont(FXApp* a,const FXString& face,FXuint sz,FXuint wt,FXuint sl,FXuint enc,FXuint setw,FXuint h);
- %ignore FXFont::FXFont(FXApp* a,const FXString& nm);
-
%exception FXFont::FXFont "$action FXRbRegisterRubyObj(self, result);";
--- 152,155 ----
***************
*** 207,211 ****
FXuint getHints() const;
! %addmethods {
// Get font description
FXFontDesc getFontDesc() const {
--- 204,208 ----
FXuint getHints() const;
! %extend {
// Get font description
FXFontDesc getFontDesc() const {
***************
*** 255,259 ****
FXint getFontSpacing() const;
! %addmethods {
// Calculate width of given text in this font
FXint getTextWidth(const FXchar *text) const {
--- 252,256 ----
FXint getFontSpacing() const;
! %extend {
// Calculate width of given text in this font
FXint getTextWidth(const FXchar *text) const {
***************
*** 269,273 ****
#ifdef SWIGRUBY
! %addmethods {
// List all fonts matching hints (returns an array of FXFontDesc objects)
static FXbool listFonts(const FXString& face,
--- 266,270 ----
#ifdef SWIGRUBY
! %extend {
// List all fonts matching hints (returns an array of FXFontDesc objects)
static FXbool listFonts(const FXString& face,
***************
*** 294,300 ****
};
- %ignore FXRbFont::FXRbFont(FXApp* a,const FXString& face,FXuint sz,FXuint wt,FXuint sl,FXuint enc,FXuint setw,FXuint h);
- %ignore FXRbFont::FXRbFont(FXApp* a,const FXString& nm);
-
%exception FXRbFont::FXRbFont "$action FXRbRegisterRubyObj(self, result);";
--- 291,294 ----
***************
*** 341,344 ****
%}
! %name(fxparsefontdesc) FXFontDesc* fxparsefontdesc2(const FXchar* string);
%name(fxunparsefontdesc) FXString fxunparsefontdesc2(const FXFontDesc& fontdesc);
--- 335,338 ----
%}
! %name(fxparsefontdesc) FXFontDesc *fxparsefontdesc2(const FXchar* string);
%name(fxunparsefontdesc) FXString fxunparsefontdesc2(const FXFontDesc& fontdesc);
Index: FXFontDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontDialog.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXFontDialog.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXFontDialog.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 39,43 ****
#ifdef SWIGRUBY
! %addmethods {
/// Get the current font selection
FXFontDesc getFontSelection() const {
--- 39,43 ----
#ifdef SWIGRUBY
! %extend {
/// Get the current font selection
FXFontDesc getFontSelection() const {
***************
*** 48,52 ****
}
#else
! %addmethods {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
--- 48,52 ----
}
#else
! %extend {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
Index: FXFontSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontSelector.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXFontSelector.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXFontSelector.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 106,110 ****
#ifdef SWIGRUBY
! %addmethods {
/// Get font selection
FXFontDesc getFontSelection() const {
--- 106,110 ----
#ifdef SWIGRUBY
! %extend {
/// Get font selection
FXFontDesc getFontSelection() const {
***************
*** 115,119 ****
}
#else
! %addmethods {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
--- 115,119 ----
}
#else
! %extend {
%new FXFontDesc* getFontSelection() const {
FXFontDesc* fontdesc = new FXFontDesc;
Index: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXGIFCursor.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXGIFCursor.i 11 Jul 2002 13:33:14 -0000 1.12
***************
*** 23,38 ****
%exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! /// GIF Cursor class
! class FXGIFCursor : public FXCursor {
! protected:
! FXGIFCursor(){}
! public:
! /// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1);
! /// Destroy
! virtual ~FXGIFCursor(){}
! };
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
--- 23,31 ----
%exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! %ignore ::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);
! %apply const FXuchar *PIXELS { const FXuchar *data };
! %include FXGIFCursor.h
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
***************
*** 41,45 ****
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1);
// Destructor
--- 34,38 ----
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy);
// Destructor
***************
*** 54,58 ****
%inline %{
! /// Load a gif file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
--- 47,51 ----
%inline %{
! /// Load a GIF file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
***************
*** 74,79 ****
}
%}
-
-
- /// Save a gif file to a stream
- FXbool fxsaveGIF(FXStream& store,const FXuchar *PIXELS,FXColor transp,FXint width,FXint height);
--- 67,68 ----
Index: FXGLCanvas.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLCanvas.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FXGLCanvas.i 19 Mar 2002 23:18:40 -0000 1.14
--- FXGLCanvas.i 11 Jul 2002 13:33:14 -0000 1.15
***************
*** 21,25 ****
***********************************************************************/
- %ignore FXGLCanvas::FXGLCanvas(FXComposite* p,FXGLVisual *vis,FXGLCanvas* sharegroup,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h);
%ignore FXGLCanvas::getContext() const;
--- 21,24 ----
***************
*** 68,73 ****
virtual ~FXGLCanvas();
};
-
- %ignore FXRbGLCanvas::FXRbGLCanvas(FXComposite* p,FXGLVisual *vis,FXGLCanvas* sharegroup,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h);
%exception FXRbGLCanvas::FXRbGLCanvas "$action FXRbRegisterRubyObj(self, result);";
--- 67,70 ----
Index: FXGLContext.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLContext.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FXGLContext.i 19 Mar 2002 23:18:40 -0000 1.14
--- FXGLContext.i 11 Jul 2002 13:33:14 -0000 1.15
***************
*** 25,30 ****
class FXGLVisual;
- %ignore FXGLContext::FXGLContext(FXApp* a,FXGLVisual *vis,FXGLContext *shared);
-
%exception FXGLContext::FXGLContext "$action FXRbRegisterRubyObj(self, result);";
--- 25,28 ----
***************
*** 78,82 ****
};
- %ignore FXRbGLContext::FXRbGLContext(FXApp* a,FXGLVisual *vis,FXGLContext *shared);
%exception FXRbGLContext::FXRbGLContext "$action FXRbRegisterRubyObj(self, result);";
--- 76,79 ----
Index: FXGLObject.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FXGLObject.i 2 Apr 2002 03:44:27 -0000 1.23
--- FXGLObject.i 11 Jul 2002 13:33:14 -0000 1.24
***************
*** 43,47 ****
#ifdef SWIGRUBY
/// Called by the viewer to get bounds for this object
! %addmethods {
FXRange bounds() {
FXRange box;
--- 43,47 ----
#ifdef SWIGRUBY
/// Called by the viewer to get bounds for this object
! %extend {
FXRange bounds() {
FXRange box;
***************
*** 51,55 ****
}
#else
! %addmethods {
// Called by the viewer to get bounds for this object
FXRange* bounds(FXRange& box) {
--- 51,55 ----
}
#else
! %extend {
// Called by the viewer to get bounds for this object
FXRange* bounds(FXRange& box) {
***************
*** 113,116 ****
--- 113,121 ----
%}
+
+ // Rename these methods
+ %rename(removeObj) FXGLGroup::remove(FXGLObject* obj);
+ %rename(removePos) FXGLGroup::remove(FXint pos);
+
%exception FXGLGroup::FXGLGroup "$action FXRbRegisterRubyObj(self, result);";
***************
*** 131,135 ****
FXGLObject* child(FXint pos) const;
! %addmethods {
/// Insert child object at given position
void insert(FXint pos,FXGLObject* obj){
--- 136,140 ----
FXGLObject* child(FXint pos) const;
! %extend {
/// Insert child object at given position
void insert(FXint pos,FXGLObject* obj){
***************
*** 158,165 ****
/// Remove child object
! %name(removeObj) void remove(FXGLObject* obj);
/// Remove child object at given position
! %name(removePos) void remove(FXint pos);
/// Remove all children
--- 163,170 ----
/// Remove child object
! void remove(FXGLObject* obj);
/// Remove child object at given position
! void remove(FXint pos);
/// Remove all children
Index: FXGLShape.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLShape.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXGLShape.i 2 Apr 2002 03:44:27 -0000 1.17
--- FXGLShape.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 41,46 ****
- %ignore FXGLShape::FXGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
-
%exception FXGLShape::FXGLShape "$action FXRbRegisterRubyObj(self, result);";
--- 41,44 ----
***************
*** 107,111 ****
#ifdef SWIGRUBY
! %addmethods {
// Get the material for specified side (where side = 0 or 1)
FXMaterial getMaterial(FXint side) const {
--- 105,109 ----
#ifdef SWIGRUBY
! %extend {
// Get the material for specified side (where side = 0 or 1)
FXMaterial getMaterial(FXint side) const {
***************
*** 116,120 ****
}
#else
! %addmethods {
%new FXMaterial* getMaterial(FXint side) const {
FXMaterial *mtl = new FXMaterial;
--- 114,118 ----
}
#else
! %extend {
%new FXMaterial* getMaterial(FXint side) const {
FXMaterial *mtl = new FXMaterial;
***************
*** 125,130 ****
#endif
};
-
- %ignore FXRbGLShape::FXRbGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
%exception FXRbGLShape::FXRbGLShape "$action FXRbRegisterRubyObj(self, result);";
--- 123,126 ----
Index: FXGLViewer.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLViewer.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** FXGLViewer.i 19 Mar 2002 23:18:40 -0000 1.25
--- FXGLViewer.i 11 Jul 2002 13:33:14 -0000 1.26
***************
*** 84,89 ****
// typedef FXbool (*FXZSortFunc)(FXfloat*& buffer,FXint& used,FXint& size); FIXME
- %ignore FXGLViewer::FXGLViewer(FXComposite* p,FXGLVisual *vis,FXGLViewer* sharegroup,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
-
/******************************** Viewer Class ******************************/
--- 84,87 ----
***************
*** 328,332 ****
// Common DND type names
! %addmethods {
static VALUE objectTypeName(){
return to_ruby(FXGLViewer::objectTypeName);
--- 326,330 ----
// Common DND type names
! %extend {
static VALUE objectTypeName(){
return to_ruby(FXGLViewer::objectTypeName);
***************
*** 349,353 ****
#ifdef SWIGRUBY
! %addmethods {
// Return a list of all objects in the given rectangle
VALUE lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
--- 347,351 ----
#ifdef SWIGRUBY
! %extend {
// Return a list of all objects in the given rectangle
VALUE lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
***************
*** 366,370 ****
}
#else
! %addmethods {
PyObject* lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
FXGLObject **items = self->lasso(x1,y1,x2,y2);
--- 364,368 ----
}
#else
! %extend {
PyObject* lasso(FXint x1,FXint y1,FXint x2,FXint y2) {
FXGLObject **items = self->lasso(x1,y1,x2,y2);
***************
*** 436,440 ****
#ifdef SWIGRUBY
! %addmethods {
// Return a list of all objects in the given rectangle
VALUE select(FXint x,FXint y,FXint w,FXint h) {
--- 434,438 ----
#ifdef SWIGRUBY
! %extend {
// Return a list of all objects in the given rectangle
VALUE select(FXint x,FXint y,FXint w,FXint h) {
***************
*** 465,469 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return the viewer's viewport
FXViewport getViewport() const {
--- 463,467 ----
#ifdef SWIGRUBY
! %extend {
/// Return the viewer's viewport
FXViewport getViewport() const {
***************
*** 485,489 ****
#else
! %addmethods {
// void getViewport(FXViewport& v) const;
%new FXViewport* getViewport() const {
--- 483,487 ----
#else
! %extend {
// void getViewport(FXViewport& v) const;
%new FXViewport* getViewport() const {
***************
*** 541,545 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return default object material setting
FXMaterial getMaterial() const {
--- 539,543 ----
#ifdef SWIGRUBY
! %extend {
/// Return default object material setting
FXMaterial getMaterial() const {
***************
*** 550,554 ****
}
#else
! %addmethods {
/// Return default object material setting
%new FXMaterial* getMaterial() const {
--- 548,552 ----
}
#else
! %extend {
/// Return default object material setting
%new FXMaterial* getMaterial() const {
***************
*** 600,604 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return boresight vector (an array of two arrays)
VALUE getBoreVector(FXint sx,FXint sy) {
--- 598,602 ----
#ifdef SWIGRUBY
! %extend {
/// Return boresight vector (an array of two arrays)
VALUE getBoreVector(FXint sx,FXint sy) {
***************
*** 624,628 ****
}
#else
! %addmethods {
/// Return boresight vector (a tuple of two lists)
PyObject* getBoreVector(FXint sx,FXint sy) {
--- 622,626 ----
}
#else
! %extend {
/// Return boresight vector (a tuple of two lists)
PyObject* getBoreVector(FXint sx,FXint sy) {
***************
*** 751,755 ****
#ifdef SWIGRUBY
! %addmethods {
// Read the pixels off the screen as R,G,B tuples.
VALUE readPixels(FXint x, FXint y, FXint w, FXint h) {
--- 749,753 ----
#ifdef SWIGRUBY
! %extend {
// Read the pixels off the screen as R,G,B tuples.
VALUE readPixels(FXint x, FXint y, FXint w, FXint h) {
***************
*** 782,786 ****
}
#else
! %addmethods {
PyObject *readPixels(FXint x,FXint y,FXint w,FXint h) {
FXuchar *buffer;
--- 780,784 ----
}
#else
! %extend {
PyObject *readPixels(FXint x,FXint y,FXint w,FXint h) {
FXuchar *buffer;
***************
*** 851,855 ****
* This can be used for move/draw printed output depth sorting.
*/
! %addmethods {
void setZSortFunc(VALUE proc){
}
--- 849,853 ----
* This can be used for move/draw printed output depth sorting.
*/
! %extend {
void setZSortFunc(VALUE proc){
}
***************
*** 859,863 ****
#ifdef SWIGRUBY
/// Return hidden surface sorting function.
! %addmethods {
VALUE getZSortFunc() const {
return Qnil;
--- 857,861 ----
#ifdef SWIGRUBY
/// Return hidden surface sorting function.
! %extend {
VALUE getZSortFunc() const {
return Qnil;
***************
*** 890,894 ****
#ifdef SWIGRUBY
! %addmethods {
// Return light source settings
FXLight getLight() const {
--- 888,892 ----
#ifdef SWIGRUBY
! %extend {
// Return light source settings
FXLight getLight() const {
***************
*** 899,903 ****
}
#else
! %addmethods {
// Return light source settings
%new FXLight* getLight() const {
--- 897,901 ----
}
#else
! %extend {
// Return light source settings
%new FXLight* getLight() const {
***************
*** 917,921 ****
- %ignore FXRbGLViewer::FXRbGLViewer(FXComposite* p,FXGLVisual *vis,FXGLViewer* sharegroup,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
%exception FXRbGLViewer::FXRbGLViewer "$action FXRbRegisterRubyObj(self, result);";
--- 915,918 ----
Index: FXHMat.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHMat.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXHMat.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXHMat.i 11 Jul 2002 13:33:14 -0000 1.10
***************
*** 21,49 ****
***********************************************************************/
- %ignore FXHMat::FXHMat();
- %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);
- %rename(rot2) FXHMat::rot(const FXVec& v,FXfloat phi);
- %rename(rot3) FXHMat::rot(const FXVec& v,FXfloat c,FXfloat s);
-
- %rename(xrot1) FXHMat::xrot(FXfloat phi);
- %rename(xrot2) FXHMat::xrot(FXfloat c,FXfloat s);
-
- %rename(yrot1) FXHMat::yrot(FXfloat phi);
- %rename(yrot2) FXHMat::yrot(FXfloat c,FXfloat s);
-
- %rename(zrot1) FXHMat::zrot(FXfloat phi);
- %rename(zrot2) FXHMat::zrot(FXfloat c,FXfloat s);
-
- %rename(trans1) FXHMat::trans(const FXVec& v);
- %rename(trans3) FXHMat::trans(FXfloat tx,FXfloat ty,FXfloat tz);
-
- %rename(scalef) FXHMat::scale(FXfloat s);
- %rename(scalev) FXHMat::scale(const FXVec& v);
- %rename(scale3) FXHMat::scale(FXfloat sx,FXfloat sy,FXfloat sz);
-
%exception FXHMat::FXHMat "$action FXRbRegisterRubyObj(self, result);";
--- 21,24 ----
***************
*** 62,66 ****
// Operators
! %addmethods {
// Add matrices
FXHMat __add__(const FXHMat& other) {
--- 37,41 ----
// Operators
! %extend {
// Add matrices
FXHMat __add__(const FXHMat& other) {
Index: FXHVec.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHVec.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXHVec.i 19 Mar 2002 23:18:40 -0000 1.6
--- FXHVec.i 11 Jul 2002 13:33:14 -0000 1.7
***************
*** 21,29 ****
***********************************************************************/
- %ignore FXHVec::FXHVec();
- %ignore FXHVec::FXHVec(const FXHVec& w);
- %ignore FXHVec::FXHVec(const FXVec& w);
- %ignore FXHVec::FXHVec(FXColor color);
-
%exception FXHVec::FXHVec "$action FXRbRegisterRubyObj(self, result);";
--- 21,24 ----
***************
*** 46,50 ****
// Other good stuff
! %addmethods {
FXfloat __getitem__(FXint i){
if(i<0||i>3){
--- 41,45 ----
// Other good stuff
! %extend {
FXfloat __getitem__(FXint i){
if(i<0||i>3){
Index: FXHeader.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FXHeader.i 2 Apr 2002 03:44:27 -0000 1.30
--- FXHeader.i 11 Jul 2002 13:33:14 -0000 1.31
***************
*** 67,71 ****
#ifdef SWIGRUBY
! %addmethods {
/// Change item's user data
void setData(VALUE ptr) {
--- 67,71 ----
#ifdef SWIGRUBY
! %extend {
/// Change item's user data
void setData(VALUE ptr) {
***************
*** 80,84 ****
#endif
#ifdef SWIGPYTHON
! %addmethods {
void setData(PyObject* ptr) {
FXPySetData(self, ptr);
--- 80,84 ----
#endif
#ifdef SWIGPYTHON
! %extend {
void setData(PyObject* ptr) {
FXPySetData(self, ptr);
***************
*** 188,194 ****
#ifdef SWIGRUBY
! %addmethods {
/// Replace the item with a [possibly subclassed] item
! FXint replaceItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXHeaderItem* oldItem=self->retrieveItem(index);
--- 188,194 ----
#ifdef SWIGRUBY
! %extend {
/// Replace the item with a [possibly subclassed] item
! FXint replaceItem(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXHeaderItem* oldItem=self->retrieveItem(index);
***************
*** 207,211 ****
/// Replace items text, icon, and user-data pointer
! FXint replaceItem2(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXHeaderItem* oldItem=self->retrieveItem(index);
--- 207,211 ----
/// Replace items text, icon, and user-data pointer
! FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXHeaderItem* oldItem=self->retrieveItem(index);
***************
*** 223,229 ****
! %addmethods {
/// Insert a new [possibly subclassed] item at the given index
! FXint insertItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
((FXRbHeaderItem*)item)->owned=TRUE;
--- 223,229 ----
! %extend {
/// Insert a new [possibly subclassed] item at the given index
! FXint insertItem(FXint index,FXHeaderItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
((FXRbHeaderItem*)item)->owned=TRUE;
***************
*** 233,241 ****
/// Insert item at index with given text, icon, and user-data pointer
! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the list
! FXint appendItem1(FXHeaderItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
((FXRbHeaderItem*)item)->owned=TRUE;
--- 233,241 ----
/// Insert item at index with given text, icon, and user-data pointer
! FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the list
! FXint appendItem(FXHeaderItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
((FXRbHeaderItem*)item)->owned=TRUE;
***************
*** 245,253 ****
/// Append new item with given text and optional icon, and user-data pointer
! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Prepend a [possibly subclassed] item to the list
! FXint prependItem1(FXHeaderItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
((FXRbHeaderItem*)item)->owned=TRUE;
--- 245,253 ----
/// Append new item with given text and optional icon, and user-data pointer
! FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Prepend a [possibly subclassed] item to the list
! FXint prependItem(FXHeaderItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem)))
((FXRbHeaderItem*)item)->owned=TRUE;
***************
*** 257,261 ****
/// Prepend new item with given text and optional icon, and user-data pointer
! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
#endif
--- 257,261 ----
/// Prepend new item with given text and optional icon, and user-data pointer
! FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE);
#endif
***************
*** 265,269 ****
/// Replace items text, icon, and user-data pointer
! %name(replaceItem2) FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
/// Insert a new [possibly subclassed] item at the give index
--- 265,269 ----
/// Replace items text, icon, and user-data pointer
! FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
/// Insert a new [possibly subclassed] item at the give index
***************
*** 271,275 ****
/// Insert item at index with given text, icon, and user-data pointer
! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
/// Append a [possibly subclassed] item to the list
--- 271,275 ----
/// Insert item at index with given text, icon, and user-data pointer
! FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
/// Append a [possibly subclassed] item to the list
***************
*** 277,281 ****
/// Append new item with given text and optional icon, and user-data pointer
! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
/// Prepend a [possibly subclassed] item to the list
--- 277,281 ----
/// Append new item with given text and optional icon, and user-data pointer
! FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
/// Prepend a [possibly subclassed] item to the list
***************
*** 283,290 ****
/// Prepend new item with given text and optional icon, and user-data pointer
! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
#endif
! %addmethods {
/// Remove item at index
void removeItem(FXint index,FXbool notify=FALSE){
--- 283,290 ----
/// Prepend new item with given text and optional icon, and user-data pointer
! FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE);
#endif
! %extend {
/// Remove item at index
void removeItem(FXint index,FXbool notify=FALSE){
***************
*** 348,352 ****
#ifdef SWIGRUBY
! %addmethods {
/// Change data of item at index
void setItemData(FXint index, VALUE ptr){
--- 348,352 ----
#ifdef SWIGRUBY
! %extend {
/// Change data of item at index
void setItemData(FXint index, VALUE ptr){
Index: FXIcon.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIcon.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXIcon.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXIcon.i 11 Jul 2002 13:33:14 -0000 1.10
***************
*** 38,42 ****
* and options as in FXImage.
*/
! FXIcon(FXApp* a,const void *pix=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
/// Create the icon resource
--- 38,42 ----
* and options as in FXImage.
*/
! FXIcon(FXApp* a,const void *IMGPIXELS=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
/// Create the icon resource
***************
*** 70,74 ****
public:
// Constructor
! FXRbIcon(FXApp* a,const void *pix=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
// Destructor
--- 70,74 ----
public:
// Constructor
! FXRbIcon(FXApp* a,const void *IMGPIXELS=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
// Destructor
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** FXIconList.i 2 Apr 2002 03:44:27 -0000 1.34
--- FXIconList.i 11 Jul 2002 13:33:14 -0000 1.35
***************
*** 83,87 ****
FXIcon* getMiniIcon() const;
! %addmethods {
void setData(VALUE ptr){
self->setData((void*) ptr);
--- 83,87 ----
FXIcon* getMiniIcon() const;
! %extend {
void setData(VALUE ptr){
self->setData((void*) ptr);
***************
*** 279,285 ****
FXIconItem *retrieveItem(FXint index) const;
! %addmethods {
/// Replace the item with a [possibly subclassed] item
! FXint replaceItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXIconItem* oldItem=self->retrieveItem(index);
--- 279,285 ----
FXIconItem *retrieveItem(FXint index) const;
! %extend {
/// Replace the item with a [possibly subclassed] item
! FXint replaceItem(FXint index,FXIconItem* item,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXIconItem* oldItem=self->retrieveItem(index);
***************
*** 298,302 ****
/// Replace items text, icons, and user-data pointer
! FXint replaceItem2(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXIconItem* oldItem=self->retrieveItem(index);
--- 298,302 ----
/// Replace items text, icons, and user-data pointer
! FXint replaceItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){
// Save pointer to the soon-to-be-destroyed item
FXIconItem* oldItem=self->retrieveItem(index);
***************
*** 314,320 ****
! %addmethods {
/// Insert a new [possibly subclassed] item at the give index
! FXint insertItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbIconItem)))
((FXRbIconItem*)item)->owned=TRUE;
--- 314,320 ----
! %extend {
/// Insert a new [possibly subclassed] item at the give index
! FXint insertItem(FXint index,FXIconItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbIconItem)))
((FXRbIconItem*)item)->owned=TRUE;
***************
*** 324,332 ****
/// Insert item at index with given text, icons, and user-data pointer
! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the end of the list
! FXint appendItem1(FXIconItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbIconItem)))
((FXRbIconItem*)item)->owned=TRUE;
--- 324,332 ----
/// Insert item at index with given text, icons, and user-data pointer
! FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the end of the list
! FXint appendItem(FXIconItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbIconItem)))
((FXRbIconItem*)item)->owned=TRUE;
***************
*** 336,344 ****
/// Append new item with given text and optional icons, and user-data pointer
! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Append a [possibly subclassed] item to the end of the list
! FXint prependItem1(FXIconItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbIconItem)))
((FXRbIconItem*)item)->owned=TRUE;
--- 336,344 ----
/// Append new item with given text and optional icons, and user-data pointer
! FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Append a [possibly subclassed] item to the end of the list
! FXint prependItem(FXIconItem* item,FXbool notify=FALSE){
if(item->isMemberOf(FXMETACLASS(FXRbIconItem)))
((FXRbIconItem*)item)->owned=TRUE;
***************
*** 348,354 ****
/// Append new item with given text and optional icons, and user-data pointer
! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %addmethods {
/// Remove item from list
void removeItem(FXint index,FXbool notify=FALSE){
--- 348,354 ----
/// Append new item with given text and optional icons, and user-data pointer
! FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
! %extend {
/// Remo...
[truncated message content] |
Update of /cvsroot/fxruby/FXRuby/rdoc-sources
In directory usw-pr-cvs1:/tmp/cvs-serv26972/rdoc-sources
Modified Files:
FX4Splitter.rb FXAccelTable.rb FXApp.rb FXArrowButton.rb
FXBitmap.rb FXButton.rb FXCanvas.rb FXCheckButton.rb
FXColorBar.rb FXComboBox.rb FXComposite.rb FXFrame.rb
FXLabel.rb FXMainWindow.rb FXObject.rb FXShell.rb
FXTextField.rb FXTooltip.rb FXTopWindow.rb Makefile
Added Files:
FXList.rb FXRadioButton.rb FXRange.rb FXScrollArea.rb
FXToggleButton.rb
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: FX4Splitter.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FX4Splitter.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FX4Splitter.rb 27 Mar 2002 18:03:04 -0000 1.4
--- FX4Splitter.rb 11 Jul 2002 13:33:13 -0000 1.5
***************
*** 70,100 ****
# Get expanded child, or -1 if not expanded
def expanded(); end
-
- # Handles the +SEL_LEFTBUTTONPRESS+ message
- def onLeftBtnPress(sender, selector, event) ; end
-
- # Handles the +SEL_LEFTBUTTONRELEASE+ message
- def onLeftBtnRelease(sender, selector, event) ; end
-
- # Handles the +SEL_MOTION+ message
- def onMotion(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_UP+ message
- def onFocusUp(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_DOWN+ message
- def onFocusDown(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_LEFT+ message
- def onFocusLeft(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_RIGHT+ message
- def onFocusRight(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifiers +FX4Splitter::ID_EXPAND_*+
- def onCmdExpand(sender, selector, event) ; end
-
- # Handles the +SEL_UPDATE+ message with identifiers +FX4Splitter::ID_EXPAND_*+
- def onUpdExpand(sender, selector, event) ; end
end
end
--- 70,73 ----
Index: FXAccelTable.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXAccelTable.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXAccelTable.rb 3 Apr 2002 16:58:29 -0000 1.1
--- FXAccelTable.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 4,13 ****
# is pressed.
class FXAccelTable < FXObject
- # Handles the SEL_KEYPRESS event
- def onKeyPress(sender, sel, event) ; end
-
- # Handles the SEL_KEYRELEASE event
- def onKeyRelease(sender, sel, event) ; end
-
# Construct empty accelerator table
def initialize() ; end
--- 4,7 ----
Index: FXApp.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXApp.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXApp.rb 27 Mar 2002 18:03:04 -0000 1.5
--- FXApp.rb 11 Jul 2002 13:33:13 -0000 1.6
***************
*** 97,107 ****
#
class FXApp < FXObject
-
- # Handles the +SEL_COMMAND+ message with identifier +ID_QUIT+
- def onCmdQuit(sender, selector, ptr) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +ID_DUMP+
- def onCmdDump(sender, selector, ptr) ; end
-
# Copyright notice for library
def FXApp.copyright() ; end
--- 97,100 ----
***************
*** 424,427 ****
--- 417,423 ----
# Disable support for multithreaded applications
def disableThreads(); end
+
+ # Check to see if multithreaded applications are supported
+ def threadsEnabled?(); end
# Set the amount of time to sleep
Index: FXArrowButton.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXArrowButton.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXArrowButton.rb 3 Apr 2002 16:58:29 -0000 1.1
--- FXArrowButton.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 24,51 ****
#
class FXArrowButton < FXFrame
- # Handles the SEL_PAINT message
- def onPaint(sender, selector, event) ; end
- # Handles the SEL_UPDATE message
- def onUpdate(sender, selector, event) ; end
- # Handles the SEL_ENTER message
- def onEnter(sender, selector, event) ; end
- # Handles the SEL_LEAVE message
- def onLeave(sender, selector, event) ; end
- # Handles the SEL_LEFTBUTTONPRESS message
- def onLeftBtnPress(sender, selector, event) ; end
- # Handles the SEL_LEFTBUTTONRELEASE message
- def onLeftBtnRelease(sender, selector, event) ; end
- # Handles the SEL_UNGRABBED message
- def onUngrabbed(sender, selector, event) ; end
- def onRepeat(sender, selector, event) ; end
- # Handles the SEL_KEYPRESS message
- def onKeyPress(sender, selector, event) ; end
- # Handles the SEL_KEYRELEASE message
- def onKeyRelease(sender, selector, event) ; end
- def onHotKeyPress(sender, selector, event) ; end
- def onHotKeyRelease(sender, selector, event) ; end
- def onQueryHelp(sender, selector, event) ; end
- def onQueryTip(sender, selector, event) ; end
-
# Construct arrow button
def initialize(p, tgt=nil, sel=0, opts=ARROW_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
--- 24,27 ----
Index: FXBitmap.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXBitmap.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXBitmap.rb 3 Apr 2002 16:58:29 -0000 1.1
--- FXBitmap.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 1,17 ****
module Fox
! #
! # Bitmap is a one bit/pixel image used for patterning and
# stippling operations.
#
# = Image rendering hints
! #
! # BITMAP_KEEP:: Keep pixel data in client
! # BITMAP_OWNED:: Pixel data is owned by image
! # BITMAP_SHMI:: Using shared memory image
! # BITMAP_SHMP:: Using shared memory pixmap
! #
class FXBitmap < FXDrawable
# Create an image
! def initialize(app, pix=nil, opts=0, w=1, h=1) ; end
# Render pixels
--- 1,15 ----
module Fox
! # A bitmap is a one bit/pixel image used for patterning and
# stippling operations.
#
# = Image rendering hints
! # BITMAP_KEEP:: Keep pixel data in client
! # BITMAP_OWNED:: Pixel data is owned by image
! # BITMAP_SHMI:: Using shared memory image
! # BITMAP_SHMP:: Using shared memory pixmap
!
class FXBitmap < FXDrawable
# Create an image
! def initialize(app, pixels=nil, opts=0, w=1, h=1) ; end
# Render pixels
***************
*** 24,32 ****
def setPixel(x, y, color) ; end
! # Save pixel data only
! def savePixels(store) ; end
!
! # Load pixel data only
! def loadPixels(store) ; end
end
end
--- 22,27 ----
def setPixel(x, y, color) ; end
! # Resize bitmap to the specified width and height; the contents become undefined
! def resize(w, h) ; end
end
end
Index: FXButton.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXButton.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXButton.rb 26 Mar 2002 21:36:23 -0000 1.2
--- FXButton.rb 11 Jul 2002 13:33:13 -0000 1.3
***************
*** 36,93 ****
# Get the button style flags
def buttonStyle() ; end
-
- # Handles the +SEL_PAINT+ message
- def onPaint(sender, selector, event) ; end
-
- # Handles the +SEL_UPDATE+ message
- def onUpdate(sender, selector, event) ; end
-
- # Handles the +SEL_ENTER+ message
- def onEnter(sender, selector, event) ; end
-
- # Handles the +SEL_LEAVE+ message
- def onLeave(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_IN+ message
- def onFocusIn(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_OUT+ message
- def onFocusOut(sender, selector, event) ; end
-
- # Handles the +SEL_UNGRABBED+ message
- def onUngrabbed(sender, selector, event) ; end
-
- # Handles the +SEL_LEFTBUTTONPRESS+ message
- def onLeftBtnPress(sender, selector, event) ; end
-
- # Handles the +SEL_LEFTBUTTONRELEASE+ message
- def onLeftBtnRelease(sender, selector, event) ; end
-
- # Handles the +SEL_KEYPRESS+ message
- def onKeyPress(sender, selector, event) ; end
-
- # Handles the +SEL_KEYRELEASE+ message
- def onKeyRelease(sender, selector, event) ; end
-
- # Handles the +SEL_KEYPRESS+ message with identifier +FXWindow::ID_HOTKEY+
- def onHotKeyPress(sender, selector, event) ; end
-
- # Handles the +SEL_KEYRELEASE+ message with identifier +FXWindow::ID_HOTKEY+
- def onHotKeyRelease(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_CHECK+
- def onCheck(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_UNCHECK+
- def onUncheck(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_SETVALUE+
- def onCmdSetValue(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_SETINTVALUE+
- def onCmdSetIntValue(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_GETINTVALUE+
- def onCmdGetIntValue(sender, selector, event) ; end
end
end
--- 36,39 ----
Index: FXCanvas.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXCanvas.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXCanvas.rb 3 Apr 2002 16:58:29 -0000 1.1
--- FXCanvas.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 2,14 ****
# Canvas, an area drawn by another object
class FXCanvas < FXWindow
- # Handles the SEL_PAINT message
- def onPaint(sender, selector, event) ; end
- # Handles the SEL_MOTION message
- def onMotion(sender, selector, event) ; end
- # Handles the SEL_KEYPRESS message
- def onKeyPress(sender, selector, event) ; end
- # Handles the SEL_KEYRELEASE message
- def onKeyRelease(sender, selector, event) ; end
-
# Construct new drawing canvas widget
def initialize(p, tgt=nil, sel=0, opts=FRAME_NORMAL, x=0, y=0, w=0, h=0) ; end
--- 2,5 ----
Index: FXCheckButton.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXCheckButton.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXCheckButton.rb 3 Apr 2002 16:58:29 -0000 1.1
--- FXCheckButton.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 14,45 ****
class FXCheckButton < FXLabel
- # Handles the SEL_PAINT message
- def onPaint(sender, selector, event) ; end
- # Handles the SEL_UPDATE message
- def onUpdate(sender, selector, event) ; end
- # Handles the SEL_ENTER message
- def onEnter(sender, selector, event) ; end
- # Handles the SEL_LEAVE message
- def onLeave(sender, selector, event) ; end
- def onFocusIn(sender, selector, event) ; end
- def onFocusOut(sender, selector, event) ; end
- def onUngrabbed(sender, selector, event) ; end
- # Handles the SEL_LEFTBUTTONPRESS message
- def onLeftBtnPress(sender, selector, event) ; end
- # Handles the SEL_LEFTBUTTONRELEASE message
- def onLeftBtnRelease(sender, selector, event) ; end
- # Handles the SEL_KEYPRESS message
- def onKeyPress(sender, selector, event) ; end
- # Handles the SEL_KEYRELEASE message
- def onKeyRelease(sender, selector, event) ; end
- def onHotKeyPress(sender, selector, event) ; end
- def onHotKeyRelease(sender, selector, event) ; end
- def onCheck(sender, selector, event) ; end
- def onUncheck(sender, selector, event) ; end
- def onUnknown(sender, selector, event) ; end
- def onCmdSetValue(sender, selector, event) ; end
- def onCmdSetIntValue(sender, selector, event) ; end
- def onCmdGetIntValue(sender, selector, event) ; end
-
# Construct new check button
def initialize(p, text, tgt=nil, sel=0, opts=CHECKBUTTON_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
--- 14,17 ----
Index: FXColorBar.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXColorBar.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXColorBar.rb 3 Apr 2002 16:58:55 -0000 1.1
--- FXColorBar.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 4,55 ****
#
# = Color bar orientation
! #
! # COLORBAR_HORIZONTAL:: Color bar shown horizontally
! # COLORBAR_VERTICAL:: Color bar shown vertically
!
class FXColorBar < FXFrame
- long onPaint(FXObject*,FXSelector,void*);
- long onLeftBtnPress(FXObject*,FXSelector,void*);
- long onLeftBtnRelease(FXObject*,FXSelector,void*);
- long onMotion(FXObject*,FXSelector,void*);
- long onQueryHelp(FXObject*,FXSelector,void*);
- long onQueryTip(FXObject*,FXSelector,void*);
-
# Construct color well with initial color clr
def initialize(p, tgt=nil, sel=0, opts=FRAME_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
!
# Change hue
def hue=(h) ; end
!
# Return hue
def hue() ; end
!
# Change saturation
def sat=(s) ; end
!
# Return saturation
def sat() ; end
!
# Change value
def val=(v) ; end
!
# Return value
def val() ; end
!
! # Get the color bar style
! def barStyle() ; end
!
# Change the color bar style
def barStyle=(style) ; end
!
# Set status line help text for this color bar
def helpText=(text) ; end
!
! # Get status line help text for this color bar
def helpText() ; end
!
! # Set tool tip message for this color bar
def tipText=(text) ; end
!
# Get tool tip message for this color well
def tipText() ; end
--- 4,47 ----
#
# = Color bar orientation
! # COLORBAR_HORIZONTAL:: Color bar shown horizontally
! # COLORBAR_VERTICAL:: Color bar shown vertically
!
class FXColorBar < FXFrame
# Construct color well with initial color clr
def initialize(p, tgt=nil, sel=0, opts=FRAME_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
!
# Change hue
def hue=(h) ; end
!
# Return hue
def hue() ; end
!
# Change saturation
def sat=(s) ; end
!
# Return saturation
def sat() ; end
!
# Change value
def val=(v) ; end
!
# Return value
def val() ; end
!
# Change the color bar style
+ def barStyle() ; end
+
+ # Get the color bar style
def barStyle=(style) ; end
!
# Set status line help text for this color bar
def helpText=(text) ; end
!
! # Get status line help text for this color well
def helpText() ; end
!
! # Set tool tip message for this color well
def tipText=(text) ; end
!
# Get tool tip message for this color well
def tipText() ; end
Index: FXComboBox.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXComboBox.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXComboBox.rb 27 Mar 2002 18:03:04 -0000 1.1
--- FXComboBox.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 19,39 ****
#
class FXComboBox < FXPacker
- # Handles the +SEL_FOCUS_UP+ message
- def onFocusUp(sender, selector, event) ; end
- # Handles the +SEL_FOCUS_DOWN+ message
- def onFocusDown(sender, selector, event) ; end
- # Handles the +SEL_COMMAND+ message from the button
- def onTextButton(sender, selector, ptr) ; end
- # Handles the +SEL_CHANGED+ message from the text field
- def onTextChanged(sender, selector, string) ; end
- # Handles the +SEL_COMMAND+ message from the text field
- def onTextCommand(sender, selector, string) ; end
- # Handles the +SEL_CLICKED+ message for the list
- def onListClicked(sender, selector, listIndex) ; end
- # Handles something else
- def onFwdToText(sender, selector, ptr) ; end
- # Handles the +SEL_UPDATE+ message from the text field
- def onUpdFmText(sender, selector, ptr);
-
# Constructor
def initialize(p, cols, nvis, tgt, sel, opts=COMBOBOX_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
--- 19,22 ----
Index: FXComposite.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXComposite.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXComposite.rb 27 Mar 2002 18:03:04 -0000 1.2
--- FXComposite.rb 11 Jul 2002 13:33:13 -0000 1.3
***************
*** 2,20 ****
# Base composite
class FXComposite < FXWindow
- # Handles the +SEL_KEYPRESS+ message
- def onKeyPress(sender, selector, event) ; end
-
- # Handles the +SEL_KEYRELEASE+ message
- def onKeyRelease(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_NEXT+ message
- def onFocusNext(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_PREV+ message
- def onFocusPrev(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier FXWindow::ID_UPDATE
- def onCmdUpdate(sender, selector, event) ; end
-
# Constructor
def initialize(p, opts=0, x=0, y=0, w=0, h=0); end
--- 2,5 ----
Index: FXFrame.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXFrame.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXFrame.rb 26 Mar 2002 21:36:23 -0000 1.2
--- FXFrame.rb 11 Jul 2002 13:33:13 -0000 1.3
***************
*** 65,71 ****
# Get base GUI color
def baseColor() ; end
-
- # Handles the +SEL_PAINT+ message
- def onPaint(sender, selector, event) ; end
end
end
--- 65,68 ----
Index: FXLabel.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXLabel.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXLabel.rb 26 Mar 2002 21:36:23 -0000 1.2
--- FXLabel.rb 11 Jul 2002 13:33:13 -0000 1.3
***************
*** 85,109 ****
# Get the tool tip message for this label
def tipText() ; end
-
- # Handles the +SEL_PAINT+ message
- def onPaint(sender, selector, event) ; end
-
- # Handles the +SEL_KEYPRESS+ message with identifier +FXWindow::ID_HOTKEY+
- def onHotKeyPress(sender, selector, event) ; end
-
- # Handles the +SEL_KEYRELEASE+ message with identifier +FXWindow::ID_HOTKEY+
- def onHotKeyRelease(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_GETSTRINGVALUE+
- def onCmdGetStringValue(sender, selector, event) ; end
-
- # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_SETSTRINGVALUE+
- def onCmdSetStringValue(sender, selector, event) ; end
-
- # Handles the +SEL_UPDATE+ message with identifier +FXWindow::ID_QUERY_HELP+
- def onQueryHelp(sender, selector, event) ; end
-
- # Handles the +SEL_UPDATE+ message with identifier +FXWindow::ID_QUERY_TIP+
- def onQueryTip(sender, selector, event) ; end
end
end
--- 85,88 ----
Index: FXMainWindow.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXMainWindow.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXMainWindow.rb 7 Feb 2002 16:54:54 -0000 1.1
--- FXMainWindow.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 4,10 ****
# Construct a main window
def initialize(app, name, ic=nil, mi=nil, opts=DECOR_ALL, x=0, y=0, w=0, h=0, pl=0, pr=0, pt=0, pb=0, hs=0, vs=0) ; end
-
- # Handles the +SEL_CLOSE+ message
- def onClose(sender, selector, event) ; end
end
end
--- 4,7 ----
Index: FXObject.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXObject.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXObject.rb 25 Jan 2002 23:14:56 -0000 1.1
--- FXObject.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 5,11 ****
def handle(sender, sel, ptr); end
- # Called for unhandled messages
- def onDefault(sender, sel, ptr) ; end
-
# Get class name of some object
def getClassName() ; end
--- 5,8 ----
Index: FXShell.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXShell.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXShell.rb 7 Feb 2002 16:54:54 -0000 1.1
--- FXShell.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 2,19 ****
# A child of the root window
class FXShell < FXComposite
- # Handles the +SEL_CONFIGURE+ message
- def onConfigure(sender, selector, event) ; end
-
- # Handles the +SEL_KEYPRESS+ message
- def onKeyPress(sender, selector, event) ; end
-
- # Handles the +SEL_KEYRELEASE+ message
- def onKeyRelease(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_NEXT+ message
- def onFocusNext(sender, selector, event) ; end
-
- # Handles the +SEL_FOCUS_PREV+ message
- def onFocusPrev(sender, selector, event) ; end
end
end
--- 2,5 ----
Index: FXTextField.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXTextField.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXTextField.rb 27 Mar 2002 18:03:04 -0000 1.1
--- FXTextField.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 38,109 ****
#
class FXTextField < FXFrame
- # Handles the +SEL_PAINT+ message
- def onPaint(sender, selector, event) ; end
- # Handles the +SEL_KEYPRESS+ message
- def onKeyPress(sender, selector, event) ; end
- # Handles the +SEL_KEYRELEASE+ message
- def onKeyRelease(sender, selector, event) ; end
- # Handles the +SEL_LEFTBUTTONPRESS+ message
- def onLeftBtnPress(sender, selector, event) ; end
- # Handles the +SEL_LEFTBUTTONRELEASE+ message
- def onLeftBtnRelease(sender, selector, event) ; end
- # Handles the +SEL_MIDDLEBUTTONPRESS+ message
- def onMiddleBtnPress(sender, selector, event) ; end
- # Handles the +SEL_MIDDLEBUTTONRELEASE+ message
- def onMiddleBtnRelease(sender, selector, event) ; end
- # Handles the +SEL_VERIFY+ message
- def onVerify(sender, selector, string) ; end
- # Handles the +SEL_MOTION+ message
- def onMotion(sender, selector, event) ; end
- # Handles the +SEL_SELECTION_LOST+ message
- def onSelectionLost(sender, selector, event) ; end
- # Handles the +SEL_SELECTION_GAINED+ message
- def onSelectionGained(sender, selector, event) ; end
- # Handles the +SEL_SELECTION_REQUEST+ message
- def onSelectionRequest(FXObject*,FXSelector,void* ptr) ; end
- # Handles the +SEL_CLIPBOARD_LOST+ message
- def onClipboardLost(sender, selector, event) ; end
- # Handles the +SEL_CLIPBOARD_GAINED+ message
- def onClipboardGained(sender, selector, event) ; end
- # Handles the +SEL_CLIPBOARD_REQUEST+ message
- def onClipboardRequest(sender, selector, event) ; end
- # Handles the +SEL_FOCUS_SELF+ message
- def onFocusSelf(sender, selector, event) ; end
- # Handles the +SEL_FOCUS_IN+ message
- def onFocusIn(sender, selector, event) ; end
- # Handles the +SEL_FOCUS_OUT+ message
- def onFocusOut(sender, selector, event) ; end
- def onBlink(sender, selector, ptr) ; end
- def onAutoScroll(sender, selector, ptr) ; end
- def onQueryHelp(sender, selector, ptr) ; end
- def onQueryTip(sender, selector, ptr) ; end
- def onCmdSetValue(sender, selector, string) ; end
- def onCmdSetIntValue(sender, selector, int) ; end
- def onCmdSetRealValue(sender, selector, float) ; end
- def onCmdSetStringValue(sender, selector, string) ; end
- def onCmdGetIntValue(sender, selector, ptr) ; end
- def onCmdGetRealValue(sender, selector, ptr) ; end
- def onCmdGetStringValue(sender, selector, ptr) ; end
- def onCmdCursorHome(sender, selector, ptr) ; end
- def onCmdCursorEnd(sender, selector, ptr) ; end
- def onCmdCursorRight(sender, selector, ptr) ; end
- def onCmdCursorLeft(sender, selector, ptr) ; end
- def onCmdMark(sender, selector, ptr) ; end
- def onCmdExtend(sender, selector, ptr) ; end
- def onCmdSelectAll(sender, selector, ptr) ; end
- def onCmdDeselectAll(sender, selector, ptr) ; end
- def onCmdCutSel(sender, selector, ptr) ; end
- def onCmdCopySel(sender, selector, ptr) ; end
- def onCmdPasteSel(sender, selector, ptr) ; end
- def onCmdDeleteSel(sender, selector, ptr) ; end
- def onCmdOverstString(sender, selector, character) ; end
- def onCmdInsertString(sender, selector, string) ; end
- def onCmdBackspace(sender, selector, ptr) ; end
- def onCmdDelete(sender, selector, ptr) ; end
- def onCmdToggleEditable(sender, selector, ptr) ; end
- def onUpdToggleEditable(sender, selector, ptr) ; end
- def onCmdToggleOverstrike(sender, selector, ptr) ; end
- def onUpdToggleOverstrike(sender, selector, ptr) ; end
-
# Construct text field wide enough to display ncols columns
def initialize(p, ncols, tgt=nil, sel=0, opts=TEXTFIELD_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
--- 38,41 ----
Index: FXTooltip.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXTooltip.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXTooltip.rb 26 Mar 2002 21:36:23 -0000 1.1
--- FXTooltip.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 13,32 ****
#
class FXTooltip < FXShell
- # Handles the +SEL_PAINT+ message
- def onPaint(sender, selector, event); end
-
- # Handles the +SEL_UPDATE+ message
- def onUpdate(sender, selector, ptr); end
-
- # Handles the +SEL_COMMAND+ message with identifier +ID_TIP_SHOW+
- def onTipShow(sender, selector, ptr); end
-
- # Handles the +SEL_COMMAND+ message with identifier +ID_TIP_HIDE+
- def onTipHide(sender, selector, ptr); end
-
- def onCmdGetStringValue(sender, selector, ptr) ; end
-
- def onCmdSetStringValue(sender, selector, string); end
-
# Construct a tool tip
def initialize(app, opts=TOOLTIP_NORMAL, x=0, y=0, w=0, h=0); end
--- 13,16 ----
Index: FXTopWindow.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXTopWindow.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXTopWindow.rb 7 Feb 2002 16:54:54 -0000 1.1
--- FXTopWindow.rb 11 Jul 2002 13:33:13 -0000 1.2
***************
*** 44,138 ****
# Return +true+ if window has been iconified
! def isIconified() ; end
# Change window title
! def setTitle(title) ; end
# Return window title
! def getTitle() ; end
# Change top padding
! def setPadTop(padTop) ; end
# Get top interior padding
! def getPadTop() ; end
# Change bottom padding
! def setPadBottom(padBottom) ; end
# Get bottom interior padding
! def getPadBottom() ; end
# Change left padding
! def setPadLeft(padLeft) ; end
# Get left interior padding
! def getPadLeft() ; end
# Change right padding
! def setPadRight(padRight) ; end
# Get right interior padding
! def getPadRight() ; end
# Return horizontal spacing between children
! def getHSpacing() ; end
# Return vertical spacing between children
! def getVSpacing() ; end
# Change horizontal spacing between children
! def setHSpacing(hSpacing) ; end
# Change vertical spacing between children
! def setVSpacing(vSpacing) ; end
# Change packing hints for children
! def setPackingHints(packingHints) ; end
# Return packing hints for children
! def getPackingHints() ; end
# Change title and border decorations
! def setDecorations(decorations) ; end
# Return current title and border decorations
! def getDecorations() ; end
# Return window icon
! def getIcon() ; end
# Change window icon
! def setIcon(icon) ; end
# Return window mini (title) icon
! def getMiniIcon() ; end
# Change window mini (title) icon
! def setMiniIcon(miniIcon) ; end
!
! # Handles the +SEL_CLOSE+ message
! def onClose(sender, selector, event) ; end
!
! # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_SETSTRINGVALUE+
! def onCmdSetStringValue(sender, selector, event) ; end
!
! # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_ICONIFY+
! def onCmdIconify(sender, selector, event) ; end
!
! # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_DEICONIFY+
! def onCmdDeiconify(sender, selector, event) ; end
!
! # Handles the +SEL_FOCUS_UP+ message
! def onFocusUp(sender, selector, event) ; end
!
! # Handles the +SEL_FOCUS_DOWN+ message
! def onFocusDown(sender, selector, event) ; end
!
! # Handles the +SEL_FOCUS_LEFT+ message
! def onFocusLeft(sender, selector, event) ; end
!
! # Handles the +SEL_FOCUS_RIGHT+ message
! def onFocusRight(sender, selector, event) ; end
end
end
--- 44,114 ----
# Return +true+ if window has been iconified
! def iconified?() ; end
# Change window title
! def title=(title) ; end
# Return window title
! def title() ; end
# Change top padding
! def padTop=(padTop) ; end
# Get top interior padding
! def padTop() ; end
# Change bottom padding
! def padBottom=(padBottom) ; end
# Get bottom interior padding
! def padBottom() ; end
# Change left padding
! def padLeft=(padLeft) ; end
# Get left interior padding
! def padLeft() ; end
# Change right padding
! def padRight=(padRight) ; end
# Get right interior padding
! def padRight() ; end
# Return horizontal spacing between children
! def hSpacing() ; end
# Return vertical spacing between children
! def vSpacing() ; end
# Change horizontal spacing between children
! def hSpacing=(hSpacing) ; end
# Change vertical spacing between children
! def vSpacing=(vSpacing) ; end
# Change packing hints for children
! def packingHints=(packingHints) ; end
# Return packing hints for children
! def packingHints() ; end
# Change title and border decorations
! def decorations=(decorations) ; end
# Return current title and border decorations
! def decorations() ; end
# Return window icon
! def icon() ; end
# Change window icon
! def icon=(icon) ; end
# Return window mini (title) icon
! def miniIcon() ; end
# Change window mini (title) icon
! def miniIcon=(miniIcon) ; end
end
end
Index: Makefile
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile 14 Mar 2002 17:09:38 -0000 1.3
--- Makefile 11 Jul 2002 13:33:13 -0000 1.4
***************
*** 1,5 ****
! rdoc:
! @ruby -rrdoc/rdoc -e 'RDoc::RDoc.new.document(["--diagram", "--quiet"])'
!
! clean:
! @rm -rf doc
--- 1,5 ----
! rdoc:
! @ruby -rrdoc/rdoc -e 'RDoc::RDoc.new.document(["--diagram", "--quiet"])'
!
! clean:
! @rm -rf doc
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:18
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv26972/tests
Modified Files:
TC_FXHMat.rb TC_FXHVec.rb TC_FXMaterial.rb TC_FXRange.rb
TC_FXViewport.rb
Added Files:
TC_FXAccelTable.rb TC_FXFileAssoc.rb TC_FXFileStream.rb
TC_FXFontDesc.rb TC_FXRegion.rb TC_FXShell.rb
TC_FXTopWindow.rb stress1.rb
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: TC_FXHMat.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXHMat.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TC_FXHMat.rb 26 Mar 2002 21:35:20 -0000 1.2
--- TC_FXHMat.rb 11 Jul 2002 13:33:14 -0000 1.3
***************
*** 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.5
diff -C2 -d -r1.4 -r1.5
*** TC_FXHVec.rb 26 Mar 2002 21:35:20 -0000 1.4
--- TC_FXHVec.rb 11 Jul 2002 13:33:15 -0000 1.5
***************
*** 83,85 ****
--- 83,89 ----
assert_equal(vec[3], arr[3])
end
+ def test_copy_constructor
+ vec1 = FXHVec.new(1.0, 2.0, 3.0, 4.0)
+ assert_equal(vec1, FXHVec.new(vec1))
+ end
end
Index: TC_FXMaterial.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXMaterial.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TC_FXMaterial.rb 26 Mar 2002 21:35:20 -0000 1.2
--- TC_FXMaterial.rb 11 Jul 2002 13:33:15 -0000 1.3
***************
*** 6,23 ****
class TC_FXMaterial < Test::Unit::TestCase
def set_up
@mat = FXMaterial.new
end
! def testAttributes
! assert_not_nil(@mat.ambient)
! assert_kind_of(FXHVec, @mat.ambient)
! assert_not_nil(@mat.diffuse)
! assert_kind_of(FXHVec, @mat.diffuse)
! assert_not_nil(@mat.specular)
! assert_kind_of(FXHVec, @mat.specular)
! assert_not_nil(@mat.emission)
! assert_kind_of(FXHVec, @mat.emission)
! assert_not_nil(@mat.shininess)
! assert_kind_of(Float, @mat.shininess)
end
end
--- 6,75 ----
class TC_FXMaterial < Test::Unit::TestCase
+
+ DELTA = 1.0e-6
+
def set_up
@mat = FXMaterial.new
end
!
! def test_ambient
! @mat.ambient = [0.5, 0.6, 0.7, 0.8]
! assert_in_delta(0.5, @mat.ambient[0], DELTA)
! assert_in_delta(0.6, @mat.ambient[1], DELTA)
! assert_in_delta(0.7, @mat.ambient[2], DELTA)
! assert_in_delta(0.8, @mat.ambient[3], DELTA)
!
! @mat.ambient = FXHVec.new(0.5, 0.6, 0.7, 0.8)
! assert_in_delta(0.5, @mat.ambient[0], DELTA)
! assert_in_delta(0.6, @mat.ambient[1], DELTA)
! assert_in_delta(0.7, @mat.ambient[2], DELTA)
! assert_in_delta(0.8, @mat.ambient[3], DELTA)
! end
!
! def test_diffuse
! @mat.diffuse = [0.5, 0.6, 0.7, 0.8]
! assert_in_delta(0.5, @mat.diffuse[0], DELTA)
! assert_in_delta(0.6, @mat.diffuse[1], DELTA)
! assert_in_delta(0.7, @mat.diffuse[2], DELTA)
! assert_in_delta(0.8, @mat.diffuse[3], DELTA)
!
! @mat.diffuse = FXHVec.new(0.5, 0.6, 0.7, 0.8)
! assert_in_delta(0.5, @mat.diffuse[0], DELTA)
! assert_in_delta(0.6, @mat.diffuse[1], DELTA)
! assert_in_delta(0.7, @mat.diffuse[2], DELTA)
! assert_in_delta(0.8, @mat.diffuse[3], DELTA)
! end
!
! def test_emission
! @mat.emission = [0.5, 0.6, 0.7, 0.8]
! assert_in_delta(0.5, @mat.emission[0], DELTA)
! assert_in_delta(0.6, @mat.emission[1], DELTA)
! assert_in_delta(0.7, @mat.emission[2], DELTA)
! assert_in_delta(0.8, @mat.emission[3], DELTA)
!
! @mat.emission = FXHVec.new(0.5, 0.6, 0.7, 0.8)
! assert_in_delta(0.5, @mat.emission[0], DELTA)
! assert_in_delta(0.6, @mat.emission[1], DELTA)
! assert_in_delta(0.7, @mat.emission[2], DELTA)
! assert_in_delta(0.8, @mat.emission[3], DELTA)
! end
!
! def test_emission
! @mat.emission = [0.5, 0.6, 0.7, 0.8]
! assert_in_delta(0.5, @mat.emission[0], DELTA)
! assert_in_delta(0.6, @mat.emission[1], DELTA)
! assert_in_delta(0.7, @mat.emission[2], DELTA)
! assert_in_delta(0.8, @mat.emission[3], DELTA)
!
! @mat.emission = FXHVec.new(0.5, 0.6, 0.7, 0.8)
! assert_in_delta(0.5, @mat.emission[0], DELTA)
! assert_in_delta(0.6, @mat.emission[1], DELTA)
! assert_in_delta(0.7, @mat.emission[2], DELTA)
! assert_in_delta(0.8, @mat.emission[3], DELTA)
! end
!
! def test_shininess
! @mat.shininess = 0.5
! assert_in_delta(0.5, @mat.shininess, DELTA)
end
end
Index: TC_FXRange.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXRange.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TC_FXRange.rb 26 Mar 2002 21:35:20 -0000 1.3
--- TC_FXRange.rb 11 Jul 2002 13:33:15 -0000 1.4
***************
*** 33,41 ****
assert_equal([@range.width, @range.height, @range.depth].min, @range.shortest)
end
! def test_empty
end
! def test_overlap
end
! def test_contains
end
def test_include
--- 33,41 ----
assert_equal([@range.width, @range.height, @range.depth].min, @range.shortest)
end
! def test_empty?
end
! def test_overlaps?
end
! def test_contains?
end
def test_include
***************
*** 43,53 ****
def test_clipTo
end
! def test_boxCorners
end
! def test_boxIntersect
end
! def test_boxCenter
end
! def test_boxDiagonal
end
end
--- 43,53 ----
def test_clipTo
end
! def test_corners
end
! def test_intersects?
end
! def test_center
end
! def test_diagonal
end
end
Index: TC_FXViewport.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXViewport.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TC_FXViewport.rb 26 Mar 2002 21:35:20 -0000 1.2
--- TC_FXViewport.rb 11 Jul 2002 13:33:15 -0000 1.3
***************
*** 9,17 ****
@viewport = FXViewport.new
end
def testAttributes
assert_not_nil(@viewport.w)
! assert_kind_of(Fixnum, @viewport.w)
assert_not_nil(@viewport.h)
! assert_kind_of(Fixnum, @viewport.h)
assert_not_nil(@viewport.left)
assert_kind_of(Float, @viewport.left)
--- 9,18 ----
@viewport = FXViewport.new
end
+
def testAttributes
assert_not_nil(@viewport.w)
! assert_kind_of(Integer, @viewport.w)
assert_not_nil(@viewport.h)
! assert_kind_of(Integer, @viewport.h)
assert_not_nil(@viewport.left)
assert_kind_of(Float, @viewport.left)
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:17
|
Update of /cvsroot/fxruby/FXRuby/scripts In directory usw-pr-cvs1:/tmp/cvs-serv26972/scripts Added Files: iface.rb Log Message: Merged changes from the release10 branch back onto the main trunk. |
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:16
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv26972/lib/fox
Modified Files:
aliases.rb overloads.rb
Added Files:
canvas.rb scintilla.rb
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** aliases.rb 3 Apr 2002 21:40:57 -0000 1.24
--- aliases.rb 11 Jul 2002 13:33:13 -0000 1.25
***************
*** 125,129 ****
class FX_ColorWell
alias rgba= setRGBA
! alias rbga getRGBA
alias opaqueOnly= setOpaqueOnly
alias opaqueOnly? isOpaqueOnly
--- 125,129 ----
class FX_ColorWell
alias rgba= setRGBA
! alias rgba getRGBA
alias opaqueOnly= setOpaqueOnly
alias opaqueOnly? isOpaqueOnly
***************
*** 183,186 ****
--- 183,192 ----
alias hotY getHotY
end
+ class FX_DataTarget
+ alias target getTarget
+ alias target= setTarget
+ alias selector getSelector
+ alias selector= setSelector
+ end
class FXDataTarget
alias value getValue
***************
*** 209,216 ****
alias function getFunction
alias function= setFunction
alias tile getTile
alias stippleBitmap getStippleBitmap
alias stipplePattern getStipplePattern
! alias clipRegion setClipRegion
alias clipRectangle getClipRectangle
alias clipX getClipX
--- 215,225 ----
alias function getFunction
alias function= setFunction
+ alias tile= setTile
alias tile getTile
+ alias stipple= setStipple
alias stippleBitmap getStippleBitmap
alias stipplePattern getStipplePattern
! alias clipRegion= setClipRegion
! alias clipRectangle= setClipRectangle
alias clipRectangle getClipRectangle
alias clipX getClipX
***************
*** 226,229 ****
--- 235,240 ----
end
class FX_Dial
+ alias range getRange
+ alias range= setRange
alias value getValue
alias value= setValue
***************
*** 244,255 ****
end
class FX_Dict
! alias length no
! alias size no
! # alias delete remove
! alias has_key? has_key
! alias include? has_key
! alias key? has_key
! alias member? has_key
! alias empty? empty
end
class FX_DirBox
--- 255,262 ----
end
class FX_Dict
! alias size length
! alias include? has_key?
! alias key? has_key?
! alias member? has_key?
end
class FX_DirBox
***************
*** 672,694 ****
end
class FX_List
! alias numItems getNumItems
! alias numVisible getNumVisible
! alias numVisible= setNumVisible
! alias currentItem getCurrentItem
! alias anchorItem= setAnchorItem
! alias anchorItem getAnchorItem
! alias cursorItem getCursorItem
! alias font= setFont
! alias font getFont
! alias textColor getTextColor
! alias textColor= setTextColor
! alias selBackColor getSelBackColor
! alias selBackColor= setSelBackColor
! alias selTextColor getSelTextColor
! alias selTextColor= setSelTextColor
! alias listStyle getListStyle
! alias listStyle= setListStyle
! alias helpText= setHelpText
! alias helpText getHelpText
end
class FX_ListBox
--- 679,705 ----
end
class FX_List
! alias numItems getNumItems
! alias numVisible getNumVisible
! alias numVisible= setNumVisible
! alias itemSelected? isItemSelected
! alias itemCurrent? isItemCurrent
! alias itemVisible? isItemVisible
! alias itemEnabled? isItemEnabled
! alias currentItem getCurrentItem
! alias anchorItem= setAnchorItem
! alias anchorItem getAnchorItem
! alias cursorItem getCursorItem
! alias font= setFont
! alias font getFont
! alias textColor getTextColor
! alias textColor= setTextColor
! alias selBackColor getSelBackColor
! alias selBackColor= setSelBackColor
! alias selTextColor getSelTextColor
! alias selTextColor= setSelTextColor
! alias listStyle getListStyle
! alias listStyle= setListStyle
! alias helpText= setHelpText
! alias helpText getHelpText
end
class FX_ListBox
***************
*** 919,926 ****
alias radioColor= setRadioColor
end
- class FXRange
- alias empty? empty
- alias contains? contains
- end
class FX_RecentFiles
alias maxFiles= setMaxFiles
--- 930,933 ----
***************
*** 933,936 ****
--- 940,946 ----
alias selector getSelector
end
+ class FXRegion
+ alias contains? contains
+ end
class FXRegistry
alias appKey getAppKey
***************
*** 958,961 ****
--- 968,972 ----
alias xPosition getXPosition
alias yPosition getYPosition
+ alias position getPosition
end
class FX_Scrollbar
***************
*** 1002,1005 ****
--- 1013,1018 ----
alias value= setValue
alias value getValue
+ alias range= setRange
+ alias range getRange
alias sliderStyle getSliderStyle
alias sliderStyle= setSliderStyle
***************
*** 1026,1029 ****
--- 1039,1044 ----
alias value= setValue
alias value getValue
+ alias range= setRange
+ alias range getRange
alias font= setFont
alias font getFont
***************
*** 1062,1066 ****
alias textHighlightColor= setTextHighlightColor
end
! class FXStream
alias swapBytes= setSwapBytes
alias swapBytes getSwapBytes
--- 1077,1084 ----
alias textHighlightColor= setTextHighlightColor
end
! class FX_Stream
! alias error= setError
! alias position= setPosition
! alias position getPosition
alias swapBytes= setSwapBytes
alias swapBytes getSwapBytes
Index: overloads.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/overloads.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** overloads.rb 3 Apr 2002 21:40:57 -0000 1.7
--- overloads.rb 11 Jul 2002 13:33:13 -0000 1.8
***************
*** 1,299 ****
! require 'fox'
!
! module Fox
! class FX_App
! def stopModal(*args)
! if args.length > 0
! if args[0].kind_of? Fixnum
! value = args[0]
! stopModalInnermost(value)
! else
! window = args[0]
! if args.length > 1
! value = args[1]
! stopModalMatching(window, value)
! else
! stopModalMatching(window)
! end
! end
! else
! stopModalInnermost
! end
! end
! end
!
! class FX_DC
! def setStipple(*args)
! if args[0].kind_of? FXBitmap
! setStippleFromBitmap(*args)
! else
! setStippleFromPattern(*args)
! end
! end
! def setClipRectangle(*args)
! if args.length == 1
! setClipRectangle1(args[0])
! else
! setClipRectangle4(args[0], args[1], args[2], args[3])
! end
! end
! end
!
! class FXFileStream
! def FXFileStream.open(filename, save_or_load, container=nil)
! fstream = FXFileStream.new(container)
! if block_given?
! if fstream.open(filename, save_or_load)
! yield fstream
! fstream.close
! else
! # open failed; raise an exception?
! end
! nil
! else
! if fstream.open(filename, save_or_load)
! fstream
! else
! # open failed; raise an exception?
! end
! end
! end
! end
!
! class FXHMat
! def rot(*args)
! if (args.length == 1)
! rot1(args[0])
! elsif (args.length == 2)
! rot2(args[0], args[1])
! else
! rot3(args[0], args[1], args[2])
! end
! end
! def xrot(*args)
! if (args.length == 1)
! xrot1(args[0])
! else
! xrot2(args[0], args[1])
! end
! end
! def yrot(*args)
! if (args.length == 1)
! yrot1(args[0])
! else
! yrot2(args[0], args[1])
! end
! end
! def zrot(*args)
! if (args.length == 1)
! zrot1(args[0])
! else
! zrot2(args[0], args[1])
! end
! end
! def trans(*args)
! if args.length == 1
! trans1(args[0])
! else
! trans3(args[0], args[1], args[2])
! end
! end
! def scale(*args)
! if args.length == 1
! if args[0].kind_of? Float
! scalef(args[0])
! else
! scalev(args[0])
! end
! else
! scale3(args[0], args[1], args[2])
! end
! end
! end
!
! class FX_Header
! def appendItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! appendItem2(*args)
! else
! appendItem1(*args)
! end
! end
! def insertItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! insertItem2(*args)
! else
! insertItem1(*args)
! end
! end
! def prependItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! prependItem2(*args)
! else
! prependItem1(*args)
! end
! end
! def replaceItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! replaceItem2(*args)
! else
! replaceItem1(*args)
! end
! end
! end
!
! class FX_IconList
! def appendItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! appendItem2(*args)
! else
! appendItem1(*args)
! end
! end
! def insertItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! insertItem2(*args)
! else
! insertItem1(*args)
! end
! end
! def prependItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! prependItem2(*args)
! else
! prependItem1(*args)
! end
! end
! def replaceItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! replaceItem2(*args)
! else
! replaceItem1(*args)
! end
! end
! end
!
! class FX_List
! def appendItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! appendItem2(*args)
! else
! appendItem1(*args)
! end
! end
! def insertItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! insertItem2(*args)
! else
! insertItem1(*args)
! end
! end
! def prependItem(*args)
! if (args.length > 0) && (args[0].kind_of? String)
! prependItem2(*args)
! else
! prependItem1(*args)
! end
! end
! def replaceItem(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! replaceItem2(*args)
! else
! replaceItem1(*args)
! end
! end
! end
!
! class FXRange
! def include(*args)
! if args.length == 3
! includePoint(*args)
! else
! if args[0].kind_of? Fox::FXRange
! includeRange(*args)
! else
! includeVec(*args)
! end
! end
! end
! end
!
! class FX_TreeList
! def addItemAfter(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemAfter2(*args)
! else
! addItemAfter1(*args)
! end
! end
! def addItemBefore(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemBefore2(*args)
! else
! addItemBefore1(*args)
! end
! end
! def addItemFirst(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemFirst2(*args)
! else
! addItemFirst1(*args)
! end
! end
! def addItemLast(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemLast2(*args)
! else
! addItemLast1(*args)
! end
! end
! end
!
! class FX_TreeListBox
! def addItemAfter(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemAfter2(*args)
! else
! addItemAfter1(*args)
! end
! end
! def addItemBefore(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemBefore2(*args)
! else
! addItemBefore1(*args)
! end
! end
! def addItemFirst(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemFirst2(*args)
! else
! addItemFirst1(*args)
! end
! end
! def addItemLast(*args)
! if (args.length > 1) && (args[1].kind_of? String)
! addItemLast2(*args)
! else
! addItemLast1(*args)
! end
! end
! end
!
! class FX_Window
! def repaint(*args)
! if args.length == 4
! repaintArea(args[0], args[1], args[2], args[3])
! else
! repaintWindow
! end
! end
! def update(*args)
! if args.length == 4
! updateArea(args[0], args[1], args[2], args[3])
! else
! updateWindow
! end
! end
! end
! end
--- 1,36 ----
! require 'fox'
!
! module Fox
! class FX_DC
! def setStipple(*args)
! if args[0].kind_of? FXBitmap
! setStippleFromBitmap(*args)
! else
! setStippleFromPattern(*args)
! end
! end
! def setClipRectangle(*args)
! if args.length == 1
! setClipRectangle1(args[0])
! else
! setClipRectangle4(args[0], args[1], args[2], args[3])
! end
! end
! end
!
! class FXFileStream
! def FXFileStream.open(filename, save_or_load, container=nil)
! fstream = FXFileStream.new(container)
! status = fstream.open(filename, save_or_load)
! if block_given?
! begin
! yield fstream
! ensure
! fstream.close
! end
! else
! fstream
! end
! end
! end
! end
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:33:16
|
Update of /cvsroot/fxruby/FXRuby/fox-includes In directory usw-pr-cvs1:/tmp/cvs-serv26972/fox-includes Modified Files: README fxver.h Log Message: Merged changes from the release10 branch back onto the main trunk. Index: README =================================================================== RCS file: /cvsroot/fxruby/FXRuby/fox-includes/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 12 Jan 2001 18:04:13 -0000 1.1 --- README 11 Jul 2002 13:33:13 -0000 1.2 *************** *** 1,4 **** This directory just contains an archived copy of the include files from the ! standard FOX distribution on which this release of Ruby/FOX is based. This gives the maintainer a good frame of reference for comparing against newer FOX releases, to see what's changed in the API. --- 1,4 ---- This directory just contains an archived copy of the include files from the ! standard FOX distribution on which this release of FXRuby is based. This gives the maintainer a good frame of reference for comparing against newer FOX releases, to see what's changed in the API. Index: fxver.h =================================================================== RCS file: /cvsroot/fxruby/FXRuby/fox-includes/fxver.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** fxver.h 3 Apr 2002 23:24:07 -0000 1.24 --- fxver.h 11 Jul 2002 13:33:13 -0000 1.25 *************** *** 6,10 **** #define FOX_MAJOR 1 #define FOX_MINOR 0 ! #define FOX_LEVEL 5 --- 6,10 ---- #define FOX_MAJOR 1 #define FOX_MINOR 0 ! #define FOX_LEVEL 10 |
Update of /cvsroot/fxruby/FXRuby/ext/fox/patches
In directory usw-pr-cvs1:/tmp/cvs-serv26972/ext/fox/patches
Modified Files:
wrap_FX_TopWindow_show.cpp
Removed Files:
wrap_FX4Splitter_initialize.cpp wrap_FXDCWindow_initialize.cpp
wrap_FXDialogBox_initialize.cpp wrap_FXFont_initialize.cpp
wrap_FXMenubar_initialize.cpp wrap_FXMessageBox_initialize.cpp
wrap_FXSplitter_initialize.cpp wrap_FXToolbar_initialize.cpp
wrap_FX_4Splitter_initialize.cpp
wrap_FX_DCWindow_initialize.cpp
wrap_FX_DialogBox_initialize.cpp wrap_FX_Font_initialize.cpp
wrap_FX_Menubar_initialize.cpp
wrap_FX_MessageBox_initialize.cpp
wrap_FX_Splitter_initialize.cpp wrap_FX_Toolbar_initialize.cpp
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: wrap_FX_TopWindow_show.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/patches/wrap_FX_TopWindow_show.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wrap_FX_TopWindow_show.cpp 20 Feb 2002 01:12:07 -0000 1.2
--- wrap_FX_TopWindow_show.cpp 11 Jul 2002 13:33:13 -0000 1.3
***************
*** 1,4 ****
_wrap_FX_TopWindow_show(int argc, VALUE *argv, VALUE self) {
! FXTopWindow *win = static_cast<FXTopWindow*>(SWIG_ConvertPtr(self, SWIGTYPE_p_FXTopWindow));
if (argc == 0) {
win->show();
--- 1,5 ----
_wrap_FX_TopWindow_show(int argc, VALUE *argv, VALUE self) {
! FXTopWindow *win;
! SWIG_ConvertPtr(self, (void **) &win, SWIGTYPE_p_FXTopWindow, 1);
if (argc == 0) {
win->show();
--- wrap_FX4Splitter_initialize.cpp DELETED ---
--- wrap_FXDCWindow_initialize.cpp DELETED ---
--- wrap_FXDialogBox_initialize.cpp DELETED ---
--- wrap_FXFont_initialize.cpp DELETED ---
--- wrap_FXMenubar_initialize.cpp DELETED ---
--- wrap_FXMessageBox_initialize.cpp DELETED ---
--- wrap_FXSplitter_initialize.cpp DELETED ---
--- wrap_FXToolbar_initialize.cpp DELETED ---
--- wrap_FX_4Splitter_initialize.cpp DELETED ---
--- wrap_FX_DCWindow_initialize.cpp DELETED ---
--- wrap_FX_DialogBox_initialize.cpp DELETED ---
--- wrap_FX_Font_initialize.cpp DELETED ---
--- wrap_FX_Menubar_initialize.cpp DELETED ---
--- wrap_FX_MessageBox_initialize.cpp DELETED ---
--- wrap_FX_Splitter_initialize.cpp DELETED ---
--- wrap_FX_Toolbar_initialize.cpp DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:06:38
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv17708/swig-interfaces
Modified Files:
Tag: release10
FXGIFCursor.i
Added Files:
Tag: release10
common.i
Log Message:
--- NEW FILE: common.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
/***********************************************************************
* $Id: common.i,v 1.1.2.1 2002/07/11 13:06:04 lyle Exp $
***********************************************************************/
%{
#include "FXRbCommon.h"
%}
// Redefine the FXAPI macro to a no-op for SWIG
#ifdef FXAPI
#undef FXAPI
#endif
#define FXAPI
// Redefine the FXDECLARE macro to a no-op for SWIG
#ifdef FXDECLARE
#undef FXDECLARE
#endif
#define FXDECLARE(classname)
%include typemaps.i
%include markfuncs.i
%include freefuncs.i
%include renames.i
%include stubs.i
Index: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** FXGIFCursor.i 8 May 2002 15:25:40 -0000 1.11.2.1
--- FXGIFCursor.i 11 Jul 2002 13:06:04 -0000 1.11.2.2
***************
*** 23,38 ****
%exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! /// GIF Cursor class
! class FXGIFCursor : public FXCursor {
! protected:
! FXGIFCursor(){}
! public:
! /// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy);
! /// Destroy
! virtual ~FXGIFCursor(){}
! };
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
--- 23,31 ----
%exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! %ignore ::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);
! %apply const FXuchar *PIXELS { const FXuchar *data };
! %include FXGIFCursor.h
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
***************
*** 54,58 ****
%inline %{
! /// Load a gif file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
--- 47,51 ----
%inline %{
! /// Load a GIF file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
***************
*** 74,79 ****
}
%}
-
-
- /// Save a gif file to a stream
- FXbool fxsaveGIF(FXStream& store,const FXuchar *PIXELS,FXColor transp,FXint width,FXint height);
--- 67,68 ----
|
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:06:18
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv17708/ext/fox
Modified Files:
Tag: release10
core_wrap.cpp
Log Message:
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.25
retrieving revision 1.62.2.26
diff -C2 -d -r1.62.2.25 -r1.62.2.26
*** core_wrap.cpp 8 Jul 2002 18:42:09 -0000 1.62.2.25
--- core_wrap.cpp 11 Jul 2002 13:06:05 -0000 1.62.2.26
***************
*** 711,719 ****
swig_class cFX_GIFCursor;
static void free_FXGIFCursor(FXGIFCursor *);
swig_class cFXGIFCursor;
static void free_FXRbGIFCursor(FXRbGIFCursor *);
! /// Load a gif file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
--- 711,720 ----
swig_class cFX_GIFCursor;
static void free_FXGIFCursor(FXGIFCursor *);
+ extern FXbool fxsaveGIF(FXStream &,FXuchar const *,FXColor,FXint,FXint);
swig_class cFXGIFCursor;
static void free_FXRbGIFCursor(FXRbGIFCursor *);
! /// Load a GIF file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
***************
*** 9411,9420 ****
FXApp *arg1 ;
void *arg2 ;
! FXint arg3 ;
! FXint arg4 ;
FXGIFCursor *result;
! if ((argc < 4) || (argc > 4))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
{
--- 9412,9421 ----
FXApp *arg1 ;
void *arg2 ;
! FXint arg3 = -1 ;
! FXint arg4 = -1 ;
FXGIFCursor *result;
! if ((argc < 2) || (argc > 4))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
{
***************
*** 9426,9431 ****
}
}
! arg3 = NUM2INT(argv[2]);
! arg4 = NUM2INT(argv[3]);
result = (FXGIFCursor *)new FXGIFCursor(arg1,(void const *)arg2,arg3,arg4);
FXRbRegisterRubyObj(self, result);
--- 9427,9436 ----
}
}
! if (argc > 2) {
! arg3 = NUM2INT(argv[2]);
! }
! if (argc > 3) {
! arg4 = NUM2INT(argv[3]);
! }
result = (FXGIFCursor *)new FXGIFCursor(arg1,(void const *)arg2,arg3,arg4);
FXRbRegisterRubyObj(self, result);
***************
*** 9440,9443 ****
--- 9445,9479 ----
}
static VALUE
+ _wrap_fxsaveGIF(int argc, VALUE *argv, VALUE self) {
+ FXStream *arg1 ;
+ FXuchar *arg2 ;
+ FXColor arg3 ;
+ FXint arg4 ;
+ FXint arg5 ;
+ FXbool result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 5) || (argc > 5))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1);
+ {
+ if (argv[1] != Qnil) {
+ Check_Type(argv[1], T_STRING);
+ arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr);
+ }else {
+ arg2 = NULL;
+ }
+ }
+ arg3 = NUM2UINT(argv[2]);
+ arg4 = NUM2INT(argv[3]);
+ arg5 = NUM2INT(argv[4]);
+ result = (FXbool)fxsaveGIF(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
+
+ vresult = result ? Qtrue : Qfalse;
+ return vresult;
+ }
+
+
+ static VALUE
_wrap_FXGIFCursor_allocate(int argc, VALUE *argv, VALUE self) {
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbGIFCursor);
***************
*** 9617,9651 ****
static VALUE
- _wrap_fxsaveGIF(int argc, VALUE *argv, VALUE self) {
- FXStream *arg1 ;
- FXuchar *arg2 ;
- FXColor arg3 ;
- FXint arg4 ;
- FXint arg5 ;
- FXbool result;
- VALUE vresult = Qnil;
-
- if ((argc < 5) || (argc > 5))
- rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc);
- SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXStream, 1);
- {
- if (argv[1] != Qnil) {
- Check_Type(argv[1], T_STRING);
- arg2 = reinterpret_cast<FXuchar *>(RSTRING(argv[1])->ptr);
- }else {
- arg2 = NULL;
- }
- }
- arg3 = NUM2UINT(argv[2]);
- arg4 = NUM2INT(argv[3]);
- arg5 = NUM2INT(argv[4]);
- result = (FXbool)fxsaveGIF(*arg1,(FXuchar const *)arg2,arg3,arg4,arg5);
-
- vresult = result ? Qtrue : Qfalse;
- return vresult;
- }
-
-
- static VALUE
_wrap_FX_Drawable_getWidth(int argc, VALUE *argv, VALUE self) {
FXDrawable *arg1 ;
--- 9653,9656 ----
***************
*** 20046,20049 ****
--- 20051,20055 ----
cFX_GIFCursor.mark = (void (*)(void *)) FXRbGIFCursor::markfunc;
cFX_GIFCursor.destroy = (void (*)(void *)) free_FXGIFCursor;
+ rb_define_module_function(mFox, "fxsaveGIF", VALUEFUNC(_wrap_fxsaveGIF), -1);
cFXGIFCursor.klass = rb_define_class_under(mFox, "FXGIFCursor", ((swig_class *) SWIGTYPE_p_FXGIFCursor->clientdata)->klass);
***************
*** 20062,20066 ****
cFXGIFCursor.destroy = (void (*)(void *)) free_FXRbGIFCursor;
rb_define_module_function(mFox, "fxloadGIF", VALUEFUNC(_wrap_fxloadGIF), -1);
- rb_define_module_function(mFox, "fxsaveGIF", VALUEFUNC(_wrap_fxsaveGIF), -1);
cFX_Drawable.klass = rb_define_class_under(mFox, "FX_Drawable", ((swig_class *) SWIGTYPE_p_FXId->clientdata)->klass);
--- 20068,20071 ----
|
|
From: Lyle J. <ly...@us...> - 2002-07-08 18:44:01
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv14447/swig-interfaces
Modified Files:
Tag: release10
FXRegion.i Makefile core.i dialogs.i icons.i image.i layout.i
mdi.i opengl.i scintilla.i ui.i
Log Message:
Started trying to include the FOX header files directly; first cut
was with FXRegion.
Index: FXRegion.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -d -r1.6.2.4 -r1.6.2.5
*** FXRegion.i 8 Jul 2002 13:27:51 -0000 1.6.2.4
--- FXRegion.i 8 Jul 2002 18:42:08 -0000 1.6.2.5
***************
*** 21,103 ****
***********************************************************************/
! %ignore FXRegion::operator=(const FXRegion& r);
%rename("empty?") FXRegion::empty() const;
%exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);";
! /// Region
! class FXRegion {
! public:
!
! /// Construct new empty region
! FXRegion();
! /// Construct new region copied from region r
! FXRegion(const FXRegion& r);
!
! /// Construct new region set to given rectangle
! FXRegion(FXint x,FXint y,FXint w,FXint h);
!
! /// Assign region r to this one
! FXRegion &operator=(const FXRegion& r);
! /// Return TRUE if region is empty
! FXbool empty() const;
! /// Return TRUE if region contains point
! FXbool contains(FXint x,FXint y) const;
! /// Return TRUE if region contains rectangle
! FXbool contains(FXint x,FXint y,FXint w,FXint h) const;
! %extend {
! // Return bounding box
! FXRectangle bounds() const {
! FXRectangle r;
! self->bounds(r);
! return r;
! }
}
! /// Offset region by dx,dy
! FXRegion& offset(FXint dx,FXint dy);
! %extend {
! /// Union region r with this one
! FXRegion __add__(const FXRegion& other) {
! return (*self) + other;
! }
!
! /// Intersect region r with this one
! FXRegion __mul__(const FXRegion& other) {
! return (*self) * other;
! }
!
! /// Subtract region r from this one
! FXRegion __sub__(const FXRegion& other) {
! return (*self) - other;
! }
!
! /// Xor region r with this one
! FXRegion __xor__(const FXRegion& other) {
! return (*self)^other;
! }
! /// Return TRUE if region equal to this one
! FXbool __eq__(const FXRegion& other) {
! return (*self) == other;
! }
}
#ifdef SWIGPYTHON
! %extend {
! FXbool __ne__(const FXRegion& other) {
! return (*self) != other;
! }
}
#endif
!
! /// Destroy region
! ~FXRegion();
! };
--- 21,80 ----
***********************************************************************/
! %ignore FXRegion::bounds(FXRectangle& r) const;
+ #ifdef SWIGRUBY
%rename("empty?") FXRegion::empty() const;
%exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);";
! %ignore FXRegion::operator=(const FXRegion& r);
! %ignore FXRegion::operator+=(const FXRegion& r);
! %ignore FXRegion::operator*=(const FXRegion& r);
! %ignore FXRegion::operator-=(const FXRegion& r);
! %ignore FXRegion::operator^=(const FXRegion& r);
! %ignore FXRegion::operator!=(const FXRegion& r);
! %ignore operator!=(const FXRegion& r1,const FXRegion& r2);
! #endif
! %include "FXRegion.h"
! %extend FXRegion {
! // Return bounding box
! FXRectangle bounds() const {
! FXRectangle r;
! self->bounds(r);
! return r;
! }
! // Union region r with this one
! FXRegion operator+(const FXRegion& other) const {
! return (*self) + other;
! }
! // Intersect region r with this one
! FXRegion operator*(const FXRegion& other) const {
! return (*self) * other;
}
! // Subtract region r from this one
! FXRegion operator-(const FXRegion& other) const {
! return (*self) - other;
! }
! // Xor region r with this one
! FXRegion operator^(const FXRegion& other) const {
! return (*self)^other;
! }
! // Return TRUE if region equal to this one
! FXbool operator==(const FXRegion& other) const {
! return (*self) == other;
}
#ifdef SWIGPYTHON
! FXbool operator!=(const FXRegion& other) const {
! return (*self) != other;
}
#endif
! }
Index: Makefile
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/Makefile,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -d -r1.20.2.1 -r1.20.2.2
*** Makefile 8 May 2002 16:48:59 -0000 1.20.2.1
--- Makefile 8 Jul 2002 18:42:08 -0000 1.20.2.2
***************
*** 9,13 ****
SWIG = swig
! CFLAGS = -c -c++ -ruby -no_default
SRCDIR = ../ext/fox
SED = sed -f swig.sed
--- 9,13 ----
SWIG = swig
! CFLAGS = -c -c++ -ruby -no_default -I../fox-includes
SRCDIR = ../ext/fox
SED = sed -f swig.sed
Index: core.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/core.i,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** core.i 2 Apr 2002 03:44:27 -0000 1.27
--- core.i 8 Jul 2002 18:42:08 -0000 1.27.2.1
***************
*** 27,39 ****
%module core
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%inline %{
--- 27,31 ----
%module core
! %include common.i
%inline %{
Index: dialogs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/dialogs.i,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** dialogs.i 2 Apr 2002 03:44:27 -0000 1.13
--- dialogs.i 8 Jul 2002 18:42:08 -0000 1.13.2.1
***************
*** 27,39 ****
%module dialogs
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module dialogs
! %include common.i
%import fxdefs.i
Index: icons.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/icons.i,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** icons.i 2 Apr 2002 03:44:27 -0000 1.13
--- icons.i 8 Jul 2002 18:42:08 -0000 1.13.2.1
***************
*** 27,39 ****
%module icons
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module icons
! %include common.i
%import fxdefs.i
Index: image.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/image.i,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -d -r1.15.2.1 -r1.15.2.2
*** image.i 8 May 2002 16:49:29 -0000 1.15.2.1
--- image.i 8 Jul 2002 18:42:08 -0000 1.15.2.2
***************
*** 27,39 ****
%module image
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module image
! %include common.i
%import fxdefs.i
Index: layout.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/layout.i,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** layout.i 2 Apr 2002 03:44:27 -0000 1.4
--- layout.i 8 Jul 2002 18:42:08 -0000 1.4.2.1
***************
*** 27,39 ****
%module layout
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module layout
! %include common.i
%import fxdefs.i
Index: mdi.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/mdi.i,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** mdi.i 2 Apr 2002 03:44:27 -0000 1.11
--- mdi.i 8 Jul 2002 18:42:08 -0000 1.11.2.1
***************
*** 27,39 ****
%module mdi
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module mdi
! %include common.i
%import fxdefs.i
Index: opengl.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/opengl.i,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** opengl.i 2 Apr 2002 03:44:27 -0000 1.15
--- opengl.i 8 Jul 2002 18:42:08 -0000 1.15.2.1
***************
*** 27,39 ****
%module opengl
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module opengl
! %include common.i
%import fxdefs.i
Index: scintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/scintilla.i,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** scintilla.i 2 Apr 2002 03:44:27 -0000 1.4
--- scintilla.i 8 Jul 2002 18:42:08 -0000 1.4.2.1
***************
*** 31,34 ****
--- 31,39 ----
%}
+ #ifdef FXAPI
+ #undef FXAPI
+ #endif
+ #define FXAPI
+
%include typemaps.i
%include markfuncs.i
Index: ui.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/ui.i,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** ui.i 2 Apr 2002 03:44:27 -0000 1.2
--- ui.i 8 Jul 2002 18:42:08 -0000 1.2.2.1
***************
*** 27,39 ****
%module ui
! %{
! #include "FXRbCommon.h"
! %}
!
! %include typemaps.i
! %include markfuncs.i
! %include freefuncs.i
! %include renames.i
! %include stubs.i
%import fxdefs.i
--- 27,31 ----
%module ui
! %include common.i
%import fxdefs.i
|
|
From: Lyle J. <ly...@us...> - 2002-07-08 18:44:01
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv14447/ext/fox
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:
Started trying to include the FOX header files directly; first cut
was with FXRegion.
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.24
retrieving revision 1.62.2.25
diff -C2 -d -r1.62.2.24 -r1.62.2.25
*** core_wrap.cpp 8 Jul 2002 14:28:25 -0000 1.62.2.24
--- core_wrap.cpp 8 Jul 2002 18:42:09 -0000 1.62.2.25
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* This file is not intended to be easily readable and contains a number of
***************
*** 742,764 ****
static void free_FXRbDrawable(FXRbDrawable *);
FXRectangle FXRegion_bounds(FXRegion const *self){
! FXRectangle r;
! self->bounds(r);
! return r;
! }
! FXRegion FXRegion___add__(FXRegion *self,FXRegion const &other){
! return (*self) + other;
! }
! FXRegion FXRegion___mul__(FXRegion *self,FXRegion const &other){
! return (*self) * other;
! }
! FXRegion FXRegion___sub__(FXRegion *self,FXRegion const &other){
! return (*self) - other;
! }
! FXRegion FXRegion___xor__(FXRegion *self,FXRegion const &other){
! return (*self)^other;
! }
! FXbool FXRegion___eq__(FXRegion *self,FXRegion const &other){
! return (*self) == other;
! }
swig_class cFXRegion;
--- 742,764 ----
static void free_FXRbDrawable(FXRbDrawable *);
FXRectangle FXRegion_bounds(FXRegion const *self){
! FXRectangle r;
! self->bounds(r);
! return r;
! }
! FXRegion FXRegion_operator_a___(FXRegion const *self,FXRegion const &other){
! return (*self) + other;
! }
! FXRegion FXRegion_operator_m___(FXRegion const *self,FXRegion const &other){
! return (*self) * other;
! }
! FXRegion FXRegion_operator_s___(FXRegion const *self,FXRegion const &other){
! return (*self) - other;
! }
! FXRegion FXRegion_operator_x___(FXRegion const *self,FXRegion const &other){
! return (*self)^other;
! }
! FXbool FXRegion_operator_ee___(FXRegion const *self,FXRegion const &other){
! return (*self) == other;
! }
swig_class cFXRegion;
***************
*** 10109,10131 ****
static VALUE
- _wrap_FXRegion_bounds(int argc, VALUE *argv, VALUE self) {
- FXRegion *arg1 ;
- FXRectangle result;
- VALUE vresult = Qnil;
-
- if ((argc < 0) || (argc > 0))
- rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
- SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
- result = FXRegion_bounds((FXRegion const *)arg1);
-
- {
- FXRectangle* resultptr = new FXRectangle(result);
- vresult = FXRbGetRubyObj(resultptr, "FXRectangle *");
- }
- return vresult;
- }
-
-
- static VALUE
_wrap_FXRegion_offset(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
--- 10109,10112 ----
***************
*** 10148,10153 ****
static VALUE
! _wrap_FXRegion___add__(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
--- 10129,10157 ----
+ static void
+ free_FXRegion(FXRegion *arg1) {
+ delete arg1;
+ }
static VALUE
! _wrap_FXRegion_bounds(int argc, VALUE *argv, VALUE self) {
! FXRegion *arg1 ;
! FXRectangle result;
! VALUE vresult = Qnil;
!
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
! SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion_bounds((FXRegion const *)arg1);
!
! {
! FXRectangle* resultptr = new FXRectangle(result);
! vresult = FXRbGetRubyObj(resultptr, "FXRectangle *");
! }
! return vresult;
! }
!
!
! static VALUE
! _wrap_FXRegion___add____SWIG_1(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
***************
*** 10159,10163 ****
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion___add__(arg1,(FXRegion const &)*arg2);
{
--- 10163,10167 ----
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion_operator_a___((FXRegion const *)arg1,(FXRegion const &)*arg2);
{
***************
*** 10169,10174 ****
static VALUE
! _wrap_FXRegion___mul__(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
--- 10173,10211 ----
+ static VALUE _wrap_FXRegion___add__(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[3];
+ int ii;
+
+ argc = nargs + 1;
+ argv[0] = self;
+ for (ii = 1; (ii < argc) && (ii < 2); ii++) {
+ argv[ii] = args[ii-1];
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_FXRegion___add____SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___add__'");
+ return Qnil;
+ }
+
+
static VALUE
! _wrap_FXRegion___mul____SWIG_1(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
***************
*** 10180,10184 ****
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion___mul__(arg1,(FXRegion const &)*arg2);
{
--- 10217,10221 ----
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion_operator_m___((FXRegion const *)arg1,(FXRegion const &)*arg2);
{
***************
*** 10190,10195 ****
static VALUE
! _wrap_FXRegion___sub__(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
--- 10227,10265 ----
+ static VALUE _wrap_FXRegion___mul__(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[3];
+ int ii;
+
+ argc = nargs + 1;
+ argv[0] = self;
+ for (ii = 1; (ii < argc) && (ii < 2); ii++) {
+ argv[ii] = args[ii-1];
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_FXRegion___mul____SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___mul__'");
+ return Qnil;
+ }
+
+
static VALUE
! _wrap_FXRegion___sub____SWIG_1(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
***************
*** 10201,10205 ****
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion___sub__(arg1,(FXRegion const &)*arg2);
{
--- 10271,10275 ----
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion_operator_s___((FXRegion const *)arg1,(FXRegion const &)*arg2);
{
***************
*** 10211,10216 ****
static VALUE
! _wrap_FXRegion___xor__(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
--- 10281,10319 ----
+ static VALUE _wrap_FXRegion___sub__(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[3];
+ int ii;
+
+ argc = nargs + 1;
+ argv[0] = self;
+ for (ii = 1; (ii < argc) && (ii < 2); ii++) {
+ argv[ii] = args[ii-1];
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_FXRegion___sub____SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___sub__'");
+ return Qnil;
+ }
+
+
static VALUE
! _wrap_FXRegion___xor____SWIG_1(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
***************
*** 10222,10226 ****
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion___xor__(arg1,(FXRegion const &)*arg2);
{
--- 10325,10329 ----
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = FXRegion_operator_x___((FXRegion const *)arg1,(FXRegion const &)*arg2);
{
***************
*** 10232,10237 ****
static VALUE
! _wrap_FXRegion___eq__(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
--- 10335,10373 ----
+ static VALUE _wrap_FXRegion___xor__(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[3];
+ int ii;
+
+ argc = nargs + 1;
+ argv[0] = self;
+ for (ii = 1; (ii < argc) && (ii < 2); ii++) {
+ argv[ii] = args[ii-1];
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_FXRegion___xor____SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___xor__'");
+ return Qnil;
+ }
+
+
static VALUE
! _wrap_FXRegion___eq____SWIG_1(int argc, VALUE *argv, VALUE self) {
FXRegion *arg1 ;
FXRegion *arg2 ;
***************
*** 10243,10247 ****
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = (FXbool)FXRegion___eq__(arg1,(FXRegion const &)*arg2);
vresult = result ? Qtrue : Qfalse;
--- 10379,10383 ----
SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXRegion, 1);
SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXRegion, 1);
! result = (FXbool)FXRegion_operator_ee___((FXRegion const *)arg1,(FXRegion const &)*arg2);
vresult = result ? Qtrue : Qfalse;
***************
*** 10250,10257 ****
! static void
! free_FXRegion(FXRegion *arg1) {
! delete arg1;
}
static VALUE
_wrap_FXSegment_allocate(int argc, VALUE *argv, VALUE self) {
--- 10386,10422 ----
! static VALUE _wrap_FXRegion___eq__(int nargs, VALUE *args, VALUE self) {
! int argc;
! VALUE argv[3];
! int ii;
!
! argc = nargs + 1;
! argv[0] = self;
! for (ii = 1; (ii < argc) && (ii < 2); ii++) {
! argv[ii] = args[ii-1];
! }
! if ((argc >= 2) && (argc <= 2)) {
! int _m = 1;
! int _v = 1;
! {
! void *ptr;
! _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
! }
! _m &= _v;
! {
! void *ptr;
! _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXRegion, 0) != -1)) ? 1 : 0;
! }
! _m &= _v;
! if (_m) {
! return _wrap_FXRegion___eq____SWIG_1(nargs, args, self);
! }
! }
!
! rb_raise(rb_eArgError, "No matching function for overloaded 'FXRegion___eq__'");
! return Qnil;
}
+
+
static VALUE
_wrap_FXSegment_allocate(int argc, VALUE *argv, VALUE self) {
***************
*** 19930,19935 ****
rb_define_method(cFXRegion.klass, "empty?", VALUEFUNC(_wrap_FXRegion_emptyq___), -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);
rb_define_method(cFXRegion.klass, "+", VALUEFUNC(_wrap_FXRegion___add__), -1);
rb_define_method(cFXRegion.klass, "*", VALUEFUNC(_wrap_FXRegion___mul__), -1);
--- 20095,20100 ----
rb_define_method(cFXRegion.klass, "empty?", VALUEFUNC(_wrap_FXRegion_emptyq___), -1);
rb_define_method(cFXRegion.klass, "contains", VALUEFUNC(_wrap_FXRegion_contains), -1);
rb_define_method(cFXRegion.klass, "offset", VALUEFUNC(_wrap_FXRegion_offset), -1);
+ rb_define_method(cFXRegion.klass, "bounds", VALUEFUNC(_wrap_FXRegion_bounds), -1);
rb_define_method(cFXRegion.klass, "+", VALUEFUNC(_wrap_FXRegion___add__), -1);
rb_define_method(cFXRegion.klass, "*", VALUEFUNC(_wrap_FXRegion___mul__), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.20
retrieving revision 1.34.2.21
diff -C2 -d -r1.34.2.20 -r1.34.2.21
*** dialogs_wrap.cpp 8 Jul 2002 13:27:24 -0000 1.34.2.20
--- dialogs_wrap.cpp 8 Jul 2002 18:42:18 -0000 1.34.2.21
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* 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.21
retrieving revision 1.37.2.22
diff -C2 -d -r1.37.2.21 -r1.37.2.22
*** icons_wrap.cpp 8 Jul 2002 13:27:25 -0000 1.37.2.21
--- icons_wrap.cpp 8 Jul 2002 18:42:19 -0000 1.37.2.22
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* 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.21
retrieving revision 1.39.2.22
diff -C2 -d -r1.39.2.21 -r1.39.2.22
*** image_wrap.cpp 8 Jul 2002 13:27:25 -0000 1.39.2.21
--- image_wrap.cpp 8 Jul 2002 18:42:19 -0000 1.39.2.22
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* 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.20
retrieving revision 1.8.2.21
diff -C2 -d -r1.8.2.20 -r1.8.2.21
*** layout_wrap.cpp 8 Jul 2002 13:27:26 -0000 1.8.2.20
--- layout_wrap.cpp 8 Jul 2002 18:42:20 -0000 1.8.2.21
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* 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.20
retrieving revision 1.36.2.21
diff -C2 -d -r1.36.2.20 -r1.36.2.21
*** mdi_wrap.cpp 8 Jul 2002 13:27:26 -0000 1.36.2.20
--- mdi_wrap.cpp 8 Jul 2002 18:42:20 -0000 1.36.2.21
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* 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.22
retrieving revision 1.41.2.23
diff -C2 -d -r1.41.2.22 -r1.41.2.23
*** opengl_wrap.cpp 8 Jul 2002 14:28:29 -0000 1.41.2.22
--- opengl_wrap.cpp 8 Jul 2002 18:42:21 -0000 1.41.2.23
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* This file is not intended to be easily readable and contains a number of
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16.2.15
retrieving revision 1.16.2.16
diff -C2 -d -r1.16.2.15 -r1.16.2.16
*** scintilla_wrap.cpp 8 Jul 2002 13:27:27 -0000 1.16.2.15
--- scintilla_wrap.cpp 8 Jul 2002 18:42:21 -0000 1.16.2.16
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* This file is not intended to be easily readable and contains a number of
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.21
retrieving revision 1.9.2.22
diff -C2 -d -r1.9.2.21 -r1.9.2.22
*** ui_wrap.cpp 8 Jul 2002 14:28:30 -0000 1.9.2.21
--- ui_wrap.cpp 8 Jul 2002 18:42:22 -0000 1.9.2.22
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.14u-20020706-1721
*
* 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.14u-20020708-1058
*
* This file is not intended to be easily readable and contains a number of
|
|
From: Lyle J. <ly...@us...> - 2002-07-08 14:29:21
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv1455/ext/fox
Modified Files:
Tag: release10
core_wrap.cpp opengl_wrap.cpp ui_wrap.cpp
Log Message:
Enabled a lot more overloaded constructors since SWIG supports this now.
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.23
retrieving revision 1.62.2.24
diff -C2 -d -r1.62.2.23 -r1.62.2.24
*** core_wrap.cpp 8 Jul 2002 13:27:17 -0000 1.62.2.23
--- core_wrap.cpp 8 Jul 2002 14:28:25 -0000 1.62.2.24
***************
*** 1733,1737 ****
static VALUE
! _wrap_FX_MemoryStream_open(int argc, VALUE *argv, VALUE self) {
FXMemoryStream *arg1 ;
FXuchar *arg2 ;
--- 1733,1737 ----
static VALUE
! _wrap_FX_MemoryStream_open__SWIG_0(int argc, VALUE *argv, VALUE self) {
FXMemoryStream *arg1 ;
FXuchar *arg2 ;
***************
*** 1753,1756 ****
--- 1753,1840 ----
static VALUE
+ _wrap_FX_MemoryStream_open__SWIG_1(int argc, VALUE *argv, VALUE self) {
+ FXMemoryStream *arg1 ;
+ FXuchar *arg2 ;
+ FXuint arg3 ;
+ int arg4 ;
+ FXbool result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 3) || (argc > 3))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
+ SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1);
+ SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXuchar, 1);
+ arg3 = NUM2UINT(argv[1]);
+ arg4 = (int) NUM2INT(argv[2]);
+ result = (FXbool)(arg1)->open(arg2,arg3,(FXStreamDirection )arg4);
+
+ vresult = result ? Qtrue : Qfalse;
+ return vresult;
+ }
+
+
+ static VALUE _wrap_FX_MemoryStream_open(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[5];
+ int ii;
+
+ argc = nargs + 1;
+ argv[0] = self;
+ for (ii = 1; (ii < argc) && (ii < 4); ii++) {
+ argv[ii] = args[ii-1];
+ }
+ if ((argc >= 3) && (argc <= 3)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMemoryStream, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXuchar, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_FX_MemoryStream_open__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 4) && (argc <= 4)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMemoryStream, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXuchar, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_FX_MemoryStream_open__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'FX_MemoryStream_open'");
+ return Qnil;
+ }
+
+
+ static VALUE
_wrap_FX_MemoryStream_getSpace(int argc, VALUE *argv, VALUE self) {
FXMemoryStream *arg1 ;
***************
*** 3922,3926 ****
--- 4006,4025 ----
static VALUE
+ _wrap_new_FX_RecentFiles__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXRecentFiles *result;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ result = (FXRecentFiles *)new FXRecentFiles();
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
_wrap_FX_RecentFiles_allocate(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p1 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRecentFiles);
rb_obj_call_init(vresult, argc, argv);
***************
*** 3930,3939 ****
static VALUE
! _wrap_new_FX_RecentFiles(int argc, VALUE *argv, VALUE self) {
FXRecentFiles *result;
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
! result = (FXRecentFiles *)new FXRecentFiles();
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
--- 4029,4057 ----
static VALUE
! _wrap_new_FX_RecentFiles__SWIG_1(int argc, VALUE *argv, VALUE self) {
! FXString *arg1 ;
! FXObject *arg2 = 0 ;
! FXSelector arg3 = 0 ;
FXRecentFiles *result;
+ SwigValueWrapper<FXString > p1 ;
! if ((argc < 1) || (argc > 3))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
! {
! if (argv[0] != Qnil) {
! Check_Type(argv[0], T_STRING);
! p1 = FXString(STR2CSTR(argv[0]));
! }else {
! p1 = FXString::null;
! }
! arg1 = &p1;
! }
! if (argc > 1) {
! SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXObject, 1);
! }
! if (argc > 2) {
! arg3 = NUM2UINT(argv[2]);
! }
! result = (FXRecentFiles *)new FXRecentFiles((FXString const &)*arg1,arg2,arg3);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
***************
*** 3942,3945 ****
--- 4060,4109 ----
+ static VALUE _wrap_new_FX_RecentFiles(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[3];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 0) && (argc <= 0)) {
+ int _m = 1;
+ int _v = 1;
+ if (_m) {
+ return _wrap_new_FX_RecentFiles__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 1) && (argc <= 3)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ _v = (NIL_P(argv[0]) || TYPE(argv[0]) == T_STRING) ? 1 : 0;
+ }
+ _m &= _v;
+ if (argc > 1) {
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXObject, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (argc > 2) {
+ {
+ _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (_m) {
+ return _wrap_new_FX_RecentFiles__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_RecentFiles'");
+ return Qnil;
+ }
+
+
static VALUE
_wrap_FX_RecentFiles_setMaxFiles(int argc, VALUE *argv, VALUE self) {
***************
*** 4141,4145 ****
--- 4305,4324 ----
}
static VALUE
+ _wrap_new_FXRecentFiles__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXRbRecentFiles *result;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ result = (FXRbRecentFiles *)new FXRbRecentFiles();
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
_wrap_FXRecentFiles_allocate(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p1 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbRecentFiles);
rb_obj_call_init(vresult, argc, argv);
***************
*** 4149,4158 ****
static VALUE
! _wrap_new_FXRecentFiles(int argc, VALUE *argv, VALUE self) {
FXRbRecentFiles *result;
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
! result = (FXRbRecentFiles *)new FXRbRecentFiles();
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
--- 4328,4356 ----
static VALUE
! _wrap_new_FXRecentFiles__SWIG_1(int argc, VALUE *argv, VALUE self) {
! FXString *arg1 ;
! FXObject *arg2 = 0 ;
! FXSelector arg3 = 0 ;
FXRbRecentFiles *result;
+ SwigValueWrapper<FXString > p1 ;
! if ((argc < 1) || (argc > 3))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
! {
! if (argv[0] != Qnil) {
! Check_Type(argv[0], T_STRING);
! p1 = FXString(STR2CSTR(argv[0]));
! }else {
! p1 = FXString::null;
! }
! arg1 = &p1;
! }
! if (argc > 1) {
! SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXObject, 1);
! }
! if (argc > 2) {
! arg3 = NUM2UINT(argv[2]);
! }
! result = (FXRbRecentFiles *)new FXRbRecentFiles((FXString const &)*arg1,arg2,arg3);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
***************
*** 4161,4164 ****
--- 4359,4408 ----
+ static VALUE _wrap_new_FXRecentFiles(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[3];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 0) && (argc <= 0)) {
+ int _m = 1;
+ int _v = 1;
+ if (_m) {
+ return _wrap_new_FXRecentFiles__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 1) && (argc <= 3)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ _v = (NIL_P(argv[0]) || TYPE(argv[0]) == T_STRING) ? 1 : 0;
+ }
+ _m &= _v;
+ if (argc > 1) {
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXObject, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (argc > 2) {
+ {
+ _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (_m) {
+ return _wrap_new_FXRecentFiles__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXRecentFiles'");
+ return Qnil;
+ }
+
+
static void
free_FXRbRecentFiles(FXRbRecentFiles *arg1) {
***************
*** 8393,8396 ****
--- 8637,8659 ----
static VALUE
+ _wrap_new_FX_Cursor__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXApp *arg1 ;
+ int arg2 = CURSOR_ARROW ;
+ FXCursor *result;
+
+ if ((argc < 1) || (argc > 2))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+ if (argc > 1) {
+ arg2 = (int) NUM2INT(argv[1]);
+ }
+ result = (FXCursor *)new FXCursor(arg1,(FXStockCursor )arg2);
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
_wrap_FX_Cursor_allocate(int argc, VALUE *argv, VALUE self) {
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXCursor);
***************
*** 8401,8416 ****
static VALUE
! _wrap_new_FX_Cursor(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! int arg2 = CURSOR_ARROW ;
FXCursor *result;
! if ((argc < 1) || (argc > 2))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! if (argc > 1) {
! arg2 = (int) NUM2INT(argv[1]);
! }
! result = (FXCursor *)new FXCursor(arg1,(FXStockCursor )arg2);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
--- 8664,8687 ----
static VALUE
! _wrap_new_FX_Cursor__SWIG_1(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! void *arg2 ;
! void *arg3 ;
! FXint arg4 ;
! FXint arg5 ;
! FXint arg6 ;
! FXint arg7 ;
FXCursor *result;
! if ((argc < 7) || (argc > 7))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! SWIG_ConvertPtr(argv[1], &arg2, 0, 1);
! SWIG_ConvertPtr(argv[2], &arg3, 0, 1);
! arg4 = NUM2INT(argv[3]);
! arg5 = NUM2INT(argv[4]);
! arg6 = NUM2INT(argv[5]);
! arg7 = NUM2INT(argv[6]);
! result = (FXCursor *)new FXCursor(arg1,(void const *)arg2,(void const *)arg3,arg4,arg5,arg6,arg7);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
***************
*** 8419,8422 ****
--- 8690,8764 ----
+ static VALUE _wrap_new_FX_Cursor(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[7];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 1) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (argc > 1) {
+ {
+ _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (_m) {
+ return _wrap_new_FX_Cursor__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 7) && (argc <= 7)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, 0, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[2]) || (TYPE(argv[2]) == T_DATA && SWIG_ConvertPtr(argv[2], &ptr, 0, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FX_Cursor__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_Cursor'");
+ return Qnil;
+ }
+
+
static VALUE
_wrap_FX_Cursor_getWidth(int argc, VALUE *argv, VALUE self) {
***************
*** 8587,8590 ****
--- 8929,8951 ----
}
static VALUE
+ _wrap_new_FXCursor__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXApp *arg1 ;
+ int arg2 = CURSOR_ARROW ;
+ FXRbCursor *result;
+
+ if ((argc < 1) || (argc > 2))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+ if (argc > 1) {
+ arg2 = (int) NUM2INT(argv[1]);
+ }
+ result = (FXRbCursor *)new FXRbCursor(arg1,(FXStockCursor )arg2);
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
_wrap_FXCursor_allocate(int argc, VALUE *argv, VALUE self) {
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbCursor);
***************
*** 8595,8610 ****
static VALUE
! _wrap_new_FXCursor(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! int arg2 = CURSOR_ARROW ;
FXRbCursor *result;
! if ((argc < 1) || (argc > 2))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! if (argc > 1) {
! arg2 = (int) NUM2INT(argv[1]);
! }
! result = (FXRbCursor *)new FXRbCursor(arg1,(FXStockCursor )arg2);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
--- 8956,8979 ----
static VALUE
! _wrap_new_FXCursor__SWIG_1(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! void *arg2 ;
! void *arg3 ;
! FXint arg4 ;
! FXint arg5 ;
! FXint arg6 ;
! FXint arg7 ;
FXRbCursor *result;
! if ((argc < 7) || (argc > 7))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! SWIG_ConvertPtr(argv[1], &arg2, 0, 1);
! SWIG_ConvertPtr(argv[2], &arg3, 0, 1);
! arg4 = NUM2INT(argv[3]);
! arg5 = NUM2INT(argv[4]);
! arg6 = NUM2INT(argv[5]);
! arg7 = NUM2INT(argv[6]);
! result = (FXRbCursor *)new FXRbCursor(arg1,(void const *)arg2,(void const *)arg3,arg4,arg5,arg6,arg7);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
***************
*** 8613,8616 ****
--- 8982,9056 ----
+ static VALUE _wrap_new_FXCursor(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[7];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 1) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (argc > 1) {
+ {
+ _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (_m) {
+ return _wrap_new_FXCursor__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 7) && (argc <= 7)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, 0, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[2]) || (TYPE(argv[2]) == T_DATA && SWIG_ConvertPtr(argv[2], &ptr, 0, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FXCursor__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXCursor'");
+ return Qnil;
+ }
+
+
static void
free_FXRbCursor(FXRbCursor *arg1) {
***************
*** 16795,16798 ****
--- 17235,17253 ----
static VALUE
+ _wrap_new_FX_FileDict__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXApp *arg1 ;
+ FXFileDict *result;
+
+ if ((argc < 1) || (argc > 1))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+ result = (FXFileDict *)new FXFileDict(arg1);
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
_wrap_FX_FileDict_allocate(int argc, VALUE *argv, VALUE self) {
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXFileDict);
***************
*** 16803,16814 ****
static VALUE
! _wrap_new_FX_FileDict(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
FXFileDict *result;
! if ((argc < 1) || (argc > 1))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! result = (FXFileDict *)new FXFileDict(arg1);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
--- 17258,17271 ----
static VALUE
! _wrap_new_FX_FileDict__SWIG_1(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
+ FXSettings *arg2 ;
FXFileDict *result;
! if ((argc < 2) || (argc > 2))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXSettings, 1);
! result = (FXFileDict *)new FXFileDict(arg1,arg2);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
***************
*** 16817,16820 ****
--- 17274,17321 ----
+ static VALUE _wrap_new_FX_FileDict(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[2];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 1) && (argc <= 1)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FX_FileDict__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXSettings, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FX_FileDict__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FX_FileDict'");
+ return Qnil;
+ }
+
+
static VALUE
_wrap_FX_FileDict_getApp(int argc, VALUE *argv, VALUE self) {
***************
*** 17018,17021 ****
--- 17519,17537 ----
}
static VALUE
+ _wrap_new_FXFileDict__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXApp *arg1 ;
+ FXRbFileDict *result;
+
+ if ((argc < 1) || (argc > 1))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+ result = (FXRbFileDict *)new FXRbFileDict(arg1);
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
_wrap_FXFileDict_allocate(int argc, VALUE *argv, VALUE self) {
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbFileDict);
***************
*** 17026,17040 ****
static VALUE
! _wrap_new_FXFileDict(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
FXRbFileDict *result;
! if ((argc < 1) || (argc > 1))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! result = (FXRbFileDict *)new FXRbFileDict(arg1);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
return self;
}
--- 17542,17602 ----
static VALUE
! _wrap_new_FXFileDict__SWIG_1(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
+ FXSettings *arg2 ;
FXRbFileDict *result;
! if ((argc < 2) || (argc > 2))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
! SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXSettings, 1);
! result = (FXRbFileDict *)new FXRbFileDict(arg1,arg2);
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
return self;
+ }
+
+
+ static VALUE _wrap_new_FXFileDict(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[2];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 1) && (argc <= 1)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FXFileDict__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXSettings, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FXFileDict__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXFileDict'");
+ return Qnil;
}
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.21
retrieving revision 1.41.2.22
diff -C2 -d -r1.41.2.21 -r1.41.2.22
*** opengl_wrap.cpp 8 Jul 2002 13:27:27 -0000 1.41.2.21
--- opengl_wrap.cpp 8 Jul 2002 14:28:29 -0000 1.41.2.22
***************
*** 1289,1292 ****
--- 1289,1305 ----
static VALUE
_wrap_new_FXHVec__SWIG_0(int argc, VALUE *argv, VALUE self) {
+ FXHVec *result;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ result = (FXHVec *)new FXHVec();
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
[...1738 lines suppressed...]
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[4]) || (TYPE(argv[4]) == T_DATA && SWIG_ConvertPtr(argv[4], &ptr, SWIGTYPE_p_FXMaterial, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[5]) || (TYPE(argv[5]) == T_DATA && SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_FXMaterial, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FXGLShape__SWIG_1(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXGLShape'");
+ return Qnil;
}
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.20
retrieving revision 1.9.2.21
diff -C2 -d -r1.9.2.20 -r1.9.2.21
*** ui_wrap.cpp 8 Jul 2002 13:27:28 -0000 1.9.2.20
--- ui_wrap.cpp 8 Jul 2002 14:28:30 -0000 1.9.2.21
***************
*** 5123,5135 ****
}
static VALUE
! _wrap_FXWindow_allocate(int argc, VALUE *argv, VALUE self) {
! VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbWindow);
! rb_obj_call_init(vresult, argc, argv);
! return vresult;
! }
!
!
! static VALUE
! _wrap_new_FXWindow(int argc, VALUE *argv, VALUE self) {
FXComposite *arg1 ;
FXuint arg2 = 0 ;
--- 5123,5127 ----
}
static VALUE
! _wrap_new_FXWindow__SWIG_0(int argc, VALUE *argv, VALUE self) {
FXComposite *arg1 ;
FXuint arg2 = 0 ;
***************
*** 5162,5165 ****
--- 5154,5320 ----
DATA_PTR(self) = result;
return self;
+ }
+
+
+ static VALUE
+ _wrap_new_FXWindow__SWIG_1(int argc, VALUE *argv, VALUE self) {
+ FXApp *arg1 ;
+ FXVisual *arg2 ;
+ FXRbWindow *result;
+
+ if ((argc < 2) || (argc > 2))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+ SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXVisual, 1);
+ result = (FXRbWindow *)new FXRbWindow(arg1,arg2);
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE
+ _wrap_FXWindow_allocate(int argc, VALUE *argv, VALUE self) {
+ VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbWindow);
+ rb_obj_call_init(vresult, argc, argv);
+ return vresult;
+ }
+
+
+ static VALUE
+ _wrap_new_FXWindow__SWIG_2(int argc, VALUE *argv, VALUE self) {
+ FXApp *arg1 ;
+ FXWindow *arg2 ;
+ FXuint arg3 ;
+ FXint arg4 ;
+ FXint arg5 ;
+ FXint arg6 ;
+ FXint arg7 ;
+ FXRbWindow *result;
+
+ if ((argc < 7) || (argc > 7))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc);
+ SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1);
+ SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_FXWindow, 1);
+ arg3 = NUM2UINT(argv[2]);
+ arg4 = NUM2INT(argv[3]);
+ arg5 = NUM2INT(argv[4]);
+ arg6 = NUM2INT(argv[5]);
+ arg7 = NUM2INT(argv[6]);
+ result = (FXRbWindow *)new FXRbWindow(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+ FXRbRegisterRubyObj(self, result);
+ DATA_PTR(self) = result;
+ return self;
+ }
+
+
+ static VALUE _wrap_new_FXWindow(int nargs, VALUE *args, VALUE self) {
+ int argc;
+ VALUE argv[7];
+ int ii;
+
+ argc = nargs;
+ for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+ argv[ii] = args[ii];
+ }
+ if ((argc >= 1) && (argc <= 6)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXComposite, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (argc > 1) {
+ {
+ _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (argc > 2) {
+ {
+ _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (argc > 3) {
+ {
+ _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (argc > 4) {
+ {
+ _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (argc > 5) {
+ {
+ _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ }
+ if (_m) {
+ return _wrap_new_FXWindow__SWIG_0(nargs, args, self);
+ }
+ }
+ if ((argc >= 2) && (argc <= 2)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXVisual, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FXWindow__SWIG_1(nargs, args, self);
+ }
+ }
+ if ((argc >= 7) && (argc <= 7)) {
+ int _m = 1;
+ int _v = 1;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXApp, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ void *ptr;
+ _v = (NIL_P(argv[1]) || (TYPE(argv[1]) == T_DATA && SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_FXWindow, 0) != -1)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[3]) == T_FIXNUM) || (TYPE(argv[3]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[4]) == T_FIXNUM) || (TYPE(argv[4]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[5]) == T_FIXNUM) || (TYPE(argv[5]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ {
+ _v = ((TYPE(argv[6]) == T_FIXNUM) || (TYPE(argv[6]) == T_BIGNUM)) ? 1 : 0;
+ }
+ _m &= _v;
+ if (_m) {
+ return _wrap_new_FXWindow__SWIG_2(nargs, args, self);
+ }
+ }
+
+ rb_raise(rb_eArgError, "No matching function for overloaded 'new_FXWindow'");
+ return Qnil;
}
|
