[Fxruby-commits] CVS: FXRuby/swig-interfaces typemaps.i,1.32,1.33

[Lyle J. <ly...@us...>]

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 */