fxruby-commits Mailing List for FXRuby (Page 4)
Status: Inactive
Brought to you by:
lyle
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
(39) |
Apr
(69) |
May
(117) |
Jun
(22) |
Jul
(57) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: Lyle J. <ly...@us...> - 2002-06-13 15:06:58
|
Update of /cvsroot/fxruby/FXRuby/tests In directory usw-pr-cvs1:/tmp/cvs-serv21837/tests Added Files: Tag: release10 TC_FXShell.rb TC_FXTopWindow.rb Log Message: Made the constructors for FXDrawable, FXShell and FXTopWindow public so that these classes can be subclassed in FXRuby. --- NEW FILE: TC_FXShell.rb --- require 'test/unit' require 'fox' include Fox class TC_FXShell < Test::Unit::TestCase def set_up if FXApp.instance.nil? @app = FXApp.new('TC_FXShell', 'FXRuby') @app.init([]) @mainwin = FXMainWindow.new(@app, 'TC_FXShell') else @app = FXApp.instance @mainwin = @app.mainWindow end end def test_new # Free-floating shell1 = FXShell.new(@app, 0, 0, 0, 0, 0) # Owned shell2 = FXShell.new(@mainwin, 0, 0, 0, 0, 0) assert_same(@mainwin, shell2.owner) end end --- NEW FILE: TC_FXTopWindow.rb --- require 'test/unit' require 'fox' include Fox class TC_FXTopWindow < Test::Unit::TestCase def set_up if FXApp.instance.nil? @app = FXApp.new('TC_FXTopWindow', 'FXRuby') @app.init([]) @mainwin = FXMainWindow.new(@app, 'TC_FXButton') else @app = FXApp.instance @mainwin = @app.mainWindow end end def test_new # Free-floating top1 = FXTopWindow.new(@app, "top1", nil, nil, DECOR_ALL, 0, 0, 0, 0, DEFAULT_PAD, DEFAULT_PAD, DEFAULT_PAD, DEFAULT_PAD, DEFAULT_SPACING, DEFAULT_SPACING) assert_equal("top1", top1.title) # Owned top2 = FXTopWindow.new(@mainwin, "top2", nil, nil, DECOR_ALL, 0, 0, 0, 0, DEFAULT_PAD, DEFAULT_PAD, DEFAULT_PAD, DEFAULT_PAD, DEFAULT_SPACING, DEFAULT_SPACING) assert_same(@mainwin, top2.owner) assert_equal("top2", top2.title) end end |
From: Lyle J. <ly...@us...> - 2002-06-11 14:42:31
|
Update of /cvsroot/fxruby/FXRuby/examples In directory usw-pr-cvs1:/tmp/cvs-serv5940 Modified Files: Tag: release10 inputs.rb Log Message: Fixed a bug in the inputs.rb example program; we should go ahead and close the pipe when it starts returning nil reads so that it doesn't flood the text buffer. Index: inputs.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/examples/inputs.rb,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** inputs.rb 27 Nov 2001 15:46:10 -0000 1.4 --- inputs.rb 11 Jun 2002 14:42:28 -0000 1.4.2.1 *************** *** 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' |
From: Lyle J. <ly...@us...> - 2002-06-05 16:55:36
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv16552/lib/fox Modified Files: Tag: release10 aliases.rb Log Message: Added new documentation files for FXList, FXScrollArea and FXToggleButton. Index: aliases.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v retrieving revision 1.24.2.7 retrieving revision 1.24.2.8 diff -C2 -d -r1.24.2.7 -r1.24.2.8 *** aliases.rb 24 May 2002 22:20:57 -0000 1.24.2.7 --- aliases.rb 5 Jun 2002 16:55:33 -0000 1.24.2.8 *************** *** 679,701 **** 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 *************** *** 961,964 **** --- 965,969 ---- alias xPosition getXPosition alias yPosition getYPosition + alias position getPosition end class FX_Scrollbar |
From: Lyle J. <ly...@us...> - 2002-06-05 16:55:36
|
Update of /cvsroot/fxruby/FXRuby/rdoc-sources In directory usw-pr-cvs1:/tmp/cvs-serv16552/rdoc-sources Added Files: Tag: release10 FXList.rb FXScrollArea.rb FXToggleButton.rb Log Message: Added new documentation files for FXList, FXScrollArea and FXToggleButton. --- NEW FILE: FXList.rb --- module Fox # List item class FXListItem < FXObject # Initialize def initialize(text, ic=nil, ptr=nil) ; end # Set the list item's text def text=(txt) ; end # Get the list item's text def text() ; end # Set the list item's icon def icon=(icn) ; end # Get the list item's icon def icon() ; end # Set the list item's data def data=(obj) ; end # Get the list item's data def data() ; end # Give this item the focus (+true+ or +false+) def focus=(focus) ; end # Returns +true+ if this item has the focus def hasFocus?() ; end # Set this item selected (+true+ or +false+) def selected=(selected) ; end # Return +true+ if this item is selected def selected?() ; end # Set this item enabled (+true+) or disabled (+false+) def enabled=(enabled) ; end # Return +true+ if this item is enabled def enabled?() ; end # Set this item draggable (+true+) or not (+false+) def draggable=(draggable) ; end # Return +true+ if this item is draggable def draggable?() ; end # Set this icon as "owned" by this list item (+true+) or not (+false+) def iconOwned=(owned) ; end # Return +true+ if this icon is owned def iconOwned?() ; end # Return the width of this item for a specified list def getWidth(list) ; end # Return the height of this item for a specified list def getHeight(list) ; end # Create the item def create() ; end # Detach the item def detach() ; end # Destroy the item def destroy( ); end end # List # # = List styles # LIST_EXTENDEDSELECT:: Extended selection mode allows for drag-selection of ranges of items # LIST_SINGLESELECT:: Single selection mode allows up to one item to be selected # LIST_BROWSESELECT:: Browse selection mode enforces one single item to be selected at all times # LIST_MULTIPLESELECT:: Multiple selection mode is used for selection of individual items # LIST_AUTOSELECT:: Automatically select under cursor # LIST_NORMAL:: same as LIST_EXTENDEDSELECT # # = Message identifiers # # ID_TIPTIMER:: # ID_LOOKUPTIMER:: # class FXList < FXScrollArea # Construct a list with nvis visible items; the list is initially empty def initialize(p, nvis, tgt=nil, sel=0, opts=LIST_NORMAL, x=0, y=0, w=0, h=0) ; end # Return the number of items in the list def numItems() ; end # Return number of visible items def numVisible() ; end # Change the number of visible items def numVisible=(nvis) ; end # Return the item at the given index def retrieveItem(index) ; end # Replace the item with a [possibly subclassed] item def replaceItem(index, item, notify=false) ; end # Replace items text, icon, and user-data pointer def replaceItem(index, text, icon=nil, ptr=nil, notify=false) ; end # Insert a new [possibly subclassed] item at the give index def insertItem(index, item, notify=false) ; end # Insert item at index with given text, icon, and user-data pointer def insertItem(index, text, icon=nil, ptr=nil, notify=false) ; end # Append a [possibly subclassed] item to the list def appendItem(item, notify=false) ; end # Append new item with given text and optional icon, and user-data pointer def appendItem(text, icon=nil, obj=nil, notify=false) ; end # Prepend a [possibly subclassed] item to the list def prependItem(item, notify=false) ; end # Prepend new item with given text and optional icon, and user-data pointer def prependItem(text, icon=nil, obj=nil, notify=false) ; end # Remove item from list def removeItem(index, notify=false) ; end # Remove all items from list def clearItems(notify=false) ; end # Return item width def getItemWidth(index) ; end # Return item height def getItemHeight(index) ; end # Return index of item at x,y, if any def getItemAt(x, y) ; end # Return item hit code: 0 no hit; 1 hit the icon; 2 hit the text def hitItem(index, x, y) ; end # Search items for item by name, starting from start item; the # flags argument controls the search direction, and case sensitivity. def findItem(text, start=-1, flags=SEARCH_FORWARD|SEARCH_WRAP) ; end # Scroll to bring item into view def makeItemVisible(index) ; end # Change item text def setItemText(index, text) ; end # Return item text def getItemText(index) ; end # Change item icon def setItemIcon(index, icon) ; end # Return item icon, if any def getItemIcon(index) ; end # Change item user-data object def setItemData(index, obj) ; end # Return item user-data object def getItemData(index) ; end # Return +true+ if item is selected def itemSelected?(index) ; end # Return +true+ if item is current def itemCurrent?(index) ; end # Return +true+ if item is visible def itemVisible?(index) ; end # Return +true+ if item is enabled def itemEnabled?(index) ; end # Repaint item def updateItem(index) ; end # Enable item def enableItem(index) ; end # Disable item def disableItem(index) ; end # Select item def selectItem(index, notify=false) ; end # Deselect item def deselectItem(index, notify=false) ; end # Toggle item selection state def toggleItem(index, notify=false) ; end # Change current item def setCurrentItem(index, notify=false) ; end # Return current item, if any def currentItem() ; end # Change anchor item def anchorItem=(index) ; end # Return anchor item, if any def anchorItem() ; end # Get item under the cursor, if any def cursorItem() ; end # Extend selection from anchor item to index def extendSelection(index, notify=false) ; end # Deselect all items def killSelection(notify=false) ; end # Sort items using current sort function def sortItems() ; end # Change text font def font=(fnt) ; end # Return text font def font() ; end # Return normal text color def textColor() ; end # Change normal text color def textColor=(clr) ; end # Return selected text background def selBackColor() ; end # Change selected text background def selBackColor=(clr) ; end # Return selected text color def selTextColor() ; end # Change selected text color def selTextColor=(clr) ; end # Return list style def listStyle() ; end # Change list style def listStyle=(style) ; end # Set the status line help text for this list def helpText=(text) ; end # Get the status line help text for this list def helpText() ; end end end --- NEW FILE: FXScrollArea.rb --- module Fox # The scroll area widget manages a content area and a viewport # area through which the content is viewed. When the content area # becomes larger than the viewport area, scrollbars are placed to # permit viewing of the entire content by scrolling the content. # Depending on the mode, scrollbars may be displayed on an as-needed # basis, always, or never. # Normally, the scroll area's size and the content's size are independent; # however, it is possible to disable scrolling in the horizontal # (vertical) direction. In this case, the content width (height) # will influence the width (height) of the scroll area widget. # For content which is time-consuming to repaint, continuous # scrolling may be turned off. # # = Scrollbar options # # SCROLLERS_NORMAL:: Show the scrollbars when needed # HSCROLLER_ALWAYS:: Always show horizontal scrollers # HSCROLLER_NEVER:: Never show horizontal scrollers # VSCROLLER_ALWAYS:: Always show vertical scrollers # VSCROLLER_NEVER:: Never show vertical scrollers # HSCROLLING_ON:: Horizontal scrolling turned on (default) # HSCROLLING_OFF:: Horizontal scrolling turned off # VSCROLLING_ON:: Vertical scrolling turned on (default) # VSCROLLING_OFF:: Vertical scrolling turned off # SCROLLERS_TRACK:: Scrollers track continuously for smooth scrolling # SCROLLERS_DONT_TRACK:: Scrollers don't track continuously # class FXScrollArea < FXComposite # Return viewport width def viewportWidth() ; end # Return viewport height def viewportHeight() ; end # Return content width def contentWidth() ; end # Return content height def contentHeight() ; end # Change scroll style def scrollStyle=(style) ; end # Return scroll style def scrollStyle() ; end # Return +true+ if horizontally scrollable def horizontalScrollable?() ; end # Return +true+ if vertically scrollable def verticalScrollable?() ; end # Return a reference to the horizontal scrollbar def horizontalScrollbar() ; end # Return a reference to the vertical scrollbar def verticalScrollbar() ; end # Return the current x-position def xPosition() ; end # Return the current y-position def yPosition() ; end # Set the current position def setPosition(x, y) ; end # Get the current position as an array [x, y] def position() ; end # Move contents to the specified position def moveContents(x, y) ; end end end --- NEW FILE: FXToggleButton.rb --- module Fox # # The toggle button provides a two-state button, which toggles between the # on and the off state each time it is pressed. For each state, the toggle # button has a unique icon and text label. # When pressed, the button widget sends a SEL_COMMAND to its target, with the # message data set to the current state of the toggle button, of the type FXbool. # # = Toggle button flags # # TOGGLEBUTTON_AUTOGRAY:: Automatically gray out when not updated # TOGGLEBUTTON_AUTOHIDE:: Automatically hide toggle button when not updated # TOGGLEBUTTON_TOOLBAR:: Toolbar style toggle button [flat look] # TOGGLEBUTTON_NORMAL:: FRAME_RAISED|FRAME_THICK|JUSTIFY_NORMAL|ICON_BEFORE_TEXT # class FXToggleButton < FXLabel # Construct toggle button with two text labels, and two icons, one for each state def initialize(p, text1, text2, icon1=nil, icon2=nil, tgt=nil, sel=0, opts=TOGGLEBUTTON_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end # Change alternate text shown when toggled def altText=(text) ; end # Return alternate text def altText() ; end # Change alternate icon shown when toggled def altIcon=(ic) ; end # Return alternate icon def altIcon() ; end # Change toggled state def state(s=true); # Return toggled state def state() ; end # Change alternate help text shown when toggled def altHelpText=(text) ; end # Return alternate help text def altHelpText() ; end # Change alternate tip text shown when toggled def altTipText=(text) ; end # Return alternate tip text def altTipText() ; end # Set the toggle button style flags def toggleStyle=(style) ; end # Get the toggle button style flags def toggleStyle() ; end end end |
From: Lyle J. <ly...@us...> - 2002-05-30 15:01:38
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv11873 Modified Files: Tag: release10 core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp librb.c mdi_wrap.cpp opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp Log Message: Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.17 retrieving revision 1.62.2.18 diff -C2 -d -r1.62.2.17 -r1.62.2.18 *** core_wrap.cpp 29 May 2002 16:50:49 -0000 1.62.2.17 --- core_wrap.cpp 30 May 2002 15:00:20 -0000 1.62.2.18 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- *************** *** 920,926 **** if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); ! arg1 = (unsigned char) NUM2INT(argv[0]); ! arg2 = (unsigned char) NUM2INT(argv[1]); ! arg3 = (unsigned char) NUM2INT(argv[2]); result = (FXuint)_FXRGB(arg1,arg2,arg3); --- 919,925 ---- if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); ! arg1 = (FXuchar) NUM2INT(argv[0]); ! arg2 = (FXuchar) NUM2INT(argv[1]); ! arg3 = (FXuchar) NUM2INT(argv[2]); result = (FXuint)_FXRGB(arg1,arg2,arg3); *************** *** 941,948 **** if ((argc < 4) || (argc > 4)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); ! arg1 = (unsigned char) NUM2INT(argv[0]); ! arg2 = (unsigned char) NUM2INT(argv[1]); ! arg3 = (unsigned char) NUM2INT(argv[2]); ! arg4 = (unsigned char) NUM2INT(argv[3]); result = (FXuint)_FXRGBA(arg1,arg2,arg3,arg4); --- 940,947 ---- if ((argc < 4) || (argc > 4)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); ! arg1 = (FXuchar) NUM2INT(argv[0]); ! arg2 = (FXuchar) NUM2INT(argv[1]); ! arg3 = (FXuchar) NUM2INT(argv[2]); ! arg4 = (FXuchar) NUM2INT(argv[3]); result = (FXuint)_FXRGBA(arg1,arg2,arg3,arg4); *************** *** 1026,1030 **** rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = NUM2UINT(argv[0]); ! arg2 = (unsigned char) NUM2INT(argv[1]); result = (FXuchar)_FXRGBACOMPVAL(arg1,arg2); --- 1025,1029 ---- rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = NUM2UINT(argv[0]); ! arg2 = (FXuchar) NUM2INT(argv[1]); result = (FXuchar)_FXRGBACOMPVAL(arg1,arg2); Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.34.2.15 retrieving revision 1.34.2.16 diff -C2 -d -r1.34.2.15 -r1.34.2.16 *** dialogs_wrap.cpp 29 May 2002 16:50:53 -0000 1.34.2.15 --- dialogs_wrap.cpp 30 May 2002 15:00:45 -0000 1.34.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.16 retrieving revision 1.37.2.17 diff -C2 -d -r1.37.2.16 -r1.37.2.17 *** icons_wrap.cpp 29 May 2002 16:50:54 -0000 1.37.2.16 --- icons_wrap.cpp 30 May 2002 15:00:48 -0000 1.37.2.17 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.39.2.16 retrieving revision 1.39.2.17 diff -C2 -d -r1.39.2.16 -r1.39.2.17 *** image_wrap.cpp 29 May 2002 16:50:54 -0000 1.39.2.16 --- image_wrap.cpp 30 May 2002 15:00:49 -0000 1.39.2.17 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- *************** *** 1036,1040 **** arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer); arg2 = NUM2UINT(argv[0]); ! arg3 = (unsigned char) NUM2INT(argv[1]); FXMemoryBuffer___setitem__(arg1,arg2,arg3); --- 1035,1039 ---- arg1 = (FXMemoryBuffer *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXMemoryBuffer); arg2 = NUM2UINT(argv[0]); ! arg3 = (FXuchar) NUM2INT(argv[1]); FXMemoryBuffer___setitem__(arg1,arg2,arg3); Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.8.2.15 retrieving revision 1.8.2.16 diff -C2 -d -r1.8.2.15 -r1.8.2.16 *** layout_wrap.cpp 29 May 2002 16:50:55 -0000 1.8.2.15 --- layout_wrap.cpp 30 May 2002 15:00:50 -0000 1.8.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- Index: librb.c =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/librb.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** librb.c 29 May 2002 16:50:55 -0000 1.6.2.1 --- librb.c 30 May 2002 15:00:51 -0000 1.6.2.2 *************** *** 203,207 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 203,206 ---- Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.36.2.15 retrieving revision 1.36.2.16 diff -C2 -d -r1.36.2.15 -r1.36.2.16 *** mdi_wrap.cpp 29 May 2002 16:50:55 -0000 1.36.2.15 --- mdi_wrap.cpp 30 May 2002 15:00:51 -0000 1.36.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.41.2.16 retrieving revision 1.41.2.17 diff -C2 -d -r1.41.2.16 -r1.41.2.17 *** opengl_wrap.cpp 29 May 2002 16:50:55 -0000 1.41.2.16 --- opengl_wrap.cpp 30 May 2002 15:00:54 -0000 1.41.2.17 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- Index: scintilla_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v retrieving revision 1.16.2.10 retrieving revision 1.16.2.11 diff -C2 -d -r1.16.2.10 -r1.16.2.11 *** scintilla_wrap.cpp 29 May 2002 16:50:56 -0000 1.16.2.10 --- scintilla_wrap.cpp 30 May 2002 15:00:56 -0000 1.16.2.11 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.9.2.15 retrieving revision 1.9.2.16 diff -C2 -d -r1.9.2.15 -r1.9.2.16 *** ui_wrap.cpp 29 May 2002 16:50:56 -0000 1.9.2.15 --- ui_wrap.cpp 30 May 2002 15:00:56 -0000 1.9.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-1701 * * This file is not intended to be easily readable and contains a number of *************** *** 28,32 **** #include "ruby.h" - #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) --- 28,31 ---- |
From: Lyle J. <ly...@us...> - 2002-05-30 14:47:55
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv1060 Modified Files: Tag: release10 Makefile Makefile.in Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/Makefile,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** Makefile 15 May 2002 14:44:54 -0000 1.1.2.7 --- Makefile 30 May 2002 14:47:52 -0000 1.1.2.8 *************** *** 39,44 **** config.save: ! ruby install.rb config -- --with-scintilla-include=/home/jlj/src/scintilla/include \ ! --with-scintilla-lib=/home/jlj/src/scintilla/bin check: --- 39,45 ---- config.save: ! ruby install.rb config -- \ ! --with-fxscintilla-include=/usr/local/include/fxscintilla \ ! --with-fxscintilla-lib=/usr/local/lib check: Index: Makefile.in =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/Makefile.in,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** Makefile.in 15 May 2002 14:44:54 -0000 1.1.2.5 --- Makefile.in 30 May 2002 14:47:52 -0000 1.1.2.6 *************** *** 39,44 **** config.save: ! ruby install.rb config -- --with-scintilla-include=/home/jlj/src/scintilla/include \ ! --with-scintilla-lib=/home/jlj/src/scintilla/bin check: --- 39,45 ---- config.save: ! ruby install.rb config -- \ ! --with-fxscintilla-include=/usr/local/include/fxscintilla \ ! --with-fxscintilla-lib=/usr/local/lib check: |
From: Lyle J. <ly...@us...> - 2002-05-30 14:43:28
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv28952 Modified Files: Tag: release10 FXRuby.spec FXRuby.spec.in Log Message: Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** FXRuby.spec 30 May 2002 13:58:01 -0000 1.1.2.8 --- FXRuby.spec 30 May 2002 14:43:25 -0000 1.1.2.9 *************** *** 35,38 **** --- 35,42 ---- %changelog + * Thu May 30 2002 Lyle Johnson <ly...@us...> + - Incorporated Laurent Julliard's patches for the new installation directories + of FXScintilla. + * Thu May 09 2002 Lyle Johnson <ly...@us...> - Fixed %files section entries for the examples Index: FXRuby.spec.in =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec.in,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** FXRuby.spec.in 30 May 2002 13:58:01 -0000 1.1.2.4 --- FXRuby.spec.in 30 May 2002 14:43:25 -0000 1.1.2.5 *************** *** 35,38 **** --- 35,42 ---- %changelog + * Thu May 30 2002 Lyle Johnson <ly...@us...> + - Incorporated Laurent Julliard's patches for the new installation directories + of FXScintilla. + * Thu May 09 2002 Lyle Johnson <ly...@us...> - Fixed %files section entries for the examples |
From: Lyle J. <ly...@us...> - 2002-05-30 14:41:57
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv26842/lib/fox Modified Files: Tag: release10 scintilla.rb Log Message: Modified the iface.rb script so that it puts the output file (scintilla.rb) in the Fox module. Index: scintilla.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/lib/fox/Attic/scintilla.rb,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** scintilla.rb 30 May 2002 14:28:04 -0000 1.1.2.1 --- scintilla.rb 30 May 2002 14:41:53 -0000 1.1.2.2 *************** *** 2,7 **** # DO NOT MODIFY ! class FXScintilla ! # --- 2,8 ---- # DO NOT MODIFY ! module Fox [...4620 lines suppressed...] ! SCN_KEY = 2005 ! SCN_DOUBLECLICK = 2006 ! SCN_UPDATEUI = 2007 ! SCN_MODIFIED = 2008 ! SCN_MACRORECORD = 2009 ! SCN_MARGINCLICK = 2010 ! SCN_NEEDSHOWN = 2011 ! SCN_PAINTED = 2013 ! SCN_USERLISTSELECTION = 2014 ! SCN_URIDROPPED = 2015 ! SCN_DWELLSTART = 2016 ! SCN_DWELLEND = 2017 ! # Deprecated ! # The old name for SCN_UPDATEUI ! SCN_CHECKBRACE = 2007 ! SCN_POSCHANGED = 2012 ! end end |
From: Lyle J. <ly...@us...> - 2002-05-30 14:41:57
|
Update of /cvsroot/fxruby/FXRuby/examples In directory usw-pr-cvs1:/tmp/cvs-serv26842/examples Modified Files: Tag: release10 scintilla-test.rb Log Message: Modified the iface.rb script so that it puts the output file (scintilla.rb) in the Fox module. Index: scintilla-test.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/examples/scintilla-test.rb,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** scintilla-test.rb 19 Feb 2002 00:11:21 -0000 1.4 --- scintilla-test.rb 30 May 2002 14:41:54 -0000 1.4.2.1 *************** *** 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 ---- |
From: Lyle J. <ly...@us...> - 2002-05-30 14:41:57
|
Update of /cvsroot/fxruby/FXRuby/scripts In directory usw-pr-cvs1:/tmp/cvs-serv26842/scripts Modified Files: Tag: release10 iface.rb Log Message: Modified the iface.rb script so that it puts the output file (scintilla.rb) in the Fox module. Index: iface.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/scripts/Attic/iface.rb,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** iface.rb 20 May 2002 22:38:20 -0000 1.1.2.1 --- iface.rb 30 May 2002 14:41:52 -0000 1.1.2.2 *************** *** 182,190 **** def processCommand(_cmd, _args) ! process = "process" + _cmd[0..0].upcase + _cmd[1..-1] ! if respond_to?(process) ! method(process).call(_args) ! else ! puts "*** Unknown cmd: #{_cmd} #{_args}" end end --- 182,192 ---- def processCommand(_cmd, _args) ! unless _cmd.empty? ! process = "process" + _cmd[0..0].upcase + _cmd[1..-1] ! if respond_to?(process) ! method(process).call(_args) ! else ! puts "*** Unknown cmd: #{_cmd} #{_args}" ! end end end *************** *** 258,268 **** def generate generateHeader ! @output.puts("class FXScintilla") @iface.cat.each do |cat| ! @output.puts(" # #{cat.name}") cat.entries.each do |entry| entry.accept(self) end end @output.puts("end") end --- 260,272 ---- def generate generateHeader ! @output.puts("module Fox") ! @output.puts(" class FXScintilla") @iface.cat.each do |cat| ! @output.puts(" # #{cat.name}") cat.entries.each do |entry| entry.accept(self) end end + @output.puts(" end") @output.puts("end") end *************** *** 273,277 **** def visitIFaceComment(_comment) ! @output.puts(" ##{_comment.text}") end --- 277,281 ---- def visitIFaceComment(_comment) ! @output.puts(" ##{_comment.text}") end *************** *** 279,283 **** return if _val.name == "KeyMod" return if _val.name == "Lexer" ! @output.puts(" #{name(_val.name)} = #{_val.code}") end --- 283,287 ---- return if _val.name == "KeyMod" return if _val.name == "Lexer" ! @output.puts(" #{name(_val.name)} = #{_val.code}") end *************** *** 287,291 **** name = name(_fun.name[0..0].downcase + _fun.name[1..-1]) ! @output.print(" def #{name}") args = _fun.args.collect do |arg| if stringresult and arg.type == "stringresult" --- 291,295 ---- name = name(_fun.name[0..0].downcase + _fun.name[1..-1]) ! @output.print(" def #{name}") args = _fun.args.collect do |arg| if stringresult and arg.type == "stringresult" *************** *** 300,304 **** if stringresult and !stringresult1 ! @output.puts(" buffer = \"\".ljust(#{_fun.args[0].name})") end --- 304,308 ---- if stringresult and !stringresult1 ! @output.puts(" buffer = \"\".ljust(#{_fun.args[0].name})") end *************** *** 314,323 **** if stringresult and !stringresult1 ! @output.puts(" #{returnValue}") ! @output.puts(" buffer") else ! @output.puts(" #{typeRet(_fun.return, returnValue)}") end ! @output.puts(" end") end --- 318,327 ---- if stringresult and !stringresult1 ! @output.puts(" #{returnValue}") ! @output.puts(" buffer") else ! @output.puts(" #{typeRet(_fun.return, returnValue)}") end ! @output.puts(" end") end *************** *** 332,336 **** def visitIFaceEvt(_evt) name = "SCN_" + _evt.name.upcase ! @output.puts(" #{name} = #{_evt.code}") end --- 336,340 ---- def visitIFaceEvt(_evt) name = "SCN_" + _evt.name.upcase ! @output.puts(" #{name} = #{_evt.code}") end |
From: Lyle J. <ly...@us...> - 2002-05-30 14:28:07
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv15888 Added Files: Tag: release10 scintilla.rb Log Message: --- NEW FILE: scintilla.rb --- # This file is automatically generated from Scintilla.iface # DO NOT MODIFY class FXScintilla # # Basics INVALID_POSITION = -1 # Define start of Scintilla messages to be greater than all edit (EM_*) messages # as many EM_ messages can be used although that use is deprecated. SCI_START = 2000 SCI_OPTIONAL_START = 3000 [...2287 lines suppressed...] # GTK+ Specific to work around focus and accelerator problems: SCN_KEY = 2005 SCN_DOUBLECLICK = 2006 SCN_UPDATEUI = 2007 SCN_MODIFIED = 2008 SCN_MACRORECORD = 2009 SCN_MARGINCLICK = 2010 SCN_NEEDSHOWN = 2011 SCN_PAINTED = 2013 SCN_USERLISTSELECTION = 2014 SCN_URIDROPPED = 2015 SCN_DWELLSTART = 2016 SCN_DWELLEND = 2017 # Deprecated # The old name for SCN_UPDATEUI SCN_CHECKBRACE = 2007 SCN_POSCHANGED = 2012 end |
From: Lyle J. <ly...@us...> - 2002-05-30 14:21:23
|
Update of /cvsroot/fxruby/FXRuby/doc In directory usw-pr-cvs1:/tmp/cvs-serv7874 Modified Files: Tag: release10 changes.html differences.html events.html implementation.html library.html scintilla.html scintilla.xml Log Message: Updated the FXScintilla-related notes for compatibility with latest build process, etc. Index: changes.html =================================================================== RCS file: /cvsroot/fxruby/FXRuby/doc/changes.html,v retrieving revision 1.42.2.4 retrieving revision 1.42.2.5 diff -C2 -d -r1.42.2.4 -r1.42.2.5 *** changes.html 14 May 2002 15:14:33 -0000 1.42.2.4 --- changes.html 30 May 2002 14:21:13 -0000 1.42.2.5 *************** *** 1,5 **** <html><head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> ! <title>Chapter 11. Change History</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="todo.html" title="Chapter 10. 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 11. 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 11. Change History</h2></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2049"></a>Changes Since Version 1.0.3</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Corrected the code for <tt>FXTreeList#clearItems</tt> so that after the C++ objects (the tree items) are destroyed, any Ruby instances holding references to those C++ objects are notified of their demise. This one was inadvertently overlooked when other, similar, fixes were made in the previous release. Thanks to Gilles Filippini for catching this.</p></li><li style="list-style-type: disc"><p>The API for Ruby's <tt>rb_rescue2()</tt> function changed in Ruby 1.6.7, but I missed this since I had only compiled against the Ruby 1.6.6 and Ruby 1.7 header files. The API change led to a compile error for FXRuby.cpp; this has been fixed. Thanks to Bil Kleb for catching this one.</p></li><li style="list-style-type: disc"><p>The <tt>FXApp#enableThreads</tt> and <tt>FXApp#disableThreads</tt> instance methods have been replaced by a single instance method, --- 1,5 ---- <html><head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> ! <title>Chapter 11. Change History</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="todo.html" title="Chapter 10. 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 11. 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 11. Change History</h2></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2031"></a>Changes Since Version 1.0.3</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Corrected the code for <tt>FXTreeList#clearItems</tt> so that after the C++ objects (the tree items) are destroyed, any Ruby instances holding references to those C++ objects are notified of their demise. This one was inadvertently overlooked when other, similar, fixes were made in the previous release. Thanks to Gilles Filippini for catching this.</p></li><li style="list-style-type: disc"><p>The API for Ruby's <tt>rb_rescue2()</tt> function changed in Ruby 1.6.7, but I missed this since I had only compiled against the Ruby 1.6.6 and Ruby 1.7 header files. The API change led to a compile error for FXRuby.cpp; this has been fixed. Thanks to Bil Kleb for catching this one.</p></li><li style="list-style-type: disc"><p>The <tt>FXApp#enableThreads</tt> and <tt>FXApp#disableThreads</tt> instance methods have been replaced by a single instance method, *************** *** 14,16 **** now be called in either of these equivalent forms:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">glviewer.backgroundColor = FXHVec.new(0.5, 0.5, 0.5, 1.0)</pre></td></tr></table> or ! <table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">glviewer.backgroundColor = [0.5, 0.5, 0.5, 1.0]</pre></td></tr></table></li><li style="list-style-type: disc"><p>Updated the test case for <tt>FXMaterial</tt>, added a new test case for <tt>FXFileStream</tt>.</p></li><li style="list-style-type: disc"><p>Added aliases <tt>posVisible?</tt> (for <tt>FXTextField#isPosVisible</tt>), <tt>posSelected?</tt> (for <tt>FXTextField#isPosSelected</tt>), <tt>itemCurrent?</tt> (for <tt>FXComboBox#isItemCurrent</tt>), <tt>hasAccel?</tt> (for <tt>FXAccelTable#hasAccel</tt>), <tt>error=</tt> (for <tt>FXStream#setError</tt>), <tt>position=</tt> (for <tt>FXStream#setPosition</tt>) and <tt>position</tt> (for <tt>FXStream#getPosition</tt>).</p></li><li style="list-style-type: disc"><p>The <tt>FXStream</tt>, <tt>FXFileStream</tt> and <tt>FXMemoryStream</tt> classes were not implemented properly, in the sense that if you subclassed one of these classes and then attempted to override one of their virtual functions, that override might not get called (see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=535955&group_id=20243&atid=120243" target="_top">SourceForge Bug #535955</a>). This has been fixed.</p></li><li style="list-style-type: disc"><p>Did some more work on completing the <tt>FXDC</tt> interface, including adding a test case for the same. Also added a new example <tt>dctest.rb</tt> that demonstrates many of the <tt>FXDC</tt> interface.</p></li><li style="list-style-type: disc"><p>All GIF image files have now been replaced with PNG equivalents. For more information on why this is a good idea, see <a href="http://burnallgifs.org" target="_top">this site</a>.</p></li><li style="list-style-type: disc"><p>Starting with this release, Red Hat Linux 7.2 RPMs are now provided in addition to the Windows installer.</p></li><li style="list-style-type: disc"><p>The previous implementation of <tt>FXImage#data</tt> returned a copy of the underlying image pixel data instead of a pointer to the actual data (see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=550996&group_id=20243&atid=120243" target="_top">SourceForge Bug #550996</a>). This has been fixed. <tt>FXImage#data</tt> now returns an instance of <tt>FXMemoryBuffer</tt> which is an array or string-like class that acts as a very thin layer over the pointer to the pixel data. The <tt>initialize</tt> methods for images and icons were also updated so that they will now accept either strings (as before) or <tt>FXMemoryBuffer</tt> instances as inputs for the image data.</p></li><li style="list-style-type: disc"><p>Modified the <tt>range</tt> and <tt>range=</tt> methods for <tt>FXDial</tt>, <tt>FXSlider</tt> and <tt>FXSpinner</tt> so that they work with Ruby <tt>Range</tt> objects instead of pairs of integers for the low and high values.</p></li><li style="list-style-type: disc"><p>Lots of other little fixes here and there...</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2253"></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="d0e2383"></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 signa l 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="d0e2417"></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 FXScintilla 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="d0e2490"></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="d0e2521"></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="d0e2714"></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 fixed.</p></li><li style="list-style-type: disc"><p>I meant to add support for the new <tt>FXPCXIcon</tt> and <tt>FXPCXImage</tt> classes with the last release, but somehow I overlooked those. They are now supported, along with the other new classes introduced by FOX version 0.99.174: <tt>FXTIFIcon</tt>, <tt>FXTIFImage</tt> and <tt>FXProgressDialog</tt>.</p></li><li style="list-style-type: disc"><p>Fixed a bug in the GC-related code for "marking" C++ objects. I had not accounted for the possibility that the pointer passed to my mark functions could be a <tt>NULL</tt> pointer, and as a result the code would seg fault during garbage collection, under some circumstances. Many thanks to Ralf Canis for catching this bug.</p></li><li style="list-style-type: disc"><p>Updated the source code and <tt>extconf.rb</tt> files so that FXRuby configures and builds correctly for the "mswin32" builds. Thanks very much to Lorien Dunn for prompting me to get this stuff up-to-date!</p></li><li style="list-style-type: disc"><p>Fixed things so that the <tt>FXApp#addInput</tt> and <tt>FXApp#removeInput</tt> instance methods work properly for generating input messages. The first argument to both of these methods should be an <tt>IO</tt> object of some kind (specifically, an object that implements a <tt>fileno</tt> method). For more information about how this works, see the "Timers, Chores, Signals and Input Messages" section of the FOX documentation. Also see the new <tt>inputs.rb</tt> program in the <tt>examples</tt> directory for an example of how this works. Thanks to Ralf Canis for reminding me that I left this broken!</p></li><li style="list-style-type: disc"><p>Completed the basic code changes required for <tt>FXObject#handle</tt> to properly convert its message data into something that the C++ objects recognize (see the first item in the FXRuby To-Do List for more information). A lot of message types and identifiers are now handled correctly, especially those that are common to all <tt>FXWindow</tt>s. Most of the more widget-specific messages are not handled yet, and this is going to take awhile to complete; it's just a tedious process.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.cfdrc.com/pub/FOX/fox-0.99.174.tar.gz" target="_top">fox-0.99.174</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2805"></a>Changes Since Version 0.99.172</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Changed the build and installation process to use Minero Aoki's <tt>setup.rb</tt> tools. Looking ahead I can see that FXRuby will probably consist of a core C++ extension module and a collection of Ruby library scripts, and so now was the right time to make that transition.</p><p>If you have previously installed FXRuby (and written programs with the same) there are a few changes that may affect you. First, <tt>setup.rb</tt> will install the shared library (<tt>fox.so</tt>) in your <tt>site_ruby</tt> directory instead of the "core" libraries directory, where it was previously installed. So you should be sure to remove the old version of <tt>fox.so</tt> before installing and using this one.</p><p>The other change to be aware of is that there is now a <tt>fox</tt> directory containing FXRuby library scripts, and the <tt>responder.rb</tt> module is the first entry for this directory. You can import this file into your Ruby scripts with the line:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">require 'fox/responder'</pre></td></tr></table><p>and it's no longer necessary to drag copies of that file around.</p></li><li style="list-style-type: disc"><p>Aliased the <tt>getText</tt> instance method to <tt>to_s</tt> for a number of classes. This change should make things a little more convenient when inspecting the contents of widgets whose primary purpose is text entry or display. Thanks to Barry Shultz for this suggestion.</p></li><li style="list-style-type: disc"><p>Added the <tt>FXWindow#removeChild</tt> method for removing child widgets from a container window. This method doesn't exist for the C++ <tt>FXWindow</tt> class because it isn't needed; in C++ programs you simply delete the C++ object and it automatically gets removed from its parent. Note that after you call <tt>FXWindow#removeChild</tt> any outstanding references to the recently deceased child widget are invalid and should be set to <tt>nil</tt> or otherwise disposed of. Thanks to Ted Meng for noticing this omission.</p></li><li style="list-style-type: disc"><p>Modified some of the OpenGL method calls in <tt>gltest.rb</tt> for compatibility with Ruby/OpenGL 0.32. You should now be able to use Ruby/OpenGL with FXRuby unmodified.</p></li><li style="list-style-type: disc"><p>Added <tt>each()</tt> instance methods for <tt>FXComboBox</tt>, <tt>FXGLGroup</tt>, <tt>FXHeader</tt>, <tt>FXIconList</tt>, <tt>FXList</tt>, <tt>FXListBox</tt>, <tt>FXTreeItem</tt>, <tt>FXTreeList</tt> and <tt>FXTreeListBox</tt> in support of iterating over their sub-items. Also mixed the <tt>Enumerable</tt> module into all of these classes.</p></li><li style="list-style-type: disc"><p>Corrected the implementations of <tt>getData()</tt> and <tt>setData()</tt> for a variety of classes. You should now be able to attach arbitrary (application-defined) data to any FOX object that supports these APIs.</p></li><li style="list-style-type: disc"><p>As a debugging tool, you can now optionally catch exceptions raised in message handlers. To turn on this feature, call the <tt>setIgnoreExceptions(true)</tt> module method. When this is enabled, any exceptions raised in message handler functions will cause a standard stack trace to be dumped to the standard output, but then your application will, for better or worse, proceed normally. Thanks to Ted Meng for this suggestion.</p></li><li style="list-style-type: disc"><p>Extended the interfaces for <tt>FXApp#addSignal</tt> and <tt>FXApp#removeSignal</tt> to accept either a string or integer as their first argument. If it's a string (e.g. "SIGINT" or just "INT") the code will determine the corresponding signal number for you (similar to the <tt>Process.kill</tt> module method). For examples of how to use this, see the <tt>datatarget.rb</tt> or <tt>imageviewer.rb</tt> example programs.</p></li><li style="list-style-type: disc"><p>Corrected the implementations of <tt>fxparsefontdesc()</tt> and <tt>fxunparsefontdesc()</tt> module methods.</p></li><li style="list-style-type: disc"><p>Added a pure Ruby implementation of the standard <tt>FXCommand</tt> and <tt>FXUndoList</tt> classes from the standard FOX library.</p></li><li style="list-style-type: disc"><p>Added the <tt>splitter.rb</tt> example, to demonstrate the <tt>FXSplitter</tt> class and its options.</p></li><li style="list-style-type: disc"><p>Completed the initial version of <tt >browser.rb</tt>, which is just a simple tool to inspect the methods and constants exposed by different FOX classes. Thanks to Albert Wagner for pointing out some bugs in this one and providing me with the motivation to complete it. I don't know how useful it is, but it seems to be a required utility for every GUI toolkit for Ruby ;) If you'd like to suggest further improvements, please feel free!</p></li><li style="list-style-type: disc"><p>Corrected the constructors for <tt>FXXPMIcon</tt> and <tt>FXXPMImage</tt> so that they accept a list of strings as their second argument. The list of strings should be an XPM format image file. You can also pass <tt>nil</tt> to construct an initially-empty icon or image.</p></li><li style="list-style-type: disc"><p>Corrected the message data sent by <tt>FXList</tt> to its message target for the <tt>SEL_SELECTED</tt>, <tt>SEL_DESELECTED</tt>, <tt>SEL_INSERTED</tt>, <tt>SEL_DELETED</tt>, and <tt>SEL_REPLACED</tt> messages. For each of these messages, the data should be an integer indicating the affected list item's index.</p></li><li style="list-style-type: disc"><p>Added typemaps to convert Ruby message data back into C++ void pointers when calling the base class versions of message handlers. Please see the to-do list for a brief discussion of the issues that this fix addressed, and what remains to be done.</p></li><li style="list-style-type: disc"><p>Fixed a subtle GC bug related to object ownership. I'll use the <tt>FXList</tt> and <tt>FXListItem</tt> classes to describe the problem, but it's also relevant for several other FOX classes.</p><p>There are two ways to add a new list item to an <tt>FXList</tt> instance. One of those ways involves creating a new <tt>FXListItem</tt> instance explicitly (i.e. using <tt>FXListItem.new</tt>) and then passing it into an <tt>FXList</tt> instance method like <tt>FXList#appendItem</tt>. Before you add the item to the list, the item is "self-owned"; in other words, if Ruby's garbage collector decides to kill off that <tt>FXListItem</tt> instance, it is appropriate to also destroy the underlying C++ object. After the list item has been added to an <tt>FXList</tt>, however, the <tt>FXList</tt> owns that list item and is responsible for destroying it.</p><p>This bug became an issue when you added <tt>FXListItem</tt> instances to a list, because the code didn't properly recognize the fact that "ownership" of the list item had been transferred from the <tt>FXListItem</tt> instance to the <tt>FXList</tt>. More to the point, Ruby's garbage collector assumed that it was still OK to destroy the <tt>FXListItem</tt> instances that it knew about, and so objects could get deleted twice. This would usually result in a core dump.</p><p>Many thanks to Albert Wagner for submitting an example program that demonstrated this problem.</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.173.tar.gz" target="_top">fox-0.99.173</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e3069"></a>Changes Since Version 0.99.167</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Completed the coding for "safe" coexistence with Ruby's garbage collector; it should no longer be necessary to call <tt>GC.disable</tt> at the top of your FXRuby programs. Although all of the example programs now work correctly without disabling the garbage collector, this doesn't mean that there aren't still some bugs lurking. If your FXRuby program(s) crash mysteriously, try adding <tt>GC.disable</tt> to the top to see if it fixes things. If this does make a difference, <span class="emphasis"><em>please</em></span> send me the program (or another that reproduces the problem) so I can track down what's going wrong.</p></li><li style="list-style-type: disc"><p>Added aliases for all classes' accessor functions so that the related properties can be accessed more directly; for example, <tt>FXLabel#getText</tt> is aliased to <tt>FXLabel#text</tt> and <tt>FXLabel#setText</tt> is aliased to <tt>FXLabel#text=</tt>. Although the different forms are functionally equivalent, the new form is often easier to read. For example, consider this snippet of code that modifies a label's text:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">aLabel.setText(aLabel.getText() + " (modified)")</pre></td></tr></table><p>and this version of the same, now using the propery accessor functions:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">aLabel.text += " (modified)"</pre></td></tr></table><p>None of the standard FOX class APIs have been removed, so you shouldn't need to modify any already-working code.</p></li><li style="list-style-type: disc"><p>Corrected the message data sent from the <tt>FXText</tt> widget to its message target for the <tt>SEL_SELECTED</tt>, <tt>SEL_DESELECTED</tt>, <tt>SEL_INSERTED</tt>, <tt>SEL_DELETED</tt> and <tt>SEL_REPLACED</tt> message types. For the first four messages, the associated message data sent to the target will be an array of two integers indicating the starting position in the text buffer and text length for the affected text. For the <tt>SEL_REPLACED</tt> message type, the message data will be an array of three integers, indicating the starting position in the text buffer, the length of the old (replaced) text, and the length of the new text.</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.172.tar.gz" target="_top">fox-0.99.172</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e3138"></a>Changes Since Version 0.99.166-1</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Corrected the interfaces for <tt>FXInputDialog.getString</tt>, <tt>FXInputDialog.getReal</tt> and <tt>FXInputDialog.getInteger</tt> to either return the requested type or <tt>nil</tt> if the user cancels the dialog.</p></li><li style="list-style-type: disc"><p>Added code at the top of all the examples to disable Ruby's garbage collector, until the issues with GC are resolved.</p></li><li style="list-style-type: disc"><p>Corrected implementations for the overloaded versions of <tt>FXWindow#update</tt>. This method can be invoke with no arguments (in which case it updates the entire window) or with four arguments indicating the x, y, w and h of the client area to be updated.</p></li><li style="list-style-type: disc"><p>Modified how the return values from Ruby message handler functions are interpreted, to make things a little more convenient for programmers. If the result is a numeric type (<tt>Fixnum</tt>, <tt>Bignum</tt> or <tt>Float</tt>) we try to cast it to a long integer but also trap the value to either zero or one. If it's a boolean result we map <tt>false</tt> and <tt>true</tt> to zero and one, respectively. For any other return type (<tt>nil</tt>, strings, etc.) we just assume they meant to return 1. Thanks to Ted Meng for this suggestion.</p></li><li style="list-style-type: disc"><p>Modified the interfaces for <tt>FXFileDialog#getPatternList</tt>, <tt>FXFileSelector#getPatternList</tt>, <tt>FXFileDialog#setPatternList</tt> and <tt>FXFileSelector#setPatternList</tt> to take (or return) an array of strings (one array item per pattern) of the form "C/C++ Files (*.cpp)". This is sort-of a compromise between the currently available overloaded C++ versions of these functions, both of which look pretty awkward in Ruby. For an example of how this works now, see the <tt>imageviewer.rb</tt> example program.</p></li><li style="list-style-type: disc"><p>Added the FOX key cap definitions (i.e. the symbols from <tt>fxkeys.h</tt>) into FXRuby. Thanks to Benedikt Grundmann for pointing out this omission.</p></li><li style="list-style-type: disc"><p>Added initial support for multithreaded FXRuby applications. The current implementation does what is a lso done in Ruby/GTK; it turns over some idle processing time to the Ruby thread scheduler to let other threads do their thing. As I learn more about Ruby's threading implementation I may try something different, but this seems to work OK for now. As a simple example, I modified the <tt>groupbox.rb</tt> example program so that the clock label that appears in the lower right-hand corner is continuously updated (by a separate thread) instead of just displaying static text.</p><p>If you suspect that FXRuby's threads support is interfering with your application's performance, you may want to try tweaking the amount of time that the main application thread "sleeps" during idle processing; do this by setting the <tt>FXApp</tt> object's <i><tt>sleepTime</tt></i> attribute. The default value for <i><tt>FXApp#sleepTime</tt></i> is 100 milliseconds. You can also disable the threads support completely by calling <tt>FXApp#disableThreads</tt> (and subsequently re-enable it with <tt>FXApp#enableThreads</tt>.</p></li><li style="list-style-type: disc"><p>Started adding <a href="http://homepage1.nifty.com/markey/ruby/rubyunit/index_e.html" target="_top">RubyUnit</a>-style test cases to the <tt>tests</tt> subdirectory. There's not much there yet but we've got to start somewhere!</p></li><li style="list-style-type: disc"><p>Converted most of the documentation over to <a href="http://www.docbook.org" target="_top">DocBook</a> format and reorganized the web page accordingly.</p></li><li style="list-style-type: disc"><p>Updated the interfaces for compatibility with <a href="ftp://ftp.cfdrc.com/pub/FOX/fox-0.99.167.tar.gz" target="_top">fox-0.99.167</a>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e3255"></a>Changes Since Version 0.99.166</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>Corrected a problem with the binary distribution (i.e. the <tt>fox.so</tt> file) for Windows, which made it unusable on most Windows installations. This problem was related to an incompatibility between the versions of Cygwin that I was using to compile FOX and FXRuby, and the version used to compile the standard Ruby 1.6.2 distribution for Windows. Many, many thanks to Pete, Bene and Robert for helping me to test and resolve this issue!</p></li><li style="list-style-type: disc"><p>Added support for FOX data targets, as demonstrated by the new <tt>datatarget.rb</tt> example in the <tt>examples</tt> directory. A data target is a special kind of FOX object that can be designated as the message target of any widget that has an associated "value", and then the value of the data target and that widget become automatically linked to each other. For example, you can create a data target with a string value and then make it the message target for an <tt>FXTextField</tt> widget. From then on, changes made to the text field will be automatically reflected in the data target's value and vice versa. (For those familiar with Tk, this is the same principal as its <tt>TkVariable</tt> class.)</p></li><li style="list-style-type: disc"><p>Made the <tt>extconf.rb</tt> script a lot more intelligent and robust. Now, if you don't explicitly specify the <tt>--with-fox-include</tt> and <tt>--with-fox-lib</tt> arguments it will look in the standard FOX installation locations (<tt>/usr/local/include/fox</tt> and <tt>/usr/local/lib</tt>, respectively). If it doesn't find the appropriate files there either, it will stop with an error message. The new <tt>extconf.rb</tt> script also compares the FOX version number from the FOX's <tt>fxver.h</tt> file to be sure it's consistent with the version of FXRuby that you're building.</p></li><li style="list-style-type: disc"><p>Revived the missing <tt>FXApp#addTimeout</tt> and <tt>FXApp#removeTimeout</tt> methods, which accidentally got clobbered in the 0.99.166 release.</p></li><li style="list-style-type: disc"><p>Corrected the implementation of <tt>FXWindow#getCursorPosition</tt>. Previously it thought it needed three inputs when in fact it doesn't; this method takes no arguments and returns a 3-element array containing the current <tt>x</tt> and <tt>y</tt> positions (in local window coordinates) and a flag indicating the mouse button states.</p></li><li style="list-style-type: disc"><p>Corrected the implementation of <tt>FXDebugTarget.messageTypeName</tt> to return an array of strings instead of an array of symbols (IDs).</p></li><li style="list-style-type: disc"><p>Added missing wrappers for the <tt>FXJPEGImage</tt> and <tt>FXJPEGIcon</tt> classes; somehow these got overlooked previously.</p></li><li style="list-style-type: disc"><p>Corrected several bugs in the example programs <tt>groupbox.rb</tt>, <tt>imageviewer.rb</tt> and <tt>table.rb</tt>.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e3352"></a>Changes Since Version 0.99.161</h2></div></div><div class="itemizedlist"><ul type="bullet"><li style="list-style-type: disc"><p>In previous releases of FXRuby, not all of the constructor arguments for some class constructors were exposed; this was due to an obscure problem with how SWIG generated code for functions with more than nine default arguments. This problem has been corrected and all class constructor argument lists should now be consistent with the C++ library versions of the same.</p></li><li style="list-style-type: disc"><p>Corrected several bugs related to the conversions between FOX's FXbool (boolean) type and Ruby's <tt>true</tt> and <tt>false</tt> values. These bugs manifested themselves in many weird and wonderful ways; the most obvious one was the way that opening up pulldown menus (for example, in the <tt>foursplit.rb</tt> example) would cause the entire program to lock up. If you were seeing some unusual behavior like this in the previous release my best advice is to see if you can still reproduce the problem (and if so, contact me).</p></li><li style="list-style-type: disc"><p>Added several new example programs (<tt>dialog.rb</tt>, <tt>dirlist.rb</tt>, <tt>groupbox.rb</tt>, <tt>header.rb</tt>, <tt>imageviewer.rb</tt>, <tt>tabbook.rb</tt> and <tt>table.rb</tt>) in the <tt>examples</tt> subdirectory.</p></li><li style="list-style-type: disc"><p>Added support for the <tt>FXFile</tt> class' singleton methods. Most or all of this functionality is already available in Ruby's standard library but <tt>FXFile</tt> is included for completeness.</p></li><li style="list-style-type: disc"><p>Generally speaking, I corrected the (Ruby-side) implementations of a lot of functions and I believe that all of the important ones are exposed correctly. See the <tt>ChangeLog</tt> file for specific cases.</p></li><li style="list-style-type: disc"><p>Started work on tutorial documentation (in the <tt>doc</tt> subdirectory) but this isn't very useful yet. Plans are to beef this up considerably next time.</p></li><li style="list-style-type: disc"><p>Updated the API for compatibility with FOX version 0.99.166.</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e3425"></a>Changes Since Version 0.99.147</h2></div></div><div class="itemizedlist"><ul type="disc"><li><p>The code has been reworked a good deal in an effort to reduce the compile time (although more can and will be done). One part of this change was to break the extension code up into multiple files instead of a single file. The more significant change was to move a lot of inlined template function instantiations out of the FXRuby header file (<tt>FXRuby.h</tt>) and into a separate source code file that only needs to be compiled once. To give you an idea of the compile times after this change, I can now compile FXRuby under Cygwin-on-Win2000 in about 6 minutes (on a Pentium III-700MHz) or under Linux in about 30 minutes (on a Pentium "classic" 133MHz).</p></li><li><p>For classes <tt>FXHeader</tt>, <tt>FXIconList</tt> and <tt>FXList</tt>, added support for the overloaded member functions <tt>appendItem</tt>, <tt>insertItem</tt>, <t t>prependItem</tt>, and <tt>replaceItem</tt>. For classes <tt>FXTreeList</tt> and <tt>FXTreeListBox</tt>, added support for the overloaded member functions <tt>addItemAfter</tt>, <tt>addItemBefore</tt>, <tt>addItemFirst</tt>, and <tt>addItemLast</tt>.</p></li><li><p>Added the <tt>header.rb</tt> example program to demonstrate the <tt>FXHeader</tt> widget.</p></li><li><p>Updated the API for compatibility with FOX version 0.99.161.</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="todo.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="book.html">Up</a></td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Chapter 10. To-do list </td><td width="20%" align="center"><a accesskey="h" href="book.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html> \ No newline at end of file --- 14,16 ---- now be called in either of these equivalent forms:</p><table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">glviewer.backgroundColor = FXHVec.new(0.5, 0.5, 0.5, 1.0)</pre></td></tr></table> or ! <table border="0" bgcolor="#E0E0E0" width="100%"><tr><td><pre class="programlisting">glviewer.backgroundColor = [0.5, 0.5, 0.5, 1.0]</pre></td></tr></table></li><li style="list-style-type: disc"><p>Updated the test case for <tt>FXMaterial</tt>, added a new test case for <tt>FXFileStream</tt>.</p></li><li style="list-style-type: disc"><p>Added aliases <tt>posVisible?</tt> (for <tt>FXTextField#isPosVisible</tt>), <tt>posSelected?</tt> (for <tt>FXTextField#isPosSelected</tt>), <tt>itemCurrent?</tt> (for <tt>FXComboBox#isItemCurrent</tt>), <tt>hasAccel?</tt> (for <tt>FXAccelTable#hasAccel</tt>), <tt>error=</tt> (for <tt>FXStream#setError</tt>), <tt>position=</tt> (for <tt>FXStream#setPosition</tt>) and <tt>position</tt> (for <tt>FXStream#getPosition</tt>).</p></li><li style="list-style-type: disc"><p>The <tt>FXStream</tt>, <tt>FXFileStream</tt> and <tt>FXMemoryStream</tt> classes were not implemented properly, in the sense that if you subclassed one of these classes and then attempted to override one of their virtual functions, that override might not get called (see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=535955&group_id=20243&atid=120243" target="_top">SourceForge Bug #535955</a>). This has been fixed.</p></li><li style="list-style-type: disc"><p>Did some more work on completing the <tt>FXDC</tt> interface, including adding a test case for the same. Also added a new example <tt>dctest.rb</tt> that demonstrates many of the <tt>FXDC</tt> interface.</p></li><li style="list-style-type: disc"><p>All GIF image files have now been replaced with PNG equivalents. For more information on why this is a good idea, see <a href="http://burnallgifs.org" target="_top">this site</a>.</p></li><li style="list-style-type: disc"><p>Starting with this release, Red Hat Linux 7.2 RPMs are now provided in addition to the Windows installer.</p></li><li style="list-style-type: disc"><p>The previous implementation of <tt>FXImage#data</tt> returned a copy of the underlying image pixel data instead of a pointer to the actual data (see <a href="http://sourceforge.net/tracker/index.php?func=detail&aid=550996&group_id=20243&atid=120243" target="_top">SourceForge Bug #550996</a>). This has been fixed. <tt>FXImage#data</tt> now returns an instance of <tt>FXMemoryBuffer</tt> which is an array or string-like class that acts as a very thin layer over the pointer to the pixel data. The <tt>initialize</tt> methods for images and icons were also updated so that they will now accept either strings (as before) or <tt>FXMemoryBuffer</tt> instances as inputs for the image data.</p></li><li style="list-style-type: disc"><p>Modified the <tt>range</tt> and <tt>range=</tt> methods for <tt>FXDial</tt>, <tt>FXSlider</tt> and <tt>FXSpinner</tt> so that they work with Ruby <tt>Range</tt> objects instead of pairs of integers for the low and high values.</p></li><li style="list-style-type: disc"><p>Lots of other little fixes here and there...</p></li></ul></div></div><div class="simplesect"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="d0e2235"></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="d0e2365"></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 signa l 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="d0e2399"></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 FXScintilla 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="d0e2472"></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="d0e2503"></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 orga... [truncated message content] |
From: Lyle J. <ly...@us...> - 2002-05-30 13:58:05
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv17852/ext/fox Modified Files: Tag: release10 extconf.rb.in extconf.rb Log Message: Incorporated Laurent Julliard's patches for the FXRuby.spec and extconf.rb files, to reflect the new installation paths and filenames for FXScintilla. Index: extconf.rb.in =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/Attic/extconf.rb.in,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** extconf.rb.in 10 May 2002 21:30:39 -0000 1.1.2.2 --- extconf.rb.in 30 May 2002 13:58:01 -0000 1.1.2.3 *************** *** 51,55 **** def is_scintilla_build? ! args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) } args.length > 0 end --- 51,55 ---- def is_scintilla_build? ! args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) } args.length > 0 end *************** *** 59,66 **** dir_config('fox', nil, '/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 --- 59,66 ---- 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 *************** *** 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, "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') *************** *** 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, "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') *************** *** 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, "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: extconf.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v retrieving revision 1.27.2.3 retrieving revision 1.27.2.4 diff -C2 -d -r1.27.2.3 -r1.27.2.4 *** extconf.rb 10 May 2002 21:30:39 -0000 1.27.2.3 --- extconf.rb 30 May 2002 13:58:02 -0000 1.27.2.4 *************** *** 51,55 **** def is_scintilla_build? ! args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) } args.length > 0 end --- 51,55 ---- def is_scintilla_build? ! args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) } args.length > 0 end *************** *** 59,66 **** dir_config('fox', nil, '/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 --- 59,66 ---- 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 *************** *** 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, "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') *************** *** 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, "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') *************** *** 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, "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') |
From: Lyle J. <ly...@us...> - 2002-05-30 13:58:05
|
Update of /cvsroot/fxruby/FXRuby In directory usw-pr-cvs1:/tmp/cvs-serv17852 Modified Files: Tag: release10 FXRuby.spec FXRuby.spec.in Log Message: Incorporated Laurent Julliard's patches for the FXRuby.spec and extconf.rb files, to reflect the new installation paths and filenames for FXScintilla. Index: FXRuby.spec =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** FXRuby.spec 15 May 2002 14:44:54 -0000 1.1.2.7 --- FXRuby.spec 30 May 2002 13:58:01 -0000 1.1.2.8 *************** *** 18,22 **** %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr -- --with-scintilla-include=/home/jlj/src/scintilla/include --with-scintilla-lib=/home/jlj/src/scintilla/bin ruby install.rb setup strip ext/fox/fox.so --- 18,22 ---- %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr -- --with-fxscintilla-include=/usr/include/fxscintilla --with-fxscintilla-lib=/usr/lib ruby install.rb setup strip ext/fox/fox.so Index: FXRuby.spec.in =================================================================== RCS file: /cvsroot/fxruby/FXRuby/Attic/FXRuby.spec.in,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** FXRuby.spec.in 15 May 2002 14:44:54 -0000 1.1.2.3 --- FXRuby.spec.in 30 May 2002 13:58:01 -0000 1.1.2.4 *************** *** 18,22 **** %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr -- --with-scintilla-include=/home/jlj/src/scintilla/include --with-scintilla-lib=/home/jlj/src/scintilla/bin ruby install.rb setup strip ext/fox/fox.so --- 18,22 ---- %build ! ruby install.rb config --prefix=$RPM_BUILD_ROOT/usr -- --with-fxscintilla-include=/usr/include/fxscintilla --with-fxscintilla-lib=/usr/lib ruby install.rb setup strip ext/fox/fox.so |
From: Lyle J. <ly...@us...> - 2002-05-29 16:51:21
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv15529/ext/fox Modified Files: Tag: release10 core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp librb.c mdi_wrap.cpp opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp Log Message: Updates for compatibility with the latest SWIG (mainly, that the wrapper names for the new and initialize methods changed). Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.16 retrieving revision 1.62.2.17 diff -C2 -d -r1.62.2.16 -r1.62.2.17 *** core_wrap.cpp 24 May 2002 22:20:41 -0000 1.62.2.16 --- core_wrap.cpp 29 May 2002 16:50:49 -0000 1.62.2.17 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * [...2578 lines suppressed...] SWIG_TypeClientData(SWIGTYPE_p_FXDocument, (void *) &cFX_Document); ! rb_define_singleton_method(cFX_Document.klass, "new", VALUEFUNC(_wrap_FX_Document_allocate), -1); ! rb_define_method(cFX_Document.klass, "initialize", VALUEFUNC(_wrap_new_FX_Document), -1); rb_define_method(cFX_Document.klass, "onUpdTitle", VALUEFUNC(_wrap_FX_Document_onUpdTitle), -1); rb_define_method(cFX_Document.klass, "onUpdFilename", VALUEFUNC(_wrap_FX_Document_onUpdFilename), -1); *************** *** 19519,19524 **** 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_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); --- 19520,19525 ---- 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.2.14 retrieving revision 1.34.2.15 diff -C2 -d -r1.34.2.14 -r1.34.2.15 *** dialogs_wrap.cpp 24 May 2002 22:20:47 -0000 1.34.2.14 --- dialogs_wrap.cpp 29 May 2002 16:50:53 -0000 1.34.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * [...1057 lines suppressed...] SWIG_TypeClientData(SWIGTYPE_p_FXMessageBox, (void *) &cFX_MessageBox); ! rb_define_singleton_method(cFX_MessageBox.klass, "new", VALUEFUNC(_wrap_FX_MessageBox_allocate), -1); ! rb_define_method(cFX_MessageBox.klass, "initialize", VALUEFUNC(_wrap_new_FX_MessageBox), -1); rb_define_method(cFX_MessageBox.klass, "onCmdClicked", VALUEFUNC(_wrap_FX_MessageBox_onCmdClicked), -1); rb_define_method(cFX_MessageBox.klass, "onCmdCancel", VALUEFUNC(_wrap_FX_MessageBox_onCmdCancel), -1); *************** *** 14099,14104 **** 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_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); --- 14096,14101 ---- 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: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.37.2.15 retrieving revision 1.37.2.16 diff -C2 -d -r1.37.2.15 -r1.37.2.16 *** icons_wrap.cpp 24 May 2002 22:20:47 -0000 1.37.2.15 --- icons_wrap.cpp 29 May 2002 16:50:54 -0000 1.37.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of *************** *** 28,31 **** --- 28,32 ---- #include "ruby.h" + #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) *************** *** 508,512 **** static VALUE ! _wrap_new_FX_Icon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXIcon); rb_obj_call_init(vresult, argc, argv); --- 509,513 ---- static VALUE ! _wrap_FX_Icon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 516,520 **** static VALUE ! _wrap_FX_Icon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 517,521 ---- static VALUE ! _wrap_new_FX_Icon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 667,671 **** } static VALUE ! _wrap_new_FXIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbIcon); rb_obj_call_init(vresult, argc, argv); --- 668,672 ---- } static VALUE ! _wrap_FXIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 675,679 **** static VALUE ! _wrap_FXIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 676,680 ---- static VALUE ! _wrap_new_FXIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 970,974 **** static VALUE ! _wrap_new_FX_BMPIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXBMPIcon); rb_obj_call_init(vresult, argc, argv); --- 971,975 ---- static VALUE ! _wrap_FX_BMPIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXBMPIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 978,982 **** static VALUE ! _wrap_FX_BMPIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 979,983 ---- static VALUE ! _wrap_new_FX_BMPIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 1024,1028 **** } static VALUE ! _wrap_new_FXBMPIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbBMPIcon); rb_obj_call_init(vresult, argc, argv); --- 1025,1029 ---- } static VALUE ! _wrap_FXBMPIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbBMPIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 1032,1036 **** static VALUE ! _wrap_FXBMPIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 1033,1037 ---- static VALUE ! _wrap_new_FXBMPIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 1369,1373 **** static VALUE ! _wrap_new_FX_GIFIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXGIFIcon); rb_obj_call_init(vresult, argc, argv); --- 1370,1374 ---- static VALUE ! _wrap_FX_GIFIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXGIFIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 1377,1381 **** static VALUE ! _wrap_FX_GIFIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 1378,1382 ---- static VALUE ! _wrap_new_FX_GIFIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 1423,1427 **** } static VALUE ! _wrap_new_FXGIFIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbGIFIcon); rb_obj_call_init(vresult, argc, argv); --- 1424,1428 ---- } static VALUE ! _wrap_FXGIFIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbGIFIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 1431,1435 **** static VALUE ! _wrap_FXGIFIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 1432,1436 ---- static VALUE ! _wrap_new_FXGIFIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 1721,1725 **** static VALUE ! _wrap_new_FX_ICOIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXICOIcon); rb_obj_call_init(vresult, argc, argv); --- 1722,1726 ---- static VALUE ! _wrap_FX_ICOIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXICOIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 1729,1733 **** static VALUE ! _wrap_FX_ICOIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 1730,1734 ---- static VALUE ! _wrap_new_FX_ICOIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 1775,1779 **** } static VALUE ! _wrap_new_FXICOIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbICOIcon); rb_obj_call_init(vresult, argc, argv); --- 1776,1780 ---- } static VALUE ! _wrap_FXICOIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbICOIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 1783,1787 **** static VALUE ! _wrap_FXICOIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 1784,1788 ---- static VALUE ! _wrap_new_FXICOIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 2120,2124 **** static VALUE ! _wrap_new_FX_JPGIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXJPGIcon); rb_obj_call_init(vresult, argc, argv); --- 2121,2125 ---- static VALUE ! _wrap_FX_JPGIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXJPGIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 2128,2132 **** static VALUE ! _wrap_FX_JPGIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 2129,2133 ---- static VALUE ! _wrap_new_FX_JPGIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 2205,2209 **** } static VALUE ! _wrap_new_FXJPGIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbJPGIcon); rb_obj_call_init(vresult, argc, argv); --- 2206,2210 ---- } static VALUE ! _wrap_FXJPGIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbJPGIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 2213,2217 **** static VALUE ! _wrap_FXJPGIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 2214,2218 ---- static VALUE ! _wrap_new_FXJPGIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 2503,2507 **** static VALUE ! _wrap_new_FX_PCXIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXPCXIcon); rb_obj_call_init(vresult, argc, argv); --- 2504,2508 ---- static VALUE ! _wrap_FX_PCXIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXPCXIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 2511,2515 **** static VALUE ! _wrap_FX_PCXIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 2512,2516 ---- static VALUE ! _wrap_new_FX_PCXIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 2557,2561 **** } static VALUE ! _wrap_new_FXPCXIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbPCXIcon); rb_obj_call_init(vresult, argc, argv); --- 2558,2562 ---- } static VALUE ! _wrap_FXPCXIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbPCXIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 2565,2569 **** static VALUE ! _wrap_FXPCXIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 2566,2570 ---- static VALUE ! _wrap_new_FXPCXIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 2902,2906 **** static VALUE ! _wrap_new_FX_PNGIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXPNGIcon); rb_obj_call_init(vresult, argc, argv); --- 2903,2907 ---- static VALUE ! _wrap_FX_PNGIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXPNGIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 2910,2914 **** static VALUE ! _wrap_FX_PNGIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 2911,2915 ---- static VALUE ! _wrap_new_FX_PNGIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 2986,2990 **** } static VALUE ! _wrap_new_FXPNGIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbPNGIcon); rb_obj_call_init(vresult, argc, argv); --- 2987,2991 ---- } static VALUE ! _wrap_FXPNGIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbPNGIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 2994,2998 **** static VALUE ! _wrap_FXPNGIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 2995,2999 ---- static VALUE ! _wrap_new_FXPNGIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 3331,3335 **** static VALUE ! _wrap_new_FX_RGBIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRGBIcon); rb_obj_call_init(vresult, argc, argv); --- 3332,3336 ---- static VALUE ! _wrap_FX_RGBIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRGBIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 3339,3343 **** static VALUE ! _wrap_FX_RGBIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 3340,3344 ---- static VALUE ! _wrap_new_FX_RGBIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 3385,3389 **** } static VALUE ! _wrap_new_FXRGBIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbRGBIcon); rb_obj_call_init(vresult, argc, argv); --- 3386,3390 ---- } static VALUE ! _wrap_FXRGBIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbRGBIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 3393,3397 **** static VALUE ! _wrap_FXRGBIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 3394,3398 ---- static VALUE ! _wrap_new_FXRGBIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 3683,3687 **** static VALUE ! _wrap_new_FXTGAIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXTGAIcon); rb_obj_call_init(vresult, argc, argv); --- 3684,3688 ---- static VALUE ! _wrap_FXTGAIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXTGAIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 3691,3695 **** static VALUE ! _wrap_FXTGAIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 3692,3696 ---- static VALUE ! _wrap_new_FXTGAIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 3737,3741 **** } static VALUE ! _wrap_new_FXRbTGAIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbTGAIcon); rb_obj_call_init(vresult, argc, argv); --- 3738,3742 ---- } static VALUE ! _wrap_FXRbTGAIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbTGAIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 3745,3749 **** static VALUE ! _wrap_FXRbTGAIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 3746,3750 ---- static VALUE ! _wrap_new_FXRbTGAIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 4035,4039 **** static VALUE ! _wrap_new_FX_TIFIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXTIFIcon); rb_obj_call_init(vresult, argc, argv); --- 4036,4040 ---- static VALUE ! _wrap_FX_TIFIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXTIFIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 4043,4047 **** static VALUE ! _wrap_FX_TIFIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 4044,4048 ---- static VALUE ! _wrap_new_FX_TIFIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 4120,4124 **** } static VALUE ! _wrap_new_FXTIFIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbTIFIcon); rb_obj_call_init(vresult, argc, argv); --- 4121,4125 ---- } static VALUE ! _wrap_FXTIFIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbTIFIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 4128,4132 **** static VALUE ! _wrap_FXTIFIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; --- 4129,4133 ---- static VALUE ! _wrap_new_FXTIFIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; void *arg2 = 0 ; *************** *** 4418,4422 **** static VALUE ! _wrap_new_FX_XPMIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXXPMIcon); rb_obj_call_init(vresult, argc, argv); --- 4419,4423 ---- static VALUE ! _wrap_FX_XPMIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXXPMIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 4426,4430 **** static VALUE ! _wrap_FX_XPMIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXchar **arg2 = 0 ; --- 4427,4431 ---- static VALUE ! _wrap_new_FX_XPMIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXchar **arg2 = 0 ; *************** *** 4476,4480 **** } static VALUE ! _wrap_new_FXXPMIcon(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbXPMIcon); rb_obj_call_init(vresult, argc, argv); --- 4477,4481 ---- } static VALUE ! _wrap_FXXPMIcon_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbXPMIcon); rb_obj_call_init(vresult, argc, argv); *************** *** 4484,4488 **** static VALUE ! _wrap_FXXPMIcon_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXchar **arg2 = 0 ; --- 4485,4489 ---- static VALUE ! _wrap_new_FXXPMIcon(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXchar **arg2 = 0 ; *************** *** 7005,7010 **** cFX_Icon.klass = rb_define_class_under(mFox, "FX_Icon", ((swig_class *) SWIGTYPE_p_FXImage->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXIcon, (void *) &cFX_Icon); ! rb_define_singleton_method(cFX_Icon.klass, "new", VALUEFUNC(_wrap_new_FX_Icon), -1); ! rb_define_method(cFX_Icon.klass, "initialize", VALUEFUNC(_wrap_FX_Icon_initialize), -1); rb_define_method(cFX_Icon.klass, "create", VALUEFUNC(_wrap_FX_Icon_create), -1); rb_define_method(cFX_Icon.klass, "detach", VALUEFUNC(_wrap_FX_Icon_detach), -1); --- 7006,7011 ---- cFX_Icon.klass = rb_define_class_under(mFox, "FX_Icon", ((swig_class *) SWIGTYPE_p_FXImage->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXIcon, (void *) &cFX_Icon); ! rb_define_singleton_method(cFX_Icon.klass, "new", VALUEFUNC(_wrap_FX_Icon_allocate), -1); ! rb_define_method(cFX_Icon.klass, "initialize", VALUEFUNC(_wrap_new_FX_Icon), -1); rb_define_method(cFX_Icon.klass, "create", VALUEFUNC(_wrap_FX_Icon_create), -1); rb_define_method(cFX_Icon.klass, "detach", VALUEFUNC(_wrap_FX_Icon_detach), -1); *************** *** 7019,7024 **** cFXIcon.klass = rb_define_class_under(mFox, "FXIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbIcon, (void *) &cFXIcon); ! rb_define_singleton_method(cFXIcon.klass, "new", VALUEFUNC(_wrap_new_FXIcon), -1); ! rb_define_method(cFXIcon.klass, "initialize", VALUEFUNC(_wrap_FXIcon_initialize), -1); rb_define_method(cFXIcon.klass, "onDefault", VALUEFUNC(_wrap_FXIcon_onDefault), -1); rb_define_method(cFXIcon.klass, "save", VALUEFUNC(_wrap_FXIcon_save), -1); --- 7020,7025 ---- cFXIcon.klass = rb_define_class_under(mFox, "FXIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbIcon, (void *) &cFXIcon); ! rb_define_singleton_method(cFXIcon.klass, "new", VALUEFUNC(_wrap_FXIcon_allocate), -1); ! rb_define_method(cFXIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXIcon), -1); rb_define_method(cFXIcon.klass, "onDefault", VALUEFUNC(_wrap_FXIcon_onDefault), -1); rb_define_method(cFXIcon.klass, "save", VALUEFUNC(_wrap_FXIcon_save), -1); *************** *** 7041,7046 **** cFX_BMPIcon.klass = rb_define_class_under(mFox, "FX_BMPIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXBMPIcon, (void *) &cFX_BMPIcon); ! rb_define_singleton_method(cFX_BMPIcon.klass, "new", VALUEFUNC(_wrap_new_FX_BMPIcon), -1); ! rb_define_method(cFX_BMPIcon.klass, "initialize", VALUEFUNC(_wrap_FX_BMPIcon_initialize), -1); cFX_BMPIcon.mark = (void (*)(void *)) FXRbBMPIcon::markfunc; cFX_BMPIcon.destroy = (void (*)(void *)) free_FXBMPIcon; --- 7042,7047 ---- cFX_BMPIcon.klass = rb_define_class_under(mFox, "FX_BMPIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXBMPIcon, (void *) &cFX_BMPIcon); ! rb_define_singleton_method(cFX_BMPIcon.klass, "new", VALUEFUNC(_wrap_FX_BMPIcon_allocate), -1); ! rb_define_method(cFX_BMPIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_BMPIcon), -1); cFX_BMPIcon.mark = (void (*)(void *)) FXRbBMPIcon::markfunc; cFX_BMPIcon.destroy = (void (*)(void *)) free_FXBMPIcon; *************** *** 7048,7053 **** cFXBMPIcon.klass = rb_define_class_under(mFox, "FXBMPIcon", ((swig_class *) SWIGTYPE_p_FXBMPIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbBMPIcon, (void *) &cFXBMPIcon); ! rb_define_singleton_method(cFXBMPIcon.klass, "new", VALUEFUNC(_wrap_new_FXBMPIcon), -1); ! rb_define_method(cFXBMPIcon.klass, "initialize", VALUEFUNC(_wrap_FXBMPIcon_initialize), -1); rb_define_method(cFXBMPIcon.klass, "onDefault", VALUEFUNC(_wrap_FXBMPIcon_onDefault), -1); rb_define_method(cFXBMPIcon.klass, "save", VALUEFUNC(_wrap_FXBMPIcon_save), -1); --- 7049,7054 ---- cFXBMPIcon.klass = rb_define_class_under(mFox, "FXBMPIcon", ((swig_class *) SWIGTYPE_p_FXBMPIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbBMPIcon, (void *) &cFXBMPIcon); ! rb_define_singleton_method(cFXBMPIcon.klass, "new", VALUEFUNC(_wrap_FXBMPIcon_allocate), -1); ! rb_define_method(cFXBMPIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXBMPIcon), -1); rb_define_method(cFXBMPIcon.klass, "onDefault", VALUEFUNC(_wrap_FXBMPIcon_onDefault), -1); rb_define_method(cFXBMPIcon.klass, "save", VALUEFUNC(_wrap_FXBMPIcon_save), -1); *************** *** 7072,7077 **** cFX_GIFIcon.klass = rb_define_class_under(mFox, "FX_GIFIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXGIFIcon, (void *) &cFX_GIFIcon); ! rb_define_singleton_method(cFX_GIFIcon.klass, "new", VALUEFUNC(_wrap_new_FX_GIFIcon), -1); ! rb_define_method(cFX_GIFIcon.klass, "initialize", VALUEFUNC(_wrap_FX_GIFIcon_initialize), -1); cFX_GIFIcon.mark = (void (*)(void *)) FXRbGIFIcon::markfunc; cFX_GIFIcon.destroy = (void (*)(void *)) free_FXGIFIcon; --- 7073,7078 ---- cFX_GIFIcon.klass = rb_define_class_under(mFox, "FX_GIFIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXGIFIcon, (void *) &cFX_GIFIcon); ! rb_define_singleton_method(cFX_GIFIcon.klass, "new", VALUEFUNC(_wrap_FX_GIFIcon_allocate), -1); ! rb_define_method(cFX_GIFIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_GIFIcon), -1); cFX_GIFIcon.mark = (void (*)(void *)) FXRbGIFIcon::markfunc; cFX_GIFIcon.destroy = (void (*)(void *)) free_FXGIFIcon; *************** *** 7079,7084 **** cFXGIFIcon.klass = rb_define_class_under(mFox, "FXGIFIcon", ((swig_class *) SWIGTYPE_p_FXGIFIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbGIFIcon, (void *) &cFXGIFIcon); ! rb_define_singleton_method(cFXGIFIcon.klass, "new", VALUEFUNC(_wrap_new_FXGIFIcon), -1); ! rb_define_method(cFXGIFIcon.klass, "initialize", VALUEFUNC(_wrap_FXGIFIcon_initialize), -1); rb_define_method(cFXGIFIcon.klass, "onDefault", VALUEFUNC(_wrap_FXGIFIcon_onDefault), -1); rb_define_method(cFXGIFIcon.klass, "save", VALUEFUNC(_wrap_FXGIFIcon_save), -1); --- 7080,7085 ---- cFXGIFIcon.klass = rb_define_class_under(mFox, "FXGIFIcon", ((swig_class *) SWIGTYPE_p_FXGIFIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbGIFIcon, (void *) &cFXGIFIcon); ! rb_define_singleton_method(cFXGIFIcon.klass, "new", VALUEFUNC(_wrap_FXGIFIcon_allocate), -1); ! rb_define_method(cFXGIFIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXGIFIcon), -1); rb_define_method(cFXGIFIcon.klass, "onDefault", VALUEFUNC(_wrap_FXGIFIcon_onDefault), -1); rb_define_method(cFXGIFIcon.klass, "save", VALUEFUNC(_wrap_FXGIFIcon_save), -1); *************** *** 7101,7106 **** cFX_ICOIcon.klass = rb_define_class_under(mFox, "FX_ICOIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXICOIcon, (void *) &cFX_ICOIcon); ! rb_define_singleton_method(cFX_ICOIcon.klass, "new", VALUEFUNC(_wrap_new_FX_ICOIcon), -1); ! rb_define_method(cFX_ICOIcon.klass, "initialize", VALUEFUNC(_wrap_FX_ICOIcon_initialize), -1); cFX_ICOIcon.mark = (void (*)(void *)) FXRbICOIcon::markfunc; cFX_ICOIcon.destroy = (void (*)(void *)) free_FXICOIcon; --- 7102,7107 ---- cFX_ICOIcon.klass = rb_define_class_under(mFox, "FX_ICOIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXICOIcon, (void *) &cFX_ICOIcon); ! rb_define_singleton_method(cFX_ICOIcon.klass, "new", VALUEFUNC(_wrap_FX_ICOIcon_allocate), -1); ! rb_define_method(cFX_ICOIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_ICOIcon), -1); cFX_ICOIcon.mark = (void (*)(void *)) FXRbICOIcon::markfunc; cFX_ICOIcon.destroy = (void (*)(void *)) free_FXICOIcon; *************** *** 7108,7113 **** cFXICOIcon.klass = rb_define_class_under(mFox, "FXICOIcon", ((swig_class *) SWIGTYPE_p_FXICOIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbICOIcon, (void *) &cFXICOIcon); ! rb_define_singleton_method(cFXICOIcon.klass, "new", VALUEFUNC(_wrap_new_FXICOIcon), -1); ! rb_define_method(cFXICOIcon.klass, "initialize", VALUEFUNC(_wrap_FXICOIcon_initialize), -1); rb_define_method(cFXICOIcon.klass, "onDefault", VALUEFUNC(_wrap_FXICOIcon_onDefault), -1); rb_define_method(cFXICOIcon.klass, "save", VALUEFUNC(_wrap_FXICOIcon_save), -1); --- 7109,7114 ---- cFXICOIcon.klass = rb_define_class_under(mFox, "FXICOIcon", ((swig_class *) SWIGTYPE_p_FXICOIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbICOIcon, (void *) &cFXICOIcon); ! rb_define_singleton_method(cFXICOIcon.klass, "new", VALUEFUNC(_wrap_FXICOIcon_allocate), -1); ! rb_define_method(cFXICOIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXICOIcon), -1); rb_define_method(cFXICOIcon.klass, "onDefault", VALUEFUNC(_wrap_FXICOIcon_onDefault), -1); rb_define_method(cFXICOIcon.klass, "save", VALUEFUNC(_wrap_FXICOIcon_save), -1); *************** *** 7132,7137 **** cFX_JPGIcon.klass = rb_define_class_under(mFox, "FX_JPGIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXJPGIcon, (void *) &cFX_JPGIcon); ! rb_define_singleton_method(cFX_JPGIcon.klass, "new", VALUEFUNC(_wrap_new_FX_JPGIcon), -1); ! rb_define_method(cFX_JPGIcon.klass, "initialize", VALUEFUNC(_wrap_FX_JPGIcon_initialize), -1); rb_define_method(cFX_JPGIcon.klass, "setQuality", VALUEFUNC(_wrap_FX_JPGIcon_setQuality), -1); rb_define_method(cFX_JPGIcon.klass, "getQuality", VALUEFUNC(_wrap_FX_JPGIcon_getQuality), -1); --- 7133,7138 ---- cFX_JPGIcon.klass = rb_define_class_under(mFox, "FX_JPGIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXJPGIcon, (void *) &cFX_JPGIcon); ! rb_define_singleton_method(cFX_JPGIcon.klass, "new", VALUEFUNC(_wrap_FX_JPGIcon_allocate), -1); ! rb_define_method(cFX_JPGIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_JPGIcon), -1); rb_define_method(cFX_JPGIcon.klass, "setQuality", VALUEFUNC(_wrap_FX_JPGIcon_setQuality), -1); rb_define_method(cFX_JPGIcon.klass, "getQuality", VALUEFUNC(_wrap_FX_JPGIcon_getQuality), -1); *************** *** 7141,7146 **** cFXJPGIcon.klass = rb_define_class_under(mFox, "FXJPGIcon", ((swig_class *) SWIGTYPE_p_FXJPGIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbJPGIcon, (void *) &cFXJPGIcon); ! rb_define_singleton_method(cFXJPGIcon.klass, "new", VALUEFUNC(_wrap_new_FXJPGIcon), -1); ! rb_define_method(cFXJPGIcon.klass, "initialize", VALUEFUNC(_wrap_FXJPGIcon_initialize), -1); rb_define_method(cFXJPGIcon.klass, "onDefault", VALUEFUNC(_wrap_FXJPGIcon_onDefault), -1); rb_define_method(cFXJPGIcon.klass, "save", VALUEFUNC(_wrap_FXJPGIcon_save), -1); --- 7142,7147 ---- cFXJPGIcon.klass = rb_define_class_under(mFox, "FXJPGIcon", ((swig_class *) SWIGTYPE_p_FXJPGIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbJPGIcon, (void *) &cFXJPGIcon); ! rb_define_singleton_method(cFXJPGIcon.klass, "new", VALUEFUNC(_wrap_FXJPGIcon_allocate), -1); ! rb_define_method(cFXJPGIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXJPGIcon), -1); rb_define_method(cFXJPGIcon.klass, "onDefault", VALUEFUNC(_wrap_FXJPGIcon_onDefault), -1); rb_define_method(cFXJPGIcon.klass, "save", VALUEFUNC(_wrap_FXJPGIcon_save), -1); *************** *** 7163,7168 **** cFX_PCXIcon.klass = rb_define_class_under(mFox, "FX_PCXIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXPCXIcon, (void *) &cFX_PCXIcon); ! rb_define_singleton_method(cFX_PCXIcon.klass, "new", VALUEFUNC(_wrap_new_FX_PCXIcon), -1); ! rb_define_method(cFX_PCXIcon.klass, "initialize", VALUEFUNC(_wrap_FX_PCXIcon_initialize), -1); cFX_PCXIcon.mark = (void (*)(void *)) FXRbPCXIcon::markfunc; cFX_PCXIcon.destroy = (void (*)(void *)) free_FXPCXIcon; --- 7164,7169 ---- cFX_PCXIcon.klass = rb_define_class_under(mFox, "FX_PCXIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXPCXIcon, (void *) &cFX_PCXIcon); ! rb_define_singleton_method(cFX_PCXIcon.klass, "new", VALUEFUNC(_wrap_FX_PCXIcon_allocate), -1); ! rb_define_method(cFX_PCXIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_PCXIcon), -1); cFX_PCXIcon.mark = (void (*)(void *)) FXRbPCXIcon::markfunc; cFX_PCXIcon.destroy = (void (*)(void *)) free_FXPCXIcon; *************** *** 7170,7175 **** cFXPCXIcon.klass = rb_define_class_under(mFox, "FXPCXIcon", ((swig_class *) SWIGTYPE_p_FXPCXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbPCXIcon, (void *) &cFXPCXIcon); ! rb_define_singleton_method(cFXPCXIcon.klass, "new", VALUEFUNC(_wrap_new_FXPCXIcon), -1); ! rb_define_method(cFXPCXIcon.klass, "initialize", VALUEFUNC(_wrap_FXPCXIcon_initialize), -1); rb_define_method(cFXPCXIcon.klass, "onDefault", VALUEFUNC(_wrap_FXPCXIcon_onDefault), -1); rb_define_method(cFXPCXIcon.klass, "save", VALUEFUNC(_wrap_FXPCXIcon_save), -1); --- 7171,7176 ---- cFXPCXIcon.klass = rb_define_class_under(mFox, "FXPCXIcon", ((swig_class *) SWIGTYPE_p_FXPCXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbPCXIcon, (void *) &cFXPCXIcon); ! rb_define_singleton_method(cFXPCXIcon.klass, "new", VALUEFUNC(_wrap_FXPCXIcon_allocate), -1); ! rb_define_method(cFXPCXIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXPCXIcon), -1); rb_define_method(cFXPCXIcon.klass, "onDefault", VALUEFUNC(_wrap_FXPCXIcon_onDefault), -1); rb_define_method(cFXPCXIcon.klass, "save", VALUEFUNC(_wrap_FXPCXIcon_save), -1); *************** *** 7194,7199 **** cFX_PNGIcon.klass = rb_define_class_under(mFox, "FX_PNGIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXPNGIcon, (void *) &cFX_PNGIcon); ! rb_define_singleton_method(cFX_PNGIcon.klass, "new", VALUEFUNC(_wrap_new_FX_PNGIcon), -1); ! rb_define_method(cFX_PNGIcon.klass, "initialize", VALUEFUNC(_wrap_FX_PNGIcon_initialize), -1); rb_define_method(cFX_PNGIcon.klass, "savePixels", VALUEFUNC(_wrap_FX_PNGIcon_savePixels), -1); rb_define_method(cFX_PNGIcon.klass, "loadPixels", VALUEFUNC(_wrap_FX_PNGIcon_loadPixels), -1); --- 7195,7200 ---- cFX_PNGIcon.klass = rb_define_class_under(mFox, "FX_PNGIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXPNGIcon, (void *) &cFX_PNGIcon); ! rb_define_singleton_method(cFX_PNGIcon.klass, "new", VALUEFUNC(_wrap_FX_PNGIcon_allocate), -1); ! rb_define_method(cFX_PNGIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_PNGIcon), -1); rb_define_method(cFX_PNGIcon.klass, "savePixels", VALUEFUNC(_wrap_FX_PNGIcon_savePixels), -1); rb_define_method(cFX_PNGIcon.klass, "loadPixels", VALUEFUNC(_wrap_FX_PNGIcon_loadPixels), -1); *************** *** 7203,7208 **** cFXPNGIcon.klass = rb_define_class_under(mFox, "FXPNGIcon", ((swig_class *) SWIGTYPE_p_FXPNGIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbPNGIcon, (void *) &cFXPNGIcon); ! rb_define_singleton_method(cFXPNGIcon.klass, "new", VALUEFUNC(_wrap_new_FXPNGIcon), -1); ! rb_define_method(cFXPNGIcon.klass, "initialize", VALUEFUNC(_wrap_FXPNGIcon_initialize), -1); rb_define_method(cFXPNGIcon.klass, "onDefault", VALUEFUNC(_wrap_FXPNGIcon_onDefault), -1); rb_define_method(cFXPNGIcon.klass, "save", VALUEFUNC(_wrap_FXPNGIcon_save), -1); --- 7204,7209 ---- cFXPNGIcon.klass = rb_define_class_under(mFox, "FXPNGIcon", ((swig_class *) SWIGTYPE_p_FXPNGIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbPNGIcon, (void *) &cFXPNGIcon); ! rb_define_singleton_method(cFXPNGIcon.klass, "new", VALUEFUNC(_wrap_FXPNGIcon_allocate), -1); ! rb_define_method(cFXPNGIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXPNGIcon), -1); rb_define_method(cFXPNGIcon.klass, "onDefault", VALUEFUNC(_wrap_FXPNGIcon_onDefault), -1); rb_define_method(cFXPNGIcon.klass, "save", VALUEFUNC(_wrap_FXPNGIcon_save), -1); *************** *** 7227,7232 **** cFX_RGBIcon.klass = rb_define_class_under(mFox, "FX_RGBIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRGBIcon, (void *) &cFX_RGBIcon); ! rb_define_singleton_method(cFX_RGBIcon.klass, "new", VALUEFUNC(_wrap_new_FX_RGBIcon), -1); ! rb_define_method(cFX_RGBIcon.klass, "initialize", VALUEFUNC(_wrap_FX_RGBIcon_initialize), -1); cFX_RGBIcon.mark = (void (*)(void *)) FXRbRGBIcon::markfunc; cFX_RGBIcon.destroy = (void (*)(void *)) free_FXRGBIcon; --- 7228,7233 ---- cFX_RGBIcon.klass = rb_define_class_under(mFox, "FX_RGBIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRGBIcon, (void *) &cFX_RGBIcon); ! rb_define_singleton_method(cFX_RGBIcon.klass, "new", VALUEFUNC(_wrap_FX_RGBIcon_allocate), -1); ! rb_define_method(cFX_RGBIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_RGBIcon), -1); cFX_RGBIcon.mark = (void (*)(void *)) FXRbRGBIcon::markfunc; cFX_RGBIcon.destroy = (void (*)(void *)) free_FXRGBIcon; *************** *** 7234,7239 **** cFXRGBIcon.klass = rb_define_class_under(mFox, "FXRGBIcon", ((swig_class *) SWIGTYPE_p_FXRGBIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbRGBIcon, (void *) &cFXRGBIcon); ! rb_define_singleton_method(cFXRGBIcon.klass, "new", VALUEFUNC(_wrap_new_FXRGBIcon), -1); ! rb_define_method(cFXRGBIcon.klass, "initialize", VALUEFUNC(_wrap_FXRGBIcon_initialize), -1); rb_define_method(cFXRGBIcon.klass, "onDefault", VALUEFUNC(_wrap_FXRGBIcon_onDefault), -1); rb_define_method(cFXRGBIcon.klass, "save", VALUEFUNC(_wrap_FXRGBIcon_save), -1); --- 7235,7240 ---- cFXRGBIcon.klass = rb_define_class_under(mFox, "FXRGBIcon", ((swig_class *) SWIGTYPE_p_FXRGBIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbRGBIcon, (void *) &cFXRGBIcon); ! rb_define_singleton_method(cFXRGBIcon.klass, "new", VALUEFUNC(_wrap_FXRGBIcon_allocate), -1); ! rb_define_method(cFXRGBIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXRGBIcon), -1); rb_define_method(cFXRGBIcon.klass, "onDefault", VALUEFUNC(_wrap_FXRGBIcon_onDefault), -1); rb_define_method(cFXRGBIcon.klass, "save", VALUEFUNC(_wrap_FXRGBIcon_save), -1); *************** *** 7256,7261 **** cFXTGAIcon.klass = rb_define_class_under(mFox, "FXTGAIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXTGAIcon, (void *) &cFXTGAIcon); ! rb_define_singleton_method(cFXTGAIcon.klass, "new", VALUEFUNC(_wrap_new_FXTGAIcon), -1); ! rb_define_method(cFXTGAIcon.klass, "initialize", VALUEFUNC(_wrap_FXTGAIcon_initialize), -1); cFXTGAIcon.mark = 0; cFXTGAIcon.destroy = (void (*)(void *)) free_FXTGAIcon; --- 7257,7262 ---- cFXTGAIcon.klass = rb_define_class_under(mFox, "FXTGAIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXTGAIcon, (void *) &cFXTGAIcon); ! rb_define_singleton_method(cFXTGAIcon.klass, "new", VALUEFUNC(_wrap_FXTGAIcon_allocate), -1); ! rb_define_method(cFXTGAIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXTGAIcon), -1); cFXTGAIcon.mark = 0; cFXTGAIcon.destroy = (void (*)(void *)) free_FXTGAIcon; *************** *** 7263,7268 **** cFXRbTGAIcon.klass = rb_define_class_under(mFox, "FXRbTGAIcon", ((swig_class *) SWIGTYPE_p_FXTGAIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbTGAIcon, (void *) &cFXRbTGAIcon); ! rb_define_singleton_method(cFXRbTGAIcon.klass, "new", VALUEFUNC(_wrap_new_FXRbTGAIcon), -1); ! rb_define_method(cFXRbTGAIcon.klass, "initialize", VALUEFUNC(_wrap_FXRbTGAIcon_initialize), -1); rb_define_method(cFXRbTGAIcon.klass, "onDefault", VALUEFUNC(_wrap_FXRbTGAIcon_onDefault), -1); rb_define_method(cFXRbTGAIcon.klass, "save", VALUEFUNC(_wrap_FXRbTGAIcon_save), -1); --- 7264,7269 ---- cFXRbTGAIcon.klass = rb_define_class_under(mFox, "FXRbTGAIcon", ((swig_class *) SWIGTYPE_p_FXTGAIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbTGAIcon, (void *) &cFXRbTGAIcon); ! rb_define_singleton_method(cFXRbTGAIcon.klass, "new", VALUEFUNC(_wrap_FXRbTGAIcon_allocate), -1); ! rb_define_method(cFXRbTGAIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXRbTGAIcon), -1); rb_define_method(cFXRbTGAIcon.klass, "onDefault", VALUEFUNC(_wrap_FXRbTGAIcon_onDefault), -1); rb_define_method(cFXRbTGAIcon.klass, "save", VALUEFUNC(_wrap_FXRbTGAIcon_save), -1); *************** *** 7285,7290 **** cFX_TIFIcon.klass = rb_define_class_under(mFox, "FX_TIFIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXTIFIcon, (void *) &cFX_TIFIcon); ! rb_define_singleton_method(cFX_TIFIcon.klass, "new", VALUEFUNC(_wrap_new_FX_TIFIcon), -1); ! rb_define_method(cFX_TIFIcon.klass, "initialize", VALUEFUNC(_wrap_FX_TIFIcon_initialize), -1); rb_define_method(cFX_TIFIcon.klass, "setCodec", VALUEFUNC(_wrap_FX_TIFIcon_setCodec), -1); rb_define_method(cFX_TIFIcon.klass, "getCodec", VALUEFUNC(_wrap_FX_TIFIcon_getCodec), -1); --- 7286,7291 ---- cFX_TIFIcon.klass = rb_define_class_under(mFox, "FX_TIFIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXTIFIcon, (void *) &cFX_TIFIcon); ! rb_define_singleton_method(cFX_TIFIcon.klass, "new", VALUEFUNC(_wrap_FX_TIFIcon_allocate), -1); ! rb_define_method(cFX_TIFIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_TIFIcon), -1); rb_define_method(cFX_TIFIcon.klass, "setCodec", VALUEFUNC(_wrap_FX_TIFIcon_setCodec), -1); rb_define_method(cFX_TIFIcon.klass, "getCodec", VALUEFUNC(_wrap_FX_TIFIcon_getCodec), -1); *************** *** 7294,7299 **** cFXTIFIcon.klass = rb_define_class_under(mFox, "FXTIFIcon", ((swig_class *) SWIGTYPE_p_FXTIFIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbTIFIcon, (void *) &cFXTIFIcon); ! rb_define_singleton_method(cFXTIFIcon.klass, "new", VALUEFUNC(_wrap_new_FXTIFIcon), -1); ! rb_define_method(cFXTIFIcon.klass, "initialize", VALUEFUNC(_wrap_FXTIFIcon_initialize), -1); rb_define_method(cFXTIFIcon.klass, "onDefault", VALUEFUNC(_wrap_FXTIFIcon_onDefault), -1); rb_define_method(cFXTIFIcon.klass, "save", VALUEFUNC(_wrap_FXTIFIcon_save), -1); --- 7295,7300 ---- cFXTIFIcon.klass = rb_define_class_under(mFox, "FXTIFIcon", ((swig_class *) SWIGTYPE_p_FXTIFIcon->clientdata)->klass); SWIG_TypeClientData(SWIGTYPE_p_FXRbTIFIcon, (void *) &cFXTIFIcon); ! rb_define_singleton_method(cFXTIFIcon.klass, "new", VALUEFUNC(_wrap_FXTIFIcon_allocate), -1); ! rb_define_method(cFXTIFIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXTIFIcon), -1); rb_define_method(cFXTIFIcon.klass, "onDefault", VALUEFUNC(_wrap_FXTIFIcon_onDefault), -1); rb_define_method(cFXTIFIcon.klass, "save", VALUEFUNC(_wrap_FXTIFIcon_save), -1); *************** *** 7316,7321 **** 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_new_FX_XPMIcon), -1); ! rb_define_method(cFX_XPMIcon.klass, "initialize", VALUEFUNC(_wrap_FX_XPMIcon_initialize), -1); cFX_XPMIcon.mark = (void (*)(void *)) FXRbXPMIcon::markfunc; cFX_XPMIcon.destroy = (void (*)(void *)) free_FXXPMIcon; --- 7317,7322 ---- 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; *************** *** 7323,7328 **** 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_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); --- 7324,7329 ---- 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.2.15 retrieving revision 1.39.2.16 diff -C2 -d -r1.39.2.15 -r1.39.2.16 *** image_wrap.cpp 24 May 2002 22:20:47 -0000 1.39.2.15 --- image_wrap.cpp 29 May 2002 16:50:54 -0000 1.39.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * [...1014 lines suppressed...] 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; *************** *** 7752,7757 **** 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_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); --- 7753,7758 ---- 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: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.8.2.14 retrieving revision 1.8.2.15 diff -C2 -d -r1.8.2.14 -r1.8.2.15 *** layout_wrap.cpp 24 May 2002 22:20:47 -0000 1.8.2.14 --- layout_wrap.cpp 29 May 2002 16:50:55 -0000 1.8.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * [...970 lines suppressed...] SWIG_TypeClientData(SWIGTYPE_p_FXStatusbar, (void *) &cFX_Statusbar); ! rb_define_singleton_method(cFX_Statusbar.klass, "new", VALUEFUNC(_wrap_FX_Statusbar_allocate), -1); ! rb_define_method(cFX_Statusbar.klass, "initialize", VALUEFUNC(_wrap_new_FX_Statusbar), -1); rb_define_method(cFX_Statusbar.klass, "setCornerStyle", VALUEFUNC(_wrap_FX_Statusbar_setCornerStyle), -1); rb_define_method(cFX_Statusbar.klass, "getCornerStyle", VALUEFUNC(_wrap_FX_Statusbar_getCornerStyle), -1); *************** *** 11782,11787 **** 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_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); --- 11779,11784 ---- 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.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** librb.c 28 Mar 2002 14:32:31 -0000 1.6 --- librb.c 29 May 2002 16:50:55 -0000 1.6.2.1 *************** *** 203,206 **** --- 203,207 ---- #include "ruby.h" + #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.36.2.14 retrieving revision 1.36.2.15 diff -C2 -d -r1.36.2.14 -r1.36.2.15 *** mdi_wrap.cpp 24 May 2002 22:20:48 -0000 1.36.2.14 --- mdi_wrap.cpp 29 May 2002 16:50:55 -0000 1.36.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020529-0853 * * This file is not intended to be easily readable and contains a number of *************** *** 28,31 **** --- 28,32 ---- #include "ruby.h" + #include "version.h" #define NUM2USHRT(n) NUM2UINT(n) *************** *** 414,418 **** static VALUE ! _wrap_new_FX_MDIDeleteButton(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIDeleteButton); rb_obj_call_init(vresult, argc, argv); --- 415,419 ---- static VALUE ! _wrap_FX_MDIDeleteButton_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIDeleteButton); rb_obj_call_init(vresult, argc, argv); *************** *** 422,426 **** static VALUE ! _wrap_FX_MDIDeleteButton_initialize(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; --- 423,427 ---- static VALUE ! _wrap_new_FX_MDIDeleteButton(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; *************** *** 465,469 **** static VALUE ! _wrap_new_FXMDIDeleteButton(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIDeleteButton); rb_obj_call_init(vresult, argc, argv); --- 466,470 ---- static VALUE ! _wrap_FXMDIDeleteButton_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIDeleteButton); rb_obj_call_init(vresult, argc, argv); *************** *** 473,477 **** static VALUE ! _wrap_FXMDIDeleteButton_initialize(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; --- 474,478 ---- static VALUE ! _wrap_new_FXMDIDeleteButton(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; *************** *** 1014,1018 **** static VALUE ! _wrap_new_FX_MDIRestoreButton(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIRestoreButton); rb_obj_call_init(vresult, argc, argv); --- 1015,1019 ---- static VALUE ! _wrap_FX_MDIRestoreButton_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIRestoreButton); rb_obj_call_init(vresult, argc, argv); *************** *** 1022,1026 **** static VALUE ! _wrap_FX_MDIRestoreButton_initialize(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; --- 1023,1027 ---- static VALUE ! _wrap_new_FX_MDIRestoreButton(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; *************** *** 1065,1069 **** static VALUE ! _wrap_new_FXMDIRestoreButton(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIRestoreButton); rb_obj_call_init(vresult, argc, argv); --- 1066,1070 ---- static VALUE ! _wrap_FXMDIRestoreButton_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIRestoreButton); rb_obj_call_init(vresult, argc, argv); *************** *** 1073,1077 **** static VALUE ! _wrap_FXMDIRestoreButton_initialize(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; --- 1074,1078 ---- static VALUE ! _wrap_new_FXMDIRestoreButton(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; *************** *** 1614,1618 **** static VALUE ! _wrap_new_FX_MDIMaximizeButton(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIMaximizeButton); rb_obj_call_init(vresult, argc, argv); --- 1615,1619 ---- static VALUE ! _wrap_FX_MDIMaximizeButton_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIMaximizeButton); rb_obj_call_init(vresult, argc, argv); *************** *** 1622,1626 **** static VALUE ! _wrap_FX_MDIMaximizeButton_initialize(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; --- 1623,1627 ---- static VALUE ! _wrap_new_FX_MDIMaximizeButton(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; *************** *** 1665,1669 **** static VALUE ! _wrap_new_FXMDIMaximizeButton(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIMaximizeButton); rb_obj_call_init(vresult, argc, argv); --- 1666,1670 ---- static VALUE ! _wrap_FXMDIMaximizeButton_allocate(int argc, VALUE *argv, VALUE self) { VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIMaximizeButton); rb_obj_call_init(vresult, argc, argv); *************** *** 1673,1677 **** static VALUE ! _wrap_FXMDIMaximizeButton_initialize(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 = 0 ; --- 1674,1678 ---- static VALUE ! _wrap_new_FXMDIMaximizeButton(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg... [truncated message content] |
Update of /cvsroot/fxruby/FXRuby/ext/fox/patches In directory usw-pr-cvs1:/tmp/cvs-serv15529/ext/fox/patches Added Files: Tag: release10 wrap_new_FX4Splitter.cpp wrap_new_FXDCWindow.cpp wrap_new_FXDialogBox.cpp wrap_new_FXFont.cpp wrap_new_FXMenubar.cpp wrap_new_FXMessageBox.cpp wrap_new_FXSplitter.cpp wrap_new_FXToolbar.cpp wrap_new_FX_4Splitter.cpp wrap_new_FX_DCWindow.cpp wrap_new_FX_DialogBox.cpp wrap_new_FX_Font.cpp wrap_new_FX_Menubar.cpp wrap_new_FX_MessageBox.cpp wrap_new_FX_Splitter.cpp wrap_new_FX_Toolbar.cpp Removed Files: Tag: release10 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: Updates for compatibility with the latest SWIG (mainly, that the wrapper names for the new and initialize methods changed). --- NEW FILE: wrap_new_FX4Splitter.cpp --- _wrap_new_FX4Splitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = FOURSPLITTER_NORMAL ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXRb4Splitter *result; if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } result = (FXRb4Splitter *)new FXRb4Splitter(arg1,arg2,arg3,arg4,arg5,arg6); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX4Splitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; FXSelector arg3 ; FXuint arg4 = FOURSPLITTER_NORMAL ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 0 ; FXRb4Splitter *result; if ((argc < 3) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXObject *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXObject); arg3 = NUM2UINT(argv[2]); if (argc > 3) { arg4 = NUM2UINT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } result = (FXRb4Splitter *)new FXRb4Splitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX4Splitter(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FX4Splitter_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) return _wrap_new_FX4Splitter_1(argc, argv, self); else return _wrap_new_FX4Splitter_2(argc, argv, self); } } --- NEW FILE: wrap_new_FXDCWindow.cpp --- _wrap_new_FXDCWindow_1(int argc, VALUE *argv, VALUE self) { FXDrawable *arg1 ; FXRbDCWindow *result; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXDrawable *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXDrawable); result = (FXRbDCWindow *)new FXRbDCWindow(arg1); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXDCWindow_2(int argc, VALUE *argv, VALUE self) { FXDrawable *arg1 ; FXEvent *arg2 ; FXRbDCWindow *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXDrawable *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXDrawable); arg2 = (FXEvent *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXEvent); result = (FXRbDCWindow *)new FXRbDCWindow(arg1,arg2); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXDCWindow(int argc, VALUE *argv, VALUE self) { if (argc == 1) return _wrap_new_FXDCWindow_1(argc, argv, self); else if (argc == 2) return _wrap_new_FXDCWindow_2(argc, argv, self); else rb_raise(rb_eArgError, "wrong # of arguments"); } --- NEW FILE: wrap_new_FXDialogBox.cpp --- _wrap_new_FXDialogBox_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXuint arg3 = DECOR_TITLE|DECOR_BORDER ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 10 ; FXint arg9 = 10 ; FXint arg10 = 10 ; FXint arg11 = 10 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXRbDialogBox *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXRbDialogBox *)new FXRbDialogBox(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FXDialogBox_2(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 ; FXString *arg2 ; FXuint arg3 = DECOR_TITLE|DECOR_BORDER ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 10 ; FXint arg9 = 10 ; FXint arg10 = 10 ; FXint arg11 = 10 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXRbDialogBox *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXWindow *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXWindow); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXRbDialogBox *)new FXRbDialogBox(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FXDialogBox(int argc, VALUE *argv, VALUE self) { if (rb_obj_is_kind_of(argv[0], ((swig_class *) SWIGTYPE_p_FXApp->clientdata)->klass)) return _wrap_new_FXDialogBox_1(argc, argv, self); else return _wrap_new_FXDialogBox_2(argc, argv, self); } --- NEW FILE: wrap_new_FXFont.cpp --- _wrap_new_FXFont_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXFontDesc *arg2 ; FXRbFont *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); arg2 = (FXFontDesc *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXFontDesc); result = (FXRbFont *)new FXRbFont(arg1,(FXFontDesc const &)*arg2); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXFont_2(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXRbFont *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } result = (FXRbFont *)new FXRbFont(arg1,(FXString const &)*arg2); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FXFont_3(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXuint arg3 ; FXuint arg4 = FONTWEIGHT_NORMAL ; FXuint arg5 = FONTSLANT_REGULAR ; FXuint arg6 = FONTENCODING_DEFAULT ; FXuint arg7 = FONTSETWIDTH_DONTCARE ; FXuint arg8 = 0 ; FXRbFont *result; if ((argc < 3) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } arg3 = NUM2UINT(argv[2]); if (argc > 3) { arg4 = NUM2UINT(argv[3]); } if (argc > 4) { arg5 = NUM2UINT(argv[4]); } if (argc > 5) { arg6 = NUM2UINT(argv[5]); } if (argc > 6) { arg7 = NUM2UINT(argv[6]); } if (argc > 7) { arg8 = NUM2UINT(argv[7]); } result = (FXRbFont *)new FXRbFont(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FXFont(int argc, VALUE *argv, VALUE self) { if (argc == 2) { if (TYPE(argv[1]) != T_STRING) return _wrap_new_FXFont_1(argc, argv, self); else return _wrap_new_FXFont_2(argc, argv, self); } else { return _wrap_new_FXFont_3(argc, argv, self); } } --- NEW FILE: wrap_new_FXMenubar.cpp --- _wrap_new_FXMenubar_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 3 ; FXint arg8 = 3 ; FXint arg9 = 2 ; FXint arg10 = 2 ; FXint arg11 = 4 ; FXint arg12 = 4 ; FXRbMenubar *result; if ((argc < 1) || (argc > 12)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } result = (FXRbMenubar *)new FXRbMenubar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXMenubar_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXComposite *arg2 ; FXuint arg3 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 3 ; FXint arg9 = 3 ; FXint arg10 = 2 ; FXint arg11 = 2 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXRbMenubar *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXComposite *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXComposite); if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXRbMenubar *)new FXRbMenubar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXMenubar(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FXMenubar_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXComposite->clientdata)->klass)) return _wrap_new_FXMenubar_1(argc, argv, self); else return _wrap_new_FXMenubar_2(argc, argv, self); } } --- NEW FILE: wrap_new_FXMessageBox.cpp --- _wrap_new_FXMessageBox_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXString *arg3 ; FXIcon *arg4 = 0 ; FXuint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXRbMessageBox *result; if ((argc < 3) || (argc > 7)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } { if (argv[2] != Qnil) { Check_Type(argv[2], T_STRING); arg3 = new FXString(STR2CSTR(argv[2])); }else { arg3 = new FXString; } } if (argc > 3) { arg4 = (FXIcon *) SWIG_ConvertPtr(argv[3], SWIGTYPE_p_FXIcon); } if (argc > 4) { arg5 = NUM2UINT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } result = (FXRbMessageBox *)new FXRbMessageBox(arg1,(FXString const &)*arg2,(FXString const &)*arg3,arg4,arg5,arg6,arg7); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; delete arg3; return self; } static VALUE _wrap_new_FXMessageBox_2(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 ; FXString *arg2 ; FXString *arg3 ; FXIcon *arg4 = 0 ; FXuint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXRbMessageBox *result; if ((argc < 3) || (argc > 7)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXWindow *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXWindow); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } { if (argv[2] != Qnil) { Check_Type(argv[2], T_STRING); arg3 = new FXString(STR2CSTR(argv[2])); }else { arg3 = new FXString; } } if (argc > 3) { arg4 = (FXIcon *) SWIG_ConvertPtr(argv[3], SWIGTYPE_p_FXIcon); } if (argc > 4) { arg5 = NUM2UINT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } result = (FXRbMessageBox *)new FXRbMessageBox(arg1,(FXString const &)*arg2,(FXString const &)*arg3,arg4,arg5,arg6,arg7); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; delete arg3; return self; } static VALUE _wrap_new_FXMessageBox(int argc, VALUE *argv, VALUE self) { if (rb_obj_is_kind_of(argv[0], ((swig_class *) SWIGTYPE_p_FXApp->clientdata)->klass)) return _wrap_new_FXMessageBox_1(argc, argv, self); else return _wrap_new_FXMessageBox_2(argc, argv, self); } --- NEW FILE: wrap_new_FXSplitter.cpp --- _wrap_new_FXSplitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = SPLITTER_NORMAL ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXRbSplitter *result; if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } result = (FXRbSplitter *)new FXRbSplitter(arg1,arg2,arg3,arg4,arg5,arg6); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXSplitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; FXSelector arg3 ; FXuint arg4 = SPLITTER_NORMAL ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 0 ; FXRbSplitter *result; if ((argc < 3) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXObject *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXObject); arg3 = NUM2UINT(argv[2]); if (argc > 3) { arg4 = NUM2UINT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } result = (FXRbSplitter *)new FXRbSplitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXSplitter(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FXSplitter_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) return _wrap_new_FXSplitter_1(argc, argv, self); else return _wrap_new_FXSplitter_2(argc, argv, self); } } --- NEW FILE: wrap_new_FXToolbar.cpp --- _wrap_new_FXToolbar_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 2 ; FXint arg8 = 3 ; FXint arg9 = 3 ; FXint arg10 = 2 ; FXint arg11 = 4 ; FXint arg12 = 4 ; FXRbToolbar *result; if ((argc < 1) || (argc > 12)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } result = (FXRbToolbar *)new FXRbToolbar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXToolbar_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXComposite *arg2 ; FXuint arg3 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 3 ; FXint arg9 = 3 ; FXint arg10 = 2 ; FXint arg11 = 2 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXRbToolbar *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXComposite *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXComposite); if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXRbToolbar *)new FXRbToolbar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FXToolbar(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FXToolbar_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXComposite->clientdata)->klass)) return _wrap_new_FXToolbar_1(argc, argv, self); else return _wrap_new_FXToolbar_2(argc, argv, self); } } --- NEW FILE: wrap_new_FX_4Splitter.cpp --- _wrap_new_FX_4Splitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = FOURSPLITTER_NORMAL ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FX4Splitter *result; if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } result = (FX4Splitter *)new FX4Splitter(arg1,arg2,arg3,arg4,arg5,arg6); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_4Splitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; FXSelector arg3 ; FXuint arg4 = FOURSPLITTER_NORMAL ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 0 ; FX4Splitter *result; if ((argc < 3) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXObject *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXObject); arg3 = NUM2UINT(argv[2]); if (argc > 3) { arg4 = NUM2UINT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } result = (FX4Splitter *)new FX4Splitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_4Splitter(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FX_4Splitter_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) return _wrap_new_FX_4Splitter_1(argc, argv, self); else return _wrap_new_FX_4Splitter_2(argc, argv, self); } } --- NEW FILE: wrap_new_FX_DCWindow.cpp --- _wrap_new_FX_DCWindow_1(int argc, VALUE *argv, VALUE self) { FXDrawable *arg1 ; FXDCWindow *result; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXDrawable *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXDrawable); result = (FXDCWindow *)new FXDCWindow(arg1); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_DCWindow_2(int argc, VALUE *argv, VALUE self) { FXDrawable *arg1 ; FXEvent *arg2 ; FXDCWindow *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXDrawable *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXDrawable); arg2 = (FXEvent *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXEvent); result = (FXDCWindow *)new FXDCWindow(arg1,arg2); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_DCWindow(int argc, VALUE *argv, VALUE self) { if (argc == 1) return _wrap_new_FX_DCWindow_1(argc, argv, self); else if (argc == 2) return _wrap_new_FX_DCWindow_2(argc, argv, self); else rb_raise(rb_eArgError, "wrong # of arguments"); } --- NEW FILE: wrap_new_FX_DialogBox.cpp --- _wrap_new_FX_DialogBox_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXuint arg3 = DECOR_TITLE|DECOR_BORDER ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 10 ; FXint arg9 = 10 ; FXint arg10 = 10 ; FXint arg11 = 10 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXDialogBox *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXDialogBox *)new FXDialogBox(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FX_DialogBox_2(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 ; FXString *arg2 ; FXuint arg3 = DECOR_TITLE|DECOR_BORDER ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 10 ; FXint arg9 = 10 ; FXint arg10 = 10 ; FXint arg11 = 10 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXDialogBox *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXWindow *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXWindow); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXDialogBox *)new FXDialogBox(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FX_DialogBox(int argc, VALUE *argv, VALUE self) { if (rb_obj_is_kind_of(argv[0], ((swig_class *) SWIGTYPE_p_FXApp->clientdata)->klass)) return _wrap_new_FX_DialogBox_1(argc, argv, self); else return _wrap_new_FX_DialogBox_2(argc, argv, self); } --- NEW FILE: wrap_new_FX_Font.cpp --- _wrap_new_FX_Font_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXFontDesc *arg2 ; FXFont *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); arg2 = (FXFontDesc *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXFontDesc); result = (FXFont *)new FXFont(arg1,(FXFontDesc const &)*arg2); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Font_2(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXFont *result; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } result = (FXFont *)new FXFont(arg1,(FXString const &)*arg2); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FX_Font_3(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXuint arg3 ; FXuint arg4 = FONTWEIGHT_NORMAL ; FXuint arg5 = FONTSLANT_REGULAR ; FXuint arg6 = FONTENCODING_DEFAULT ; FXuint arg7 = FONTSETWIDTH_DONTCARE ; FXuint arg8 = 0 ; FXFont *result; if ((argc < 3) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } arg3 = NUM2UINT(argv[2]); if (argc > 3) { arg4 = NUM2UINT(argv[3]); } if (argc > 4) { arg5 = NUM2UINT(argv[4]); } if (argc > 5) { arg6 = NUM2UINT(argv[5]); } if (argc > 6) { arg7 = NUM2UINT(argv[6]); } if (argc > 7) { arg8 = NUM2UINT(argv[7]); } result = (FXFont *)new FXFont(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; return self; } static VALUE _wrap_new_FX_Font(int argc, VALUE *argv, VALUE self) { if (argc == 2) { if (TYPE(argv[1]) != T_STRING) return _wrap_new_FX_Font_1(argc, argv, self); else return _wrap_new_FX_Font_2(argc, argv, self); } else { return _wrap_new_FX_Font_3(argc, argv, self); } } --- NEW FILE: wrap_new_FX_Menubar.cpp --- _wrap_new_FX_Menubar_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 3 ; FXint arg8 = 3 ; FXint arg9 = 2 ; FXint arg10 = 2 ; FXint arg11 = 4 ; FXint arg12 = 4 ; FXMenubar *result; if ((argc < 1) || (argc > 12)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } result = (FXMenubar *)new FXMenubar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Menubar_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXComposite *arg2 ; FXuint arg3 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 3 ; FXint arg9 = 3 ; FXint arg10 = 2 ; FXint arg11 = 2 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXMenubar *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXComposite *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXComposite); if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXMenubar *)new FXMenubar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Menubar(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FX_Menubar_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXComposite->clientdata)->klass)) return _wrap_new_FX_Menubar_1(argc, argv, self); else return _wrap_new_FX_Menubar_2(argc, argv, self); } } --- NEW FILE: wrap_new_FX_MessageBox.cpp --- _wrap_new_FX_MessageBox_1(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; FXString *arg2 ; FXString *arg3 ; FXIcon *arg4 = 0 ; FXuint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXMessageBox *result; if ((argc < 3) || (argc > 7)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXApp *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXApp); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } { if (argv[2] != Qnil) { Check_Type(argv[2], T_STRING); arg3 = new FXString(STR2CSTR(argv[2])); }else { arg3 = new FXString; } } if (argc > 3) { arg4 = (FXIcon *) SWIG_ConvertPtr(argv[3], SWIGTYPE_p_FXIcon); } if (argc > 4) { arg5 = NUM2UINT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } result = (FXMessageBox *)new FXMessageBox(arg1,(FXString const &)*arg2,(FXString const &)*arg3,arg4,arg5,arg6,arg7); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; delete arg3; return self; } static VALUE _wrap_new_FX_MessageBox_2(int argc, VALUE *argv, VALUE self) { FXWindow *arg1 ; FXString *arg2 ; FXString *arg3 ; FXIcon *arg4 = 0 ; FXuint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXMessageBox *result; if ((argc < 3) || (argc > 7)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXWindow *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXWindow); { if (argv[1] != Qnil) { Check_Type(argv[1], T_STRING); arg2 = new FXString(STR2CSTR(argv[1])); }else { arg2 = new FXString; } } { if (argv[2] != Qnil) { Check_Type(argv[2], T_STRING); arg3 = new FXString(STR2CSTR(argv[2])); }else { arg3 = new FXString; } } if (argc > 3) { arg4 = (FXIcon *) SWIG_ConvertPtr(argv[3], SWIGTYPE_p_FXIcon); } if (argc > 4) { arg5 = NUM2UINT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } result = (FXMessageBox *)new FXMessageBox(arg1,(FXString const &)*arg2,(FXString const &)*arg3,arg4,arg5,arg6,arg7); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); delete arg2; delete arg3; return self; } static VALUE _wrap_new_FX_MessageBox(int argc, VALUE *argv, VALUE self) { if (rb_obj_is_kind_of(argv[0], ((swig_class *) SWIGTYPE_p_FXApp->clientdata)->klass)) return _wrap_new_FX_MessageBox_1(argc, argv, self); else return _wrap_new_FX_MessageBox_2(argc, argv, self); } --- NEW FILE: wrap_new_FX_Splitter.cpp --- _wrap_new_FX_Splitter_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = SPLITTER_NORMAL ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXSplitter *result; if ((argc < 1) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } result = (FXSplitter *)new FXSplitter(arg1,arg2,arg3,arg4,arg5,arg6); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Splitter_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXObject *arg2 ; FXSelector arg3 ; FXuint arg4 = SPLITTER_NORMAL ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 0 ; FXSplitter *result; if ((argc < 3) || (argc > 8)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXObject *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXObject); arg3 = NUM2UINT(argv[2]); if (argc > 3) { arg4 = NUM2UINT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } result = (FXSplitter *)new FXSplitter(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Splitter(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FX_Splitter_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXObject->clientdata)->klass)) return _wrap_new_FX_Splitter_1(argc, argv, self); else return _wrap_new_FX_Splitter_2(argc, argv, self); } } --- NEW FILE: wrap_new_FX_Toolbar.cpp --- _wrap_new_FX_Toolbar_1(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXuint arg2 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg3 = 0 ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 2 ; FXint arg8 = 3 ; FXint arg9 = 3 ; FXint arg10 = 2 ; FXint arg11 = 4 ; FXint arg12 = 4 ; FXToolbar *result; if ((argc < 1) || (argc > 12)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); if (argc > 1) { arg2 = NUM2UINT(argv[1]); } if (argc > 2) { arg3 = NUM2INT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } result = (FXToolbar *)new FXToolbar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Toolbar_2(int argc, VALUE *argv, VALUE self) { FXComposite *arg1 ; FXComposite *arg2 ; FXuint arg3 = LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X ; FXint arg4 = 0 ; FXint arg5 = 0 ; FXint arg6 = 0 ; FXint arg7 = 0 ; FXint arg8 = 3 ; FXint arg9 = 3 ; FXint arg10 = 2 ; FXint arg11 = 2 ; FXint arg12 = 4 ; FXint arg13 = 4 ; FXToolbar *result; if ((argc < 2) || (argc > 13)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); arg1 = (FXComposite *) SWIG_ConvertPtr(argv[0], SWIGTYPE_p_FXComposite); arg2 = (FXComposite *) SWIG_ConvertPtr(argv[1], SWIGTYPE_p_FXComposite); if (argc > 2) { arg3 = NUM2UINT(argv[2]); } if (argc > 3) { arg4 = NUM2INT(argv[3]); } if (argc > 4) { arg5 = NUM2INT(argv[4]); } if (argc > 5) { arg6 = NUM2INT(argv[5]); } if (argc > 6) { arg7 = NUM2INT(argv[6]); } if (argc > 7) { arg8 = NUM2INT(argv[7]); } if (argc > 8) { arg9 = NUM2INT(argv[8]); } if (argc > 9) { arg10 = NUM2INT(argv[9]); } if (argc > 10) { arg11 = NUM2INT(argv[10]); } if (argc > 11) { arg12 = NUM2INT(argv[11]); } if (argc > 12) { arg13 = NUM2INT(argv[12]); } result = (FXToolbar *)new FXToolbar(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); return self; } static VALUE _wrap_new_FX_Toolbar(int argc, VALUE *argv, VALUE self) { if (argc == 1) { return _wrap_new_FX_Toolbar_1(argc, argv, self); } else { if (!rb_obj_is_kind_of(argv[1], ((swig_class *) SWIGTYPE_p_FXComposite->clientdata)->klass)) return _wrap_new_FX_Toolbar_1(argc, argv, self); else return _wrap_new_FX_Toolbar_2(argc, argv, self); } } --- 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-05-29 14:41:59
|
Update of /cvsroot/fxruby/FXRuby/examples In directory usw-pr-cvs1:/tmp/cvs-serv4007 Modified Files: Tag: release10 table.rb Log Message: Index: table.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/examples/table.rb,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** table.rb 2 Apr 2002 22:27:54 -0000 1.9 --- table.rb 29 May 2002 14:41:56 -0000 1.9.2.1 *************** *** 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}" } |
From: Lyle J. <ly...@us...> - 2002-05-24 23:03:18
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv23945/lib/fox Added Files: Tag: release10 canvas.rb Log Message: --- NEW FILE: canvas.rb --- require 'fox' include Fox # # The Canvas module defines a framework similar to that provided by Tk's Canvas # widget (and subsequent improvements, such as GNOME's Canvas and wxWindows' # Object Graphics Library). # # Links # ===== # # Tk's Canvas Widget # http://starship.python.net/crew/fredrik/tkmanual/canvas.html # http://www.dci.clrc.ac.uk/Publications/Cookbook/chap4.html # # GNOME's Canvas Widget # http://developer.gnome.org/doc/whitepapers/canvas/canvas.html # module Canvas class Shape attr_accessor :x, :y, :foreground, :target, :selector def initialize(x, y) @visible = true @selected = false @draggable = false @x = x @y = y @foreground = FXRGB(0, 0, 0) @target = nil @selector = 0 end # Return the bounding box for this shape def bounds FXRectangle.new(x, y, width, height) end # Hit test def hit?(xpos, ypos) (xpos >= x) && (xpos < x+width) && (ypos >= y) && (ypos < y+height) end # Move shape to specified position def move(x, y) @x, @y = x, y end # Resize shape to specified width and height def resize(w, h) end # Move and resize the shape def position(x, y, w, h) move(x, y) resize(w, h) end # Set the visibility of this shape def visible=(visible) @visible = visible end # Is this shape visible? def visible? @visible end # Select this shape def select @selected = true end # Deselect this shape def deselect @selected = false end # Is this shape selected? def selected? @selected end # Set this shape's draggability def draggable=(d) @draggable = d end # Is this shape draggable? def draggable? @draggable end # Draw this shape into the specificed device context def draw(dc) end end class ShapeGroup include Enumerable def initialize @shapes = [] end # Add a shape to this group def addShape(shape) @shapes << shape end # Remove a shape from this group def removeShape(shape) @shapes.remove(shape) end def each @shapes.each { |shape| yield shape } end def reverse_each @shapes.reverse_each { |shape| yield shape } end end class LineShape < Shape attr_accessor :lineWidth, :lineCap, :lineJoin, :lineStyle attr_accessor :x1, :y1, :x2, :y2 def initialize(x1, y1, x2, y2) super(x1, y1) @x1, @y1, @x2, @y2 = x1, y1, x2, y2 @lineWidth = 1 @lineCap = CAP_NOT_LAST @lineJoin = JOIN_MITER @lineStyle = LINE_SOLID end def width 0 end def height 0 end def draw(dc) # Save old values oldForeground = dc.foreground oldLineWidth = dc.lineWidth oldLineCap = dc.lineCap oldLineJoin = dc.lineJoin oldLineStyle = dc.lineStyle # Set properties for this line dc.foreground = foreground dc.lineWidth = lineWidth dc.lineCap = lineCap dc.lineJoin = lineJoin dc.lineStyle = lineStyle # Draw the line dc.drawLine(x1, y1, x2, y2) # Restore old properties dc.lineWidth = oldLineWidth dc.lineCap = oldLineCap dc.lineJoin = oldLineJoin dc.lineStyle = oldLineStyle dc.foreground = oldForeground end end class RectangleShape < Shape attr_accessor :width, :height def initialize(x, y, w, h) super(x, y) @width = w @height = h end def draw(dc) oldForeground = dc.foreground dc.foreground = foreground dc.drawRectangle(x, y, width, height) dc.foreground = oldForeground end end class TextShape < RectangleShape attr_reader :font, :text def initialize(x, y, w, h, text=nil) super(x, y, w, h) @text = text @font = FXApp.instance.normalFont end def draw(dc) super(dc) oldForeground = dc.foreground oldTextFont = dc.textFont dc.textFont = @font dc.drawImageText(x, y, text) dc.textFont = oldTextFont if oldTextFont dc.foreground = oldForeground end end class CircleShape < Shape attr_accessor :radius def initialize(x, y, radius) super(x, y) @radius = radius end def width 2*radius end def height 2*radius end def draw(dc) oldForeground = dc.foreground oldLineWidth = dc.lineWidth dc.foreground = foreground dc.lineWidth = 5 if selected? dc.drawArc(x, y, width, height, 0, 64*180) dc.drawArc(x, y, width, height, 64*180, 64*360) dc.foreground = oldForeground dc.lineWidth = oldLineWidth end end class PolygonShape < Shape end class ImageShape < Shape attr_accessor :image def initialize(x, y, image) @image = image end def draw(dc) dc.drawImage(image) end end class ShapeCanvas < FXCanvas attr_accessor :scene def initialize(p, tgt=nil, sel=0, opts=FRAME_NORMAL, x=0, y=0, w=0, h=0) # Initialize base class super(p, tgt, sel, opts, x, y, w, h) # Start with an empty group @scene = ShapeGroup.new # Handle paint message self.connect(SEL_PAINT, method(:onPaint)) self.connect(SEL_LEFTBUTTONPRESS, method(:onLeftBtnPress)) self.connect(SEL_LEFTBUTTONRELEASE, method(:onLeftBtnRelease)) end # Find the shape of the least depth containing this point def findShape(x, y) @scene.reverse_each do |shape| return shape if shape.hit?(x, y) end end # Paint def onPaint(sender, sel, evt) dc = FXDCWindow.new(sender, evt) dc.foreground = sender.backColor dc.fillRectangle(evt.rect.x, evt.rect.y, evt.rect.w, evt.rect.h) @scene.each do |shape| shape.draw(dc) end dc.end return 1 end # Left button press def onLeftBtnPress(sender, sel, evt) return 1 end # Left button release def onLeftBtnRelease(sender, sel, evt) # First deselect every object in the scene @scene.each { |shape| shape.deselect } # Now select the object at the lowest depth shape = findShape(evt.win_x, evt.win_y) shape.select unless shape.nil? # Repaint update end end end |
From: Lyle J. <ly...@us...> - 2002-05-24 23:03:18
|
Update of /cvsroot/fxruby/FXRuby/examples In directory usw-pr-cvs1:/tmp/cvs-serv23945/examples Added Files: Tag: release10 canvasdemo.rb Log Message: --- NEW FILE: canvasdemo.rb --- require 'fox' require '../lib/fox/canvas' include Fox include Canvas class OGLMainWindow < FXMainWindow def initialize(app) # Initialize base class first super(app, "OGLEditDemo", nil, nil, DECOR_ALL, 0, 0, 500, 400) # Menu bar menu_bar = FXMenubar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X) # File menu file_menu = FXMenuPane.new(self) FXMenuCommand.new(file_menu, "&New...") FXMenuCommand.new(file_menu, "&Open...") FXMenuCommand.new(file_menu, "&Close") FXMenuCommand.new(file_menu, "&Save") FXMenuCommand.new(file_menu, "Save &As...") FXMenuSeparator.new(file_menu) FXMenuCommand.new(file_menu, "&Print...") FXMenuCommand.new(file_menu, "Print &Setup...") FXMenuCommand.new(file_menu, "Print Pre&view") FXMenuSeparator.new(file_menu) FXMenuCommand.new(file_menu, "E&xit", nil, app, FXApp::ID_QUIT) # Edit menu edit_menu = FXMenuPane.new(self) FXMenuCommand.new(edit_menu, "&Undo") FXMenuCommand.new(edit_menu, "&Redo") FXMenuSeparator.new(edit_menu) FXMenuCommand.new(edit_menu, "&Cut") FXMenuSeparator.new(edit_menu) FXMenuCommand.new(edit_menu, "Change &background color") FXMenuCommand.new(edit_menu, "Edit &label") # Recently used files @mru_files = FXRecentFiles.new # Help menu help_menu = FXMenuPane.new(self) aboutBox = FXMenuCommand.new(help_menu, "&About...") aboutBox.connect(SEL_COMMAND) do |sender, sel, ptr| FXMessageBox.information(self, MBOX_OK, "About OGLEdit", "OGLEdit Demo\nTo draw a shape, select a shape on the toolbar and left-click on the canvas.\nTo draw a line, right-drag between shapes.\nFor further details, see the OGL manual.\n (c) Julian Smart 1996") end # Attach menus to menu bar titles FXMenuTitle.new(menu_bar, "&File", nil, file_menu) FXMenuTitle.new(menu_bar, "&Edit", nil, edit_menu) FXMenuTitle.new(menu_bar, "&Help", nil, help_menu) # Status bar FXStatusbar.new(self, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER) # Shapes canvas fills the remainder frame = FXHorizontalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, 0, 0, 0, 0, 0, 0, 0, 0) canvas = ShapeCanvas.new(frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y) canvas.scene = get_scene(canvas) end def get_scene(canvas) scene = ShapeGroup.new scene.addShape(CircleShape.new(5, 5, 10)) scene.addShape(CircleShape.new(50, 50, 20)) scene.addShape(LineShape.new(10, 10, 70, 70)) scene.addShape(RectangleShape.new(90, 90, 30, 40)) scene.addShape(TextShape.new(60, 60, 30, 40, "Hello!")) scene end def create super show(PLACEMENT_SCREEN) end end if __FILE__ == $0 app = FXApp.new("OGLEdit", "FXRuby") app.init(ARGV) OGLMainWindow.new(app) app.create app.run end |
From: Lyle J. <ly...@us...> - 2002-05-24 22:59:27
|
Update of /cvsroot/fxruby/FXRuby/tests In directory usw-pr-cvs1:/tmp/cvs-serv19863 Added Files: Tag: release10 TC_FXFileAssoc.rb TC_FXFontDesc.rb Log Message: --- NEW FILE: TC_FXFileAssoc.rb --- require 'test/unit' require 'fox' include Fox class TC_FXFileAssoc < Test::Unit::TestCase def set_up @app = FXApp.instance || FXApp.new @icon = FXIcon.new(@app) @fileassoc = FXFileAssoc.new end def test_command @fileassoc.command = "netscape" assert_equal("netscape", @fileassoc.command) end def test_extension @fileassoc.extension = ".html" assert_equal(".html", @fileassoc.extension) end def test_mimetype @fileassoc.mimetype = "mimetype" assert_equal("mimetype", @fileassoc.mimetype) end def test_bigicon @fileassoc.bigicon = @icon assert_kind_of(FXIcon, @fileassoc.bigicon) assert_same(@icon, @fileassoc.bigicon) end def test_bigiconopen @fileassoc.bigiconopen = @icon assert_kind_of(FXIcon, @fileassoc.bigiconopen) assert_same(@icon, @fileassoc.bigiconopen) end def test_miniicon @fileassoc.miniicon = @icon assert_kind_of(FXIcon, @fileassoc.miniicon) assert_same(@icon, @fileassoc.miniicon) end def test_miniiconopen @fileassoc.miniiconopen = @icon assert_kind_of(FXIcon, @fileassoc.miniiconopen) assert_same(@icon, @fileassoc.miniiconopen) end def test_dragtype @fileassoc.dragtype = 0 assert_equal(0, @fileassoc.dragtype) end def test_flags @fileassoc.flags = 0 assert_equal(0, @fileassoc.flags) end end --- NEW FILE: TC_FXFontDesc.rb --- require 'test/unit' require 'fox' include Fox class TC_FXFontDesc < Test::Unit::TestCase def set_up @fontdesc = FXFontDesc.new end def test_face @fontdesc.face = "Times New Roman" assert_equal("Times New Roman", @fontdesc.face) end def test_size @fontdesc.size = 120 assert_equal(120, @fontdesc.size) end def test_weight weights = [FONTWEIGHT_DONTCARE, FONTWEIGHT_THIN, FONTWEIGHT_EXTRALIGHT, FONTWEIGHT_LIGHT, FONTWEIGHT_NORMAL, FONTWEIGHT_REGULAR, FONTWEIGHT_MEDIUM, FONTWEIGHT_DEMIBOLD, FONTWEIGHT_BOLD, FONTWEIGHT_EXTRABOLD, FONTWEIGHT_HEAVY, FONTWEIGHT_BLACK] weights.each do |weight| @fontdesc.weight = weight assert_equal(weight, @fontdesc.weight) end end def test_slant slants = [FONTSLANT_DONTCARE, FONTSLANT_REGULAR, FONTSLANT_ITALIC, FONTSLANT_OBLIQUE, FONTSLANT_REVERSE_ITALIC, FONTSLANT_REVERSE_OBLIQUE] slants.each do |slant| @fontdesc.slant = slant assert_equal(slant, @fontdesc.slant) end end def test_encoding end def test_setwidth end def test_flags end end |
From: Lyle J. <ly...@us...> - 2002-05-24 22:23:57
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv14481 Modified Files: Tag: release10 FXScintilla.i Log Message: Index: FXScintilla.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScintilla.i,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -C2 -d -r1.9.2.4 -r1.9.2.5 *** FXScintilla.i 8 May 2002 19:53:18 -0000 1.9.2.4 --- FXScintilla.i 24 May 2002 22:23:55 -0000 1.9.2.5 *************** *** 1,196 **** ! /*********************************************************************** ! * 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...". ! ***********************************************************************/ ! ! // Struct definition from Scintilla.h ! struct NotifyHeader { ! %immutable; ! unsigned int idFrom; ! unsigned int code; ! %mutable; ! }; ! ! // Struct definition from Scintilla.h ! struct SCNotification { ! %immutable; ! struct NotifyHeader nmhdr; ! int position; // SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND ! int ch; // SCN_CHARADDED, SCN_KEY ! int modifiers; // SCN_KEY ! int modificationType; // SCN_MODIFIED ! %extend { ! // Need to be careful about when this field's value is actually defined ! VALUE text() const { ! if (self->nmhdr.code==SCN_MODIFIED){ ! return (self->text) ? rb_str_new(self->text,self->length) : Qnil; ! } ! else if (self->nmhdr.code==SCN_USERLISTSELECTION || self->nmhdr.code==SCN_URIDROPPED){ ! return (self->text) ? rb_str_new2(self->text) : Qnil; ! } else { ! return Qnil; ! } ! } ! } ! int length; // SCN_MODIFIED ! int linesAdded; // SCN_MODIFIED ! int message; // SCN_MACRORECORD ! int line; // SCN_MODIFIED ! int foldLevelNow; // SCN_MODIFIED ! int foldLevelPrev; // SCN_MODIFIED ! int margin; // SCN_MARGINCLICK ! int listType; // SCN_USERLISTSELECTION ! int x; // SCN_DWELLSTART, SCN_DWELLEND ! int y; // SCN_DWELLSTART, SCN_DWELLEND ! %mutable; ! %extend { ! VALUE wParam() const { ! return INT2NUM(self->wParam); ! } ! VALUE lParam() const { ! return INT2NUM(self->lParam); ! } ! } ! }; ! ! struct TextRange { ! %immutable; ! char *lpstrText; ! %mutable; ! %extend { ! // "Construct" a TextRange instance ! TextRange(int start,int last,size_t size){ ! TextRange *tr=new TextRange; ! tr->chrg.cpMin=start; ! tr->chrg.cpMax=last; ! tr->lpstrText=ALLOC_N(char,size); ! return tr; ! } ! ! // Destructor ! ~TextRange(){ ! free(self->lpstrText); ! delete self; ! } ! } ! }; ! ! %exception FXScintilla::FXScintilla "$action FXRbRegisterRubyObj(self, result);"; ! ! class FXScintilla : public FXScrollArea { ! public: ! enum{ ! ID_TICK, ! }; ! public: ! long onScintillaCommand(FXObject*, FXSelector, void* PTR_IGNORE); ! long onPaint(FXObject*, FXSelector, void* PTR_EVENT); ! long onConfigure(FXObject*, FXSelector, void* PTR_EVENT); ! long onTimeoutTicking(FXObject*, FXSelector, void* PTR_IGNORE); ! long onFocusIn(FXObject*, FXSelector, void* PTR_EVENT); ! long onFocusOut(FXObject*, FXSelector, void* PTR_EVENT); ! long onMotion(FXObject*, FXSelector, void* PTR_EVENT); ! long onLeftBtnPress(FXObject*, FXSelector, void* PTR_EVENT); ! long onLeftBtnRelease(FXObject*, FXSelector, void* PTR_EVENT); ! long onRightBtnPress(FXObject*, FXSelector, void* PTR_EVENT); ! long onMiddleBtnPress(FXObject*, FXSelector, void* PTR_EVENT); ! long onBeginDrag(FXObject*, FXSelector, void* PTR_EVENT); ! long onDragged(FXObject*, FXSelector, void* PTR_EVENT); ! long onEndDrag(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDEnter(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDLeave(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDMotion(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDDrop(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDRequest(FXObject*, FXSelector, void* PTR_EVENT); ! long onSelectionLost(FXObject*, FXSelector, void* PTR_EVENT); ! long onSelectionRequest(FXObject*, FXSelector, void* PTR_EVENT); ! long onClipboardLost(FXObject*, FXSelector, void* PTR_EVENT); ! long onClipboardRequest(FXObject*, FXSelector, void* PTR_EVENT); ! long onKeyPress(FXObject*, FXSelector, void* PTR_EVENT); ! public: ! // Constructor ! FXScintilla(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0); ! ! // Scintilla messaging ! void setScintillaID(int id); ! ! %extend { ! VALUE sendMessage(unsigned int iMsg, VALUE wParam = Qnil, VALUE lParam = Qnil){ ! // Convert wParam argument ! uptr_t wp; ! switch(TYPE(wParam)){ ! case T_FIXNUM: ! wp=static_cast<uptr_t>(NUM2UINT(wParam)); ! break; ! case T_STRING: ! wp=static_cast<uptr_t>(reinterpret_cast<long>(RSTRING(wParam)->ptr)); ! break; ! case T_TRUE: ! case T_FALSE: ! wp=(wParam==Qtrue) ? 1 : 0; ! break; ! default: ! wp=0; ! break; ! } ! ! // Convert lParam argument ! sptr_t lp; ! switch(TYPE(lParam)){ ! case T_FIXNUM: ! lp=static_cast<sptr_t>(NUM2UINT(lParam)); ! break; ! case T_STRING: ! lp=static_cast<sptr_t>(reinterpret_cast<long>(RSTRING(lParam)->ptr)); ! break; ! case T_TRUE: ! case T_FALSE: ! lp=(lParam==Qtrue) ? 1 : 0; ! break; ! default: ! lp=0; ! break; ! } ! sptr_t result=self->sendMessage(iMsg,wp,lp); ! return INT2NUM(result); ! } ! } ! ! /// Destructor ! virtual ~FXScintilla(); ! }; ! ! %exception FXRbScintilla::FXRbScintilla "$action FXRbRegisterRubyObj(self, result);"; ! ! class FXRbScintilla : public FXScintilla { ! public: ! /// Constructor ! FXRbScintilla(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0); ! ! // Destructor ! virtual ~FXRbScintilla(); ! ! public: ! DECLARE_FXOBJECT_VIRTUALS ! DECLARE_FXID_VIRTUALS ! DECLARE_FXDRAWABLE_VIRTUALS ! DECLARE_FXWINDOW_VIRTUALS ! DECLARE_FXSCROLLAREA_VIRTUALS ! }; --- 1,196 ---- ! /*********************************************************************** ! * 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...". ! ***********************************************************************/ ! ! // Struct definition from Scintilla.h ! struct NotifyHeader { ! %immutable; ! unsigned int idFrom; ! unsigned int code; ! %mutable; ! }; ! ! // Struct definition from Scintilla.h ! struct SCNotification { ! %immutable; ! struct NotifyHeader nmhdr; ! int position; // SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND ! int ch; // SCN_CHARADDED, SCN_KEY ! int modifiers; // SCN_KEY ! int modificationType; // SCN_MODIFIED ! %extend { ! // Need to be careful about when this field's value is actually defined ! VALUE text() const { ! if (self->nmhdr.code==SCN_MODIFIED){ ! return (self->text) ? rb_str_new(self->text,self->length) : Qnil; ! } ! else if (self->nmhdr.code==SCN_USERLISTSELECTION || self->nmhdr.code==SCN_URIDROPPED){ ! return (self->text) ? rb_str_new2(self->text) : Qnil; ! } else { ! return Qnil; ! } ! } ! } ! int length; // SCN_MODIFIED ! int linesAdded; // SCN_MODIFIED ! int message; // SCN_MACRORECORD ! int line; // SCN_MODIFIED ! int foldLevelNow; // SCN_MODIFIED ! int foldLevelPrev; // SCN_MODIFIED ! int margin; // SCN_MARGINCLICK ! int listType; // SCN_USERLISTSELECTION ! int x; // SCN_DWELLSTART, SCN_DWELLEND ! int y; // SCN_DWELLSTART, SCN_DWELLEND ! %mutable; ! %extend { ! VALUE wParam() const { ! return INT2NUM(self->wParam); ! } ! VALUE lParam() const { ! return INT2NUM(self->lParam); ! } ! } ! }; ! ! struct TextRange { ! %immutable; ! char *lpstrText; ! %mutable; ! %extend { ! // "Construct" a TextRange instance ! TextRange(int start,int last,size_t size){ ! TextRange *tr=new TextRange; ! tr->chrg.cpMin=start; ! tr->chrg.cpMax=last; ! tr->lpstrText=ALLOC_N(char,size); ! return tr; ! } ! ! // Destructor ! ~TextRange(){ ! free(self->lpstrText); ! delete self; ! } ! } ! }; ! ! %exception FXScintilla::FXScintilla "$action FXRbRegisterRubyObj(self, result);"; ! ! class FXScintilla : public FXScrollArea { ! public: ! enum{ ! ID_TICK, ! }; ! public: ! long onScintillaCommand(FXObject*, FXSelector, void* PTR_IGNORE); ! long onPaint(FXObject*, FXSelector, void* PTR_EVENT); ! long onConfigure(FXObject*, FXSelector, void* PTR_EVENT); ! long onTimeoutTicking(FXObject*, FXSelector, void* PTR_IGNORE); ! long onFocusIn(FXObject*, FXSelector, void* PTR_EVENT); ! long onFocusOut(FXObject*, FXSelector, void* PTR_EVENT); ! long onMotion(FXObject*, FXSelector, void* PTR_EVENT); ! long onLeftBtnPress(FXObject*, FXSelector, void* PTR_EVENT); ! long onLeftBtnRelease(FXObject*, FXSelector, void* PTR_EVENT); ! long onRightBtnPress(FXObject*, FXSelector, void* PTR_EVENT); ! long onMiddleBtnPress(FXObject*, FXSelector, void* PTR_EVENT); ! long onBeginDrag(FXObject*, FXSelector, void* PTR_EVENT); ! long onDragged(FXObject*, FXSelector, void* PTR_EVENT); ! long onEndDrag(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDEnter(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDLeave(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDMotion(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDDrop(FXObject*, FXSelector, void* PTR_EVENT); ! long onDNDRequest(FXObject*, FXSelector, void* PTR_EVENT); ! long onSelectionLost(FXObject*, FXSelector, void* PTR_EVENT); ! long onSelectionRequest(FXObject*, FXSelector, void* PTR_EVENT); ! long onClipboardLost(FXObject*, FXSelector, void* PTR_EVENT); ! long onClipboardRequest(FXObject*, FXSelector, void* PTR_EVENT); ! long onKeyPress(FXObject*, FXSelector, void* PTR_EVENT); ! public: ! // Constructor ! FXScintilla(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0); ! ! // Scintilla messaging ! void setScintillaID(int id); ! ! %extend { ! VALUE sendMessage(unsigned int iMsg, VALUE wParam = Qnil, VALUE lParam = Qnil){ ! // Convert wParam argument ! uptr_t wp; ! switch(TYPE(wParam)){ ! case T_FIXNUM: ! wp=static_cast<uptr_t>(NUM2UINT(wParam)); ! break; ! case T_STRING: ! wp=static_cast<uptr_t>(reinterpret_cast<long>(RSTRING(wParam)->ptr)); ! break; ! case T_TRUE: ! case T_FALSE: ! wp=(wParam==Qtrue) ? 1 : 0; ! break; ! default: ! wp=0; ! break; ! } ! ! // Convert lParam argument ! sptr_t lp; ! switch(TYPE(lParam)){ ! case T_FIXNUM: ! lp=static_cast<sptr_t>(NUM2UINT(lParam)); ! break; ! case T_STRING: ! lp=static_cast<sptr_t>(reinterpret_cast<long>(RSTRING(lParam)->ptr)); ! break; ! case T_TRUE: ! case T_FALSE: ! lp=(lParam==Qtrue) ? 1 : 0; ! break; ! default: ! lp=0; ! break; ! } ! sptr_t result=self->sendMessage(iMsg,wp,lp); ! return INT2NUM(result); ! } ! } ! ! /// Destructor ! virtual ~FXScintilla(); ! }; ! ! %exception FXRbScintilla::FXRbScintilla "$action FXRbRegisterRubyObj(self, result);"; ! ! class FXRbScintilla : public FXScintilla { ! public: ! /// Constructor ! FXRbScintilla(FXComposite* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0); ! ! // Destructor ! virtual ~FXRbScintilla(); ! ! public: ! DECLARE_FXOBJECT_VIRTUALS ! DECLARE_FXID_VIRTUALS ! DECLARE_FXDRAWABLE_VIRTUALS ! DECLARE_FXWINDOW_VIRTUALS ! DECLARE_FXSCROLLAREA_VIRTUALS ! }; |
From: Lyle J. <ly...@us...> - 2002-05-24 22:21:09
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv13212/ext/fox Modified Files: Tag: release10 FXRuby.cpp 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: Replaced inlined %name directives in SWIG interface files with the newer %rename directives; a little tweaking of FXDict as well. Index: FXRuby.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v retrieving revision 1.40.2.5 retrieving revision 1.40.2.6 diff -C2 -d -r1.40.2.5 -r1.40.2.6 *** FXRuby.cpp 24 May 2002 17:36:15 -0000 1.40.2.5 --- FXRuby.cpp 24 May 2002 22:20:41 -0000 1.40.2.6 *************** *** 153,157 **** */ VALUE FXRbGetRubyObj(const void *foxObj,FXbool searchBoth){ - FXASSERT(foxObj); std::map<const void*,VALUE>::const_iterator itr=FXRuby_ObjMap.find(foxObj); if(itr!=FXRuby_ObjMap.end()){ --- 153,156 ---- Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.62.2.15 retrieving revision 1.62.2.16 diff -C2 -d -r1.62.2.15 -r1.62.2.16 *** core_wrap.cpp 24 May 2002 17:40:53 -0000 1.62.2.15 --- core_wrap.cpp 24 May 2002 22:20:41 -0000 1.62.2.16 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of *************** *** 510,516 **** VALUE FXDict_keys(FXDict const *self){ VALUE arr = rb_ary_new(); return arr; } ! FXbool FXDict_has_key(FXDict *self,FXchar const *ky){ return (self->find(ky) != 0); } --- 510,519 ---- VALUE FXDict_keys(FXDict const *self){ 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; } ! FXbool FXDict_has_key(FXDict const *self,FXchar const *ky){ return (self->find(ky) != 0); } *************** *** 2565,2600 **** static VALUE ! _wrap_FX_Dict_getSize(int argc, VALUE *argv, VALUE self) { ! FXDict *arg1 ; ! FXint result; ! VALUE vresult = Qnil; ! ! if ((argc < 0) || (argc > 0)) ! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); ! arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); ! result = (FXint)((FXDict const *)arg1)->size(); ! ! vresult = INT2NUM(result); ! return vresult; ! } ! ! ! static VALUE ! _wrap_FX_Dict_setSize(int argc, VALUE *argv, VALUE self) { ! FXDict *arg1 ; ! FXint arg2 ; ! ! if ((argc < 1) || (argc > 1)) ! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); ! arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); ! arg2 = NUM2INT(argv[0]); ! (arg1)->size(arg2); ! ! return Qnil; ! } ! ! ! static VALUE ! _wrap_FX_Dict_no(int argc, VALUE *argv, VALUE self) { FXDict *arg1 ; FXint result; --- 2568,2572 ---- static VALUE ! _wrap_FX_Dict_length(int argc, VALUE *argv, VALUE self) { FXDict *arg1 ; FXint result; *************** *** 2612,2665 **** static VALUE - _wrap_FX_Dict_keys(int argc, VALUE *argv, VALUE self) { - FXDict *arg1 ; - VALUE result; - VALUE vresult = Qnil; - - if ((argc < 0) || (argc > 0)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); - arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); - result = (VALUE)FXDict_keys((FXDict const *)arg1); - - vresult = result; - return vresult; - } - - - static VALUE - _wrap_FX_Dict_has_key(int argc, VALUE *argv, VALUE self) { - FXDict *arg1 ; - FXchar *arg2 ; - FXbool result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); - arg2 = STR2CSTR(argv[0]); - result = (FXbool)FXDict_has_key(arg1,(FXchar const *)arg2); - - vresult = result ? Qtrue : Qfalse; - return vresult; - } - - - static VALUE - _wrap_FX_Dict_empty(int argc, VALUE *argv, VALUE self) { - FXDict *arg1 ; - FXbool result; - VALUE vresult = Qnil; - - if ((argc < 0) || (argc > 0)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); - arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); - result = (FXbool)FXDict_empty((FXDict const *)arg1); - - vresult = result ? Qtrue : Qfalse; - return vresult; - } - - - static VALUE _wrap_FX_Dict_key(int argc, VALUE *argv, VALUE self) { FXDict *arg1 ; --- 2584,2587 ---- *************** *** 2778,2781 **** --- 2700,2753 ---- + static VALUE + _wrap_FX_Dict_keys(int argc, VALUE *argv, VALUE self) { + FXDict *arg1 ; + VALUE result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); + arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); + result = (VALUE)FXDict_keys((FXDict const *)arg1); + + vresult = result; + return vresult; + } + + + static VALUE + _wrap_FX_Dict_has_keyq___(int argc, VALUE *argv, VALUE self) { + FXDict *arg1 ; + FXchar *arg2 ; + FXbool result; + VALUE vresult = Qnil; + + if ((argc < 1) || (argc > 1)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); + arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); + arg2 = STR2CSTR(argv[0]); + result = (FXbool)FXDict_has_key((FXDict const *)arg1,(FXchar const *)arg2); + + vresult = (result ? Qtrue : Qfalse); + return vresult; + } + + + static VALUE + _wrap_FX_Dict_emptyq___(int argc, VALUE *argv, VALUE self) { + FXDict *arg1 ; + FXbool result; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); + arg1 = (FXDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXDict); + result = (FXbool)FXDict_empty((FXDict const *)arg1); + + vresult = (result ? Qtrue : Qfalse); + return vresult; + } + + static void free_FXDict(FXDict *arg1) { *************** *** 2938,2977 **** - static VALUE - _wrap_FX_StringDict_remove(int argc, VALUE *argv, VALUE self) { - FXStringDict *arg1 ; - FXchar *arg2 ; - FXchar *result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - arg1 = (FXStringDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXStringDict); - arg2 = STR2CSTR(argv[0]); - result = (FXchar *)(arg1)->remove((FXchar const *)arg2); - - vresult = rb_str_new2(result); - return vresult; - } - - - static VALUE - _wrap_FX_StringDict_find(int argc, VALUE *argv, VALUE self) { - FXStringDict *arg1 ; - FXchar *arg2 ; - FXchar *result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - arg1 = (FXStringDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXStringDict); - arg2 = STR2CSTR(argv[0]); - result = (FXchar *)((FXStringDict const *)arg1)->find((FXchar const *)arg2); - - vresult = rb_str_new2(result); - return vresult; - } - - static void free_FXStringDict(FXStringDict *arg1) { --- 2910,2913 ---- *************** *** 3138,3159 **** static VALUE - _wrap_FXSettings_find(int argc, VALUE *argv, VALUE self) { - FXSettings *arg1 ; - FXchar *arg2 ; - FXStringDict *result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - arg1 = (FXSettings *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXSettings); - arg2 = STR2CSTR(argv[0]); - result = (FXStringDict *)((FXSettings const *)arg1)->find((FXchar const *)arg2); - - vresult = FXRbGetRubyObj(result, "FXStringDict *"); - return vresult; - } - - - static VALUE _wrap_FXSettings_readStringEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 ; --- 3074,3077 ---- *************** *** 16255,16276 **** static VALUE - _wrap_FX_IconDict_remove(int argc, VALUE *argv, VALUE self) { - FXIconDict *arg1 ; - FXchar *arg2 ; - FXIcon *result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - arg1 = (FXIconDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXIconDict); - arg2 = STR2CSTR(argv[0]); - result = (FXIcon *)(arg1)->remove((FXchar const *)arg2); - - vresult = FXRbGetRubyObj(result, "FXIcon *"); - return vresult; - } - - - static VALUE _wrap_FX_IconDict_find(int argc, VALUE *argv, VALUE self) { FXIconDict *arg1 ; --- 16173,16176 ---- *************** *** 16531,16552 **** static VALUE - _wrap_FX_FileDict_remove(int argc, VALUE *argv, VALUE self) { - FXFileDict *arg1 ; - FXchar *arg2 ; - FXFileAssoc *result; - VALUE vresult = Qnil; - - if ((argc < 1) || (argc > 1)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - arg1 = (FXFileDict *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXFileDict); - arg2 = STR2CSTR(argv[0]); - result = (FXFileAssoc *)(arg1)->remove((FXchar const *)arg2); - - vresult = FXRbGetRubyObj(result, "FXFileAssoc *"); - return vresult; - } - - - static VALUE _wrap_FX_FileDict_find(int argc, VALUE *argv, VALUE self) { FXFileDict *arg1 ; --- 16431,16434 ---- *************** *** 18317,18326 **** rb_define_singleton_method(cFX_Dict.klass, "new", VALUEFUNC(_wrap_new_FX_Dict), -1); rb_define_method(cFX_Dict.klass, "initialize", VALUEFUNC(_wrap_FX_Dict_initialize), -1); ! rb_define_method(cFX_Dict.klass, "getSize", VALUEFUNC(_wrap_FX_Dict_getSize), -1); ! rb_define_method(cFX_Dict.klass, "setSize", VALUEFUNC(_wrap_FX_Dict_setSize), -1); ! rb_define_method(cFX_Dict.klass, "no", VALUEFUNC(_wrap_FX_Dict_no), -1); ! rb_define_method(cFX_Dict.klass, "keys", VALUEFUNC(_wrap_FX_Dict_keys), -1); ! rb_define_method(cFX_Dict.klass, "has_key", VALUEFUNC(_wrap_FX_Dict_has_key), -1); ! rb_define_method(cFX_Dict.klass, "empty", VALUEFUNC(_wrap_FX_Dict_empty), -1); rb_define_method(cFX_Dict.klass, "key", VALUEFUNC(_wrap_FX_Dict_key), -1); rb_define_method(cFX_Dict.klass, "mark", VALUEFUNC(_wrap_FX_Dict_mark), -1); --- 18199,18203 ---- rb_define_singleton_method(cFX_Dict.klass, "new", VALUEFUNC(_wrap_new_FX_Dict), -1); rb_define_method(cFX_Dict.klass, "initialize", VALUEFUNC(_wrap_FX_Dict_initialize), -1); ! rb_define_method(cFX_Dict.klass, "length", VALUEFUNC(_wrap_FX_Dict_length), -1); rb_define_method(cFX_Dict.klass, "key", VALUEFUNC(_wrap_FX_Dict_key), -1); rb_define_method(cFX_Dict.klass, "mark", VALUEFUNC(_wrap_FX_Dict_mark), -1); *************** *** 18330,18333 **** --- 18207,18213 ---- rb_define_method(cFX_Dict.klass, "prev", VALUEFUNC(_wrap_FX_Dict_prev), -1); rb_define_method(cFX_Dict.klass, "clear", VALUEFUNC(_wrap_FX_Dict_clear), -1); + rb_define_method(cFX_Dict.klass, "keys", VALUEFUNC(_wrap_FX_Dict_keys), -1); + rb_define_method(cFX_Dict.klass, "has_key?", VALUEFUNC(_wrap_FX_Dict_has_keyq___), -1); + rb_define_method(cFX_Dict.klass, "empty?", VALUEFUNC(_wrap_FX_Dict_emptyq___), -1); cFX_Dict.mark = (void (*)(void *)) FXRbDict::markfunc; cFX_Dict.destroy = (void (*)(void *)) free_FXDict; *************** *** 18349,18354 **** rb_define_method(cFX_StringDict.klass, "insert", VALUEFUNC(_wrap_FX_StringDict_insert), -1); rb_define_method(cFX_StringDict.klass, "replace", VALUEFUNC(_wrap_FX_StringDict_replace), -1); - rb_define_method(cFX_StringDict.klass, "remove", VALUEFUNC(_wrap_FX_StringDict_remove), -1); - rb_define_method(cFX_StringDict.klass, "find", VALUEFUNC(_wrap_FX_StringDict_find), -1); cFX_StringDict.mark = (void (*)(void *)) FXRbStringDict::markfunc; cFX_StringDict.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; --- 18229,18232 ---- *************** *** 18370,18374 **** rb_define_method(cFXSettings.klass, "parseFile", VALUEFUNC(_wrap_FXSettings_parseFile), -1); rb_define_method(cFXSettings.klass, "unparseFile", VALUEFUNC(_wrap_FXSettings_unparseFile), -1); - rb_define_method(cFXSettings.klass, "find", VALUEFUNC(_wrap_FXSettings_find), -1); rb_define_method(cFXSettings.klass, "readStringEntry", VALUEFUNC(_wrap_FXSettings_readStringEntry), -1); rb_define_method(cFXSettings.klass, "readIntEntry", VALUEFUNC(_wrap_FXSettings_readIntEntry), -1); --- 18248,18251 ---- *************** *** 19514,19518 **** rb_define_method(cFX_IconDict.klass, "getIconPath", VALUEFUNC(_wrap_FX_IconDict_getIconPath), -1); rb_define_method(cFX_IconDict.klass, "insert", VALUEFUNC(_wrap_FX_IconDict_insert), -1); - rb_define_method(cFX_IconDict.klass, "remove", VALUEFUNC(_wrap_FX_IconDict_remove), -1); rb_define_method(cFX_IconDict.klass, "find", VALUEFUNC(_wrap_FX_IconDict_find), -1); cFX_IconDict.mark = (void (*)(void *)) FXRbIconDict::markfunc; --- 19391,19394 ---- *************** *** 19540,19544 **** rb_define_method(cFX_FileDict.klass, "getIconPath", VALUEFUNC(_wrap_FX_FileDict_getIconPath), -1); rb_define_method(cFX_FileDict.klass, "replace", VALUEFUNC(_wrap_FX_FileDict_replace), -1); - rb_define_method(cFX_FileDict.klass, "remove", VALUEFUNC(_wrap_FX_FileDict_remove), -1); rb_define_method(cFX_FileDict.klass, "find", VALUEFUNC(_wrap_FX_FileDict_find), -1); rb_define_method(cFX_FileDict.klass, "associate", VALUEFUNC(_wrap_FX_FileDict_associate), -1); --- 19416,19419 ---- Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.34.2.13 retrieving revision 1.34.2.14 diff -C2 -d -r1.34.2.13 -r1.34.2.14 *** dialogs_wrap.cpp 24 May 2002 17:41:00 -0000 1.34.2.13 --- dialogs_wrap.cpp 24 May 2002 22:20:47 -0000 1.34.2.14 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.14 retrieving revision 1.37.2.15 diff -C2 -d -r1.37.2.14 -r1.37.2.15 *** icons_wrap.cpp 24 May 2002 17:41:01 -0000 1.37.2.14 --- icons_wrap.cpp 24 May 2002 22:20:47 -0000 1.37.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.14 retrieving revision 1.39.2.15 diff -C2 -d -r1.39.2.14 -r1.39.2.15 *** image_wrap.cpp 24 May 2002 17:41:01 -0000 1.39.2.14 --- image_wrap.cpp 24 May 2002 22:20:47 -0000 1.39.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.13 retrieving revision 1.8.2.14 diff -C2 -d -r1.8.2.13 -r1.8.2.14 *** layout_wrap.cpp 24 May 2002 17:41:02 -0000 1.8.2.13 --- layout_wrap.cpp 24 May 2002 22:20:47 -0000 1.8.2.14 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.13 retrieving revision 1.36.2.14 diff -C2 -d -r1.36.2.13 -r1.36.2.14 *** mdi_wrap.cpp 24 May 2002 17:41:03 -0000 1.36.2.13 --- mdi_wrap.cpp 24 May 2002 22:20:48 -0000 1.36.2.14 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.14 retrieving revision 1.41.2.15 diff -C2 -d -r1.41.2.14 -r1.41.2.15 *** opengl_wrap.cpp 24 May 2002 17:41:03 -0000 1.41.2.14 --- opengl_wrap.cpp 24 May 2002 22:20:48 -0000 1.41.2.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.8 retrieving revision 1.16.2.9 diff -C2 -d -r1.16.2.8 -r1.16.2.9 *** scintilla_wrap.cpp 24 May 2002 17:41:04 -0000 1.16.2.8 --- scintilla_wrap.cpp 24 May 2002 22:20:48 -0000 1.16.2.9 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * 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.13 retrieving revision 1.9.2.14 diff -C2 -d -r1.9.2.13 -r1.9.2.14 *** ui_wrap.cpp 24 May 2002 17:41:04 -0000 1.9.2.13 --- ui_wrap.cpp 24 May 2002 22:20:48 -0000 1.9.2.14 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020523-1540 * * This file is not intended to be easily readable and contains a number of --- 1,5 ---- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020524-1322 * * This file is not intended to be easily readable and contains a number of |
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv13212/swig-interfaces Modified Files: Tag: release10 FXDict.i FXDirList.i FXFileList.i FXFileSelector.i FXFont.i FXGLObject.i FXWindow.i Log Message: Replaced inlined %name directives in SWIG interface files with the newer %rename directives; a little tweaking of FXDict as well. Index: FXDict.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDict.i,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -d -r1.17.2.1 -r1.17.2.2 *** FXDict.i 6 May 2002 19:16:29 -0000 1.17.2.1 --- FXDict.i 24 May 2002 22:20:57 -0000 1.17.2.2 *************** *** 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 ! ! %extend { ! // Returns a new array populated with the keys from this hash ! VALUE keys() const { ! VALUE arr = rb_ary_new(); ! return arr; ! } ! } ! ! %extend { ! // Returns true if the given key is present ! FXbool has_key(const FXchar* ky) { ! return (self->find(ky) != 0); ! } ! } ! ! %extend { ! // 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.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** FXDirList.i 2 Apr 2002 03:44:27 -0000 1.20 --- FXDirList.i 24 May 2002 22:20:57 -0000 1.20.2.1 *************** *** 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: FXFileList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileList.i,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -C2 -d -r1.21 -r1.21.2.1 *** FXFileList.i 2 Apr 2002 03:44:27 -0000 1.21 --- FXFileList.i 24 May 2002 22:20:57 -0000 1.21.2.1 *************** *** 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.2.1 retrieving revision 1.19.2.2 diff -C2 -d -r1.19.2.1 -r1.19.2.2 *** FXFileSelector.i 6 May 2002 19:16:29 -0000 1.19.2.1 --- FXFileSelector.i 24 May 2002 22:20:57 -0000 1.19.2.2 *************** *** 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);"; *************** *** 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.2.1 retrieving revision 1.15.2.2 diff -C2 -d -r1.15.2.1 -r1.15.2.2 *** FXFont.i 6 May 2002 19:16:29 -0000 1.15.2.1 --- FXFont.i 24 May 2002 22:20:57 -0000 1.15.2.2 *************** *** 341,344 **** %} ! %name(fxparsefontdesc) FXFontDesc* fxparsefontdesc2(const FXchar* string); %name(fxunparsefontdesc) FXString fxunparsefontdesc2(const FXFontDesc& fontdesc); --- 341,344 ---- %} ! %name(fxparsefontdesc) FXFontDesc *fxparsefontdesc2(const FXchar* string); %name(fxunparsefontdesc) FXString fxunparsefontdesc2(const FXFontDesc& fontdesc); Index: FXGLObject.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -C2 -d -r1.23.2.1 -r1.23.2.2 *** FXGLObject.i 6 May 2002 19:16:29 -0000 1.23.2.1 --- FXGLObject.i 24 May 2002 22:20:57 -0000 1.23.2.2 *************** *** 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);"; *************** *** 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: FXWindow.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXWindow.i,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -C2 -d -r1.32.2.1 -r1.32.2.2 *** FXWindow.i 6 May 2002 19:16:29 -0000 1.32.2.1 --- FXWindow.i 24 May 2002 22:20:57 -0000 1.32.2.2 *************** *** 83,86 **** --- 83,94 ---- } + + // Rename these methods + %rename(updateArea) FXWindow::update(FXint x,FXint y,FXint w,FXint h); + %rename(updateWindow) FXWindow::update(); + %rename(repaintArea) FXWindow::repaint(FXint x,FXint y,FXint w,FXint h); + %rename(repaintWindow) FXWindow::repaint(); + + /// Base class for all windows class FXWindow : public FXDrawable { *************** *** 547,560 **** /// Mark the specified rectangle dirty, i.e. to be repainted ! %name(updateArea) void update(FXint x,FXint y,FXint w,FXint h); /// Mark the entire window client area dirty ! %name(updateWindow) void update(); /// If marked but not yet painted, paint the given area ! %name(repaintArea) void repaint(FXint x,FXint y,FXint w,FXint h); /// If marked but not yet painted, paint the entire window ! %name(repaintWindow) void repaint(); /** --- 555,568 ---- /// Mark the specified rectangle dirty, i.e. to be repainted ! void update(FXint x,FXint y,FXint w,FXint h); /// Mark the entire window client area dirty ! void update(); /// If marked but not yet painted, paint the given area ! void repaint(FXint x,FXint y,FXint w,FXint h); /// If marked but not yet painted, paint the entire window ! void repaint(); /** |
From: Lyle J. <ly...@us...> - 2002-05-24 22:20:59
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv13212/lib/fox Modified Files: Tag: release10 aliases.rb Log Message: Replaced inlined %name directives in SWIG interface files with the newer %rename directives; a little tweaking of FXDict as well. Index: aliases.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v retrieving revision 1.24.2.6 retrieving revision 1.24.2.7 diff -C2 -d -r1.24.2.6 -r1.24.2.7 *** aliases.rb 24 May 2002 16:24:28 -0000 1.24.2.6 --- aliases.rb 24 May 2002 22:20:57 -0000 1.24.2.7 *************** *** 255,266 **** 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 |
From: Lyle J. <ly...@us...> - 2002-05-24 22:17:53
|
Update of /cvsroot/fxruby/FXRuby/lib/fox In directory usw-pr-cvs1:/tmp/cvs-serv12848 Modified Files: Tag: release10 overloads.rb Log Message: Added ensure clause for FXFileStream.open() to ensure that the file stream object is closed after executing the block. Index: overloads.rb =================================================================== RCS file: /cvsroot/fxruby/FXRuby/lib/fox/overloads.rb,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** overloads.rb 8 May 2002 21:43:44 -0000 1.7.2.1 --- overloads.rb 24 May 2002 22:17:50 -0000 1.7.2.2 *************** *** 43,60 **** 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 --- 43,55 ---- 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 |