fxruby-commits Mailing List for FXRuby (Page 11)
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-04-03 00:34:38
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv4200
Modified Files:
FXRuby.cpp
Log Message:
Corrected a bug in FXRbGetExpectedData() for determining the type (class)
of the receiver object.
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FXRuby.cpp 1 Apr 2002 23:17:48 -0000 1.38
--- FXRuby.cpp 3 Apr 2002 00:18:12 -0000 1.39
***************
*** 73,80 ****
}
- FXbool FXRbIsKindOf(VALUE obj,swig_type_info* ty){
- return (FXRbConvertPtr(obj,ty) != 0);
- }
-
// Wrapper around SWIG_NewPointerObj()
--- 73,76 ----
***************
*** 468,471 ****
--- 464,472 ----
FXint type=SELTYPE(key);
FXint id=SELID(key);
+
+ // Extract the FOX object (the receiver) from this Ruby instance
+ FXObject* obj;
+ Data_Get_Struct(recv,FXObject,obj);
+
switch(type){
case SEL_KEYPRESS:
***************
*** 557,561 ****
}
if(type==SEL_COMMAND){
! if(FXRbIsKindOf(recv,FXRbTypeQuery("FXWindow *"))){
switch(id){
case FXWindow::ID_HIDE:
--- 558,562 ----
}
if(type==SEL_COMMAND){
! if(obj->isMemberOf(FXMETACLASS(FXWindow))){
switch(id){
case FXWindow::ID_HIDE:
***************
*** 597,629 ****
return NULL;
case FXWindow::ID_SETVALUE:
! if(FXRbIsKindOf(recv,FXRbTypeQuery("FXButton *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXCheckButton *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXDial *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXRadioButton *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXShutter *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXSpinner *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXTabBar *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXToggleButton *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXScrollbar *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXSlider *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXSwitcher *"))){
return reinterpret_cast<void*>(NUM2INT(value));
}
! else if(FXRbIsKindOf(recv,FXRbTypeQuery("FXColorSelector *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXColorWell *"))){
return reinterpret_cast<void*>(NUM2UINT(value));
}
! else if(FXRbIsKindOf(recv,FXRbTypeQuery("FXProgressBar *"))){
return reinterpret_cast<void*>(NUM2UINT(value));
}
! else if(FXRbIsKindOf(recv,FXRbTypeQuery("FXComboBox *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXTextField *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXDirBox *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXDirList *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXDriveBox *")) ||
! FXRbIsKindOf(recv,FXRbTypeQuery("FXFileList *"))){
return static_cast<void*>(STR2CSTR(value));
}
! else if(FXRbIsKindOf(recv,FXRbTypeQuery("FXMenuCommand *"))){
return reinterpret_cast<void*>(RTEST(value) ? 1 : 0);
}
--- 598,630 ----
return NULL;
case FXWindow::ID_SETVALUE:
! if(obj->isMemberOf(FXMETACLASS(FXButton)) ||
! obj->isMemberOf(FXMETACLASS(FXCheckButton)) ||
! obj->isMemberOf(FXMETACLASS(FXDial)) ||
! obj->isMemberOf(FXMETACLASS(FXRadioButton)) ||
! obj->isMemberOf(FXMETACLASS(FXShutter)) ||
! obj->isMemberOf(FXMETACLASS(FXSpinner)) ||
! obj->isMemberOf(FXMETACLASS(FXTabBar)) ||
! obj->isMemberOf(FXMETACLASS(FXToggleButton)) ||
! obj->isMemberOf(FXMETACLASS(FXScrollbar)) ||
! obj->isMemberOf(FXMETACLASS(FXSlider)) ||
! obj->isMemberOf(FXMETACLASS(FXSwitcher))){
return reinterpret_cast<void*>(NUM2INT(value));
}
! else if(obj->isMemberOf(FXMETACLASS(FXColorSelector)) ||
! obj->isMemberOf(FXMETACLASS(FXColorWell))){
return reinterpret_cast<void*>(NUM2UINT(value));
}
! else if(obj->isMemberOf(FXMETACLASS(FXProgressBar))){
return reinterpret_cast<void*>(NUM2UINT(value));
}
! else if(obj->isMemberOf(FXMETACLASS(FXComboBox)) ||
! obj->isMemberOf(FXMETACLASS(FXTextField)) ||
! obj->isMemberOf(FXMETACLASS(FXDirBox)) ||
! obj->isMemberOf(FXMETACLASS(FXDirList)) ||
! obj->isMemberOf(FXMETACLASS(FXDriveBox)) ||
! obj->isMemberOf(FXMETACLASS(FXFileList))){
return static_cast<void*>(STR2CSTR(value));
}
! else if(obj->isMemberOf(FXMETACLASS(FXMenuCommand))){
return reinterpret_cast<void*>(RTEST(value) ? 1 : 0);
}
***************
*** 633,637 ****
return reinterpret_cast<void*>(NUM2INT(value));
case FXWindow::ID_SETINTVALUE:
! if(FXRbIsKindOf(recv,FXRbTypeQuery("FXColorWell *"))){
colorValue=NUM2UINT(value);
return static_cast<void*>(&colorValue);
--- 634,638 ----
return reinterpret_cast<void*>(NUM2INT(value));
case FXWindow::ID_SETINTVALUE:
! if(obj->isMemberOf(FXMETACLASS(FXColorWell))){
colorValue=NUM2UINT(value);
return static_cast<void*>(&colorValue);
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 00:30:44
|
Update of /cvsroot/fxruby/FXRuby/examples/icons
In directory usw-pr-cvs1:/tmp/cvs-serv3601/icons
Added Files:
big.png delimit.png hello2.png indent.png palette.png
pattern.png saveas.png
Removed Files:
big_gif.gif delimit.gif hello2.gif indent.gif palette.gif
pattern.gif saveas.gif
Log Message:
Updated examples to use PNG icons instead of GIF icons.
--- NEW FILE: big.png ---
PNG
--- NEW FILE: delimit.png ---
PNG
--- NEW FILE: hello2.png ---
PNG
B$ÈÉ(âä¤3(§ðI ²MdR s¼)PDÍ fH£b
Cy2h"`"ãɨzBYÇ©Ê:A° ö²Æ¢
«1Y6õ1ÔM
Rý!Ru0]
Ï f*?y">"bæ±ugm¶&A/^ÙDÿðBáKP]
2ePLÉÉeWBA½&úi
<ÄôÐ?&`º
XdÎæð&ÙÍ
Í$Lñ1£+¼<! É1
&ªÍSF¢¢kHX
sÄ¢êI¨è"þÇ
KµTI[¹©dPf¶Èò,¤p.Z¡òÐA@Ù<&²tßRÆâ¤:#f© g©
cº)HÔ¬Ø R5ð)SPËù-$¬FsÖadj$eèh¶¯S§(ÖNLSìf,t:@Þ<Ìmº)°â¡Ð&UPh¢"&eS!b\»³²D°tjcÚhÉ (N0áòTá²bήtË¡Åæ:¨¢µ4P1HÁ"Ý×Jaêí
çèê¿Þ»?í§%RÌn]~þö·Üå±¢óä{§ï:Ð!Á?RÈ/¾×Z\P?»gäôy½`g´©ª¢«ª¢Ò ÿ^
ô^xUÝyy;zFG½
?úëë²aEÝSAO\züHÔís.6¸`×yàE"h ,x<çêê¼²¤n'a]»I®ão
x0¾ìXã$49Õ{_îHØïhf z®¾ü}EýcáNøíͯö÷çuÆôqiê'fqêÖ/ðze«{}ö`|"@è-.¸.°Ç
{+¿%?Ìö ¦Ðs°¨xs0t.
CÄ¢4Qh
ð£[ñº¶
ÜV¢TE
"@òªç«¶ä~¸
R÷OÜ[Ur%H4åÄ$§H\aÙ
ÒÒU> çp ·7ÔW|"è¬ôyϬ½páûñÐãêàvGäUçÎ[~ûy§éuêj{ûpUÉÕÄÕÄðn âpl;ÜV_Ppí_C[±Á©^Ð|w÷Ñ`±³ôÛµ¾ÿ~ü."b,RÆÝë¶¼êüææêÝAP¡:yUMOµ\N$Vë#ÐÐM «±f°xVÛù¶¶»^;F2j°Ã
Nױ.Ȧ
èÝ?eýúWÓzK'ªU±h+b@xñæ?PêNºqí8
|MRTئh*
M[ÔwuÕÖîÂ#@R>Já³5WàF6ËWıÅ-ùµ£AOÍ`D×ýþ7xÝvõB¸Æ[Ò¾³ðÖ¼ù
««æðÌO¬wùû%ù-3j¿Áõdi yFÇ,Á-ï÷DâðµXqCãKÏùåG}Ö¦>RÛ¢ÉXvUÔÞWU
ã<ôÂÄã¡àIð´²6¬í§ÑúÃ3gvuu7ôtw_)Iwíò÷Æã9¤"¯Ù(Ï/Ï%Ô¾'⤱
<óÜ«g·]ºtiÛ¶G~yý±Ç}ö»wÜÔYJmÉ`òî¸ã;ölÞÕØV·m¸úùi(
¡²QdnlèÀv¤ßÔtww×ÖÕ64Ô¶ùÇÜÜEz@>_eá'ï~v¾¶»a6qlÔpö"îXUÚx¾¶¡å§Å6}÷ÝÏxçkÒѵW½9eãâÚ"âg,õ!P$¾åvö;~ìX¯»ªñh,½lNË|]<N«$ÖÆØóñ5¸ð¬¶%@)Hüü¡@.Ü?Æi:c©OYÒF\^ßÝ×?r<JúиSt8!Íuè?êÔûl
|²`Æ!EG°82©>(Ð 2:,mv'}JL§09Q²+EDA4Õ K7ÅfßÓ?M¬DEw¦p3(VÃ'ZäU³$P,ã ¸æg´Á}o9U¤²Æ:¢Ù±%£Õ#>UÄ»dí+ª Ú[Õãõµ1iªx²pÓ±©»hp6Yº¯cbÕÐPFu\òY¶ l²e¢Ø£õ¦ Jw3AÝPÂ`8à ðgD,$LçUsY-Ò)TLæ@¹¦%`$²À³OªDÙÌ»`lóÇÚø¢:ªÉØfTU4Y$áTés¤ð7ê(¯l|ÕÙ@KDúä¢ ÄÈ4MËLé©~¨¥ ÔUÂ<q²
ú±Ù;ö¢+ÈfHPõ-I$È 5]]ûè¢ £ã³+Ë}6ÊÙb?t#IrÝ "æÒn(ZpÓ°éÊÖÌæ¤w¨áe++FÆ:Ø\õl
ùg=ôÉ3úl¥ÀS.±=üªÛG2-ð
×9SSH"HãFôà°,NE²HÌ©_R4Íf&vPÉöä ú -ÆM<&¢Wã0Ò©ãÅCà
¼´V?æ©vXD°«ãÒúæ @9L{ÙV¼C¦Ì)iG-Ï,6-Y#
Ö`©YÜ2çVÎ. ?²ÒíWÐë"ýº{V@þ`w7B,@âþ&bAÿ0ô¬êGj´É|E?cÁùÌ 2(Lk Ü@Vø3®ÄÆÞ
FV9Ì2ËGo$ƱAÕÔYñq5¦h#Yø|`j¸¼ÄP¸ÙÃC¢±R²#D`*-cÑ É|b§VÔ(ÌG5)ögìâG ØÒÊ.Þ8ke"¾[d~$M»@ز£kíüè²(ú²d:þ3!
--- NEW FILE: indent.png ---
PNG
--- NEW FILE: palette.png ---
PNG
ÀFÖLQhP¡5t#ÔÚlEl¿lÒ¨úeC#tóÖí;mMÑ
ÐöG<m{ùÌ幪BÅXtôÅËW¯;\º7²©
fâóSÑÌø*ñ<þuõ¿
^X½¯®ïá¡õߣïøÇýu¤Ö
--- NEW FILE: pattern.png ---
PNG
--- NEW FILE: saveas.png ---
PNG
ÞѶ£¥
--- big_gif.gif DELETED ---
--- delimit.gif DELETED ---
--- hello2.gif DELETED ---
--- indent.gif DELETED ---
--- palette.gif DELETED ---
--- pattern.gif DELETED ---
--- saveas.gif DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 00:29:49
|
Update of /cvsroot/fxruby/FXRuby/doc/images
In directory usw-pr-cvs1:/tmp/cvs-serv25938/images
Added Files:
glviewer.png
Removed Files:
glviewer.gif
Log Message:
Replaced glviewer.gif (snapshot) with glviewer.png.
--- NEW FILE: glviewer.png ---
PNG
»»»¹¹¹···µµµ
:Vl(棣&ê5ÆcK1!
hkÀ¿rÏ´3mwwÙö}HVv-ì~æá9eÎ!AG ""8A;yDD´#"Nû."Üà ^åð² "B;½î]óè¯÷0j'úEðZ"^»®×_7îa¢ý>!<Ñ@î/ñ_Ýçæ¦ÛLoáæníD ÛÚ[·níp2zË&
Í&»«,´C:Â?Ú
ï¥Kí´Â!öµlºÓn÷¡á#íÊx)Ûè"yí
zν
¹æV»zùB»Q{7Ê5öî«#´[kwH¹ÞL;GñUÎX«¸
½vü½ÝÝcûòy1¿²I8xO·óõóhªÇkªçíëÇñü
A»í¦ýSÐíÐíaý¤Ûg¥~
ö¯\aÐ~MÞæyûÏôÍlv"üf¬=åqìwÝã¿¢Ú9åϪ°É§¹>U6]r²]Û)÷W¹ýä¿y½ÉíÚ¼êA»xÁé^Eò/÷/¡ÖOî_XivÂ,Ê-ýZíô¡8×`~_×q³3Ó®[
ÊÚ¯¹6oUÝþê«ZîvµsBüiÞ_ûÿþïÿÊÜ6û°ùO~¤
¤t¯7[;rÒ¿òd_i?©gü%å<1³ëêöWÄô®Ëí/øR¶üTYí(cnWváo§^»¸QTÑ?³Ê²f½
vÂK£]³:ü{êµ_Ñn#=k7Wmý³Õl;}ÜÎö²ÚÙJÉø¼ §`ç9¾î'%í䤨£vzѾ
Ð= !æÚ]©ÍíòVö¨
×¹vÂ«Ú £]ô®Ö3f}2<oÚ÷ÂóíÊbÞû>W¯)u^»¼Y«l§×®±»³Úåí¯~åízM«]x:réN&Úò.?BjwÉÝAÜôÉ0/¯Os;-BÜ®Õ+Ö<2GCÙ£@Èí;ÿb'Þ¦N#j~×iÿ¯vÿk®Ý¡bs;ïªgغûWþÄoSí®"åxF»:6m¥é"`U3v»RqõäÕwoáç¯zÒ.VÞÚ:§ Ü\»ðk¯Ø>ò]á]n·Ð.ÃBÂ8IÆJF¯ÝaK;ÛóækíòÜwÂæÊDhxÊ_ÄÓQ Ôí÷Wvﳺ¿zÆÜnòpEn½
°Ü¾KüM¸7hWZ§DQ¯×nUÉ0¬%Èíq»øgGÙn©}×.ök¢Oñ^ªN¤û½æÚ&pg¶¹]øâ¯é÷¶ _B»ÕNH#´»°ÔíRb»Ä4ÚOk·QÉÈ ý§]xÏ9MnW±$¡OFà.jçÙ£C½}ÝNÔ/b^·«¿³.·?QµK¹]ÒÎï2Ñ.åtµ7ævÓV*Ã3×Îmçå4ï¦Ùe¢ýç¾&å¯1}&ÒvE;³]Ò.ÊþY»ÿÏJnÿù+v;ùc%ãA»r¾hú>üü|©Ëý¤©vcÝî¹*1®~_jçÍ´ë±{8
þv»^;{`èªò_Mµ¿4§ÖhF$ó&¹](Éõ8ÂÔ0ò
y%CÌ´+]o:ÕÍn·ÞK»µv7j+¯(wm%Ã+»ëµl7¯Û=iûÛųЮôºÛè±ÑÉ3}[M ]Â=B}ã)·ë+ªÖëtb¢]Ø=ól=ªtûXçv!½kw3ªv¢ÉínæT³Ýn7¿¿]Ú]¡Ó®ÄWí_¹~ pS¶ß3wÃj7ïqß)¥Jï³Ì]]¢I\I²£Ýîè3`ÐÜn~Ð'øBzÿÜävw¹]ªõÚj=cÛÅônÒJ%<3ÊÄ.1u»o´s/¥ýç)ýè;þ©×n66j5Æêþ9fdÉý<Næ®9 b×k7KÍÂvWßß4ÚõØ=BP°ÊYör»~ƹvWïµV;§W&ÞÜ®¤Ê¡9À7³ÂÜæpÎd»æ«ûÛ\Ú©õÚpºYaÆÈÆtír>×®`µëR¸£@wàô@Ì ÿåÔ/> ºk}µÔé.ìö]®ðzVÃwÚR{¸j¹kµ³SY}1×lòíHý3¼Yç íúÇÖ¬0Mg&gÒi6ªã¿µ;Ì.æ°Ólç5ÛíÎgµ«ý¥·U2Ü<oNÛu·³9¬ç@zó3ÍÑôïSS</hvh÷±vósñ¿·»{l_>/¶[¼§Ûùúy4Õã5Õóöõãx~
^F; P¸{l_>/CV¿pÛùúy4Õã5Õóöõãx~
^F;æíhG yíøä>´Dd#¢´#¹Eø§A;Ú¡¶Úíd´#B\»]ÆÚ¡®·ïÆa+ÿ{õÐRí¼üï
aíàÍí>9"¼»GhG@;´# ÝvL§°_k«v⩪í<Â^p¯]svãù$´#iÛ}ñÂT;q[Ú û#+íO"/ÐíÔ./c/}XëÃY^»Ãv´C{jg>fÍåÞõ/»X+ùÓÒÏÑ|,f'"ÌIB ÚݡѮ|Æ1·D_·k¨=Ú¡=PÚUØÚÜ®
w¯Ý¡_6¸>>OÑÎîJPÉ@{ ´míî¹1jw£væýJÚC»ÇV*ñPÉèë"b<_É^0
¹xö6
q§Þv}»¶êжRùaài¥rMÞ? íºÄö¦Ñn¾8ïÆRIPô@rÌòç»v1DzzH2Ϩ
oýChÇ<+é¦Híâ¤NC¥¬TÓkÝÜÎ.=ïÚ$¿EÐNódä·]ójhgÆ
£Ç$T°{¥ÝU£B{Øi×N2Ñ®*VÚn´-赫¿«!Ò¬ ±Z?h4N»Z°ëg±#mv«§PÔ®~´T75G|Û53~ÔEDÁ\Qí®É«¯=ÔF| nqâªöàk½"·C»íúD¯ÍI´rºµàÒÎ|èêvh×j7ïoW§þhÓ=agCB¡ª}2¦=rÆRÑßYÚ9þöÈѱÔÒî³2víÆÙoö6A{iGØx¡Ú¡Ú¡Ú¡=8µcm$Ï0C;´C{$iÊ_vh÷öPø|@hviÖßÚ¡ÝívæðÑ×ܸqéìÙ³Ç;Dcâ]+FÒmfIñ?rü?m(彤ȷîLºcñ1ÄG>:}nÜ Ú¡ÝÚ9N:SÜS9sÂð¯ò
ó7ß2ß=ø?}Â%´C{#*ç[B;´KÝN<vhV*±ÑJ
vh£ÜíÐºÚ òÖ×A;z #A{nzTTFFttf³ØµÅÐîí£KAEkÒ?xàp<z´téÓUÑ«s:&C»ÇRCà|´pÔÓð¤öÎwï.Z´hñ£e+VedµX³¶hsOh÷£öàmU
³öUËÞ½9wnUUUZZÚZÇåÏVE7o±&/¡¨t;´cÆo8i_þèÎÜY³*++gß¼97íÎÝÅêW<OÏ\í\Ó¦ÝÆ-½¡ÚZûÖ=wÙí\y° ªòý?þøðÏ?©øUóîɽ!£ÙêØøõE%[ûA;´«ömébÔÕÙÓ^w7mö¬?¨ö?>¼Ï®· öÁR1¹Çääë¼}?´C{Ði¯« §WÿóÙÃ/ìioWu³òÃ÷ß;å^ysnÍE.{ú,½Yvl«öJ·îLvh"íR:¬_ÿèÖí
÷?·¥=ª6mnåïÿ&s5{nÚ<Iûó¨¬ìؼÂâ®=ûvh
ío¤³ñÆO3ÞýýcÜíhwF/½SEëÿóÛoö?þ}³ªfÁ]¡y&öAƯ£Ú»÷Þ7Ú¡=àÚë\Ì¿5fÜÓgßøéw~ýHÒîûÖ¬§ÔþÇoRf§uLU
m¤>x´lùÊôÌÕööö{v?.ck»J}ð¡/}üÔ¤³o\xëòõÜî[å[µ\åXvjjö?+gW uÌb¡K21-ã
Ún(.Ù²wÿÁ_í¾×³°íÅ\Ô÷ôß?ð`ÅÐÃG¥ÚøñÍ×?útþ½%-´«UOô²Ú;Tû¬Eë³*Å¢]èzd2²²sr©öNI\Ï>ý8í~Ðy2¶³ú¶í;võÙ³w@ÊÁ}Mµæ-Ü¯ß ÍTó©ð«sV,]4/mîìYú³TìB÷£ÐÛÞ"¶U¶»tëÕwű¯C;æ@@ûÐ>½¶oíÞ}Û¶={õîÓ·ÜPíÇN|'î3®*ÍÔ:kêÕÕëVÕ;դͥÉ]F}snZÍ¡
ºìé³UQͳkò
;vNîÞ«_yÅãg¡ÝÚ1¿ÝS¤ôî)jûî¾{¢Ú¿ùV,ܧM¿bÖLÕR§ÑêÙ2Ç¢;w1æÒê©
úìyztV36N,dºöè½÷ÀÐãN¿ í8#
w¡ú}êëâø[ê4Ög7ZõlùòeO=¢Ò-«_þt
Ø£5_M3{üÚõ7&oÝÞ{ϾÃFO:cf5´{gaûD{w¶J÷¡B)sâ;¡p÷D½ººû:góLÊ}ÅÓú'Ëê©tJ}åó1±g;Eìí;&&%s=zíî_>dķνùöO Ý·c©8»
ûÁ!òTtÏÖ««¹«e4<_ùlÅ3+?_Ù¬y3'®UAÂúöEKºpÝ{öÙ[>xبãß¿ôîÇ·¡Ý§ÚóÄÍàÓîNUw±Òu¥kãrZ4oÕ°jð_CzzFt³¬Õ1Ù-×䯷Y×nCÑÆÎ¥[¶ö,ë·ÿàÐßíÇË3oÝvÌø
Ĭ0e8U)Ü
>H»ÔEíñ¹±Î¬Ìè訨èÌ̬櫳[´ÌË+Hh[Ø¡xc -Ú)ö
u|âäiï|tû!´C{ ´»SÂÝêÕÕý7·K(È]ãÌnÕ<«(}uv¶³el\nMìíK6w¥Ø÷80äðÈ1§^ûáâõ9÷ê Ú¤}2y l÷V}xÐÞkKQ»6ykZf·hÓ<&»
³eNll\«ø6kÛ¶ÛÐqã¦ÒänÛzö¦Ø+üvÜ÷>³ú>´C{´÷ê!õÊPí}öx©}(·©¨pÝÚ¼¸Ø5±9-[Rékâr[åÅ·Ih»^¬bºtÝÚ£WYß+}|Â7¦ÍøàöhöÀ»²³§4y@æ¥ö#Ý»$µ_¿¶ />¯Un+yñmÖ&´m×¾CÇâMIÉܶ;w÷Û'c?}îÇ·®üõ´C{´É]íñRû^ÝJ6´k°¶Má?*}}»Bj½Ó¦.[¶öØQÖ·ÿþ¿!N¬N³ð!´C{ÎK-ÓÒá÷S}·wMJ,.j_Ø~=
JßС¨x㦤.[¸î=wöé·/ePÅ~ìÔ¤Éç§M¿ú{õgC»G1ø ÖÞäþÚ²mÉ%7u,ê°:ïС¨cñÆÄÎI·të¾Vì{÷<(ýwzò¦¿ýë_ó<vkÇYضÏMíÝõëe)3hïÎÉ»lÚ¸±S§Nil*Iê"YïM+öâØì×ÎMyó+×?ºuïáækí'c?¹½2Â<È>ÞjÿràÞÛ¸®[º&%t)¥Ñ%yGïè½{Oa¬êðQßxFdvõ×ßçÜö]jóRåT9¾Lî+Ü_?´¿_Ý·v£â·léJRïÑS´>` pnÈ7£ÇúÃ
·.¿ûû_zÏwØ#(·ã,lß§6²ù¦¢¼ßÞÛ{lë.îÍN0+§ÓáGwêûÔ7¦]zûúòéÂuÐîµv
í»Üþ2ÚÏr`ÿÞÝ»ûôîµFïÞe}úPêû¨uZÄõíØñOKÜs{ág¾Ä1Úq¶O'¹+³~{{ý¸¯>P>`ßÞ=}ûíí×ooÿ}ö§8X!.²7öÄI©çÎOþÎÌ¿>ÿó/ê ½qgs ·7EáîÖ:Ïÿrvô7_;4xPyÊþå)å\1äп>",LóýkøQÀþqµPÄø{Ĭ°í~ÙË«RF¼ñ[gÇùæÈð/W>XQ1xpÅ¡¡_>âQ£¿NæN}}Ê
ö[óï?öFh'h÷Kán:Òu?MþîıÑ#=üðaú~dä¨ÑcÇ?õÝé³4¯¿õË«3ÿªþôÏS{³°ýpvª}íê?xóÜãÇ=úè7£¾¡ÐiR{â»I¯üÃÔ.Íxçúï¿ÿõÉ?óïákìÕß³°}W¸Ëg§Ú-Ü5·¾~iÊë©ß81þÄñãcÇ;%°HðoNûê{üõ÷ß,¼wïó:h÷×X*ÎÂön¤4W¦çeÇòµ·~øûÛÓ¦túôk¾8qÒúÇìì¹óBZ¿r}æoݾ}û%Kø;´ã,ìFîê<H¥Ïë´ó|}úOSÎrþsBJ:uê´Óg¼óÞïÍ©ÿÙýû÷<~ü¹ï±C;fü6r¤ÍÂ]Ü]ÏýqõWg\º4}úÅ7ºxé3®\½>ó£9·nËmÓ:?dvhöÆ26wy÷|½÷/î}rãÝëïýzýêÛï¼û¿ðÑÇÌÿtá?bvhoT)ìi=Òµ»A;_÷øáüêOoýý×
ª\9·ªoß»÷Ï/üÚ¡½±}
wfo£vjþÏã%÷þ?ÿö?ÿüsûÓùïݸDPòuhöFOp_¸kö6Ñ.zâ/?¼Rüº/>÷§uhöF'÷já.$ª]·³©v÷:ZÖ|ÎT0þ²íMv^*vÚõ å÷öĽ®)¬C{SêWíbá.nÑ,nK»w¿_@»ðøy(Ü´ëCk=ÝNánB¾ Fë Ú}mÝ+íM:6þ3~¥°åKÓyÐî[ëÐàùíò§Ñ@{SX×wËäC{@´¢êQ;ý» ý«\®×÷Ê
ë{^Ý%|µW[X7$wh¨vâv¢üÏw]¥×z$ÈßË$¬µób»é@{àêöÌíîµu'1ÛküGv¾^h·î¼öÊí³³lj'L%Ã3W¡ÝÈÝíéíÑÎy«ø çkçÈÐn;¹7Âzzu5´¿¬v³Tíåv¢Ö0ìU¢/w"(·û@»ìÐÞXí×Ò§&ämjWºbxö*³EÕÚUʤ»ÃíK%¼&k®MmiÚùÓî;´fæ
íM6s@mrÖDÒ¬¡dØÎvGB»ûÕ{õÚyhÇ<ÐÕng¹jËOvh!íö«µóÐí!«½I«vhbìÐ0íX=©É±C{ ´7Í+Ú«W55Ù;¥Úý¯køq¼ÔþzÕuË
R¡ÚCY»~_ë9)ËÖ×A;´¶vó%|
©½aYLA´C{ÈkWÀ»93)¥aYFì¦1Ðía ÝÃzÕu¹
ËÇl¨íЪ=¶¹8Õgt íÐæÚër³ÕSíI}ýÅÚ¡=X´©j/îº/u&´C{8kO¡©]ÐÞª}éÎThöpÖ^.j_Ómà
¹}#&\v{ÚI¸FXi×vÈÆÔúçÎ<¡:Æý2á©=Ì#<´kûÚijËö
-rÛ&Òä>Þ÷ܡڼé0janÖªTû³5ÅwV<qq&´C{H®°ávq$!µ7<WµtM2Òç¥;´C{S7F«öÕ¬ööÉ}Shé>Ú¡=d×´X©¼dmNóOEíÑ«sòÖöì;pÄ3¡ÚCxÕSÅêvĵÈ\õly=Õ¾*ªYÜ»îÜ'$÷Ðía²Æ¯}âVg
Lýçé´iS¸±K!¹Oõ)whö@G]÷ëãV§³ÚóÖÑvªÜ§Îvh#í}:´Õho[Ð~Sr¾FLLzÚ¡=|´©ÝÅhoî+hXÚµ÷ãS/Þvhí)Bj^µR«½¸srÏ~8å
´C{h¯Û±q}®3«áù³§¬öõ»t/K>êxªïT¡Ú;\©}¹¬=ºy5y í;%uÝÑ¿bøÑS¦Ívhíu%Ålj§Ú¢Åää¬ïØ9y[ßòáÇS_÷U7$´C{@cOIa5BUѾrXÊįë@Û©;÷Wx:õÊLhö×^¾£¤07'Û }MÞZ¡Ú£¬ÿ áÇÇOºxÚ¡=äµ÷ás«3uÚ[ĶjCÛ©¥Ü=åCzñhöP×Þ=©h-Û34Ú³²[ÆÅ'´/.ÙңϾAÃG4e:´C{¨kOÚXXÝ,]éµGe®vƶ*hW\²yëÎ~å#hr6Ú¡=ĵ'v ©½¹ÚëÅxúìyÜsrÚuÜÔ¥ëvÜ÷ýÓ ÚC[{RÇõB+µk´mLJî.tËs"õ
höÏíÄSímÛÓäÞ³ïAÃF
íÐâگǯzdÌ´Ç'´ë°1i˶2Ü<5 Ú¡=ÔGÔ.ízí-×´*h»¡m§ö¢É½âðØSÐí¡®=®eÚi#U£=Æ¿®Pl§íM4dôXhö&iWR»¬½Ùê9qykÛ%&wïÕ·ÊÁ#èoöjw ìö×Î#ìía IÛî;íÐíÐíÐíÐíÐXí»nÚ¡Ú¡Ú¡ÚZ»þ=W¶ú_ßæ&h/íº'¶ÚuïÍMÐfÚY²v9ÕÉÒ&×\WÔñÐí¡¤'¢]½äµW¤½öÐÍíÌÇ{ª¤É1ÚÃP»æ-0Ѿ7¸vùæC»WÚr ía§];ÊD»ZªXiª×·Ê5>´Ë×í"t<´Gvµ`çuÊRÕî:(´×BR»ÃõÉåÐñ¹Õ®Ê×|-DµËÚý¨½©Ã¶vÞtN»ë¯mØ"·C{(i×'zvv'~ö Ó®¶HQ·C»N»y»\¼óúâÆÕ/Iî
Uíè0í3þöÈÒÎô·cæ
íÐíÐíÐíÐíÐíÐíÐíÐvh©¨ãñ{ó«ç|íÐÚëÍÚ¡=Ü´'º
höðÑ^è9 ÚÃC{¢ÍvhíÁ.Ú¡Ý·Ú<´C»çhá%÷D¡Òn&´C{piw&6&Üßi³¨UÏW>Ël×¶´C{0iowKïëã®XþdéÒ¥õ+Veå´/ÙíÐ$ÚÕná=öî¢ÚÚ»îÜ]ü¨þYC³mºvhíÎXqo½b^ÚܳgݬY°øÉÓçQkÚ&r¡ÚA{¨=×Gé=fU}MÕìÊYΪ¼9¯VHî1ñzìíÐxí-$íym|á}õG57+ÿüðCA{ÚÝ4¹GÇä¬ÛØuç £ÐíA¡½¥ }]âK{ÏzR[ssÖïÿñá³fϹ³xéòç1±ñJ{ô=tÚ¡=´ç¬´¯o_ôÜ£.ªúóýß~£ÜgݬGÛ©ËGg¯)X¿©[§¡Ú@{l\«xQ{§M/ã½Å3ǹ³>üã}ª½rnÚE´YÙ"®M»N]wî«
íLäÎÝr̨1.ÃØô>bÌw/\^íçÅ Ú½Ó.2{Íæ
PíÍÆlx?;õí_ÿúÚ¡=t´WϿ穱ò~éúÏûy<hv_hºdn}ê¹l7ã.ìüÎóý¾($´C»§pº×þ½Ú%£m¤:Ý3/Xoßvh´vAmKãPjù !â0vv¤íÎ:6>½×ëýB;´Û8Ð*^7¸T.uÉ»dÞº|uæGë&@z¥ýaS,n
íÐnkâ@^ÁÚ¶íØÁ¥riNØxaºïÓ¯XÉa[{¬äíÐnÿÌ%×àp
¶
ö/ìjozìÐí^¹¤.)§`ë´7ºloÏèvh÷N»\ȤO\b©²]ê̱vhJíeb!#¸$5RÍzÛy÷ÜÞ:´C{ãµeûD«ÞvWW½
í<íÐ4Úåîv¥K¦LÛHýiºÉHfhÊcj·|ì|hö¦×.u·'& Ô^}úYiW©×FkϧÜíÐ.t·Ú7sºy¬ö
FªUÈø^:´C»½i29T»°PÐÝ.hgOåPºdtT¦ñÚ_ÐðkRvh÷ælª½}ØÝ.j
±Kæ´2oàoÓ²=ߢxצvF»ß¤C;´{3ª®xÊ4RÏ(cKsÜhç=Tív¿Rvh÷ö<=÷ÚõÔ|Þ¼kÆD{¾¿©C;´{£Ýµ¾¯
vc#57ç®o£6thvïr{¢0'LÖ.tɰë
Tcÿ£¹vMjÏo"êÐíÞj»Û
È/¿VÖP©îR»µö¦íÐîÕPjG¥»Ý¬Ñm?µó<´C{piw
¥iÿåÃ0höÖ®¥&ë´§þ@)aÐí!¨]J-Þ$j/s5R'|~Ú¥·¯Ëç-Yö?*ØóÚ¡ÝóÌe(µ4Z¶g
Ú¬lØ«âÌårvh÷»Y!ã4ãN±W©ýÁh1µ¹<?Ú¡=ôµq°Ïe´Ï©Ëvhzí¼'ífÜìBueó¼"Y;íÐôÚywe»Ó»¦öµÅv>?Ú¡=صóÚy§5÷¹ój¬d´×ñ| Ò;´CûKkWb2÷]Hí˲í3åÑvhrí¼ vmcü^ESûófÎ6z8rfêå
--- glviewer.gif DELETED ---
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 00:29:48
|
Update of /cvsroot/fxruby/FXRuby/doc
In directory usw-pr-cvs1:/tmp/cvs-serv25938
Modified Files:
examples.xml
Log Message:
Replaced glviewer.gif (snapshot) with glviewer.png.
Index: examples.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/examples.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** examples.xml 21 Mar 2002 19:09:11 -0000 1.3
--- examples.xml 2 Apr 2002 23:37:13 -0000 1.4
***************
*** 159,163 ****
<screenshot>
<mediaobject>
! <imageobject><imagedata fileref="images/glviewer.gif" format="GIF" align="center"/></imageobject>
</mediaobject>
</screenshot>
--- 159,163 ----
<screenshot>
<mediaobject>
! <imageobject><imagedata fileref="images/glviewer.png" format="PNG" align="center"/></imageobject>
</mediaobject>
</screenshot>
|
|
From: Lyle J. <ly...@us...> - 2002-04-03 00:29:36
|
Update of /cvsroot/fxruby/FXRuby/examples/textedit
In directory usw-pr-cvs1:/tmp/cvs-serv3601/textedit
Modified Files:
prefdialog.rb textedit.rb
Log Message:
Updated examples to use PNG icons instead of GIF icons.
Index: prefdialog.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/textedit/prefdialog.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** prefdialog.rb 26 Nov 2001 19:28:56 -0000 1.3
--- prefdialog.rb 2 Apr 2002 22:27:54 -0000 1.4
***************
*** 6,10 ****
def loadIcon(name)
filename = File.join("..", "icons", name)
! FXGIFIcon.new(getApp(), File.open(filename, "rb").read)
end
--- 6,10 ----
def loadIcon(name)
filename = File.join("..", "icons", name)
! FXPNGIcon.new(getApp(), File.open(filename, "rb").read)
end
***************
*** 25,32 ****
# Icons
! pal = loadIcon("palette.gif")
! ind = loadIcon("indent.gif")
! pat = loadIcon("pattern.gif")
! del = loadIcon("delimit.gif")
# Pane 1
--- 25,32 ----
# Icons
! pal = loadIcon("palette.png")
! ind = loadIcon("indent.png")
! pat = loadIcon("pattern.png")
! del = loadIcon("delimit.png")
# Pane 1
Index: textedit.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/examples/textedit/textedit.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** textedit.rb 29 Jan 2002 16:25:01 -0000 1.10
--- textedit.rb 2 Apr 2002 22:27:54 -0000 1.11
***************
*** 67,71 ****
def loadIcon(name)
path = File.join("..", "icons", name)
! FXGIFIcon.new(getApp(), File.open(path, "rb").read)
end
--- 67,71 ----
def loadIcon(name)
path = File.join("..", "icons", name)
! FXPNGIcon.new(getApp(), File.open(path, "rb").read)
end
***************
*** 175,194 ****
# Make some icons
! @bigicon = loadIcon("big_gif.gif")
! @smallicon = loadIcon("small_gif.gif")
! @newicon = loadIcon("filenew.gif")
! @openicon = loadIcon("fileopen.gif")
! @saveicon = loadIcon("filesave.gif")
! @saveasicon = FXGIFIcon.new(getApp(), File.open(File.join("..", "icons", "saveas.gif"), "rb").read(),
0, IMAGE_ALPHAGUESS)
! @printicon = loadIcon("printicon.gif")
! @cuticon = loadIcon("cut.gif")
! @copyicon = loadIcon("copy.gif")
! @pasteicon = loadIcon("paste.gif")
! @deleteicon = loadIcon("kill.gif")
! @undoicon = loadIcon("undo_gif.gif")
! @redoicon = loadIcon("redo_gif.gif")
! @fontsicon = loadIcon("fonts.gif")
! @helpicon = loadIcon("help_gif.gif")
# Application icons
--- 175,194 ----
# Make some icons
! @bigicon = loadIcon("big.png")
! @smallicon = loadIcon("small.png")
! @newicon = loadIcon("filenew.png")
! @openicon = loadIcon("fileopen.png")
! @saveicon = loadIcon("filesave.png")
! @saveasicon = FXPNGIcon.new(getApp(), File.open(File.join("..", "icons", "saveas.png"), "rb").read(),
0, IMAGE_ALPHAGUESS)
! @printicon = loadIcon("printicon.png")
! @cuticon = loadIcon("cut.png")
! @copyicon = loadIcon("copy.png")
! @pasteicon = loadIcon("paste.png")
! @deleteicon = loadIcon("kill.png")
! @undoicon = loadIcon("undo.png")
! @redoicon = loadIcon("redo.png")
! @fontsicon = loadIcon("fonts.png")
! @helpicon = loadIcon("help.png")
# Application icons
|
|
From: Lyle J. <ly...@us...> - 2002-04-02 04:11:54
|
Update of /cvsroot/fxruby/FXRuby/doc
In directory usw-pr-cvs1:/tmp/cvs-serv7114
Modified Files:
changes.xml
Log Message:
Added a note to the change log about Bil's report on the change in
rb_rescue2().
Index: changes.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/changes.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** changes.xml 23 Mar 2002 00:03:24 -0000 1.8
--- changes.xml 2 Apr 2002 04:11:50 -0000 1.9
***************
*** 4,8 ****
<title>Changes Since Version 1.0.3</title>
<itemizedlist mark="bullet">
! <listitem><para>Corrected the code for <methodname>FXTreeList#clearItems</methodname> 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!</para></listitem>
</itemizedlist>
</simplesect>
--- 4,9 ----
<title>Changes Since Version 1.0.3</title>
<itemizedlist mark="bullet">
! <listitem><para>Corrected the code for <methodname>FXTreeList#clearItems</methodname> 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.</para></listitem>
! <listitem><para>The API for Ruby's <methodname>rb_rescue2()</methodname> 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.</para></listitem>
</itemizedlist>
</simplesect>
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv6532/ext/fox Modified Files: core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp ui_wrap.cpp Log Message: Added "free" functions (called when a Ruby instance is garbage-collected) to ensure that the Ruby-C++ object mappings are properly broken. Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** core_wrap.cpp 28 Mar 2002 15:26:04 -0000 1.58 --- core_wrap.cpp 2 Apr 2002 04:10:09 -0000 1.59 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 4819,4823 **** result = (FXTimer *)(arg1)->addTimeout(arg2,arg3,arg4); ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXTimer,0); return vresult; } --- 4819,4823 ---- result = (FXTimer *)(arg1)->addTimeout(arg2,arg3,arg4); ! vresult = FXRbGetRubyObj(result, "FXTimer *"); return vresult; } *************** *** 4837,4841 **** result = (FXTimer *)(arg1)->removeTimeout(arg2); ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXTimer,0); return vresult; } --- 4837,4841 ---- result = (FXTimer *)(arg1)->removeTimeout(arg2); ! vresult = FXRbGetRubyObj(result, "FXTimer *"); return vresult; } *************** *** 4857,4861 **** result = (FXChore *)(arg1)->addChore(arg2,arg3); ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXChore,0); return vresult; } --- 4857,4861 ---- result = (FXChore *)(arg1)->addChore(arg2,arg3); ! vresult = FXRbGetRubyObj(result, "FXChore *"); return vresult; } *************** *** 4875,4879 **** result = (FXChore *)(arg1)->removeChore(arg2); ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXChore,0); return vresult; } --- 4875,4879 ---- result = (FXChore *)(arg1)->removeChore(arg2); ! vresult = FXRbGetRubyObj(result, "FXChore *"); return vresult; } *************** *** 5394,5398 **** result = (FXRegistry *) &_result_ref; ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXRegistry,0); return vresult; } --- 5394,5398 ---- result = (FXRegistry *) &_result_ref; ! vresult = FXRbGetRubyObj(result, "FXRegistry *"); return vresult; } *************** *** 7575,7581 **** { ! FXFontDesc * resultptr; ! resultptr = new FXFontDesc (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXFontDesc, 1); } return vresult; --- 7575,7580 ---- { ! FXFontDesc* resultptr = new FXFontDesc(result); ! vresult = FXRbGetRubyObj(resultptr, "FXFontDesc *"); } return vresult; *************** *** 9223,9229 **** { ! FXRectangle * resultptr; ! resultptr = new FXRectangle (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXRectangle, 1); } return vresult; --- 9222,9227 ---- { ! FXRectangle* resultptr = new FXRectangle(result); ! vresult = FXRbGetRubyObj(resultptr, "FXRectangle *"); } return vresult; *************** *** 9247,9251 **** result = (FXRegion *) &_result_ref; ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXRegion,0); return vresult; } --- 9245,9249 ---- result = (FXRegion *) &_result_ref; ! vresult = FXRbGetRubyObj(result, "FXRegion *"); return vresult; } *************** *** 9266,9272 **** { ! FXRegion * resultptr; ! resultptr = new FXRegion (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXRegion, 1); } return vresult; --- 9264,9269 ---- { ! FXRegion* resultptr = new FXRegion(result); ! vresult = FXRbGetRubyObj(resultptr, "FXRegion *"); } return vresult; *************** *** 9288,9294 **** { ! FXRegion * resultptr; ! resultptr = new FXRegion (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXRegion, 1); } return vresult; --- 9285,9290 ---- { ! FXRegion* resultptr = new FXRegion(result); ! vresult = FXRbGetRubyObj(resultptr, "FXRegion *"); } return vresult; *************** *** 9310,9316 **** { ! FXRegion * resultptr; ! resultptr = new FXRegion (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXRegion, 1); } return vresult; --- 9306,9311 ---- { ! FXRegion* resultptr = new FXRegion(result); ! vresult = FXRbGetRubyObj(resultptr, "FXRegion *"); } return vresult; *************** *** 9332,9338 **** { ! FXRegion * resultptr; ! resultptr = new FXRegion (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXRegion, 1); } return vresult; --- 9327,9332 ---- { ! FXRegion* resultptr = new FXRegion(result); ! vresult = FXRbGetRubyObj(resultptr, "FXRegion *"); } return vresult; *************** *** 10893,10897 **** result = (FXRectangle *) &_result_ref; ! vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FXRectangle,0); return vresult; } --- 10887,10891 ---- result = (FXRectangle *) &_result_ref; ! vresult = FXRbGetRubyObj(result, "FXRectangle *"); return vresult; } *************** *** 17232,17236 **** rb_define_singleton_method(cFXStream.klass, "isLittleEndian", VALUEFUNC(_wrap_FXStream_isLittleEndian), -1); cFXStream.mark = 0; ! cFXStream.destroy = (void (*)(void *)) free_FXStream; cFXFileStream.klass = rb_define_class_under(mFox, "FXFileStream", cFXStream.klass); --- 17226,17230 ---- rb_define_singleton_method(cFXStream.klass, "isLittleEndian", VALUEFUNC(_wrap_FXStream_isLittleEndian), -1); cFXStream.mark = 0; ! cFXStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXFileStream.klass = rb_define_class_under(mFox, "FXFileStream", cFXStream.klass); *************** *** 17265,17269 **** rb_define_method(cFXSize.klass, "h", VALUEFUNC(_wrap_FXSize_h_get), -1); cFXSize.mark = 0; ! cFXSize.destroy = (void (*)(void *)) free_FXSize; cFXPoint.klass = rb_define_class_under(mFox, "FXPoint", rb_cObject); --- 17259,17263 ---- rb_define_method(cFXSize.klass, "h", VALUEFUNC(_wrap_FXSize_h_get), -1); cFXSize.mark = 0; ! cFXSize.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXPoint.klass = rb_define_class_under(mFox, "FXPoint", rb_cObject); *************** *** 17276,17279 **** --- 17270,17274 ---- rb_define_method(cFXPoint.klass, "y", VALUEFUNC(_wrap_FXPoint_y_get), -1); cFXPoint.mark = 0; + cFXPoint.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXRectangle.klass = rb_define_class_under(mFox, "FXRectangle", rb_cObject); *************** *** 17290,17293 **** --- 17285,17289 ---- rb_define_method(cFXRectangle.klass, "h", VALUEFUNC(_wrap_FXRectangle_h_get), -1); cFXRectangle.mark = 0; + cFXRectangle.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; rb_define_const(mFox,"MINKEY", INT2NUM(0)); rb_define_const(mFox,"MAXKEY", INT2NUM(65535)); *************** *** 17304,17308 **** rb_define_method(cFX_Object.klass, "load", VALUEFUNC(_wrap_FX_Object_load), -1); cFX_Object.mark = (void (*)(void *)) FXRbObject::markfunc; ! cFX_Object.destroy = (void (*)(void *)) free_FXObject; cFXObject.klass = rb_define_class_under(mFox, "FXObject", cFX_Object.klass); --- 17300,17304 ---- rb_define_method(cFX_Object.klass, "load", VALUEFUNC(_wrap_FX_Object_load), -1); cFX_Object.mark = (void (*)(void *)) FXRbObject::markfunc; ! cFX_Object.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXObject.klass = rb_define_class_under(mFox, "FXObject", cFX_Object.klass); *************** *** 17375,17379 **** 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 *)) free_FXStringDict; cFXStringDict.klass = rb_define_class_under(mFox, "FXStringDict", cFX_StringDict.klass); --- 17371,17375 ---- 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; cFXStringDict.klass = rb_define_class_under(mFox, "FXStringDict", cFX_StringDict.klass); *************** *** 17424,17428 **** rb_define_method(cFXRegistry.klass, "getAsciiMode", VALUEFUNC(_wrap_FXRegistry_getAsciiMode), -1); cFXRegistry.mark = 0; ! cFXRegistry.destroy = (void (*)(void *)) free_FXRegistry; cFX_AccelTable.klass = rb_define_class_under(mFox, "FX_AccelTable", cFX_Object.klass); --- 17420,17424 ---- rb_define_method(cFXRegistry.klass, "getAsciiMode", VALUEFUNC(_wrap_FXRegistry_getAsciiMode), -1); cFXRegistry.mark = 0; ! cFXRegistry.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFX_AccelTable.klass = rb_define_class_under(mFox, "FX_AccelTable", cFX_Object.klass); *************** *** 17437,17441 **** rb_define_method(cFX_AccelTable.klass, "removeAccel", VALUEFUNC(_wrap_FX_AccelTable_removeAccel), -1); cFX_AccelTable.mark = (void (*)(void *)) FXRbAccelTable::markfunc; ! cFX_AccelTable.destroy = (void (*)(void *)) free_FXAccelTable; cFXAccelTable.klass = rb_define_class_under(mFox, "FXAccelTable", cFX_AccelTable.klass); --- 17433,17437 ---- rb_define_method(cFX_AccelTable.klass, "removeAccel", VALUEFUNC(_wrap_FX_AccelTable_removeAccel), -1); cFX_AccelTable.mark = (void (*)(void *)) FXRbAccelTable::markfunc; ! cFX_AccelTable.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXAccelTable.klass = rb_define_class_under(mFox, "FXAccelTable", cFX_AccelTable.klass); *************** *** 17555,17558 **** --- 17551,17555 ---- rb_undef_method(CLASS_OF(cFXChore.klass), "new"); cFXChore.mark = 0; + cFXChore.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXTimer.klass = rb_define_class_under(mFox, "FXTimer", rb_cObject); *************** *** 17560,17563 **** --- 17557,17561 ---- rb_undef_method(CLASS_OF(cFXTimer.klass), "new"); cFXTimer.mark = 0; + cFXTimer.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFX_App.klass = rb_define_class_under(mFox, "FX_App", cFX_Object.klass); *************** *** 17671,17675 **** rb_define_method(cFX_App.klass, "dumpWidgets", VALUEFUNC(_wrap_FX_App_dumpWidgets), -1); cFX_App.mark = (void (*)(void *)) FXRbApp::markfunc; ! cFX_App.destroy = (void (*)(void *)) free_FXApp; cFXApp.klass = rb_define_class_under(mFox, "FXApp", cFX_App.klass); --- 17669,17673 ---- rb_define_method(cFX_App.klass, "dumpWidgets", VALUEFUNC(_wrap_FX_App_dumpWidgets), -1); cFX_App.mark = (void (*)(void *)) FXRbApp::markfunc; ! cFX_App.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXApp.klass = rb_define_class_under(mFox, "FXApp", cFX_App.klass); *************** *** 17754,17758 **** rb_define_method(cFX_Visual.klass, "getType", VALUEFUNC(_wrap_FX_Visual_getType), -1); cFX_Visual.mark = (void (*)(void *)) FXRbVisual::markfunc; ! cFX_Visual.destroy = (void (*)(void *)) free_FXVisual; cFXVisual.klass = rb_define_class_under(mFox, "FXVisual", cFX_Visual.klass); --- 17752,17756 ---- rb_define_method(cFX_Visual.klass, "getType", VALUEFUNC(_wrap_FX_Visual_getType), -1); cFX_Visual.mark = (void (*)(void *)) FXRbVisual::markfunc; ! cFX_Visual.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXVisual.klass = rb_define_class_under(mFox, "FXVisual", cFX_Visual.klass); *************** *** 17879,17883 **** rb_define_method(cFXFontDesc.klass, "flags", VALUEFUNC(_wrap_FXFontDesc_flags_get), -1); cFXFontDesc.mark = 0; ! cFXFontDesc.destroy = (void (*)(void *)) free_FXFontDesc; cFX_Font.klass = rb_define_class_under(mFox, "FX_Font", cFX_Id.klass); --- 17877,17881 ---- rb_define_method(cFXFontDesc.klass, "flags", VALUEFUNC(_wrap_FXFontDesc_flags_get), -1); cFXFontDesc.mark = 0; ! cFXFontDesc.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFX_Font.klass = rb_define_class_under(mFox, "FX_Font", cFX_Id.klass); *************** *** 17910,17914 **** rb_define_singleton_method(cFX_Font.klass, "listFonts", VALUEFUNC(_wrap_FX_Font_listFonts), -1); cFX_Font.mark = (void (*)(void *)) FXRbFont::markfunc; ! cFX_Font.destroy = (void (*)(void *)) free_FXFont; cFXFont.klass = rb_define_class_under(mFox, "FXFont", cFX_Font.klass); --- 17908,17912 ---- rb_define_singleton_method(cFX_Font.klass, "listFonts", VALUEFUNC(_wrap_FX_Font_listFonts), -1); cFX_Font.mark = (void (*)(void *)) FXRbFont::markfunc; ! cFX_Font.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXFont.klass = rb_define_class_under(mFox, "FXFont", cFX_Font.klass); *************** *** 17951,17955 **** rb_define_method(cFX_Cursor.klass, "load", VALUEFUNC(_wrap_FX_Cursor_load), -1); cFX_Cursor.mark = (void (*)(void *)) FXRbCursor::markfunc; ! cFX_Cursor.destroy = (void (*)(void *)) free_FXCursor; cFXCursor.klass = rb_define_class_under(mFox, "FXCursor", cFX_Cursor.klass); --- 17949,17953 ---- rb_define_method(cFX_Cursor.klass, "load", VALUEFUNC(_wrap_FX_Cursor_load), -1); cFX_Cursor.mark = (void (*)(void *)) FXRbCursor::markfunc; ! cFX_Cursor.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXCursor.klass = rb_define_class_under(mFox, "FXCursor", cFX_Cursor.klass); *************** *** 18053,18057 **** rb_define_method(cFXRegion.klass, "==", VALUEFUNC(_wrap_FXRegion___eq__), -1); cFXRegion.mark = 0; ! cFXRegion.destroy = (void (*)(void *)) free_FXRegion; rb_define_const(mFox,"BLT_CLR", INT2NUM(BLT_CLR)); rb_define_const(mFox,"BLT_SRC_AND_DST", INT2NUM(BLT_SRC_AND_DST)); --- 18051,18055 ---- rb_define_method(cFXRegion.klass, "==", VALUEFUNC(_wrap_FXRegion___eq__), -1); cFXRegion.mark = 0; ! cFXRegion.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; rb_define_const(mFox,"BLT_CLR", INT2NUM(BLT_CLR)); rb_define_const(mFox,"BLT_SRC_AND_DST", INT2NUM(BLT_SRC_AND_DST)); *************** *** 18424,18428 **** rb_define_method(cFXPrinter.klass, "flags", VALUEFUNC(_wrap_FXPrinter_flags_get), -1); cFXPrinter.mark = 0; ! cFXPrinter.destroy = (void (*)(void *)) free_FXPrinter; cFX_DCPrint.klass = rb_define_class_under(mFox, "FX_DCPrint", cFX_DC.klass); --- 18422,18426 ---- rb_define_method(cFXPrinter.klass, "flags", VALUEFUNC(_wrap_FXPrinter_flags_get), -1); cFXPrinter.mark = 0; ! cFXPrinter.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFX_DCPrint.klass = rb_define_class_under(mFox, "FX_DCPrint", cFX_DC.klass); *************** *** 18519,18523 **** rb_define_method(cFXFileAssoc.klass, "flags", VALUEFUNC(_wrap_FXFileAssoc_flags_get), -1); cFXFileAssoc.mark = 0; ! cFXFileAssoc.destroy = (void (*)(void *)) free_FXFileAssoc; cFX_IconDict.klass = rb_define_class_under(mFox, "FX_IconDict", cFX_Dict.klass); --- 18517,18521 ---- rb_define_method(cFXFileAssoc.klass, "flags", VALUEFUNC(_wrap_FXFileAssoc_flags_get), -1); cFXFileAssoc.mark = 0; ! cFXFileAssoc.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFX_IconDict.klass = rb_define_class_under(mFox, "FX_IconDict", cFX_Dict.klass); *************** *** 18565,18569 **** rb_define_method(cFX_FileDict.klass, "load", VALUEFUNC(_wrap_FX_FileDict_load), -1); cFX_FileDict.mark = (void (*)(void *)) FXRbFileDict::markfunc; ! cFX_FileDict.destroy = (void (*)(void *)) free_FXFileDict; cFXFileDict.klass = rb_define_class_under(mFox, "FXFileDict", cFX_FileDict.klass); --- 18563,18567 ---- rb_define_method(cFX_FileDict.klass, "load", VALUEFUNC(_wrap_FX_FileDict_load), -1); cFX_FileDict.mark = (void (*)(void *)) FXRbFileDict::markfunc; ! cFX_FileDict.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXFileDict.klass = rb_define_class_under(mFox, "FXFileDict", cFX_FileDict.klass); Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** dialogs_wrap.cpp 28 Mar 2002 15:26:07 -0000 1.32 --- dialogs_wrap.cpp 2 Apr 2002 04:10:13 -0000 1.33 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 4208,4214 **** { ! FXFontDesc * resultptr; ! resultptr = new FXFontDesc (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXFontDesc, 1); } return vresult; --- 4208,4213 ---- { ! FXFontDesc* resultptr = new FXFontDesc(result); ! vresult = FXRbGetRubyObj(resultptr, "FXFontDesc *"); } return vresult; *************** *** 8191,8197 **** { ! FXPrinter * resultptr; ! resultptr = new FXPrinter (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXPrinter, 1); } return vresult; --- 8190,8195 ---- { ! FXPrinter *resultptr = new FXPrinter(result); ! vresult = FXRbGetRubyObj(resultptr, "FXPrinter *"); } return vresult; Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** icons_wrap.cpp 28 Mar 2002 15:26:07 -0000 1.35 --- icons_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.36 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 7020,7024 **** rb_define_method(cFX_Icon.klass, "setTransparentColor", VALUEFUNC(_wrap_FX_Icon_setTransparentColor), -1); cFX_Icon.mark = (void (*)(void *)) FXRbIcon::markfunc; ! cFX_Icon.destroy = (void (*)(void *)) free_FXIcon; cFXIcon.klass = rb_define_class_under(mFox, "FXIcon", cFX_Icon.klass); --- 7020,7024 ---- rb_define_method(cFX_Icon.klass, "setTransparentColor", VALUEFUNC(_wrap_FX_Icon_setTransparentColor), -1); cFX_Icon.mark = (void (*)(void *)) FXRbIcon::markfunc; ! cFX_Icon.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXIcon.klass = rb_define_class_under(mFox, "FXIcon", cFX_Icon.klass); Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** image_wrap.cpp 28 Mar 2002 15:26:07 -0000 1.37 --- image_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.38 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 7256,7260 **** rb_define_method(cFX_Bitmap.klass, "loadPixels", VALUEFUNC(_wrap_FX_Bitmap_loadPixels), -1); cFX_Bitmap.mark = (void (*)(void *)) FXRbBitmap::markfunc; ! cFX_Bitmap.destroy = (void (*)(void *)) free_FXBitmap; cFXBitmap.klass = rb_define_class_under(mFox, "FXBitmap", cFX_Bitmap.klass); --- 7256,7260 ---- rb_define_method(cFX_Bitmap.klass, "loadPixels", VALUEFUNC(_wrap_FX_Bitmap_loadPixels), -1); cFX_Bitmap.mark = (void (*)(void *)) FXRbBitmap::markfunc; ! cFX_Bitmap.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXBitmap.klass = rb_define_class_under(mFox, "FXBitmap", cFX_Bitmap.klass); *************** *** 7310,7314 **** rb_define_method(cFX_Image.klass, "loadPixels", VALUEFUNC(_wrap_FX_Image_loadPixels), -1); cFX_Image.mark = (void (*)(void *)) FXRbImage::markfunc; ! cFX_Image.destroy = (void (*)(void *)) free_FXImage; cFXImage.klass = rb_define_class_under(mFox, "FXImage", cFX_Image.klass); --- 7310,7314 ---- rb_define_method(cFX_Image.klass, "loadPixels", VALUEFUNC(_wrap_FX_Image_loadPixels), -1); cFX_Image.mark = (void (*)(void *)) FXRbImage::markfunc; ! cFX_Image.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXImage.klass = rb_define_class_under(mFox, "FXImage", cFX_Image.klass); Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** layout_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.6 --- layout_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.7 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 11294,11297 **** --- 11294,11298 ---- rb_define_method(cFX_VerticalFrame.klass, "initialize", VALUEFUNC(_wrap_FX_VerticalFrame_initialize), -1); cFX_VerticalFrame.mark = (void (*)(void *)) FXRbVerticalFrame::markfunc; + cFX_VerticalFrame.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXVerticalFrame.klass = rb_define_class_under(mFox, "FXVerticalFrame", cFX_VerticalFrame.klass); Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mdi_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.34 --- mdi_wrap.cpp 2 Apr 2002 04:10:14 -0000 1.35 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 10890,10894 **** rb_define_method(cFX_MDIChild.klass, "getFont", VALUEFUNC(_wrap_FX_MDIChild_getFont), -1); cFX_MDIChild.mark = (void (*)(void *)) FXRbMDIChild::markfunc; ! cFX_MDIChild.destroy = (void (*)(void *)) free_FXMDIChild; cFXMDIChild.klass = rb_define_class_under(mFox, "FXMDIChild", cFX_MDIChild.klass); --- 10890,10894 ---- rb_define_method(cFX_MDIChild.klass, "getFont", VALUEFUNC(_wrap_FX_MDIChild_getFont), -1); cFX_MDIChild.mark = (void (*)(void *)) FXRbMDIChild::markfunc; ! cFX_MDIChild.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXMDIChild.klass = rb_define_class_under(mFox, "FXMDIChild", cFX_MDIChild.klass); Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** opengl_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.39 --- opengl_wrap.cpp 2 Apr 2002 04:10:15 -0000 1.40 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * [...1277 lines suppressed...] cFXMaterial.mark = 0; ! cFXMaterial.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFX_GLViewer.klass = rb_define_class_under(mFox, "FX_GLViewer", cFX_GLCanvas.klass); *************** *** 13708,13711 **** --- 13663,13667 ---- rb_define_method(cFX_GLObject.klass, "drag", VALUEFUNC(_wrap_FX_GLObject_drag), -1); cFX_GLObject.mark = (void (*)(void *)) FXRbGLObject::markfunc; + cFX_GLObject.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXGLObject.klass = rb_define_class_under(mFox, "FXGLObject", cFX_GLObject.klass); *************** *** 13807,13810 **** --- 13763,13767 ---- rb_define_method(cFX_GLShape.klass, "getMaterial", VALUEFUNC(_wrap_FX_GLShape_getMaterial), -1); cFX_GLShape.mark = (void (*)(void *)) FXRbGLShape::markfunc; + cFX_GLShape.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXGLShape.klass = rb_define_class_under(mFox, "FXGLShape", cFX_GLShape.klass); Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ui_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.7 --- ui_wrap.cpp 2 Apr 2002 04:10:15 -0000 1.8 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020327-1824 * * 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-20020401-2115 * * This file is not intended to be easily readable and contains a number of *************** *** 901,905 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(oldItem); // Done --- 901,905 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(oldItem); // Done *************** *** 914,918 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(oldItem); // Done --- 914,918 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(oldItem); // Done *************** *** 942,946 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(item); } void FXList_clearItems(FXList *self,FXbool notify){ --- 942,946 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(item); } void FXList_clearItems(FXList *self,FXbool notify){ *************** *** 960,964 **** if(items){ for(FXint i=0; i<numItems; i++){ ! FXRbNotifyDestroyed(items[i]); } FXFREE(&items); --- 960,964 ---- if(items){ for(FXint i=0; i<numItems; i++){ ! FXRbUnregisterRubyObj(items[i]); } FXFREE(&items); *************** *** 1042,1046 **** // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbNotifyDestroyed(items[i]); } } --- 1042,1046 ---- // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbUnregisterRubyObj(items[i]); } } *************** *** 1055,1059 **** // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbNotifyDestroyed(items[i]); } } --- 1055,1059 ---- // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbUnregisterRubyObj(items[i]); } } *************** *** 1068,1072 **** // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbNotifyDestroyed(items[i]); } } --- 1068,1072 ---- // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbUnregisterRubyObj(items[i]); } } *************** *** 1147,1151 **** // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbNotifyDestroyed(items[i]); } } --- 1147,1151 ---- // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbUnregisterRubyObj(items[i]); } } *************** *** 1164,1168 **** // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbNotifyDestroyed(items[i]); } } --- 1164,1168 ---- // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbUnregisterRubyObj(items[i]); } } *************** *** 1181,1185 **** // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbNotifyDestroyed(items[i]); } } --- 1181,1185 ---- // Now zero-out pointers held by still-alive Ruby objects for(FXint i=0;i<items.no();i++){ ! FXRbUnregisterRubyObj(items[i]); } } *************** *** 1192,1196 **** // Now zero-out any pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(item); } void FXTable_setItemData(FXTable *self,FXint r,FXint c,VALUE ptr){ --- 1192,1196 ---- // Now zero-out any pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(item); } void FXTable_setItemData(FXTable *self,FXint r,FXint c,VALUE ptr){ *************** *** 1263,1267 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(oldItem); // Done --- 1263,1267 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(oldItem); // Done *************** *** 1276,1280 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(oldItem); // Done --- 1276,1280 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(oldItem); // Done *************** *** 1304,1308 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(item); } void FXHeader_clearItems(FXHeader *self,FXbool notify){ --- 1304,1308 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(item); } void FXHeader_clearItems(FXHeader *self,FXbool notify){ *************** *** 1322,1326 **** if(items){ for(FXint i=0; i<numItems; i++){ ! FXRbNotifyDestroyed(items[i]); } FXFREE(&items); --- 1322,1326 ---- if(items){ for(FXint i=0; i<numItems; i++){ ! FXRbUnregisterRubyObj(items[i]); } FXFREE(&items); *************** *** 1360,1364 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(oldItem); // Done --- 1360,1364 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(oldItem); // Done *************** *** 1373,1377 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(oldItem); // Done --- 1373,1377 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(oldItem); // Done *************** *** 1401,1405 **** // Now zero-out pointers held by still-alive Ruby objects ! FXRbNotifyDestroyed(item); } void FXIconList_clearItems(FXIconList *self,FXbool notify){ --- 1401,1405 ---- // Now zero-out pointers held by still-alive Ruby objects ! FXRbUnregisterRubyObj(item); } void FXIconList_clearItems(FXIconList *self,FXbool notify){ *************** *** 1419,1423 **** if(items){ for(FXint i=0; i<numItems; i++){ ! FXRbNotifyDestroyed(items[i]); } FXFREE(&items); --- 1419,1423 ---- if(items){ for(FXint i=0; i<numItems; i++){ ! FXRbUnregisterRubyObj(items[i]); } FXFREE(&items); *************** *** 87022,87028 **** { ! FXFontDesc * resultptr; ! resultptr = new FXFontDesc (result); ! vresult = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_FXFontDesc, 1); } return vresult; --- 87022,87027 ---- { ! FXFontDesc* resultptr = new FXFontDesc(result); ! vresult = FXRbGetRubyObj(resultptr, "FXFontDesc *"); } return vresult; *************** *** 100235,100239 **** rb_define_method(cFX_Window.klass, "doesSaveUnder", VALUEFUNC(_wrap_FX_Window_doesSaveUnder), -1); cFX_Window.mark = (void (*)(void *)) FXRbWindow::markfunc; ! cFX_Window.destroy = (void (*)(void *)) free_FXWindow; cFXWindow.klass = rb_define_class_under(mFox, "FXWindow", cFX_Window.klass); --- 100234,100238 ---- rb_define_method(cFX_Window.klass, "doesSaveUnder", VALUEFUNC(_wrap_FX_Window_doesSaveUnder), -1); cFX_Window.mark = (void (*)(void *)) FXRbWindow::markfunc; ! cFX_Window.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXWindow.klass = rb_define_class_under(mFox, "FXWindow", cFX_Window.klass); *************** *** 101008,101012 **** rb_define_method(cFX_Button.klass, "getButtonStyle", VALUEFUNC(_wrap_FX_Button_getButtonStyle), -1); cFX_Button.mark = (void (*)(void *)) FXRbButton::markfunc; ! cFX_Button.destroy = (void (*)(void *)) free_FXButton; cFXButton.klass = rb_define_class_under(mFox, "FXButton", cFX_Button.klass); --- 101007,101011 ---- rb_define_method(cFX_Button.klass, "getButtonStyle", VALUEFUNC(_wrap_FX_Button_getButtonStyle), -1); cFX_Button.mark = (void (*)(void *)) FXRbButton::markfunc; ! cFX_Button.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXButton.klass = rb_define_class_under(mFox, "FXButton", cFX_Button.klass); *************** *** 101501,101505 **** rb_define_method(cFX_Composite.klass, "maxChildHeight", VALUEFUNC(_wrap_FX_Composite_maxChildHeight), -1); cFX_Composite.mark = (void (*)(void *)) FXRbComposite::markfunc; ! cFX_Composite.destroy = (void (*)(void *)) free_FXComposite; cFXComposite.klass = rb_define_class_under(mFox, "FXComposite", cFX_Composite.klass); --- 101500,101504 ---- rb_define_method(cFX_Composite.klass, "maxChildHeight", VALUEFUNC(_wrap_FX_Composite_maxChildHeight), -1); cFX_Composite.mark = (void (*)(void *)) FXRbComposite::markfunc; ! cFX_Composite.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXComposite.klass = rb_define_class_under(mFox, "FXComposite", cFX_Composite.klass); *************** *** 101708,101712 **** rb_define_method(cFX_RootWindow.klass, "initialize", VALUEFUNC(_wrap_FX_RootWindow_initialize), -1); cFX_RootWindow.mark = (void (*)(void *)) FXRbRootWindow::markfunc; ! cFX_RootWindow.destroy = (void (*)(void *)) free_FXRootWindow; cFXRootWindow.klass = rb_define_class_under(mFox, "FXRootWindow", cFX_RootWindow.klass); --- 101707,101711 ---- rb_define_method(cFX_RootWindow.klass, "initialize", VALUEFUNC(_wrap_FX_RootWindow_initialize), -1); cFX_RootWindow.mark = (void (*)(void *)) FXRbRootWindow::markfunc; ! cFX_RootWindow.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXRootWindow.klass = rb_define_class_under(mFox, "FXRootWindow", cFX_RootWindow.klass); *************** *** 101949,101953 **** rb_define_method(cFX_Popup.klass, "setShrinkWrap", VALUEFUNC(_wrap_FX_Popup_setShrinkWrap), -1); cFX_Popup.mark = (void (*)(void *)) FXRbPopup::markfunc; ! cFX_Popup.destroy = (void (*)(void *)) free_FXPopup; cFXPopup.klass = rb_define_class_under(mFox, "FXPopup", cFX_Popup.klass); --- 101948,101952 ---- rb_define_method(cFX_Popup.klass, "setShrinkWrap", VALUEFUNC(_wrap_FX_Popup_setShrinkWrap), -1); cFX_Popup.mark = (void (*)(void *)) FXRbPopup::markfunc; ! cFX_Popup.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXPopup.klass = rb_define_class_under(mFox, "FXPopup", cFX_Popup.klass); *************** *** 102627,102631 **** rb_define_method(cFX_Option.klass, "onHotKeyRelease", VALUEFUNC(_wrap_FX_Option_onHotKeyRelease), -1); cFX_Option.mark = (void (*)(void *)) FXRbOption::markfunc; ! cFX_Option.destroy = (void (*)(void *)) free_FXOption; cFXOption.klass = rb_define_class_under(mFox, "FXOption", cFX_Option.klass); --- 102626,102630 ---- rb_define_method(cFX_Option.klass, "onHotKeyRelease", VALUEFUNC(_wrap_FX_Option_onHotKeyRelease), -1); cFX_Option.mark = (void (*)(void *)) FXRbOption::markfunc; ! cFX_Option.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXOption.klass = rb_define_class_under(mFox, "FXOption", cFX_Option.klass); *************** *** 102980,102984 **** rb_define_method(cFX_Scrollbar.klass, "setScrollbarStyle", VALUEFUNC(_wrap_FX_Scrollbar_setScrollbarStyle), -1); cFX_Scrollbar.mark = (void (*)(void *)) FXRbScrollbar::markfunc; ! cFX_Scrollbar.destroy = (void (*)(void *)) free_FXScrollbar; cFXScrollbar.klass = rb_define_class_under(mFox, "FXScrollbar", cFX_Scrollbar.klass); --- 102979,102983 ---- rb_define_method(cFX_Scrollbar.klass, "setScrollbarStyle", VALUEFUNC(_wrap_FX_Scrollbar_setScrollbarStyle), -1); cFX_Scrollbar.mark = (void (*)(void *)) FXRbScrollbar::markfunc; ! cFX_Scrollbar.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXScrollbar.klass = rb_define_class_under(mFox, "FXScrollbar", cFX_Scrollbar.klass); *************** *** 103228,103231 **** --- 103227,103231 ---- rb_define_method(cFX_ListItem.klass, "destroy", VALUEFUNC(_wrap_FX_ListItem_destroy), -1); cFX_ListItem.mark = (void (*)(void *)) FXRbListItem::markfunc; + cFX_ListItem.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXListItem.klass = rb_define_class_under(mFox, "FXListItem", cFX_ListItem.klass); *************** *** 103632,103635 **** --- 103632,103636 ---- rb_define_method(cFX_TreeItem.klass, "destroy", VALUEFUNC(_wrap_FX_TreeItem_destroy), -1); cFX_TreeItem.mark = (void (*)(void *)) FXRbTreeItem::markfunc; + cFX_TreeItem.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXTreeItem.klass = rb_define_class_under(mFox, "FXTreeItem", cFX_TreeItem.klass); *************** *** 103981,103985 **** rb_define_method(cFXTablePos.klass, "col", VALUEFUNC(_wrap_FXTablePos_col_get), -1); cFXTablePos.mark = 0; ! cFXTablePos.destroy = (void (*)(void *)) free_FXTablePos; cFXTableRange.klass = rb_define_class_under(mFox, "FXTableRange", rb_cObject); --- 103982,103986 ---- rb_define_method(cFXTablePos.klass, "col", VALUEFUNC(_wrap_FXTablePos_col_get), -1); cFXTablePos.mark = 0; ! cFXTablePos.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXTableRange.klass = rb_define_class_under(mFox, "FXTableRange", rb_cObject); *************** *** 104046,104049 **** --- 104047,104051 ---- rb_define_method(cFX_TableItem.klass, "load", VALUEFUNC(_wrap_FX_TableItem_load), -1); cFX_TableItem.mark = (void (*)(void *)) FXRbTableItem::markfunc; + cFX_TableItem.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXTableItem.klass = rb_define_class_under(mFox, "FXTableItem", cFX_TableItem.klass); *************** *** 104322,104325 **** --- 104324,104328 ---- rb_define_method(cFX_DragCorner.klass, "getShadowColor", VALUEFUNC(_wrap_FX_DragCorner_getShadowColor), -1); cFX_DragCorner.mark = (void (*)(void *)) FXRbDragCorner::markfunc; + cFX_DragCorner.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXDragCorner.klass = rb_define_class_under(mFox, "FXDragCorner", cFX_DragCorner.klass); *************** *** 104379,104383 **** rb_define_method(cFX_Statusline.klass, "setTextHighlightColor", VALUEFUNC(_wrap_FX_Statusline_setTextHighlightColor), -1); cFX_Statusline.mark = (void (*)(void *)) FXRbStatusline::markfunc; ! cFX_Statusline.destroy = (void (*)(void *)) free_FXStatusline; cFXStatusline.klass = rb_define_class_under(mFox, "FXStatusline", cFX_Statusline.klass); --- 104382,104386 ---- rb_define_method(cFX_Statusline.klass, "setTextHighlightColor", VALUEFUNC(_wrap_FX_Statusline_setTextHighlightColor), -1); cFX_Statusline.mark = (void (*)(void *)) FXRbStatusline::markfunc; ! cFX_Statusline.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXStatusline.klass = rb_define_class_under(mFox, "FXStatusline", cFX_Statusline.klass); *************** *** 104699,104702 **** --- 104702,104706 ---- rb_define_method(cFX_HeaderItem.klass, "destroy", VALUEFUNC(_wrap_FX_HeaderItem_destroy), -1); cFX_HeaderItem.mark = (void (*)(void *)) FXRbHeaderItem::markfunc; + cFX_HeaderItem.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXHeaderItem.klass = rb_define_class_under(mFox, "FXHeaderItem", cFX_HeaderItem.klass); *************** *** 104764,104768 **** rb_define_method(cFX_Header.klass, "getHelpText", VALUEFUNC(_wrap_FX_Header_getHelpText), -1); cFX_Header.mark = (void (*)(void *)) FXRbHeader::markfunc; ! cFX_Header.destroy = (void (*)(void *)) free_FXHeader; cFXHeader.klass = rb_define_class_under(mFox, "FXHeader", cFX_Header.klass); --- 104768,104772 ---- rb_define_method(cFX_Header.klass, "getHelpText", VALUEFUNC(_wrap_FX_Header_getHelpText), -1); cFX_Header.mark = (void (*)(void *)) FXRbHeader::markfunc; ! cFX_Header.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXHeader.klass = rb_define_class_under(mFox, "FXHeader", cFX_Header.klass); *************** *** 104844,104847 **** --- 104848,104852 ---- rb_define_method(cFX_IconItem.klass, "load", VALUEFUNC(_wrap_FX_IconItem_load), -1); cFX_IconItem.mark = (void (*)(void *)) FXRbIconItem::markfunc; + cFX_IconItem.destroy = (void (*)(void *)) FXRbUnregisterRubyObj; cFXIconItem.klass = rb_define_class_under(mFox, "FXIconItem", cFX_IconItem.klass); |
|
From: Lyle J. <ly...@us...> - 2002-04-02 04:10:20
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv6532/swig-interfaces
Modified Files:
freefuncs.i
Log Message:
Added "free" functions (called when a Ruby instance is garbage-collected)
to ensure that the Ruby-C++ object mappings are properly broken.
Index: freefuncs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/freefuncs.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** freefuncs.i 2 Apr 2002 03:44:27 -0000 1.1
--- freefuncs.i 2 Apr 2002 04:10:16 -0000 1.2
***************
*** 21,33 ****
***********************************************************************/
! %feature("freefunc") FXRbDirItem "FXRbDirItem::freefunc";
! %feature("freefunc") FXRbFileItem "FXRbFileItem::freefunc";
! %feature("freefunc") FXRbGLObject "FXRbGLObject::freefunc";
! %feature("freefunc") FXRbGLGroup "FXRbGLGroup::freefunc";
! %feature("freefunc") FXRbGLShape "FXRbGLShape::freefunc";
! %feature("freefunc") FXRbHeaderItem "FXRbHeaderItem::freefunc";
! %feature("freefunc") FXRbIconItem "FXRbIconItem::freefunc";
! %feature("freefunc") FXRbListItem "FXRbListItem::freefunc";
! %feature("freefunc") FXRbTableItem "FXRbTableItem::freefunc";
! %feature("freefunc") FXTreeItem "FXRbUnregisterRubyObj";
! %feature("freefunc") FXRbTreeItem "FXRbTreeItem::freefunc";
--- 21,88 ----
***********************************************************************/
! %freefunc FXAccelTable "FXRbUnregisterRubyObj";
! %freefunc FXApp "FXRbUnregisterRubyObj";
! %freefunc FXBitmap "FXRbUnregisterRubyObj";
! %freefunc FXButton "FXRbUnregisterRubyObj";
! %freefunc FXChore "FXRbUnregisterRubyObj";
! %freefunc FXComposite "FXRbUnregisterRubyObj";
! %freefunc FXCursor "FXRbUnregisterRubyObj";
! %freefunc FXDQuat "FXRbUnregisterRubyObj";
! %freefunc FXDragCorner "FXRbUnregisterRubyObj";
! %freefunc FXFileAssoc "FXRbUnregisterRubyObj";
! %freefunc FXFileDict "FXRbUnregisterRubyObj";
! %freefunc FXFont "FXRbUnregisterRubyObj";
! %freefunc FXFontDesc "FXRbUnregisterRubyObj";
! %freefunc FXGLObject "FXRbUnregisterRubyObj";
! %freefunc FXGLShape "FXRbUnregisterRubyObj";
! %freefunc FXGLVisual "FXRbUnregisterRubyObj";
! %freefunc FXHeader "FXRbUnregisterRubyObj";
! %freefunc FXHeaderItem "FXRbUnregisterRubyObj";
! %freefunc FXHMat "FXRbUnregisterRubyObj";
! %freefunc FXHVec "FXRbUnregisterRubyObj";
! %freefunc FXIcon "FXRbUnregisterRubyObj";
! %freefunc FXIconItem "FXRbUnregisterRubyObj";
! %freefunc FXImage "FXRbUnregisterRubyObj";
! %freefunc FXLight "FXRbUnregisterRubyObj";
! %freefunc FXListItem "FXRbUnregisterRubyObj";
! %freefunc FXMaterial "FXRbUnregisterRubyObj";
! %freefunc FXMDIChild "FXRbUnregisterRubyObj";
! %freefunc FXObject "FXRbUnregisterRubyObj";
! %freefunc FXOption "FXRbUnregisterRubyObj";
! %freefunc FXPoint "FXRbUnregisterRubyObj";
! %freefunc FXPopup "FXRbUnregisterRubyObj";
! %freefunc FXPrinter "FXRbUnregisterRubyObj";
! %freefunc FXQuat "FXRbUnregisterRubyObj";
! %freefunc FXRange "FXRbUnregisterRubyObj";
! %freefunc FXRangeSlice "FXRbUnregisterRubyObj";
! %freefunc FXRectangle "FXRbUnregisterRubyObj";
! %freefunc FXRegion "FXRbUnregisterRubyObj";
! %freefunc FXRegistry "FXRbUnregisterRubyObj";
! %freefunc FXRootWindow "FXRbUnregisterRubyObj";
! %freefunc FXScrollbar "FXRbUnregisterRubyObj";
! %freefunc FXSize "FXRbUnregisterRubyObj";
! %freefunc FXStatusline "FXRbUnregisterRubyObj";
! %freefunc FXStream "FXRbUnregisterRubyObj";
! %freefunc FXStringDict "FXRbUnregisterRubyObj";
! %freefunc FXTableItem "FXRbUnregisterRubyObj";
! %freefunc FXTablePos "FXRbUnregisterRubyObj";
! %freefunc FXTableItem "FXRbUnregisterRubyObj";
! %freefunc FXTimer "FXRbUnregisterRubyObj";
! %freefunc FXTreeItem "FXRbUnregisterRubyObj";
! %freefunc FXVec "FXRbUnregisterRubyObj";
! %freefunc FXVerticalFrame "FXRbUnregisterRubyObj";
! %freefunc FXViewport "FXRbUnregisterRubyObj";
! %freefunc FXVisual "FXRbUnregisterRubyObj";
! %freefunc FXWindow "FXRbUnregisterRubyObj";
! %freefunc NotifyHeader "FXRbUnregisterRubyObj";
!
! %freefunc FXRbDirItem "FXRbDirItem::freefunc";
! %freefunc FXRbFileItem "FXRbFileItem::freefunc";
! %freefunc FXRbGLObject "FXRbGLObject::freefunc";
! %freefunc FXRbGLGroup "FXRbGLGroup::freefunc";
! %freefunc FXRbGLShape "FXRbGLShape::freefunc";
! %freefunc FXRbHeaderItem "FXRbHeaderItem::freefunc";
! %freefunc FXRbIconItem "FXRbIconItem::freefunc";
! %freefunc FXRbListItem "FXRbListItem::freefunc";
! %freefunc FXRbTableItem "FXRbTableItem::freefunc";
! %freefunc FXRbTreeItem "FXRbTreeItem::freefunc";
|
|
From: Lyle J. <ly...@us...> - 2002-04-02 03:44:30
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv1889
Modified Files:
FXDirList.i FXFileList.i FXGLObject.i FXGLShape.i FXHeader.i
FXIconList.i FXList.i FXTable.i FXTreeList.i core.i dialogs.i
icons.i image.i layout.i mdi.i opengl.i scintilla.i ui.i
Added Files:
freefuncs.i
Log Message:
Moved all %freefunc directives to a centralized include file (freefuncs.i).
--- NEW FILE: freefuncs.i ---
/***********************************************************************
* FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
* Copyright (c) 2001 by J. Lyle Johnson. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* For further information please contact the author by e-mail
* at "ly...@us...".
***********************************************************************/
%feature("freefunc") FXRbDirItem "FXRbDirItem::freefunc";
%feature("freefunc") FXRbFileItem "FXRbFileItem::freefunc";
%feature("freefunc") FXRbGLObject "FXRbGLObject::freefunc";
%feature("freefunc") FXRbGLGroup "FXRbGLGroup::freefunc";
%feature("freefunc") FXRbGLShape "FXRbGLShape::freefunc";
%feature("freefunc") FXRbHeaderItem "FXRbHeaderItem::freefunc";
%feature("freefunc") FXRbIconItem "FXRbIconItem::freefunc";
%feature("freefunc") FXRbListItem "FXRbListItem::freefunc";
%feature("freefunc") FXRbTableItem "FXRbTableItem::freefunc";
%feature("freefunc") FXTreeItem "FXRbUnregisterRubyObj";
%feature("freefunc") FXRbTreeItem "FXRbTreeItem::freefunc";
Index: FXDirList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDirList.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FXDirList.i 26 Mar 2002 22:44:03 -0000 1.19
--- FXDirList.i 2 Apr 2002 03:44:27 -0000 1.20
***************
*** 71,75 ****
};
- %feature("freefunc") FXRbDirItem "FXRbDirItem::freefunc";
%exception FXRbDirItem::FXRbDirItem "$action FXRbRegisterRubyObj(self, result);";
--- 71,74 ----
Index: FXFileList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileList.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FXFileList.i 26 Mar 2002 22:44:03 -0000 1.20
--- FXFileList.i 2 Apr 2002 03:44:27 -0000 1.21
***************
*** 91,96 ****
};
- %feature("freefunc") FXRbFileItem "FXRbFileItem::freefunc";
-
%exception FXRbFileItem::FXRbFileItem "$action FXRbRegisterRubyObj(self, result);";
--- 91,94 ----
Index: FXGLObject.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FXGLObject.i 26 Mar 2002 22:44:03 -0000 1.22
--- FXGLObject.i 2 Apr 2002 03:44:27 -0000 1.23
***************
*** 79,84 ****
};
- %feature("freefunc") FXRbGLObject "FXRbGLObject::freefunc";
-
%exception FXRbGLObject::FXRbGLObject "$action FXRbRegisterRubyObj(self, result);";
--- 79,82 ----
***************
*** 168,173 ****
void clear();
};
-
- %feature("freefunc") FXRbGLGroup "FXRbGLGroup::freefunc";
%exception FXRbGLGroup::FXRbGLGroup "$action FXRbRegisterRubyObj(self, result);";
--- 166,169 ----
Index: FXGLShape.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLShape.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FXGLShape.i 26 Mar 2002 22:44:03 -0000 1.16
--- FXGLShape.i 2 Apr 2002 03:44:27 -0000 1.17
***************
*** 128,133 ****
%ignore FXRbGLShape::FXRbGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
- %feature("freefunc") FXRbGLShape "FXRbGLShape::freefunc";
-
%exception FXRbGLShape::FXRbGLShape "$action FXRbRegisterRubyObj(self, result);";
--- 128,131 ----
Index: FXHeader.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** FXHeader.i 1 Apr 2002 23:13:55 -0000 1.29
--- FXHeader.i 2 Apr 2002 03:44:27 -0000 1.30
***************
*** 121,126 ****
};
- %feature("freefunc") FXRbHeaderItem "FXRbHeaderItem::freefunc";
-
%exception FXRbHeaderItem::FXRbHeaderItem "$action FXRbRegisterRubyObj(self, result);";
--- 121,124 ----
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** FXIconList.i 1 Apr 2002 23:13:55 -0000 1.33
--- FXIconList.i 2 Apr 2002 03:44:27 -0000 1.34
***************
*** 123,128 ****
};
- %feature("freefunc") FXRbIconItem "FXRbIconItem::freefunc";
-
%exception FXRbIconItem::FXRbIconItem "$action FXRbRegisterRubyObj(self, result);";
--- 123,126 ----
Index: FXList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** FXList.i 1 Apr 2002 23:13:55 -0000 1.35
--- FXList.i 2 Apr 2002 03:44:27 -0000 1.36
***************
*** 116,121 ****
};
- %feature("freefunc") FXRbListItem "FXRbListItem::freefunc";
-
%exception FXRbListItem::FXRbListItem "$action FXRbRegisterRubyObj(self, result);";
--- 116,119 ----
Index: FXTable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTable.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** FXTable.i 1 Apr 2002 23:13:55 -0000 1.27
--- FXTable.i 2 Apr 2002 03:44:27 -0000 1.28
***************
*** 141,146 ****
};
- %feature("freefunc") FXRbTableItem "FXRbTableItem::freefunc";
-
%exception FXRbTableItem::FXRbTableItem "$action FXRbRegisterRubyObj(self, result);";
--- 141,144 ----
Index: FXTreeList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeList.i,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FXTreeList.i 1 Apr 2002 23:13:55 -0000 1.32
--- FXTreeList.i 2 Apr 2002 03:44:27 -0000 1.33
***************
*** 41,46 ****
%exception FXTreeItem::FXTreeItem "$action FXRbRegisterRubyObj(self, result);";
- %feature("freefunc") FXTreeItem "FXRbUnregisterRubyObj";
-
/// Tree list Item
class FXTreeItem : public FXObject {
--- 41,44 ----
***************
*** 146,151 ****
// virtual ~FXTreeItem(){}
};
-
- %feature("freefunc") FXRbTreeItem "FXRbTreeItem::freefunc";
%exception FXRbTreeItem::FXRbTreeItem "$action FXRbRegisterRubyObj(self, result);";
--- 144,147 ----
Index: core.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/core.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** core.i 14 Mar 2002 18:48:14 -0000 1.26
--- core.i 2 Apr 2002 03:44:27 -0000 1.27
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: dialogs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/dialogs.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dialogs.i 14 Mar 2002 18:48:14 -0000 1.12
--- dialogs.i 2 Apr 2002 03:44:27 -0000 1.13
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: icons.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/icons.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** icons.i 25 Feb 2002 22:49:49 -0000 1.12
--- icons.i 2 Apr 2002 03:44:27 -0000 1.13
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: image.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/image.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** image.i 14 Mar 2002 18:48:14 -0000 1.14
--- image.i 2 Apr 2002 03:44:27 -0000 1.15
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: layout.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/layout.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** layout.i 14 Mar 2002 18:48:15 -0000 1.3
--- layout.i 2 Apr 2002 03:44:27 -0000 1.4
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: mdi.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/mdi.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mdi.i 14 Mar 2002 18:48:15 -0000 1.10
--- mdi.i 2 Apr 2002 03:44:27 -0000 1.11
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: opengl.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/opengl.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** opengl.i 14 Mar 2002 18:48:15 -0000 1.14
--- opengl.i 2 Apr 2002 03:44:27 -0000 1.15
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
Index: scintilla.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/scintilla.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scintilla.i 14 Mar 2002 18:48:15 -0000 1.3
--- scintilla.i 2 Apr 2002 03:44:27 -0000 1.4
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
Index: ui.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/ui.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ui.i 14 Mar 2002 18:48:15 -0000 1.1
--- ui.i 2 Apr 2002 03:44:27 -0000 1.2
***************
*** 33,36 ****
--- 33,37 ----
%include typemaps.i
%include markfuncs.i
+ %include freefuncs.i
%include renames.i
%include stubs.i
|
|
From: Lyle J. <ly...@us...> - 2002-04-01 23:17:52
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv9977
Modified Files:
FXRuby.cpp
Log Message:
Ripped out stuff about borrowed references and FXRbNotifyDestroyed().
This can all be handled with the current FXRbRegisterRubyObj() and
FXRbUnregisterRubyObj() functionality.
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** FXRuby.cpp 1 Apr 2002 14:55:55 -0000 1.37
--- FXRuby.cpp 1 Apr 2002 23:17:48 -0000 1.38
***************
*** 77,88 ****
}
- // Maps void pointers to linked lists of VALUEs
- static std::map<void*, std::list<VALUE> > borrowedRefs;
-
// Wrapper around SWIG_NewPointerObj()
VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
! VALUE obj=SWIG_NewPointerObj(ptr,ty,0);
! borrowedRefs[ptr].push_back(obj);
return obj;
}
--- 77,85 ----
}
// Wrapper around SWIG_NewPointerObj()
VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
! VALUE obj=SWIG_NewPointerObj(ptr,ty,1);
! FXRbRegisterRubyObj(obj,ptr);
return obj;
}
***************
*** 150,172 ****
/**
* Return the registered Ruby class instance associated with this
! * FOX object, or a new unregistered instance if not found.
*/
VALUE FXRbGetRubyObj(const void *foxObj, const char *type){
VALUE rbObj = FXRbGetRubyObj(foxObj);
return (rbObj == Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj;
- }
-
-
- // Zero-out any pointers to this object still held by Ruby objects
- void FXRbNotifyDestroyed(void* ptr){
- std::map<void*, std::list<VALUE> >::iterator itr=borrowedRefs.find(ptr);
- if(itr!=borrowedRefs.end()){
- std::list<VALUE>::iterator i;
- for(i=(itr->second).begin(); i!=(itr->second).end(); i++){
- VALUE obj=*i;
- DATA_PTR(obj)=0;
- }
- borrowedRefs.erase(itr);
- }
}
--- 147,155 ----
/**
* Return the registered Ruby class instance associated with this
! * FOX object, or a new registered instance if not found.
*/
VALUE FXRbGetRubyObj(const void *foxObj, const char *type){
VALUE rbObj = FXRbGetRubyObj(foxObj);
return (rbObj == Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj;
}
|
|
From: Lyle J. <ly...@us...> - 2002-04-01 23:16:25
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv9699
Modified Files:
FXRbTable.h
Log Message:
Replaced calls to FXRbNotifyDestroyed() with calls to FXRbUnregisterRubyObj().
Index: FXRbTable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTable.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXRbTable.h 19 Mar 2002 20:04:42 -0000 1.7
--- FXRbTable.h 1 Apr 2002 23:16:21 -0000 1.8
***************
*** 175,179 ****
baseclass::removeRows(row,nr,notify); \
for(FXint i=0;i<items.no();i++){ \
! FXRbNotifyDestroyed(items[i]); \
} \
} \
--- 175,179 ----
baseclass::removeRows(row,nr,notify); \
for(FXint i=0;i<items.no();i++){ \
! FXRbUnregisterRubyObj(items[i]); \
} \
} \
***************
*** 190,194 ****
baseclass::removeColumns(col,nc,notify); \
for(FXint i=0;i<items.no();i++){ \
! FXRbNotifyDestroyed(items[i]); \
} \
} \
--- 190,194 ----
baseclass::removeColumns(col,nc,notify); \
for(FXint i=0;i<items.no();i++){ \
! FXRbUnregisterRubyObj(items[i]); \
} \
} \
***************
*** 199,203 ****
FXTableItem* item=getItem(row,col); \
baseclass::removeItem(row,col,notify); \
! FXRbNotifyDestroyed(item); \
} \
void cls::removeItem(FXint row,FXint col,FXbool notify){ \
--- 199,203 ----
FXTableItem* item=getItem(row,col); \
baseclass::removeItem(row,col,notify); \
! FXRbUnregisterRubyObj(item); \
} \
void cls::removeItem(FXint row,FXint col,FXbool notify){ \
|
|
From: Lyle J. <ly...@us...> - 2002-04-01 23:15:43
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include In directory usw-pr-cvs1:/tmp/cvs-serv9573 Modified Files: FXRuby.h Log Message: Remove declaration for FXRbNotifyDestroyed(). Index: FXRuby.h =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FXRuby.h 14 Mar 2002 18:48:14 -0000 1.19 --- FXRuby.h 1 Apr 2002 23:15:39 -0000 1.20 *************** *** 63,67 **** void FXRbRegisterRubyObj(VALUE rubyObj, const void* foxObj); ! // Remove mapping for this FOX object void FXRbUnregisterRubyObj(const void* foxObj); --- 63,68 ---- void FXRbRegisterRubyObj(VALUE rubyObj, const void* foxObj); ! // Remove mapping for this FOX object and zero out any pointers ! // to this (now dead) C++ object held by any Ruby object void FXRbUnregisterRubyObj(const void* foxObj); *************** *** 75,80 **** void FXRbDestroyAppSensitiveObjects(); - // Zero-out the pointers to this (now dead) C++ object held by any Ruby object - void FXRbNotifyDestroyed(void *ptr); /** --- 76,79 ---- |
|
From: Lyle J. <ly...@us...> - 2002-04-01 23:13:59
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv9108
Modified Files:
FXHeader.i FXIconList.i FXList.i FXTable.i FXTreeList.i
Log Message:
Replaced calls to FXRbNotifyDestroyed() with calls to FXRbUnregisterRubyObj().
Index: FXHeader.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** FXHeader.i 26 Mar 2002 22:44:03 -0000 1.28
--- FXHeader.i 1 Apr 2002 23:13:55 -0000 1.29
***************
*** 202,206 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(oldItem);
// Done
--- 202,206 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(oldItem);
// Done
***************
*** 217,221 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(oldItem);
// Done
--- 217,221 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(oldItem);
// Done
***************
*** 298,302 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(item);
}
--- 298,302 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(item);
}
***************
*** 318,322 ****
if(items){
for(FXint i=0; i<numItems; i++){
! FXRbNotifyDestroyed(items[i]);
}
FXFREE(&items);
--- 318,322 ----
if(items){
for(FXint i=0; i<numItems; i++){
! FXRbUnregisterRubyObj(items[i]);
}
FXFREE(&items);
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FXIconList.i 26 Mar 2002 22:44:03 -0000 1.32
--- FXIconList.i 1 Apr 2002 23:13:55 -0000 1.33
***************
*** 293,297 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(oldItem);
// Done
--- 293,297 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(oldItem);
// Done
***************
*** 308,312 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(oldItem);
// Done
--- 308,312 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(oldItem);
// Done
***************
*** 362,366 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(item);
}
--- 362,366 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(item);
}
***************
*** 382,386 ****
if(items){
for(FXint i=0; i<numItems; i++){
! FXRbNotifyDestroyed(items[i]);
}
FXFREE(&items);
--- 382,386 ----
if(items){
for(FXint i=0; i<numItems; i++){
! FXRbUnregisterRubyObj(items[i]);
}
FXFREE(&items);
Index: FXList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** FXList.i 26 Mar 2002 22:44:03 -0000 1.34
--- FXList.i 1 Apr 2002 23:13:55 -0000 1.35
***************
*** 228,232 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(oldItem);
// Done
--- 228,232 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(oldItem);
// Done
***************
*** 243,247 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(oldItem);
// Done
--- 243,247 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(oldItem);
// Done
***************
*** 311,315 ****
// Now zero-out pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(item);
}
--- 311,315 ----
// Now zero-out pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(item);
}
***************
*** 331,335 ****
if(items){
for(FXint i=0; i<numItems; i++){
! FXRbNotifyDestroyed(items[i]);
}
FXFREE(&items);
--- 331,335 ----
if(items){
for(FXint i=0; i<numItems; i++){
! FXRbUnregisterRubyObj(items[i]);
}
FXFREE(&items);
Index: FXTable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTable.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** FXTable.i 26 Mar 2002 22:44:03 -0000 1.26
--- FXTable.i 1 Apr 2002 23:13:55 -0000 1.27
***************
*** 371,375 ****
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbNotifyDestroyed(items[i]);
}
}
--- 371,375 ----
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbUnregisterRubyObj(items[i]);
}
}
***************
*** 446,450 ****
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbNotifyDestroyed(items[i]);
}
}
--- 446,450 ----
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbUnregisterRubyObj(items[i]);
}
}
***************
*** 465,469 ****
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbNotifyDestroyed(items[i]);
}
}
--- 465,469 ----
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbUnregisterRubyObj(items[i]);
}
}
***************
*** 478,482 ****
// Now zero-out any pointers held by still-alive Ruby objects
! FXRbNotifyDestroyed(item);
}
}
--- 478,482 ----
// Now zero-out any pointers held by still-alive Ruby objects
! FXRbUnregisterRubyObj(item);
}
}
Index: FXTreeList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeList.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FXTreeList.i 26 Mar 2002 22:44:03 -0000 1.31
--- FXTreeList.i 1 Apr 2002 23:13:55 -0000 1.32
***************
*** 41,44 ****
--- 41,46 ----
%exception FXTreeItem::FXTreeItem "$action FXRbRegisterRubyObj(self, result);";
+ %feature("freefunc") FXTreeItem "FXRbUnregisterRubyObj";
+
/// Tree list Item
class FXTreeItem : public FXObject {
***************
*** 318,322 ****
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbNotifyDestroyed(items[i]);
}
}
--- 320,324 ----
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbUnregisterRubyObj(items[i]);
}
}
***************
*** 333,337 ****
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbNotifyDestroyed(items[i]);
}
}
--- 335,339 ----
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbUnregisterRubyObj(items[i]);
}
}
***************
*** 348,352 ****
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbNotifyDestroyed(items[i]);
}
}
--- 350,354 ----
// Now zero-out pointers held by still-alive Ruby objects
for(FXint i=0;i<items.no();i++){
! FXRbUnregisterRubyObj(items[i]);
}
}
|
|
From: Lyle J. <ly...@us...> - 2002-04-01 21:38:05
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv14222
Modified Files:
typemaps.i
Log Message:
Updated output typemaps for certain types.
Index: typemaps.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** typemaps.i 14 Mar 2002 18:48:15 -0000 1.32
--- typemaps.i 1 Apr 2002 21:29:39 -0000 1.33
***************
*** 243,246 ****
--- 243,249 ----
%typemap(ruby, out) FXButton* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+ /* Output typemap for FXChore instances */
+ %typemap(ruby, out) FXChore* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+
/* Output typemap for FXComposite instances */
%typemap(ruby, out) FXComposite* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
***************
*** 265,268 ****
--- 268,275 ----
/* Output typemap for FXFontDesc instances */
+ %typemap(ruby, out) FXFontDesc {
+ FXFontDesc* resultptr = new FXFontDesc($1);
+ $result = FXRbGetRubyObj(resultptr, "FXFontDesc *");
+ }
%typemap(ruby, out) FXFontDesc* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
***************
*** 283,290 ****
/* Output typemap for FXHMat instances */
! %typemap(ruby, out) FXHMat* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXHVec instances */
%typemap(ruby, out) FXHVec* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXIcon instances */
--- 290,306 ----
/* Output typemap for FXHMat instances */
! %typemap(ruby, out) FXHMat {
! FXHMat* resultptr = new FXHMat($1);
! $result = FXRbGetRubyObj(resultptr, "FXHMat *");
! }
! %typemap(ruby, out) FXHMat& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXHVec instances */
+ %typemap(ruby, out) FXHVec {
+ FXHVec* resultptr = new FXHVec($1);
+ $result = FXRbGetRubyObj(resultptr, "FXHVec *");
+ }
%typemap(ruby, out) FXHVec* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+ %typemap(ruby, out) FXHVec& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXIcon instances */
***************
*** 298,301 ****
--- 314,321 ----
/* Output typemap for FXLight instances */
+ %typemap(ruby, out) FXLight {
+ FXLight *resultptr = new FXLight($1);
+ $result = FXRbGetRubyObj(resultptr, "FXLight *");
+ }
%typemap(ruby, out) FXLight* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
***************
*** 304,308 ****
/* Output typemap for FXMaterial instances */
! %typemap(ruby, out) FXMaterial* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXMDIChild instances */
--- 324,331 ----
/* Output typemap for FXMaterial instances */
! %typemap(ruby, out) FXMaterial {
! FXMaterial *resultptr = new FXMaterial($1);
! $result = FXRbGetRubyObj(resultptr, "FXMaterial *");
! }
/* Output typemap for FXMDIChild instances */
***************
*** 321,335 ****
%typemap(ruby, out) FXPopup* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXQuat instances */
! %typemap(ruby, out) FXQuat* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXRectangle instances */
! %typemap(ruby, out) FXRectangle* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXRegion instances */
! %typemap(ruby, out) FXRegion* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXRegistry instances */
! %typemap(ruby, out) FXRegistry* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXRootWindow instances */
--- 344,390 ----
%typemap(ruby, out) FXPopup* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+ /* Output typemap for FXPrinter instances */
+ %typemap(ruby, out) FXPrinter {
+ FXPrinter *resultptr = new FXPrinter($1);
+ $result = FXRbGetRubyObj(resultptr, "FXPrinter *");
+ }
+
/* Output typemap for FXQuat instances */
! %typemap(ruby, out) FXQuat {
! FXQuat *resultptr = new FXQuat($1);
! $result = FXRbGetRubyObj($1, "FXQuat *");
! }
! %typemap(ruby, out) FXQuat& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
!
! /* Output typemap for FXRange instances */
! %typemap(ruby, out) FXRange {
! FXRange* resultptr = new FXRange($1);
! $result = FXRbGetRubyObj(resultptr, "FXRange *");
! }
! %typemap(ruby, out) FXRange& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
!
! /* Output typemap for FXRangeSlice instances */
! %typemap(ruby, out) FXRangeSlice {
! FXRangeSlice *resultptr = new FXRangeSlice($1);
! $result = FXRbGetRubyObj(resultptr, "FXRangeSlice *");
! }
/* Output typemap for FXRectangle instances */
! %typemap(ruby, out) FXRectangle*, const FXRectangle& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
! %typemap(ruby, out) FXRectangle {
! FXRectangle* resultptr = new FXRectangle($1);
! $result = FXRbGetRubyObj(resultptr, "FXRectangle *");
! }
/* Output typemap for FXRegion instances */
! %typemap(ruby, out) FXRegion {
! FXRegion* resultptr = new FXRegion($1);
! $result = FXRbGetRubyObj(resultptr, "FXRegion *");
! }
! %typemap(ruby, out) FXRegion& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
! %typemap(ruby, out) const FXRegion& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXRegistry instances */
! %typemap(ruby, out) FXRegistry& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXRootWindow instances */
***************
*** 357,365 ****
%typemap(ruby, out) FXTablePos* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXTreeItem instances */
%typemap(ruby, out) FXTreeItem* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXVec instances */
! %typemap(ruby, out) FXVec* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXVerticalFrame instances */
--- 412,428 ----
%typemap(ruby, out) FXTablePos* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+ /* Output typemap for FXTimer instances */
+ %typemap(ruby, out) FXTimer* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+
/* Output typemap for FXTreeItem instances */
%typemap(ruby, out) FXTreeItem* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXVec instances */
! %typemap(ruby, out) FXVec {
! FXVec* resultptr = new FXVec($1);
! $result = FXRbGetRubyObj(resultptr, "FXVec *");
! }
! %typemap(ruby, out) FXVec* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
! %typemap(ruby, out) const FXVec& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXVerticalFrame instances */
***************
*** 367,371 ****
/* Output typemap for FXViewport instances */
! %typemap(ruby, out) FXViewport* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Output typemap for FXVisual instances */
--- 430,437 ----
/* Output typemap for FXViewport instances */
! %typemap(ruby, out) FXViewport {
! FXViewport* resultptr = new FXViewport($1);
! $result = FXRbGetRubyObj(resultptr, "FXViewport *");
! }
/* Output typemap for FXVisual instances */
***************
*** 374,377 ****
--- 440,446 ----
/* Output typemap for FXWindow instances */
%typemap(ruby, out) FXWindow* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
+
+ /* Output typemap for NotifyHeader instances */
+ %typemap(ruby, out) NotifyHeader* "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
/* Convert a Ruby array of FXHiliteStyle instances into a C++ array */
|
|
From: Lyle J. <ly...@us...> - 2002-04-01 14:58:50
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv3078
Modified Files:
FXRuby.cpp
Log Message:
Modified call to rb_rescue2() to match Ruby 1.6.7 prototype. Thanks to Bil
Kleb for catching this one.
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** FXRuby.cpp 20 Mar 2002 17:49:53 -0000 1.36
--- FXRuby.cpp 1 Apr 2002 14:55:55 -0000 1.37
***************
*** 761,765 ****
VALUE retval;
if(FXRbCatchExceptions){
! #if RUBY_VERSION_CODE < 170
retval=rb_rescue2((VALUE(*)()) handle_body, (VALUE) &hArgs,
(VALUE(*)()) handle_rescue, Qnil,
--- 761,765 ----
VALUE retval;
if(FXRbCatchExceptions){
! #if RUBY_VERSION_CODE < 167
retval=rb_rescue2((VALUE(*)()) handle_body, (VALUE) &hArgs,
(VALUE(*)()) handle_rescue, Qnil,
|
|
From: Lyle J. <ly...@us...> - 2002-03-28 16:32:55
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv10771
Modified Files:
FXFileDict.i
Log Message:
Index: FXFileDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDict.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FXFileDict.i 26 Mar 2002 22:44:03 -0000 1.18
--- FXFileDict.i 28 Mar 2002 16:32:52 -0000 1.19
***************
*** 84,88 ****
public:
// Construct an icon dictionary, with given path
! FXRbIconDict(FXApp* a,const FXString& p=FXRbIconDict::defaultIconPath);
// Destructor
--- 84,88 ----
public:
// Construct an icon dictionary, with given path
! FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
// Destructor
|
|
From: Lyle J. <ly...@us...> - 2002-03-28 15:26:13
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv22671 Modified Files: core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp Log Message: Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** core_wrap.cpp 27 Mar 2002 17:41:47 -0000 1.57 --- core_wrap.cpp 28 Mar 2002 15:26:04 -0000 1.58 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** dialogs_wrap.cpp 26 Mar 2002 23:58:41 -0000 1.31 --- dialogs_wrap.cpp 28 Mar 2002 15:26:07 -0000 1.32 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** icons_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.34 --- icons_wrap.cpp 28 Mar 2002 15:26:07 -0000 1.35 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** image_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.36 --- image_wrap.cpp 28 Mar 2002 15:26:07 -0000 1.37 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** layout_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.5 --- layout_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.6 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mdi_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.33 --- mdi_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.34 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** opengl_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.38 --- opengl_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.39 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: scintilla_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** scintilla_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.14 --- scintilla_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.15 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ui_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.6 --- ui_wrap.cpp 28 Mar 2002 15:26:08 -0000 1.7 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020326-1200 * * 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-20020327-1824 * * This file is not intended to be easily readable and contains a number of *************** *** 286,289 **** --- 286,293 ---- SWIGIMPORT(void *) SWIG_ConvertPtr(VALUE, swig_type_info *); SWIGIMPORT(int) SWIG_CheckConvert(VALUE, swig_type_info *); + SWIGIMPORT(char *) SWIG_PackData(char *c, void *ptr, int sz); + SWIGIMPORT(char *) SWIG_UnpackData(char *c, void *ptr, int sz); + SWIGIMPORT(VALUE) SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type); + SWIGIMPORT(void) SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags); #ifdef __cplusplus |
|
From: Lyle J. <ly...@us...> - 2002-03-28 14:32:35
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv4084
Modified Files:
librb.c
Log Message:
Index: librb.c
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/librb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** librb.c 19 Mar 2002 17:16:27 -0000 1.5
--- librb.c 28 Mar 2002 14:32:31 -0000 1.6
***************
*** 368,371 ****
--- 368,449 ----
}
+ /* Pack binary data into a string */
+ SWIGRUNTIME(char *)
+ SWIG_PackData(char *c, void *ptr, int sz) {
+ static char hex[17] = "0123456789abcdef";
+ int i;
+ unsigned char *u = (unsigned char *) ptr;
+ register unsigned char uu;
+ for (i = 0; i < sz; i++,u++) {
+ uu = *u;
+ *(c++) = hex[(uu & 0xf0) >> 4];
+ *(c++) = hex[uu & 0xf];
+ }
+ return c;
+ }
+
+ /* Unpack binary data from a string */
+ SWIGRUNTIME(char *)
+ SWIG_UnpackData(char *c, void *ptr, int sz) {
+ register unsigned char uu;
+ register int d;
+ unsigned char *u = (unsigned char *) ptr;
+ int i;
+ for (i = 0; i < sz; i++, u++) {
+ d = *(c++);
+ if ((d >= '0') && (d <= '9'))
+ uu = ((d - '0') << 4);
+ else if ((d >= 'a') && (d <= 'f'))
+ uu = ((d - ('a'-10)) << 4);
+ d = *(c++);
+ if ((d >= '0') && (d <= '9'))
+ uu |= (d - '0');
+ else if ((d >= 'a') && (d <= 'f'))
+ uu |= (d - ('a'-10));
+ *u = uu;
+ }
+ return c;
+ }
+
+ SWIGRUNTIME(VALUE)
+ SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
+ char result[1024];
+ char *r = result;
+ if ((2*sz + 1 + strlen(type->name)) > 1000) return 0;
+ *(r++) = '_';
+ r = SWIG_PackData(r, ptr, sz);
+ strcpy(r, type->name);
+ return rb_str_new2(result);
+ }
+
+ /* Convert a packed value value */
+ SWIGRUNTIME(void)
+ SWIG_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags) {
+ swig_type_info *tc;
+ char *c;
+
+ if (TYPE(obj) != T_STRING) goto type_error;
+ c = STR2CSTR(obj);
+ /* Pointer values must start with leading underscore */
+ if (*c != '_') goto type_error;
+ c++;
+ c = SWIG_UnpackData(c, ptr, sz);
+ if (ty) {
+ tc = SWIG_TypeCheck(c, ty);
+ if (!tc) goto type_error;
+ }
+ return;
+
+ type_error:
+
+ if (flags) {
+ if (ty) {
+ rb_raise(rb_eTypeError, "Type error. Expected %s", ty->name);
+ } else {
+ rb_raise(rb_eTypeError, "Expected a pointer");
+ }
+ }
+ }
+
#ifdef __cplusplus
}
|
|
From: Lyle J. <ly...@us...> - 2002-03-27 18:27:42
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv8367
Modified Files:
core_wrap.cpp
Log Message:
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** core_wrap.cpp 26 Mar 2002 23:58:38 -0000 1.56
--- core_wrap.cpp 27 Mar 2002 17:41:47 -0000 1.57
***************
*** 15365,15369 ****
_wrap_FXIconDict_initialize(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! FXString *arg2 = (FXString *) &FXRbIconDict::defaultIconPath ;
FXRbIconDict *result;
--- 15365,15369 ----
_wrap_FXIconDict_initialize(int argc, VALUE *argv, VALUE self) {
FXApp *arg1 ;
! FXString *arg2 = (FXString *) &FXIconDict::defaultIconPath ;
FXRbIconDict *result;
|
|
From: Lyle J. <ly...@us...> - 2002-03-27 18:27:41
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv19774
Modified Files:
aliases.rb
Log Message:
Added aliases itemCurrent? for FXComboBox#isItemCurrent; posSelected? for
FXTextField#isPosSelected; and posVisible? for FXTextField#isPosVisible.
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** aliases.rb 26 Mar 2002 21:39:09 -0000 1.21
--- aliases.rb 27 Mar 2002 18:05:04 -0000 1.22
***************
*** 171,174 ****
--- 171,175 ----
alias tipText getTipText
alias paneShown? isPaneShown
+ alias itemCurrent? isItemCurrent
end
class FX_Cursor
***************
*** 1272,1275 ****
--- 1273,1278 ----
alias textStyle= setTextStyle
alias textStyle getTextStyle
+ alias posSelected? isPosSelected
+ alias posVisible? isPosVisible
end
class FX_TIFIcon
|
Update of /cvsroot/fxruby/FXRuby/rdoc-sources
In directory usw-pr-cvs1:/tmp/cvs-serv18923
Modified Files:
FX4Splitter.rb FXApp.rb FXComposite.rb
Added Files:
FXComboBox.rb FXHorizontalFrame.rb FXTextField.rb
FXVerticalFrame.rb
Log Message:
More documentation updates.
--- NEW FILE: FXComboBox.rb ---
module Fox
# Combobox
#
# = ComboBox styles
#
# COMBOBOX_NO_REPLACE:: Leave the list the same
# COMBOBOX_REPLACE:: Replace current item with typed text
# COMBOBOX_INSERT_BEFORE:: Typed text inserted before current
# COMBOBOX_INSERT_AFTER:: Typed text inserted after current
# COMBOBOX_INSERT_FIRST:: Typed text inserted at begin of list
# COMBOBOX_INSERT_LAST:: Typed text inserted at end of list
# COMBOBOX_STATIC:: Unchangable text box
# COMBOBOX_NORMAL:: Default options for comboboxes
#
# = Message identifiers
#
# ID_LIST::
# ID_TEXT::
#
class FXComboBox < FXPacker
# Handles the +SEL_FOCUS_UP+ message
def onFocusUp(sender, selector, event) ; end
# Handles the +SEL_FOCUS_DOWN+ message
def onFocusDown(sender, selector, event) ; end
# Handles the +SEL_COMMAND+ message from the button
def onTextButton(sender, selector, ptr) ; end
# Handles the +SEL_CHANGED+ message from the text field
def onTextChanged(sender, selector, string) ; end
# Handles the +SEL_COMMAND+ message from the text field
def onTextCommand(sender, selector, string) ; end
# Handles the +SEL_CLICKED+ message for the list
def onListClicked(sender, selector, listIndex) ; end
# Handles something else
def onFwdToText(sender, selector, ptr) ; end
# Handles the +SEL_UPDATE+ message from the text field
def onUpdFmText(sender, selector, ptr);
# Constructor
def initialize(p, cols, nvis, tgt, sel, opts=COMBOBOX_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
# Return true if combobox is editable
def editable?() ; end
# Set editable state
def editable=(editable=true) ; end
# Set the text
def text=(text) ; end
# Get the text
def text() ; end
# Set the number of columns
def numColumns=(cols) ; end
# Get the number of columns
def numColumns() ; end
# Return the number of items in the list
def numItems() ; end
# Return the number of visible items
def numVisible() ; end
# Set the number of visible items
def numVisible=(nvis) ; end
# Return true if current item
def itemCurrent?(index) ; end
# Set the current item (index is zero-based)
def currentItem=(indexz) ; end
# Get the current item's index
def currentItem() ; end
# Return the item at the given index
def retrieveItem(index) ; end
# Replace the item at index
def replaceItem(index, text, data=nil) ; end
# Insert a new item at index
def insertItem(index, text, data=nil) ; end
# Append an item to the list
def appendItem(text, data=nil) ; end
# Prepend an item to the list
def prependItem(text, data=nil) ; end
# Remove this item from the list
def removeItem(index) ; end
# Remove all items from the list
def clearItems() ; end
# Set text for specified item
def setItemText(index, text) ; end
# Get text for specified item
def getItemText(index) ; end
# Set data pointer for specified item
def setItemData(index, data) ; end
# Get data pointer for specified item
def getItemData(index) ; end
# Is the pane shown
def paneShown?() ; end
# Sort items using current sort function
def sortItems() ; end
# Set text font
def font=(fnt) ; end
# Get text font
def font() ; end
# Set the combobox style.
def comboStyle=(comboStyle) ; end
# Get the combobox style.
def comboStyle() ; end
# Set window background color
def backColor=(color) ; end
# Get background color
def backColor() ; end
# Change text color
def textColor=(color) ; end
# Return text color
def textColor() ; end
# Change selected background color
def selBackColor=(color) ; end
# Return selected background color
def selBackColor() ; end
# Change selected text color
def selTextColor=(color) ; end
# Return selected text color
def selTextColor() ; end
# Set the combobox help text
def helpText=(txt) ; end
# Get the combobox help text
def helpText() ; end
# Set the tool tip message for this combobox
def tipText=(txt) ; end
# Get the tool tip message for this combobox
def tipText() ; end
# Iterate over the list items
def each # :yields: text, data
end
end
end
--- NEW FILE: FXHorizontalFrame.rb ---
module Fox
# Horizontal frame layout manager widget is used to automatically
# place child-windows horizontally from left-to-right, or right-to-left,
# depending on the child window's layout hints.
class FXHorizontalFrame < FXPacker
# Construct a horizontal frame layout manager
def initialize(p,opts=0,x=0,y=0,w=0,h=0,pl=DEFAULT_SPACING,pr=DEFAULT_SPACING,pt=DEFAULT_SPACING,pb=DEFAULT_SPACING,hs=DEFAULT_SPACING,vs=DEFAULT_SPACING); end
end
end
--- NEW FILE: FXTextField.rb ---
module Fox
# A text field is a single-line text entry widget.
# The text field widget supports clipboard for cut-and-paste
# operations.
#
# = Textfield styles
#
# TEXTFIELD_PASSWD:: Password mode
# TEXTFIELD_INTEGER:: Integer mode
# TEXTFIELD_REAL:: Real mode
# TEXTFIELD_READONLY:: NOT editable
# TEXTFIELD_ENTER_ONLY:: Only callback when enter hit
# TEXTFIELD_LIMITED:: Limit entry to given number of columns
# TEXTFIELD_OVERSTRIKE:: Overstrike mode
# TEXTFIELD_NORMAL:: FRAME_SUNKEN|FRAME_THICK
#
# = Message identifiers
#
# ID_CURSOR_HOME::
# ID_CURSOR_END::
# ID_CURSOR_RIGHT::
# ID_CURSOR_LEFT::
# ID_MARK::
# ID_EXTEND::
# ID_SELECT_ALL::
# ID_DESELECT_ALL::
# ID_CUT_SEL::
# ID_COPY_SEL::
# ID_PASTE_SEL::
# ID_DELETE_SEL::
# ID_OVERST_STRING::
# ID_INSERT_STRING::
# ID_BACKSPACE::
# ID_DELETE::
# ID_TOGGLE_EDITABLE::
# ID_TOGGLE_OVERSTRIKE::
# ID_BLINK::
#
class FXTextField < FXFrame
# Handles the +SEL_PAINT+ message
def onPaint(sender, selector, event) ; end
# Handles the +SEL_KEYPRESS+ message
def onKeyPress(sender, selector, event) ; end
# Handles the +SEL_KEYRELEASE+ message
def onKeyRelease(sender, selector, event) ; end
# Handles the +SEL_LEFTBUTTONPRESS+ message
def onLeftBtnPress(sender, selector, event) ; end
# Handles the +SEL_LEFTBUTTONRELEASE+ message
def onLeftBtnRelease(sender, selector, event) ; end
# Handles the +SEL_MIDDLEBUTTONPRESS+ message
def onMiddleBtnPress(sender, selector, event) ; end
# Handles the +SEL_MIDDLEBUTTONRELEASE+ message
def onMiddleBtnRelease(sender, selector, event) ; end
# Handles the +SEL_VERIFY+ message
def onVerify(sender, selector, string) ; end
# Handles the +SEL_MOTION+ message
def onMotion(sender, selector, event) ; end
# Handles the +SEL_SELECTION_LOST+ message
def onSelectionLost(sender, selector, event) ; end
# Handles the +SEL_SELECTION_GAINED+ message
def onSelectionGained(sender, selector, event) ; end
# Handles the +SEL_SELECTION_REQUEST+ message
def onSelectionRequest(FXObject*,FXSelector,void* ptr) ; end
# Handles the +SEL_CLIPBOARD_LOST+ message
def onClipboardLost(sender, selector, event) ; end
# Handles the +SEL_CLIPBOARD_GAINED+ message
def onClipboardGained(sender, selector, event) ; end
# Handles the +SEL_CLIPBOARD_REQUEST+ message
def onClipboardRequest(sender, selector, event) ; end
# Handles the +SEL_FOCUS_SELF+ message
def onFocusSelf(sender, selector, event) ; end
# Handles the +SEL_FOCUS_IN+ message
def onFocusIn(sender, selector, event) ; end
# Handles the +SEL_FOCUS_OUT+ message
def onFocusOut(sender, selector, event) ; end
def onBlink(sender, selector, ptr) ; end
def onAutoScroll(sender, selector, ptr) ; end
def onQueryHelp(sender, selector, ptr) ; end
def onQueryTip(sender, selector, ptr) ; end
def onCmdSetValue(sender, selector, string) ; end
def onCmdSetIntValue(sender, selector, int) ; end
def onCmdSetRealValue(sender, selector, float) ; end
def onCmdSetStringValue(sender, selector, string) ; end
def onCmdGetIntValue(sender, selector, ptr) ; end
def onCmdGetRealValue(sender, selector, ptr) ; end
def onCmdGetStringValue(sender, selector, ptr) ; end
def onCmdCursorHome(sender, selector, ptr) ; end
def onCmdCursorEnd(sender, selector, ptr) ; end
def onCmdCursorRight(sender, selector, ptr) ; end
def onCmdCursorLeft(sender, selector, ptr) ; end
def onCmdMark(sender, selector, ptr) ; end
def onCmdExtend(sender, selector, ptr) ; end
def onCmdSelectAll(sender, selector, ptr) ; end
def onCmdDeselectAll(sender, selector, ptr) ; end
def onCmdCutSel(sender, selector, ptr) ; end
def onCmdCopySel(sender, selector, ptr) ; end
def onCmdPasteSel(sender, selector, ptr) ; end
def onCmdDeleteSel(sender, selector, ptr) ; end
def onCmdOverstString(sender, selector, character) ; end
def onCmdInsertString(sender, selector, string) ; end
def onCmdBackspace(sender, selector, ptr) ; end
def onCmdDelete(sender, selector, ptr) ; end
def onCmdToggleEditable(sender, selector, ptr) ; end
def onUpdToggleEditable(sender, selector, ptr) ; end
def onCmdToggleOverstrike(sender, selector, ptr) ; end
def onUpdToggleOverstrike(sender, selector, ptr) ; end
# Construct text field wide enough to display ncols columns
def initialize(p, ncols, tgt=nil, sel=0, opts=TEXTFIELD_NORMAL, x=0, y=0, w=0, h=0, pl=DEFAULT_PAD, pr=DEFAULT_PAD, pt=DEFAULT_PAD, pb=DEFAULT_PAD) ; end
# Return TRUE if text field may be edited
def editable?() ; end
# Change text field editability
def editable=(editable=true) ; end
# Set cursor position
def cursorPos=(pos) ; end
# Return cursor position
def cursorPos() ; end
# Change anchor position
def anchorPos=(pos) ; end
# Return anchor position
def anchorPos() ; end
# Set the text for this label
def text=(text) ; end
# Get the text for this label
def text() ; end
# Set the text font
def font=(fnt) ; end
# Get the text font
def font() ; end
# Change text color
def textColor=(clr) ; end
# Return text color
def textColor() ; end
# Change selected background color
def selBackColor=(clr) ; end
# Return selected background color
def selBackColor() ; end
# Change selected text color
def selTextColor=(clr) ; end
# Return selected text color
def selTextColor() ; end
# Change width of text field in terms of number of columns * `m'
def numColumns=(cols) ; end
# Return number of columns
def numColumns() ; end
# Change text justification mode
def justify=(mode) ; end
# Return text justification mode
def justify() ; end
# Set the status line help text for this label
def helpText=(text) ; end
# Get the status line help text for this label
def helpText() ; end
# Set the tool tip message for this text field
def tipText=(text) ; end
# Get the tool tip message for this text field
def tipText() ; end
# Change text style
def textStyle=(style) ; end
# Return text style
def textStyle() ; end
# Select all text
def selectAll(); end
# Select len characters starting at given position pos
def setSelection(pos, len) ; end
# Extend the selection from the anchor to the given position
def extendSelection(pos) ; end
# Unselect the text
def killSelection() ; end
# Return true if position _pos_ is selected
def posSelected?(pos) ; end
# Return true if position is fully visible
def posVisible?(pos) ; end
# Scroll text to make the given position visible
def makePositionVisible(pos) ; end
end
end
--- NEW FILE: FXVerticalFrame.rb ---
module Fox
# Vertical frame layout manager widget is used to automatically
# place child-windows vertically from top-to-bottom, or bottom-to-top,
# depending on the child window's layout hints.
class FXVerticalFrame < FXPacker
# Construct a horizontal frame layout manager
def initialize(p,opts=0,x=0,y=0,w=0,h=0,pl=DEFAULT_SPACING,pr=DEFAULT_SPACING,pt=DEFAULT_SPACING,pb=DEFAULT_SPACING,hs=DEFAULT_SPACING,vs=DEFAULT_SPACING); end
end
end
Index: FX4Splitter.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FX4Splitter.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FX4Splitter.rb 26 Mar 2002 21:36:22 -0000 1.3
--- FX4Splitter.rb 27 Mar 2002 18:03:04 -0000 1.4
***************
*** 20,24 ****
# FOURSPLITTER_NORMAL:: Normal mode (no continuous tracking)
#
! # = Messages understood by FX4Splitter
#
# ID_EXPAND_ALL:: Expand all four panes
--- 20,24 ----
# FOURSPLITTER_NORMAL:: Normal mode (no continuous tracking)
#
! # = Messages identifiers
#
# ID_EXPAND_ALL:: Expand all four panes
Index: FXApp.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXApp.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXApp.rb 26 Mar 2002 21:36:23 -0000 1.4
--- FXApp.rb 27 Mar 2002 18:03:04 -0000 1.5
***************
*** 39,47 ****
def click_count ; end
# Moved cursor since press
! def moved ; end
# Exposed rectangle for paint events
def rect ; end
# True if synthetic expose event
! def synthetic ; end
# Target drag type being requested
def target ; end
--- 39,47 ----
def click_count ; end
# Moved cursor since press
! def moved? ; end
# Exposed rectangle for paint events
def rect ; end
# True if synthetic expose event
! def synthetic? ; end
# Target drag type being requested
def target ; end
***************
*** 91,95 ****
# DEF_ROTATE_CURSOR:: Rotate cursor
#
! # = Messages applications understand
#
# ID_QUIT:: Terminate the application normally
--- 91,95 ----
# DEF_ROTATE_CURSOR:: Rotate cursor
#
! # = Messages identifiers
#
# ID_QUIT:: Terminate the application normally
***************
*** 204,208 ****
# the event loop was terminated due to #stop() or #stopModal().
# Except for the modal window and its children, user input to all windows
! #* is blocked; if the modal window is nil all user input is blocked.
def runWhileEvents(window=nil); end
--- 204,208 ----
# the event loop was terminated due to #stop() or #stopModal().
# Except for the modal window and its children, user input to all windows
! # is blocked; if the modal window is nil all user input is blocked.
def runWhileEvents(window=nil); end
***************
*** 305,334 ****
# Change default cursor
! def setDefaultCursor(which, cur); end
! # Obtain application-wide settings
def typingSpeed() ; end
def clickSpeed() ; end
def scrollSpeed() ; end
def scrollDelay() ; end
def blinkSpeed() ; end
def animSpeed() ; end
def menuPause() ; end
def tooltipPause() ; end
def tooltipTime() ; end
def dragDelta() ; end
def wheelLines() ; end
! # Change application-wide settings
def typingSpeed=(speed); end
def clickSpeed=(speed); end
def scrollSpeed=(speed); end
def scrollDelay=(delay); end
def blinkSpeed=(speed); end
def animSpeed=(speed); end
def menuPause=(pause); end
def tooltipPause=(pause); end
def tooltipTime=(time); end
def dragDelta=(delta); end
def wheelLines=(lines); end
--- 305,375 ----
# Change default cursor
! def setDefaultCursor(which, cursor); end
! # Get typing speed used for the FXIconList, FXList and FXTreeList widgets' lookup features.
! # Default value is 1000 millseconds.
def typingSpeed() ; end
+
+ # Get click speed
def clickSpeed() ; end
+
+ # Get scroll speed
def scrollSpeed() ; end
+
+ # Get scroll delay
def scrollDelay() ; end
+
+ # Get blink speed
def blinkSpeed() ; end
+
+ # Get animation speed
def animSpeed() ; end
+
+ # Get menu pause
def menuPause() ; end
+
+ # Get tooltip pause
def tooltipPause() ; end
+
+ # Get tooltip time
def tooltipTime() ; end
+
+ # Get drag delta (in pixels)
def dragDelta() ; end
+
+ # Get number of wheel lines
def wheelLines() ; end
! # Set typing speed
def typingSpeed=(speed); end
+
+ # Set click speed
def clickSpeed=(speed); end
+
+ # Set scroll speed
def scrollSpeed=(speed); end
+
+ # Set scroll delay
def scrollDelay=(delay); end
+
+ # Set blink speed
def blinkSpeed=(speed); end
+
+ # Set animation speed
def animSpeed=(speed); end
+
+ # Set menu pause
def menuPause=(pause); end
+
+ # Set tooltip pause
def tooltipPause=(pause); end
+
+ # Set tooltip time
def tooltipTime=(time); end
+
+ # Set drag delta (in pixels)
def dragDelta=(delta); end
+
+ # Set number of wheel lines
def wheelLines=(lines); end
Index: FXComposite.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXComposite.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXComposite.rb 7 Feb 2002 16:54:54 -0000 1.1
--- FXComposite.rb 27 Mar 2002 18:03:04 -0000 1.2
***************
*** 14,22 ****
def onFocusPrev(sender, selector, event) ; end
! # Handles the +SEL_COMMAND+ message with identifier +FXWindow::ID_UPDATE+
def onCmdUpdate(sender, selector, event) ; end
# Constructor
! def initialize(p, opts=0, x=0, y=0, w=0, h=0);
# Return the width of the widest child window
--- 14,22 ----
def onFocusPrev(sender, selector, event) ; end
! # Handles the +SEL_COMMAND+ message with identifier FXWindow::ID_UPDATE
def onCmdUpdate(sender, selector, event) ; end
# Constructor
! def initialize(p, opts=0, x=0, y=0, w=0, h=0); end
# Return the width of the widest child window
|
|
From: Lyle J. <ly...@us...> - 2002-03-26 23:58:47
|
Update of /cvsroot/fxruby/FXRuby/ext/fox In directory usw-pr-cvs1:/tmp/cvs-serv7056 Modified Files: core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp Log Message: Index: core_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** core_wrap.cpp 23 Mar 2002 00:03:09 -0000 1.55 --- core_wrap.cpp 26 Mar 2002 23:58:38 -0000 1.56 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; *************** *** 9252,9256 **** FXRegion *arg1 ; FXRegion *arg2 ; ! FXRegion result; VALUE vresult = Qnil; --- 9252,9256 ---- FXRegion *arg1 ; FXRegion *arg2 ; ! SwigValueWrapper<FXRegion> result; VALUE vresult = Qnil; *************** *** 9274,9278 **** FXRegion *arg1 ; FXRegion *arg2 ; ! FXRegion result; VALUE vresult = Qnil; --- 9274,9278 ---- FXRegion *arg1 ; FXRegion *arg2 ; ! SwigValueWrapper<FXRegion> result; VALUE vresult = Qnil; *************** *** 9296,9300 **** FXRegion *arg1 ; FXRegion *arg2 ; ! FXRegion result; VALUE vresult = Qnil; --- 9296,9300 ---- FXRegion *arg1 ; FXRegion *arg2 ; ! SwigValueWrapper<FXRegion> result; VALUE vresult = Qnil; *************** *** 9318,9322 **** FXRegion *arg1 ; FXRegion *arg2 ; ! FXRegion result; VALUE vresult = Qnil; --- 9318,9322 ---- FXRegion *arg1 ; FXRegion *arg2 ; ! SwigValueWrapper<FXRegion> result; VALUE vresult = Qnil; *************** *** 15365,15369 **** _wrap_FXIconDict_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; ! FXString *arg2 = (FXString *) &FXIconDict::defaultIconPath ; FXRbIconDict *result; --- 15365,15369 ---- _wrap_FXIconDict_initialize(int argc, VALUE *argv, VALUE self) { FXApp *arg1 ; ! FXString *arg2 = (FXString *) &FXRbIconDict::defaultIconPath ; FXRbIconDict *result; Index: dialogs_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** dialogs_wrap.cpp 23 Mar 2002 00:03:21 -0000 1.30 --- dialogs_wrap.cpp 26 Mar 2002 23:58:41 -0000 1.31 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; Index: icons_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** icons_wrap.cpp 23 Mar 2002 00:03:22 -0000 1.33 --- icons_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.34 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; Index: image_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** image_wrap.cpp 23 Mar 2002 00:03:22 -0000 1.35 --- image_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.36 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; Index: layout_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** layout_wrap.cpp 23 Mar 2002 00:03:22 -0000 1.4 --- layout_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.5 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; Index: mdi_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mdi_wrap.cpp 23 Mar 2002 00:03:22 -0000 1.32 --- mdi_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.33 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; Index: opengl_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** opengl_wrap.cpp 23 Mar 2002 00:03:22 -0000 1.37 --- opengl_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.38 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; *************** *** 1183,1187 **** _wrap_FXHVec___neg__(int argc, VALUE *argv, VALUE self) { FXHVec *arg1 ; ! FXHVec result; VALUE vresult = Qnil; --- 1183,1187 ---- _wrap_FXHVec___neg__(int argc, VALUE *argv, VALUE self) { FXHVec *arg1 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1204,1208 **** FXHVec *arg1 ; FXHVec *arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1204,1208 ---- FXHVec *arg1 ; FXHVec *arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1226,1230 **** FXHVec *arg1 ; FXHVec *arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1226,1230 ---- FXHVec *arg1 ; FXHVec *arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1248,1252 **** FXHVec *arg1 ; FXfloat arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1248,1252 ---- FXHVec *arg1 ; FXfloat arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1270,1274 **** FXHVec *arg1 ; FXfloat arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1270,1274 ---- FXHVec *arg1 ; FXfloat arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1310,1314 **** FXHVec *arg1 ; FXHVec *arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1310,1314 ---- FXHVec *arg1 ; FXHVec *arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1347,1351 **** _wrap_FXHVec_normalize(int argc, VALUE *argv, VALUE self) { FXHVec *arg1 ; ! FXHVec result; VALUE vresult = Qnil; --- 1347,1351 ---- _wrap_FXHVec_normalize(int argc, VALUE *argv, VALUE self) { FXHVec *arg1 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1368,1372 **** FXHVec *arg1 ; FXHVec *arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1368,1372 ---- FXHVec *arg1 ; FXHVec *arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1390,1394 **** FXHVec *arg1 ; FXHVec *arg2 ; ! FXHVec result; VALUE vresult = Qnil; --- 1390,1394 ---- FXHVec *arg1 ; FXHVec *arg2 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 1719,1723 **** FXHMat *arg1 ; FXHMat *arg2 ; ! FXHMat result; VALUE vresult = Qnil; --- 1719,1723 ---- FXHMat *arg1 ; FXHMat *arg2 ; ! SwigValueWrapper<FXHMat> result; VALUE vresult = Qnil; *************** *** 1741,1745 **** FXHMat *arg1 ; FXHMat *arg2 ; ! FXHMat result; VALUE vresult = Qnil; --- 1741,1745 ---- FXHMat *arg1 ; FXHMat *arg2 ; ! SwigValueWrapper<FXHMat> result; VALUE vresult = Qnil; *************** *** 1763,1767 **** FXHMat *arg1 ; FXHMat *arg2 ; ! FXHMat result; VALUE vresult = Qnil; --- 1763,1767 ---- FXHMat *arg1 ; FXHMat *arg2 ; ! SwigValueWrapper<FXHMat> result; VALUE vresult = Qnil; *************** *** 1819,1823 **** _wrap_FXHMat_transpose(int argc, VALUE *argv, VALUE self) { FXHMat *arg1 ; ! FXHMat result; VALUE vresult = Qnil; --- 1819,1823 ---- _wrap_FXHMat_transpose(int argc, VALUE *argv, VALUE self) { FXHMat *arg1 ; ! SwigValueWrapper<FXHMat> result; VALUE vresult = Qnil; *************** *** 1839,1843 **** _wrap_FXHMat_invert(int argc, VALUE *argv, VALUE self) { FXHMat *arg1 ; ! FXHMat result; VALUE vresult = Qnil; --- 1839,1843 ---- _wrap_FXHMat_invert(int argc, VALUE *argv, VALUE self) { FXHMat *arg1 ; ! SwigValueWrapper<FXHMat> result; VALUE vresult = Qnil; *************** *** 8477,8481 **** _wrap_FX_GLViewer_getBackgroundColor(int argc, VALUE *argv, VALUE self) { FXGLViewer *arg1 ; ! FXHVec result; VALUE vresult = Qnil; --- 8477,8481 ---- _wrap_FX_GLViewer_getBackgroundColor(int argc, VALUE *argv, VALUE self) { FXGLViewer *arg1 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; *************** *** 8512,8516 **** _wrap_FX_GLViewer_getAmbientColor(int argc, VALUE *argv, VALUE self) { FXGLViewer *arg1 ; ! FXHVec result; VALUE vresult = Qnil; --- 8512,8516 ---- _wrap_FX_GLViewer_getAmbientColor(int argc, VALUE *argv, VALUE self) { FXGLViewer *arg1 ; ! SwigValueWrapper<FXHVec> result; VALUE vresult = Qnil; Index: scintilla_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** scintilla_wrap.cpp 23 Mar 2002 00:03:23 -0000 1.13 --- scintilla_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.14 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; Index: ui_wrap.cpp =================================================================== RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ui_wrap.cpp 23 Mar 2002 00:03:23 -0000 1.5 --- ui_wrap.cpp 26 Mar 2002 23:58:42 -0000 1.6 *************** *** 1,5 **** /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.12u-20020322-0903 * * 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-20020326-1200 * * This file is not intended to be easily readable and contains a number of *************** *** 17,22 **** inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(T t) {tt = new T(t); return *this;} ! inline operator T&() const {return *tt;} inline T *operator&() { return tt; } }; --- 17,22 ---- inline SwigValueWrapper() : tt(0) { } inline ~SwigValueWrapper() { if (tt) delete tt; } ! inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; } ! inline operator T&() const { return *tt; } inline T *operator&() { return tt; } }; *************** *** 3715,3720 **** arg1 = (FXWindow *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXWindow); arg2 = NUM2INT(argv[0]); ! result = (FXWindow *)((FXWindow const *)arg1)->childAtIndex(arg2); ! vresult = FXRbGetRubyObj(result, "FXWindow *"); return vresult; --- 3715,3725 ---- arg1 = (FXWindow *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXWindow); arg2 = NUM2INT(argv[0]); ! { ! result = (FXWindow *)((FXWindow const *)arg1)->childAtIndex(arg2); ! ! if (!result) { ! rb_raise(rb_eIndexError, "child window index out of bounds"); ! } ! } vresult = FXRbGetRubyObj(result, "FXWindow *"); return vresult; |
|
From: Lyle J. <ly...@us...> - 2002-03-26 22:44:06
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv19589
Modified Files:
FXDirList.i FXFileDict.i FXFileList.i FXGLObject.i FXGLShape.i
FXHeader.i FXIconList.i FXList.i FXTable.i FXTreeList.i
markfuncs.i
Log Message:
Fixes for latest version of SWIG.
Index: FXDirList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDirList.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** FXDirList.i 19 Mar 2002 23:18:40 -0000 1.18
--- FXDirList.i 26 Mar 2002 22:44:03 -0000 1.19
***************
*** 71,75 ****
};
! %feature("freefunc") ::FXRbDirItem "FXRbDirItem::freefunc";
%exception FXRbDirItem::FXRbDirItem "$action FXRbRegisterRubyObj(self, result);";
--- 71,75 ----
};
! %feature("freefunc") FXRbDirItem "FXRbDirItem::freefunc";
%exception FXRbDirItem::FXRbDirItem "$action FXRbRegisterRubyObj(self, result);";
Index: FXFileDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDict.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXFileDict.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXFileDict.i 26 Mar 2002 22:44:03 -0000 1.18
***************
*** 84,88 ****
public:
// Construct an icon dictionary, with given path
! FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath);
// Destructor
--- 84,88 ----
public:
// Construct an icon dictionary, with given path
! FXRbIconDict(FXApp* a,const FXString& p=FXRbIconDict::defaultIconPath);
// Destructor
Index: FXFileList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileList.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FXFileList.i 19 Mar 2002 23:18:40 -0000 1.19
--- FXFileList.i 26 Mar 2002 22:44:03 -0000 1.20
***************
*** 91,95 ****
};
! %feature("freefunc") ::FXRbFileItem "FXRbFileItem::freefunc";
%exception FXRbFileItem::FXRbFileItem "$action FXRbRegisterRubyObj(self, result);";
--- 91,95 ----
};
! %feature("freefunc") FXRbFileItem "FXRbFileItem::freefunc";
%exception FXRbFileItem::FXRbFileItem "$action FXRbRegisterRubyObj(self, result);";
Index: FXGLObject.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXGLObject.i 19 Mar 2002 23:18:40 -0000 1.21
--- FXGLObject.i 26 Mar 2002 22:44:03 -0000 1.22
***************
*** 79,83 ****
};
! %feature("freefunc") ::FXRbGLObject "FXRbGLObject::freefunc";
%exception FXRbGLObject::FXRbGLObject "$action FXRbRegisterRubyObj(self, result);";
--- 79,83 ----
};
! %feature("freefunc") FXRbGLObject "FXRbGLObject::freefunc";
%exception FXRbGLObject::FXRbGLObject "$action FXRbRegisterRubyObj(self, result);";
***************
*** 169,173 ****
};
! %feature("freefunc") ::FXRbGLGroup "FXRbGLGroup::freefunc";
%exception FXRbGLGroup::FXRbGLGroup "$action FXRbRegisterRubyObj(self, result);";
--- 169,173 ----
};
! %feature("freefunc") FXRbGLGroup "FXRbGLGroup::freefunc";
%exception FXRbGLGroup::FXRbGLGroup "$action FXRbRegisterRubyObj(self, result);";
Index: FXGLShape.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLShape.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FXGLShape.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXGLShape.i 26 Mar 2002 22:44:03 -0000 1.16
***************
*** 128,132 ****
%ignore FXRbGLShape::FXRbGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
! %feature("freefunc") ::FXRbGLShape "FXRbGLShape::freefunc";
%exception FXRbGLShape::FXRbGLShape "$action FXRbRegisterRubyObj(self, result);";
--- 128,132 ----
%ignore FXRbGLShape::FXRbGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
! %feature("freefunc") FXRbGLShape "FXRbGLShape::freefunc";
%exception FXRbGLShape::FXRbGLShape "$action FXRbRegisterRubyObj(self, result);";
Index: FXHeader.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** FXHeader.i 19 Mar 2002 23:18:40 -0000 1.27
--- FXHeader.i 26 Mar 2002 22:44:03 -0000 1.28
***************
*** 121,125 ****
};
! %feature("freefunc") ::FXRbHeaderItem "FXRbHeaderItem::freefunc";
%exception FXRbHeaderItem::FXRbHeaderItem "$action FXRbRegisterRubyObj(self, result);";
--- 121,125 ----
};
! %feature("freefunc") FXRbHeaderItem "FXRbHeaderItem::freefunc";
%exception FXRbHeaderItem::FXRbHeaderItem "$action FXRbRegisterRubyObj(self, result);";
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FXIconList.i 19 Mar 2002 23:18:40 -0000 1.31
--- FXIconList.i 26 Mar 2002 22:44:03 -0000 1.32
***************
*** 123,127 ****
};
! %feature("freefunc") ::FXRbIconItem "FXRbIconItem::freefunc";
%exception FXRbIconItem::FXRbIconItem "$action FXRbRegisterRubyObj(self, result);";
--- 123,127 ----
};
! %feature("freefunc") FXRbIconItem "FXRbIconItem::freefunc";
%exception FXRbIconItem::FXRbIconItem "$action FXRbRegisterRubyObj(self, result);";
Index: FXList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** FXList.i 19 Mar 2002 23:18:40 -0000 1.33
--- FXList.i 26 Mar 2002 22:44:03 -0000 1.34
***************
*** 116,120 ****
};
! %feature("freefunc") ::FXRbListItem "FXRbListItem::freefunc";
%exception FXRbListItem::FXRbListItem "$action FXRbRegisterRubyObj(self, result);";
--- 116,120 ----
};
! %feature("freefunc") FXRbListItem "FXRbListItem::freefunc";
%exception FXRbListItem::FXRbListItem "$action FXRbRegisterRubyObj(self, result);";
Index: FXTable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTable.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** FXTable.i 19 Mar 2002 23:18:40 -0000 1.25
--- FXTable.i 26 Mar 2002 22:44:03 -0000 1.26
***************
*** 141,145 ****
};
! %feature("freefunc") ::FXRbTableItem "FXRbTableItem::freefunc";
%exception FXRbTableItem::FXRbTableItem "$action FXRbRegisterRubyObj(self, result);";
--- 141,145 ----
};
! %feature("freefunc") FXRbTableItem "FXRbTableItem::freefunc";
%exception FXRbTableItem::FXRbTableItem "$action FXRbRegisterRubyObj(self, result);";
Index: FXTreeList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeList.i,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FXTreeList.i 23 Mar 2002 00:03:24 -0000 1.30
--- FXTreeList.i 26 Mar 2002 22:44:03 -0000 1.31
***************
*** 145,149 ****
};
! %feature("freefunc") ::FXRbTreeItem "FXRbTreeItem::freefunc";
%exception FXRbTreeItem::FXRbTreeItem "$action FXRbRegisterRubyObj(self, result);";
--- 145,149 ----
};
! %feature("freefunc") FXRbTreeItem "FXRbTreeItem::freefunc";
%exception FXRbTreeItem::FXRbTreeItem "$action FXRbRegisterRubyObj(self, result);";
Index: markfuncs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/markfuncs.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** markfuncs.i 25 Feb 2002 22:49:49 -0000 1.3
--- markfuncs.i 26 Mar 2002 22:44:03 -0000 1.4
***************
*** 21,333 ****
***********************************************************************/
! %markfunc ::FX4Splitter "FXRb4Splitter::markfunc";
! %markfunc ::FXAccelTable "FXRbAccelTable::markfunc";
! %markfunc ::FXApp "FXRbApp::markfunc";
! %markfunc ::FXArrowButton "FXRbArrowButton::markfunc";
! %markfunc ::FXBMPIcon "FXRbBMPIcon::markfunc";
! %markfunc ::FXBMPImage "FXRbBMPImage::markfunc";
! %markfunc ::FXBitmap "FXRbBitmap::markfunc";
! %markfunc ::FXButton "FXRbButton::markfunc";
! %markfunc ::FXCanvas "FXRbCanvas::markfunc";
! %markfunc ::FXCheckButton "FXRbCheckButton::markfunc";
! %markfunc ::FXColorBar "FXRbColorBar::markfunc";
! %markfunc ::FXColorDialog "FXRbColorDialog::markfunc";
! %markfunc ::FXColorSelector "FXRbColorSelector::markfunc";
! %markfunc ::FXColorWell "FXRbColorWell::markfunc";
! %markfunc ::FXColorWheel "FXRbColorWheel::markfunc";
! %markfunc ::FXComboBox "FXRbComboBox::markfunc";
! %markfunc ::FXComposite "FXRbComposite::markfunc";
! %markfunc ::FXCURCursor "FXRbCURCursor::markfunc";
! %markfunc ::FXCursor "FXRbCursor::markfunc";
! %markfunc ::FXDataTarget "FXRbDataTarget::markfunc";
! %markfunc ::FXDC "FXRbDC::markfunc";
! %markfunc ::FXDCPrint "FXRbDCPrint::markfunc";
! %markfunc ::FXDCWindow "FXRbDCWindow::markfunc";
! %markfunc ::FXDebugTarget "FXRbDebugTarget::markfunc";
! %markfunc ::FXDelegator "FXRbDelegator::markfunc";
! %markfunc ::FXDial "FXRbDial::markfunc";
! %markfunc ::FXDialogBox "FXRbDialogBox::markfunc";
! %markfunc ::FXDict "FXRbDict::markfunc";
! %markfunc ::FXDirBox "FXRbDirBox::markfunc";
! %markfunc ::FXDirDialog "FXRbDirDialog::markfunc";
! %markfunc ::FXDirItem "FXRbDirItem::markfunc";
! %markfunc ::FXDirList "FXRbDirList::markfunc";
! %markfunc ::FXDirSelector "FXRbDirSelector::markfunc";
! %markfunc ::FXDocument "FXRbDocument::markfunc";
! %markfunc ::FXDragCorner "FXRbDragCorner::markfunc";
! %markfunc ::FXDrawable "FXRbDrawable::markfunc";
! %markfunc ::FXDriveBox "FXRbDriveBox::markfunc";
! %markfunc ::FXFileDialog "FXRbFileDialog::markfunc";
! %markfunc ::FXFileDict "FXRbFileDict::markfunc";
! %markfunc ::FXFileItem "FXRbFileItem::markfunc";
! %markfunc ::FXFileList "FXRbFileList::markfunc";
! %markfunc ::FXFileSelector "FXRbFileSelector::markfunc";
! %markfunc ::FXFont "FXRbFont::markfunc";
! %markfunc ::FXFontDialog "FXRbFontDialog::markfunc";
! %markfunc ::FXFontSelector "FXRbFontSelector::markfunc";
! %markfunc ::FXFrame "FXRbFrame::markfunc";
! %markfunc ::FXGIFCursor "FXRbGIFCursor::markfunc";
! %markfunc ::FXGIFIcon "FXRbGIFIcon::markfunc";
! %markfunc ::FXGIFImage "FXRbGIFImage::markfunc";
! %markfunc ::FXGLCanvas "FXRbGLCanvas::markfunc";
! %markfunc ::FXGLContext "FXRbGLContext::markfunc";
! %markfunc ::FXGLGroup "FXRbGLGroup::markfunc";
! %markfunc ::FXGLObject "FXRbGLObject::markfunc";
! %markfunc ::FXGLShape "FXRbGLShape::markfunc";
! %markfunc ::FXGLViewer "FXRbGLViewer::markfunc";
! %markfunc ::FXGLVisual "FXRbGLVisual::markfunc";
! %markfunc ::FXGroupBox "FXRbGroupBox::markfunc";
! %markfunc ::FXHeader "FXRbHeader::markfunc";
! %markfunc ::FXHeaderItem "FXRbHeaderItem::markfunc";
! %markfunc ::FXHorizontalFrame "FXRbHorizontalFrame::markfunc";
! %markfunc ::FXHorizontalSeparator "FXRbHorizontalSeparator::markfunc";
! %markfunc ::FXICOIcon "FXRbICOIcon::markfunc";
! %markfunc ::FXICOImage "FXRbICOImage::markfunc";
! %markfunc ::FXIcon "FXRbIcon::markfunc";
! %markfunc ::FXIconDict "FXRbIconDict::markfunc";
! %markfunc ::FXIconItem "FXRbIconItem::markfunc";
! %markfunc ::FXIconList "FXRbIconList::markfunc";
! %markfunc ::FXId "FXRbId::markfunc";
! %markfunc ::FXImage "FXRbImage::markfunc";
! %markfunc ::FXImageView "FXRbImageView::markfunc";
! %markfunc ::FXInputDialog "FXRbInputDialog::markfunc";
! %markfunc ::FXJPGIcon "FXRbJPGIcon::markfunc";
! %markfunc ::FXJPGImage "FXRbJPGImage::markfunc";
! %markfunc ::FXLabel "FXRbLabel::markfunc";
! %markfunc ::FXList "FXRbList::markfunc";
! %markfunc ::FXListBox "FXRbListBox::markfunc";
! %markfunc ::FXListItem "FXRbListItem::markfunc";
! %markfunc ::FXMDIChild "FXRbMDIChild::markfunc";
! %markfunc ::FXMDIClient "FXRbMDIClient::markfunc";
! %markfunc ::FXMDIDeleteButton "FXRbMDIDeleteButton::markfunc";
! %markfunc ::FXMDIMaximizeButton "FXRbMDIMaximizeButton::markfunc";
! %markfunc ::FXMDIMenu "FXRbMDIMenu::markfunc";
! %markfunc ::FXMDIMinimizeButton "FXRbMDIMinimizeButton::markfunc";
! %markfunc ::FXMDIRestoreButton "FXRbMDIRestoreButton::markfunc";
! %markfunc ::FXMDIWindowButton "FXRbMDIWindowButton::markfunc";
! %markfunc ::FXMainWindow "FXRbMainWindow::markfunc";
! %markfunc ::FXMatrix "FXRbMatrix::markfunc";
! %markfunc ::FXMenuButton "FXRbMenuButton::markfunc";
! %markfunc ::FXMenuCaption "FXRbMenuCaption::markfunc";
! %markfunc ::FXMenuCascade "FXRbMenuCascade::markfunc";
! %markfunc ::FXMenuCommand "FXRbMenuCommand::markfunc";
! %markfunc ::FXMenuPane "FXRbMenuPane::markfunc";
! %markfunc ::FXMenuSeparator "FXRbMenuSeparator::markfunc";
! %markfunc ::FXMenuTitle "FXRbMenuTitle::markfunc";
! %markfunc ::FXMenubar "FXRbMenubar::markfunc";
! %markfunc ::FXMessageBox "FXRbMessageBox::markfunc";
! %markfunc ::FXObject "FXRbObject::markfunc";
! %markfunc ::FXOption "FXRbOption::markfunc";
! %markfunc ::FXOptionMenu "FXRbOptionMenu::markfunc";
! %markfunc ::FXPacker "FXRbPacker::markfunc";
! %markfunc ::FXPCXIcon "FXRbPCXIcon::markfunc";
! %markfunc ::FXPCXImage "FXRbPCXImage::markfunc";
! %markfunc ::FXPicker "FXRbPicker::markfunc";
! %markfunc ::FXPNGIcon "FXRbPNGIcon::markfunc";
! %markfunc ::FXPNGImage "FXRbPNGImage::markfunc";
! %markfunc ::FXPopup "FXRbPopup::markfunc";
! %markfunc ::FXPrintDialog "FXRbPrintDialog::markfunc";
! %markfunc ::FXProgressBar "FXRbProgressBar::markfunc";
! %markfunc ::FXProgressDialog "FXRbProgressDialog::markfunc";
! %markfunc ::FXRadioButton "FXRbRadioButton::markfunc";
! %markfunc ::FXRecentFiles "FXRbRecentFiles::markfunc";
! %markfunc ::FXReplaceDialog "FXRbReplaceDialog::markfunc";
! %markfunc ::FXRGBIcon "FXRbRGBIcon::markfunc";
! %markfunc ::FXRGBImage "FXRbRGBImage::markfunc";
! %markfunc ::FXRootWindow "FXRbRootWindow::markfunc";
! %markfunc ::FXScrollArea "FXRbScrollArea::markfunc";
! %markfunc ::FXScrollCorner "FXRbScrollCorner::markfunc";
! %markfunc ::FXScrollWindow "FXRbScrollWindow::markfunc";
! %markfunc ::FXScrollbar "FXRbScrollbar::markfunc";
! %markfunc ::FXSearchDialog "FXRbSearchDialog::markfunc";
! %markfunc ::FXShell "FXRbShell::markfunc";
! %markfunc ::FXShutter "FXRbShutter::markfunc";
! %markfunc ::FXShutterItem "FXRbShutterItem::markfunc";
! %markfunc ::FXSlider "FXRbSlider::markfunc";
! %markfunc ::FXSpinner "FXRbSpinner::markfunc";
! %markfunc ::FXSplitter "FXRbSplitter::markfunc";
! %markfunc ::FXStatusbar "FXRbStatusbar::markfunc";
! %markfunc ::FXStatusline "FXRbStatusline::markfunc";
! %markfunc ::FXStringDict "FXRbStringDict::markfunc";
! %markfunc ::FXSwitcher "FXRbSwitcher::markfunc";
! %markfunc ::FXTabBar "FXRbTabBar::markfunc";
! %markfunc ::FXTabBook "FXRbTabBook::markfunc";
! %markfunc ::FXTabItem "FXRbTabItem::markfunc";
! %markfunc ::FXTable "FXRbTable::markfunc";
! %markfunc ::FXTableItem "FXRbTableItem::markfunc";
! %markfunc ::FXText "FXRbText::markfunc";
! %markfunc ::FXTextField "FXRbTextField::markfunc";
! %markfunc ::FXTIFIcon "FXRbTIFIcon::markfunc";
! %markfunc ::FXTIFImage "FXRbTIFImage::markfunc";
! %markfunc ::FXToggleButton "FXRbToggleButton::markfunc";
! %markfunc ::FXToolbar "FXRbToolbar::markfunc";
! %markfunc ::FXToolbarGrip "FXRbToolbarGrip::markfunc";
! %markfunc ::FXToolbarShell "FXRbToolbarShell::markfunc";
! %markfunc ::FXToolbarTab "FXRbToolbarTab::markfunc";
! %markfunc ::FXTooltip "FXRbTooltip::markfunc";
! %markfunc ::FXTopWindow "FXRbTopWindow::markfunc";
! %markfunc ::FXTreeItem "FXRbTreeItem::markfunc";
! %markfunc ::FXTreeList "FXRbTreeList::markfunc";
! %markfunc ::FXTreeListBox "FXRbTreeListBox::markfunc";
! %markfunc ::FXVerticalFrame "FXRbVerticalFrame::markfunc";
! %markfunc ::FXVerticalSeparator "FXRbVerticalSeparator::markfunc";
! %markfunc ::FXVisual "FXRbVisual::markfunc";
! %markfunc ::FXWindow "FXRbWindow::markfunc";
! %markfunc ::FXXPMIcon "FXRbXPMIcon::markfunc";
! %markfunc ::FXXPMImage "FXRbXPMImage::markfunc";
! %markfunc ::FXRb4Splitter "FXRb4Splitter::markfunc";
! %markfunc ::FXRbAccelTable "FXRbAccelTable::markfunc";
! %markfunc ::FXRbApp "FXRbApp::markfunc";
! %markfunc ::FXRbArrowButton "FXRbArrowButton::markfunc";
! %markfunc ::FXRbBMPIcon "FXRbBMPIcon::markfunc";
! %markfunc ::FXRbBMPImage "FXRbBMPImage::markfunc";
! %markfunc ::FXRbBitmap "FXRbBitmap::markfunc";
! %markfunc ::FXRbButton "FXRbButton::markfunc";
! %markfunc ::FXRbCanvas "FXRbCanvas::markfunc";
! %markfunc ::FXRbCheckButton "FXRbCheckButton::markfunc";
! %markfunc ::FXRbColorBar "FXRbColorBar::markfunc";
! %markfunc ::FXRbColorDialog "FXRbColorDialog::markfunc";
! %markfunc ::FXRbColorSelector "FXRbColorSelector::markfunc";
! %markfunc ::FXRbColorWell "FXRbColorWell::markfunc";
! %markfunc ::FXRbColorWheel "FXRbColorWheel::markfunc";
! %markfunc ::FXRbComboBox "FXRbComboBox::markfunc";
! %markfunc ::FXRbComposite "FXRbComposite::markfunc";
! %markfunc ::FXRbCURCursor "FXRbCURCursor::markfunc";
! %markfunc ::FXRbCursor "FXRbCursor::markfunc";
! %markfunc ::FXRbDataTarget "FXRbDataTarget::markfunc";
! %markfunc ::FXRbDC "FXRbDC::markfunc";
! %markfunc ::FXRbDCPrint "FXRbDCPrint::markfunc";
! %markfunc ::FXRbDCWindow "FXRbDCWindow::markfunc";
! %markfunc ::FXRbDebugTarget "FXRbDebugTarget::markfunc";
! %markfunc ::FXRbDelegator "FXRbDelegator::markfunc";
! %markfunc ::FXRbDial "FXRbDial::markfunc";
! %markfunc ::FXRbDialogBox "FXRbDialogBox::markfunc";
! %markfunc ::FXRbDict "FXRbDict::markfunc";
! %markfunc ::FXRbDirBox "FXRbDirBox::markfunc";
! %markfunc ::FXRbDirDialog "FXRbDirDialog::markfunc";
! %markfunc ::FXRbDirItem "FXRbDirItem::markfunc";
! %markfunc ::FXRbDirList "FXRbDirList::markfunc";
! %markfunc ::FXRbDirSelector "FXRbDirSelector::markfunc";
! %markfunc ::FXRbDocument "FXRbDocument::markfunc";
! %markfunc ::FXRbDragCorner "FXRbDragCorner::markfunc";
! %markfunc ::FXRbDrawable "FXRbDrawable::markfunc";
! %markfunc ::FXRbDriveBox "FXRbDriveBox::markfunc";
! %markfunc ::FXRbFileDialog "FXRbFileDialog::markfunc";
! %markfunc ::FXRbFileDict "FXRbFileDict::markfunc";
! %markfunc ::FXRbFileItem "FXRbFileItem::markfunc";
! %markfunc ::FXRbFileList "FXRbFileList::markfunc";
! %markfunc ::FXRbFileSelector "FXRbFileSelector::markfunc";
! %markfunc ::FXRbFont "FXRbFont::markfunc";
! %markfunc ::FXRbFontDialog "FXRbFontDialog::markfunc";
! %markfunc ::FXRbFontSelector "FXRbFontSelector::markfunc";
! %markfunc ::FXRbFrame "FXRbFrame::markfunc";
! %markfunc ::FXRbGIFCursor "FXRbGIFCursor::markfunc";
! %markfunc ::FXRbGIFIcon "FXRbGIFIcon::markfunc";
! %markfunc ::FXRbGIFImage "FXRbGIFImage::markfunc";
! %markfunc ::FXRbGLCanvas "FXRbGLCanvas::markfunc";
! %markfunc ::FXRbGLContext "FXRbGLContext::markfunc";
! %markfunc ::FXRbGLGroup "FXRbGLGroup::markfunc";
! %markfunc ::FXRbGLObject "FXRbGLObject::markfunc";
! %markfunc ::FXRbGLShape "FXRbGLShape::markfunc";
! %markfunc ::FXRbGLViewer "FXRbGLViewer::markfunc";
! %markfunc ::FXRbGLVisual "FXRbGLVisual::markfunc";
! %markfunc ::FXRbGroupBox "FXRbGroupBox::markfunc";
! %markfunc ::FXRbHeader "FXRbHeader::markfunc";
! %markfunc ::FXRbHeaderItem "FXRbHeaderItem::markfunc";
! %markfunc ::FXRbHorizontalFrame "FXRbHorizontalFrame::markfunc";
! %markfunc ::FXRbHorizontalSeparator "FXRbHorizontalSeparator::markfunc";
! %markfunc ::FXRbICOIcon "FXRbICOIcon::markfunc";
! %markfunc ::FXRbICOImage "FXRbICOImage::markfunc";
! %markfunc ::FXRbIcon "FXRbIcon::markfunc";
! %markfunc ::FXRbIconDict "FXRbIconDict::markfunc";
! %markfunc ::FXRbIconItem "FXRbIconItem::markfunc";
! %markfunc ::FXRbIconList "FXRbIconList::markfunc";
! %markfunc ::FXRbId "FXRbId::markfunc";
! %markfunc ::FXRbImage "FXRbImage::markfunc";
! %markfunc ::FXRbImageView "FXRbImageView::markfunc";
! %markfunc ::FXRbInputDialog "FXRbInputDialog::markfunc";
! %markfunc ::FXRbJPGIcon "FXRbJPGIcon::markfunc";
! %markfunc ::FXRbJPGImage "FXRbJPGImage::markfunc";
! %markfunc ::FXRbLabel "FXRbLabel::markfunc";
! %markfunc ::FXRbList "FXRbList::markfunc";
! %markfunc ::FXRbListBox "FXRbListBox::markfunc";
! %markfunc ::FXRbListItem "FXRbListItem::markfunc";
! %markfunc ::FXRbMDIChild "FXRbMDIChild::markfunc";
! %markfunc ::FXRbMDIClient "FXRbMDIClient::markfunc";
! %markfunc ::FXRbMDIDeleteButton "FXRbMDIDeleteButton::markfunc";
! %markfunc ::FXRbMDIMaximizeButton "FXRbMDIMaximizeButton::markfunc";
! %markfunc ::FXRbMDIMenu "FXRbMDIMenu::markfunc";
! %markfunc ::FXRbMDIMinimizeButton "FXRbMDIMinimizeButton::markfunc";
! %markfunc ::FXRbMDIRestoreButton "FXRbMDIRestoreButton::markfunc";
! %markfunc ::FXRbMDIWindowButton "FXRbMDIWindowButton::markfunc";
! %markfunc ::FXRbMainWindow "FXRbMainWindow::markfunc";
! %markfunc ::FXRbMatrix "FXRbMatrix::markfunc";
! %markfunc ::FXRbMenuButton "FXRbMenuButton::markfunc";
! %markfunc ::FXRbMenuCaption "FXRbMenuCaption::markfunc";
! %markfunc ::FXRbMenuCascade "FXRbMenuCascade::markfunc";
! %markfunc ::FXRbMenuCommand "FXRbMenuCommand::markfunc";
! %markfunc ::FXRbMenuPane "FXRbMenuPane::markfunc";
! %markfunc ::FXRbMenuSeparator "FXRbMenuSeparator::markfunc";
! %markfunc ::FXRbMenuTitle "FXRbMenuTitle::markfunc";
! %markfunc ::FXRbMenubar "FXRbMenubar::markfunc";
! %markfunc ::FXRbMessageBox "FXRbMessageBox::markfunc";
! %markfunc ::FXRbObject "FXRbObject::markfunc";
! %markfunc ::FXRbOption "FXRbOption::markfunc";
! %markfunc ::FXRbOptionMenu "FXRbOptionMenu::markfunc";
! %markfunc ::FXRbPacker "FXRbPacker::markfunc";
! %markfunc ::FXRbPCXIcon "FXRbPCXIcon::markfunc";
! %markfunc ::FXRbPCXImage "FXRbPCXImage::markfunc";
! %markfunc ::FXRbPicker "FXRbPicker::markfunc";
! %markfunc ::FXRbPNGIcon "FXRbPNGIcon::markfunc";
! %markfunc ::FXRbPNGImage "FXRbPNGImage::markfunc";
! %markfunc ::FXRbPopup "FXRbPopup::markfunc";
! %markfunc ::FXRbPrintDialog "FXRbPrintDialog::markfunc";
! %markfunc ::FXRbProgressBar "FXRbProgressBar::markfunc";
! %markfunc ::FXRbProgressDialog "FXRbProgressDialog::markfunc";
! %markfunc ::FXRbRadioButton "FXRbRadioButton::markfunc";
! %markfunc ::FXRbRecentFiles "FXRbRecentFiles::markfunc";
! %markfunc ::FXRbReplaceDialog "FXRbReplaceDialog::markfunc";
! %markfunc ::FXRbRGBIcon "FXRbRGBIcon::markfunc";
! %markfunc ::FXRbRGBImage "FXRbRGBImage::markfunc";
! %markfunc ::FXRbRootWindow "FXRbRootWindow::markfunc";
! %markfunc ::FXRbScrollArea "FXRbScrollArea::markfunc";
! %markfunc ::FXRbScrollCorner "FXRbScrollCorner::markfunc";
! %markfunc ::FXRbScrollWindow "FXRbScrollWindow::markfunc";
! %markfunc ::FXRbScrollbar "FXRbScrollbar::markfunc";
! %markfunc ::FXRbSearchDialog "FXRbSearchDialog::markfunc";
! %markfunc ::FXRbShell "FXRbShell::markfunc";
! %markfunc ::FXRbShutter "FXRbShutter::markfunc";
! %markfunc ::FXRbShutterItem "FXRbShutterItem::markfunc";
! %markfunc ::FXRbSlider "FXRbSlider::markfunc";
! %markfunc ::FXRbSpinner "FXRbSpinner::markfunc";
! %markfunc ::FXRbSplitter "FXRbSplitter::markfunc";
! %markfunc ::FXRbStatusbar "FXRbStatusbar::markfunc";
! %markfunc ::FXRbStatusline "FXRbStatusline::markfunc";
! %markfunc ::FXRbStringDict "FXRbStringDict::markfunc";
! %markfunc ::FXRbSwitcher "FXRbSwitcher::markfunc";
! %markfunc ::FXRbTabBar "FXRbTabBar::markfunc";
! %markfunc ::FXRbTabBook "FXRbTabBook::markfunc";
! %markfunc ::FXRbTabItem "FXRbTabItem::markfunc";
! %markfunc ::FXRbTable "FXRbTable::markfunc";
! %markfunc ::FXRbTableItem "FXRbTableItem::markfunc";
! %markfunc ::FXRbText "FXRbText::markfunc";
! %markfunc ::FXRbTextField "FXRbTextField::markfunc";
! %markfunc ::FXRbTIFIcon "FXRbTIFIcon::markfunc";
! %markfunc ::FXRbTIFImage "FXRbTIFImage::markfunc";
! %markfunc ::FXRbToggleButton "FXRbToggleButton::markfunc";
! %markfunc ::FXRbToolbar "FXRbToolbar::markfunc";
! %markfunc ::FXRbToolbarGrip "FXRbToolbarGrip::markfunc";
! %markfunc ::FXRbToolbarShell "FXRbToolbarShell::markfunc";
! %markfunc ::FXRbToolbarTab "FXRbToolbarTab::markfunc";
! %markfunc ::FXRbTooltip "FXRbTooltip::markfunc";
! %markfunc ::FXRbTopWindow "FXRbTopWindow::markfunc";
! %markfunc ::FXRbTreeItem "FXRbTreeItem::markfunc";
! %markfunc ::FXRbTreeList "FXRbTreeList::markfunc";
! %markfunc ::FXRbTreeListBox "FXRbTreeListBox::markfunc";
! %markfunc ::FXRbVerticalFrame "FXRbVerticalFrame::markfunc";
! %markfunc ::FXRbVerticalSeparator "FXRbVerticalSeparator::markfunc";
! %markfunc ::FXRbVisual "FXRbVisual::markfunc";
! %markfunc ::FXRbWindow "FXRbWindow::markfunc";
! %markfunc ::FXRbXPMIcon "FXRbXPMIcon::markfunc";
! %markfunc ::FXRbXPMImage "FXRbXPMImage::markfunc";
--- 21,333 ----
***********************************************************************/
! %markfunc FX4Splitter "FXRb4Splitter::markfunc";
! %markfunc FXAccelTable "FXRbAccelTable::markfunc";
! %markfunc FXApp "FXRbApp::markfunc";
! %markfunc FXArrowButton "FXRbArrowButton::markfunc";
! %markfunc FXBMPIcon "FXRbBMPIcon::markfunc";
! %markfunc FXBMPImage "FXRbBMPImage::markfunc";
! %markfunc FXBitmap "FXRbBitmap::markfunc";
! %markfunc FXButton "FXRbButton::markfunc";
! %markfunc FXCanvas "FXRbCanvas::markfunc";
! %markfunc FXCheckButton "FXRbCheckButton::markfunc";
! %markfunc FXColorBar "FXRbColorBar::markfunc";
! %markfunc FXColorDialog "FXRbColorDialog::markfunc";
! %markfunc FXColorSelector "FXRbColorSelector::markfunc";
! %markfunc FXColorWell "FXRbColorWell::markfunc";
! %markfunc FXColorWheel "FXRbColorWheel::markfunc";
! %markfunc FXComboBox "FXRbComboBox::markfunc";
! %markfunc FXComposite "FXRbComposite::markfunc";
! %markfunc FXCURCursor "FXRbCURCursor::markfunc";
! %markfunc FXCursor "FXRbCursor::markfunc";
! %markfunc FXDataTarget "FXRbDataTarget::markfunc";
! %markfunc FXDC "FXRbDC::markfunc";
! %markfunc FXDCPrint "FXRbDCPrint::markfunc";
! %markfunc FXDCWindow "FXRbDCWindow::markfunc";
! %markfunc FXDebugTarget "FXRbDebugTarget::markfunc";
! %markfunc FXDelegator "FXRbDelegator::markfunc";
! %markfunc FXDial "FXRbDial::markfunc";
! %markfunc FXDialogBox "FXRbDialogBox::markfunc";
! %markfunc FXDict "FXRbDict::markfunc";
! %markfunc FXDirBox "FXRbDirBox::markfunc";
! %markfunc FXDirDialog "FXRbDirDialog::markfunc";
! %markfunc FXDirItem "FXRbDirItem::markfunc";
! %markfunc FXDirList "FXRbDirList::markfunc";
! %markfunc FXDirSelector "FXRbDirSelector::markfunc";
! %markfunc FXDocument "FXRbDocument::markfunc";
! %markfunc FXDragCorner "FXRbDragCorner::markfunc";
! %markfunc FXDrawable "FXRbDrawable::markfunc";
! %markfunc FXDriveBox "FXRbDriveBox::markfunc";
! %markfunc FXFileDialog "FXRbFileDialog::markfunc";
! %markfunc FXFileDict "FXRbFileDict::markfunc";
! %markfunc FXFileItem "FXRbFileItem::markfunc";
! %markfunc FXFileList "FXRbFileList::markfunc";
! %markfunc FXFileSelector "FXRbFileSelector::markfunc";
! %markfunc FXFont "FXRbFont::markfunc";
! %markfunc FXFontDialog "FXRbFontDialog::markfunc";
! %markfunc FXFontSelector "FXRbFontSelector::markfunc";
! %markfunc FXFrame "FXRbFrame::markfunc";
! %markfunc FXGIFCursor "FXRbGIFCursor::markfunc";
! %markfunc FXGIFIcon "FXRbGIFIcon::markfunc";
! %markfunc FXGIFImage "FXRbGIFImage::markfunc";
! %markfunc FXGLCanvas "FXRbGLCanvas::markfunc";
! %markfunc FXGLContext "FXRbGLContext::markfunc";
! %markfunc FXGLGroup "FXRbGLGroup::markfunc";
! %markfunc FXGLObject "FXRbGLObject::markfunc";
! %markfunc FXGLShape "FXRbGLShape::markfunc";
! %markfunc FXGLViewer "FXRbGLViewer::markfunc";
! %markfunc FXGLVisual "FXRbGLVisual::markfunc";
! %markfunc FXGroupBox "FXRbGroupBox::markfunc";
! %markfunc FXHeader "FXRbHeader::markfunc";
! %markfunc FXHeaderItem "FXRbHeaderItem::markfunc";
! %markfunc FXHorizontalFrame "FXRbHorizontalFrame::markfunc";
! %markfunc FXHorizontalSeparator "FXRbHorizontalSeparator::markfunc";
! %markfunc FXICOIcon "FXRbICOIcon::markfunc";
! %markfunc FXICOImage "FXRbICOImage::markfunc";
! %markfunc FXIcon "FXRbIcon::markfunc";
! %markfunc FXIconDict "FXRbIconDict::markfunc";
! %markfunc FXIconItem "FXRbIconItem::markfunc";
! %markfunc FXIconList "FXRbIconList::markfunc";
! %markfunc FXId "FXRbId::markfunc";
! %markfunc FXImage "FXRbImage::markfunc";
! %markfunc FXImageView "FXRbImageView::markfunc";
! %markfunc FXInputDialog "FXRbInputDialog::markfunc";
! %markfunc FXJPGIcon "FXRbJPGIcon::markfunc";
! %markfunc FXJPGImage "FXRbJPGImage::markfunc";
! %markfunc FXLabel "FXRbLabel::markfunc";
! %markfunc FXList "FXRbList::markfunc";
! %markfunc FXListBox "FXRbListBox::markfunc";
! %markfunc FXListItem "FXRbListItem::markfunc";
! %markfunc FXMDIChild "FXRbMDIChild::markfunc";
! %markfunc FXMDIClient "FXRbMDIClient::markfunc";
! %markfunc FXMDIDeleteButton "FXRbMDIDeleteButton::markfunc";
! %markfunc FXMDIMaximizeButton "FXRbMDIMaximizeButton::markfunc";
! %markfunc FXMDIMenu "FXRbMDIMenu::markfunc";
! %markfunc FXMDIMinimizeButton "FXRbMDIMinimizeButton::markfunc";
! %markfunc FXMDIRestoreButton "FXRbMDIRestoreButton::markfunc";
! %markfunc FXMDIWindowButton "FXRbMDIWindowButton::markfunc";
! %markfunc FXMainWindow "FXRbMainWindow::markfunc";
! %markfunc FXMatrix "FXRbMatrix::markfunc";
! %markfunc FXMenuButton "FXRbMenuButton::markfunc";
! %markfunc FXMenuCaption "FXRbMenuCaption::markfunc";
! %markfunc FXMenuCascade "FXRbMenuCascade::markfunc";
! %markfunc FXMenuCommand "FXRbMenuCommand::markfunc";
! %markfunc FXMenuPane "FXRbMenuPane::markfunc";
! %markfunc FXMenuSeparator "FXRbMenuSeparator::markfunc";
! %markfunc FXMenuTitle "FXRbMenuTitle::markfunc";
! %markfunc FXMenubar "FXRbMenubar::markfunc";
! %markfunc FXMessageBox "FXRbMessageBox::markfunc";
! %markfunc FXObject "FXRbObject::markfunc";
! %markfunc FXOption "FXRbOption::markfunc";
! %markfunc FXOptionMenu "FXRbOptionMenu::markfunc";
! %markfunc FXPacker "FXRbPacker::markfunc";
! %markfunc FXPCXIcon "FXRbPCXIcon::markfunc";
! %markfunc FXPCXImage "FXRbPCXImage::markfunc";
! %markfunc FXPicker "FXRbPicker::markfunc";
! %markfunc FXPNGIcon "FXRbPNGIcon::markfunc";
! %markfunc FXPNGImage "FXRbPNGImage::markfunc";
! %markfunc FXPopup "FXRbPopup::markfunc";
! %markfunc FXPrintDialog "FXRbPrintDialog::markfunc";
! %markfunc FXProgressBar "FXRbProgressBar::markfunc";
! %markfunc FXProgressDialog "FXRbProgressDialog::markfunc";
! %markfunc FXRadioButton "FXRbRadioButton::markfunc";
! %markfunc FXRecentFiles "FXRbRecentFiles::markfunc";
! %markfunc FXReplaceDialog "FXRbReplaceDialog::markfunc";
! %markfunc FXRGBIcon "FXRbRGBIcon::markfunc";
! %markfunc FXRGBImage "FXRbRGBImage::markfunc";
! %markfunc FXRootWindow "FXRbRootWindow::markfunc";
! %markfunc FXScrollArea "FXRbScrollArea::markfunc";
! %markfunc FXScrollCorner "FXRbScrollCorner::markfunc";
! %markfunc FXScrollWindow "FXRbScrollWindow::markfunc";
! %markfunc FXScrollbar "FXRbScrollbar::markfunc";
! %markfunc FXSearchDialog "FXRbSearchDialog::markfunc";
! %markfunc FXShell "FXRbShell::markfunc";
! %markfunc FXShutter "FXRbShutter::markfunc";
! %markfunc FXShutterItem "FXRbShutterItem::markfunc";
! %markfunc FXSlider "FXRbSlider::markfunc";
! %markfunc FXSpinner "FXRbSpinner::markfunc";
! %markfunc FXSplitter "FXRbSplitter::markfunc";
! %markfunc FXStatusbar "FXRbStatusbar::markfunc";
! %markfunc FXStatusline "FXRbStatusline::markfunc";
! %markfunc FXStringDict "FXRbStringDict::markfunc";
! %markfunc FXSwitcher "FXRbSwitcher::markfunc";
! %markfunc FXTabBar "FXRbTabBar::markfunc";
! %markfunc FXTabBook "FXRbTabBook::markfunc";
! %markfunc FXTabItem "FXRbTabItem::markfunc";
! %markfunc FXTable "FXRbTable::markfunc";
! %markfunc FXTableItem "FXRbTableItem::markfunc";
! %markfunc FXText "FXRbText::markfunc";
! %markfunc FXTextField "FXRbTextField::markfunc";
! %markfunc FXTIFIcon "FXRbTIFIcon::markfunc";
! %markfunc FXTIFImage "FXRbTIFImage::markfunc";
! %markfunc FXToggleButton "FXRbToggleButton::markfunc";
! %markfunc FXToolbar "FXRbToolbar::markfunc";
! %markfunc FXToolbarGrip "FXRbToolbarGrip::markfunc";
! %markfunc FXToolbarShell "FXRbToolbarShell::markfunc";
! %markfunc FXToolbarTab "FXRbToolbarTab::markfunc";
! %markfunc FXTooltip "FXRbTooltip::markfunc";
! %markfunc FXTopWindow "FXRbTopWindow::markfunc";
! %markfunc FXTreeItem "FXRbTreeItem::markfunc";
! %markfunc FXTreeList "FXRbTreeList::markfunc";
! %markfunc FXTreeListBox "FXRbTreeListBox::markfunc";
! %markfunc FXVerticalFrame "FXRbVerticalFrame::markfunc";
! %markfunc FXVerticalSeparator "FXRbVerticalSeparator::markfunc";
! %markfunc FXVisual "FXRbVisual::markfunc";
! %markfunc FXWindow "FXRbWindow::markfunc";
! %markfunc FXXPMIcon "FXRbXPMIcon::markfunc";
! %markfunc FXXPMImage "FXRbXPMImage::markfunc";
! %markfunc FXRb4Splitter "FXRb4Splitter::markfunc";
! %markfunc FXRbAccelTable "FXRbAccelTable::markfunc";
! %markfunc FXRbApp "FXRbApp::markfunc";
! %markfunc FXRbArrowButton "FXRbArrowButton::markfunc";
! %markfunc FXRbBMPIcon "FXRbBMPIcon::markfunc";
! %markfunc FXRbBMPImage "FXRbBMPImage::markfunc";
! %markfunc FXRbBitmap "FXRbBitmap::markfunc";
! %markfunc FXRbButton "FXRbButton::markfunc";
! %markfunc FXRbCanvas "FXRbCanvas::markfunc";
! %markfunc FXRbCheckButton "FXRbCheckButton::markfunc";
! %markfunc FXRbColorBar "FXRbColorBar::markfunc";
! %markfunc FXRbColorDialog "FXRbColorDialog::markfunc";
! %markfunc FXRbColorSelector "FXRbColorSelector::markfunc";
! %markfunc FXRbColorWell "FXRbColorWell::markfunc";
! %markfunc FXRbColorWheel "FXRbColorWheel::markfunc";
! %markfunc FXRbComboBox "FXRbComboBox::markfunc";
! %markfunc FXRbComposite "FXRbComposite::markfunc";
! %markfunc FXRbCURCursor "FXRbCURCursor::markfunc";
! %markfunc FXRbCursor "FXRbCursor::markfunc";
! %markfunc FXRbDataTarget "FXRbDataTarget::markfunc";
! %markfunc FXRbDC "FXRbDC::markfunc";
! %markfunc FXRbDCPrint "FXRbDCPrint::markfunc";
! %markfunc FXRbDCWindow "FXRbDCWindow::markfunc";
! %markfunc FXRbDebugTarget "FXRbDebugTarget::markfunc";
! %markfunc FXRbDelegator "FXRbDelegator::markfunc";
! %markfunc FXRbDial "FXRbDial::markfunc";
! %markfunc FXRbDialogBox "FXRbDialogBox::markfunc";
! %markfunc FXRbDict "FXRbDict::markfunc";
! %markfunc FXRbDirBox "FXRbDirBox::markfunc";
! %markfunc FXRbDirDialog "FXRbDirDialog::markfunc";
! %markfunc FXRbDirItem "FXRbDirItem::markfunc";
! %markfunc FXRbDirList "FXRbDirList::markfunc";
! %markfunc FXRbDirSelector "FXRbDirSelector::markfunc";
! %markfunc FXRbDocument "FXRbDocument::markfunc";
! %markfunc FXRbDragCorner "FXRbDragCorner::markfunc";
! %markfunc FXRbDrawable "FXRbDrawable::markfunc";
! %markfunc FXRbDriveBox "FXRbDriveBox::markfunc";
! %markfunc FXRbFileDialog "FXRbFileDialog::markfunc";
! %markfunc FXRbFileDict "FXRbFileDict::markfunc";
! %markfunc FXRbFileItem "FXRbFileItem::markfunc";
! %markfunc FXRbFileList "FXRbFileList::markfunc";
! %markfunc FXRbFileSelector "FXRbFileSelector::markfunc";
! %markfunc FXRbFont "FXRbFont::markfunc";
! %markfunc FXRbFontDialog "FXRbFontDialog::markfunc";
! %markfunc FXRbFontSelector "FXRbFontSelector::markfunc";
! %markfunc FXRbFrame "FXRbFrame::markfunc";
! %markfunc FXRbGIFCursor "FXRbGIFCursor::markfunc";
! %markfunc FXRbGIFIcon "FXRbGIFIcon::markfunc";
! %markfunc FXRbGIFImage "FXRbGIFImage::markfunc";
! %markfunc FXRbGLCanvas "FXRbGLCanvas::markfunc";
! %markfunc FXRbGLContext "FXRbGLContext::markfunc";
! %markfunc FXRbGLGroup "FXRbGLGroup::markfunc";
! %markfunc FXRbGLObject "FXRbGLObject::markfunc";
! %markfunc FXRbGLShape "FXRbGLShape::markfunc";
! %markfunc FXRbGLViewer "FXRbGLViewer::markfunc";
! %markfunc FXRbGLVisual "FXRbGLVisual::markfunc";
! %markfunc FXRbGroupBox "FXRbGroupBox::markfunc";
! %markfunc FXRbHeader "FXRbHeader::markfunc";
! %markfunc FXRbHeaderItem "FXRbHeaderItem::markfunc";
! %markfunc FXRbHorizontalFrame "FXRbHorizontalFrame::markfunc";
! %markfunc FXRbHorizontalSeparator "FXRbHorizontalSeparator::markfunc";
! %markfunc FXRbICOIcon "FXRbICOIcon::markfunc";
! %markfunc FXRbICOImage "FXRbICOImage::markfunc";
! %markfunc FXRbIcon "FXRbIcon::markfunc";
! %markfunc FXRbIconDict "FXRbIconDict::markfunc";
! %markfunc FXRbIconItem "FXRbIconItem::markfunc";
! %markfunc FXRbIconList "FXRbIconList::markfunc";
! %markfunc FXRbId "FXRbId::markfunc";
! %markfunc FXRbImage "FXRbImage::markfunc";
! %markfunc FXRbImageView "FXRbImageView::markfunc";
! %markfunc FXRbInputDialog "FXRbInputDialog::markfunc";
! %markfunc FXRbJPGIcon "FXRbJPGIcon::markfunc";
! %markfunc FXRbJPGImage "FXRbJPGImage::markfunc";
! %markfunc FXRbLabel "FXRbLabel::markfunc";
! %markfunc FXRbList "FXRbList::markfunc";
! %markfunc FXRbListBox "FXRbListBox::markfunc";
! %markfunc FXRbListItem "FXRbListItem::markfunc";
! %markfunc FXRbMDIChild "FXRbMDIChild::markfunc";
! %markfunc FXRbMDIClient "FXRbMDIClient::markfunc";
! %markfunc FXRbMDIDeleteButton "FXRbMDIDeleteButton::markfunc";
! %markfunc FXRbMDIMaximizeButton "FXRbMDIMaximizeButton::markfunc";
! %markfunc FXRbMDIMenu "FXRbMDIMenu::markfunc";
! %markfunc FXRbMDIMinimizeButton "FXRbMDIMinimizeButton::markfunc";
! %markfunc FXRbMDIRestoreButton "FXRbMDIRestoreButton::markfunc";
! %markfunc FXRbMDIWindowButton "FXRbMDIWindowButton::markfunc";
! %markfunc FXRbMainWindow "FXRbMainWindow::markfunc";
! %markfunc FXRbMatrix "FXRbMatrix::markfunc";
! %markfunc FXRbMenuButton "FXRbMenuButton::markfunc";
! %markfunc FXRbMenuCaption "FXRbMenuCaption::markfunc";
! %markfunc FXRbMenuCascade "FXRbMenuCascade::markfunc";
! %markfunc FXRbMenuCommand "FXRbMenuCommand::markfunc";
! %markfunc FXRbMenuPane "FXRbMenuPane::markfunc";
! %markfunc FXRbMenuSeparator "FXRbMenuSeparator::markfunc";
! %markfunc FXRbMenuTitle "FXRbMenuTitle::markfunc";
! %markfunc FXRbMenubar "FXRbMenubar::markfunc";
! %markfunc FXRbMessageBox "FXRbMessageBox::markfunc";
! %markfunc FXRbObject "FXRbObject::markfunc";
! %markfunc FXRbOption "FXRbOption::markfunc";
! %markfunc FXRbOptionMenu "FXRbOptionMenu::markfunc";
! %markfunc FXRbPacker "FXRbPacker::markfunc";
! %markfunc FXRbPCXIcon "FXRbPCXIcon::markfunc";
! %markfunc FXRbPCXImage "FXRbPCXImage::markfunc";
! %markfunc FXRbPicker "FXRbPicker::markfunc";
! %markfunc FXRbPNGIcon "FXRbPNGIcon::markfunc";
! %markfunc FXRbPNGImage "FXRbPNGImage::markfunc";
! %markfunc FXRbPopup "FXRbPopup::markfunc";
! %markfunc FXRbPrintDialog "FXRbPrintDialog::markfunc";
! %markfunc FXRbProgressBar "FXRbProgressBar::markfunc";
! %markfunc FXRbProgressDialog "FXRbProgressDialog::markfunc";
! %markfunc FXRbRadioButton "FXRbRadioButton::markfunc";
! %markfunc FXRbRecentFiles "FXRbRecentFiles::markfunc";
! %markfunc FXRbReplaceDialog "FXRbReplaceDialog::markfunc";
! %markfunc FXRbRGBIcon "FXRbRGBIcon::markfunc";
! %markfunc FXRbRGBImage "FXRbRGBImage::markfunc";
! %markfunc FXRbRootWindow "FXRbRootWindow::markfunc";
! %markfunc FXRbScrollArea "FXRbScrollArea::markfunc";
! %markfunc FXRbScrollCorner "FXRbScrollCorner::markfunc";
! %markfunc FXRbScrollWindow "FXRbScrollWindow::markfunc";
! %markfunc FXRbScrollbar "FXRbScrollbar::markfunc";
! %markfunc FXRbSearchDialog "FXRbSearchDialog::markfunc";
! %markfunc FXRbShell "FXRbShell::markfunc";
! %markfunc FXRbShutter "FXRbShutter::markfunc";
! %markfunc FXRbShutterItem "FXRbShutterItem::markfunc";
! %markfunc FXRbSlider "FXRbSlider::markfunc";
! %markfunc FXRbSpinner "FXRbSpinner::markfunc";
! %markfunc FXRbSplitter "FXRbSplitter::markfunc";
! %markfunc FXRbStatusbar "FXRbStatusbar::markfunc";
! %markfunc FXRbStatusline "FXRbStatusline::markfunc";
! %markfunc FXRbStringDict "FXRbStringDict::markfunc";
! %markfunc FXRbSwitcher "FXRbSwitcher::markfunc";
! %markfunc FXRbTabBar "FXRbTabBar::markfunc";
! %markfunc FXRbTabBook "FXRbTabBook::markfunc";
! %markfunc FXRbTabItem "FXRbTabItem::markfunc";
! %markfunc FXRbTable "FXRbTable::markfunc";
! %markfunc FXRbTableItem "FXRbTableItem::markfunc";
! %markfunc FXRbText "FXRbText::markfunc";
! %markfunc FXRbTextField "FXRbTextField::markfunc";
! %markfunc FXRbTIFIcon "FXRbTIFIcon::markfunc";
! %markfunc FXRbTIFImage "FXRbTIFImage::markfunc";
! %markfunc FXRbToggleButton "FXRbToggleButton::markfunc";
! %markfunc FXRbToolbar "FXRbToolbar::markfunc";
! %markfunc FXRbToolbarGrip "FXRbToolbarGrip::markfunc";
! %markfunc FXRbToolbarShell "FXRbToolbarShell::markfunc";
! %markfunc FXRbToolbarTab "FXRbToolbarTab::markfunc";
! %markfunc FXRbTooltip "FXRbTooltip::markfunc";
! %markfunc FXRbTopWindow "FXRbTopWindow::markfunc";
! %markfunc FXRbTreeItem "FXRbTreeItem::markfunc";
! %markfunc FXRbTreeList "FXRbTreeList::markfunc";
! %markfunc FXRbTreeListBox "FXRbTreeListBox::markfunc";
! %markfunc FXRbVerticalFrame "FXRbVerticalFrame::markfunc";
! %markfunc FXRbVerticalSeparator "FXRbVerticalSeparator::markfunc";
! %markfunc FXRbVisual "FXRbVisual::markfunc";
! %markfunc FXRbWindow "FXRbWindow::markfunc";
! %markfunc FXRbXPMIcon "FXRbXPMIcon::markfunc";
! %markfunc FXRbXPMImage "FXRbXPMImage::markfunc";
|
|
From: Lyle J. <ly...@us...> - 2002-03-26 21:49:53
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv2479
Modified Files:
FXWindow.i
Log Message:
Replaced "except" typemap on FXWindow#childAtIndex with an %exception
directive.
Index: FXWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXWindow.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FXWindow.i 26 Mar 2002 21:38:33 -0000 1.31
--- FXWindow.i 26 Mar 2002 21:49:50 -0000 1.32
***************
*** 76,82 ****
%exception FXWindow::FXWindow "$action FXRbRegisterRubyObj(self, result);";
! %typemap(except) FXWindow* FXWindow::childAtIndex {
! $action;
! if (!$1) {
rb_raise(rb_eIndexError, "child window index out of bounds");
}
--- 76,82 ----
%exception FXWindow::FXWindow "$action FXRbRegisterRubyObj(self, result);";
! %exception FXWindow::childAtIndex(FXint index) const {
! $action
! if (!result) {
rb_raise(rb_eIndexError, "child window index out of bounds");
}
|
|
From: Lyle J. <ly...@us...> - 2002-03-26 21:39:13
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv31877
Modified Files:
aliases.rb
Log Message:
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aliases.rb 28 Feb 2002 16:51:00 -0000 1.20
--- aliases.rb 26 Mar 2002 21:39:09 -0000 1.21
***************
*** 12,15 ****
--- 12,16 ----
alias focusWindow getFocusWindow
alias mainWindow getMainWindow
+ alias modal? isModal
alias normalFont getNormalFont
alias normalFont= setNormalFont
***************
*** 304,307 ****
--- 305,312 ----
alias drive= setDrive
end
+ class FXEvent
+ alias moved? moved
+ alias synthetic? synthetic
+ end
class FX_FileDialog
alias filename= setFilename
***************
*** 1475,1491 ****
--- 1480,1512 ----
alias accelTable getAccelTable
alias accelTable= setAccelTable
+ alias shell? isShell
+ alias childOf? isChildOf
+ alias containsChild? containsChild
alias defaultCursor= setDefaultCursor
alias defaultCursor getDefaultCursor
alias dragCursor= setDragCursor
alias dragCursor getDragCursor
+ alias cursorPosition getCursorPosition
alias enabled? isEnabled
alias active? isActive
+ alias canFocus? canFocus
+ alias hasFocus? hasFocus
+ alias default? isDefault
+ alias initial? isInitial
+ alias grabbed? grabbed
+ alias shown? shown
alias composite? isComposite
+ alias underCursor? underCursor
+ alias hasSelection? hasSelection
+ alias hasClipboard? hasClipboard
alias dropEnabled? isDropEnabled
alias dragging? isDragging
alias dropTarget? isDropTarget
+ alias didAccept? didAccept
+ alias contains? contains
alias backColor= setBackColor
alias backColor getBackColor
alias children getChildren
+ alias doesSaveUnder? doesSaveUnder
end
end
|