Thread: [Fxruby-commits] CVS: FXRuby/fox-includes FXDC.h,1.7,1.8 FXDCPrint.h,1.8,1.9 FXDCWindow.h,1.7,1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv23484/fox-includes

Modified Files:
	FXDC.h FXDCPrint.h FXDCWindow.h 
Log Message:
Added support for new FXDC virtual functions fillChord() and fillChords().


Index: FXDC.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDC.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXDC.h	2 Jan 2002 22:23:56 -0000	1.7
--- FXDC.h	11 Jul 2002 18:00:23 -0000	1.8
***************
*** 4,8 ****
  *                                                                               *
  *********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp.   All Rights Reserved.        *
  *********************************************************************************
  * This library is free software; you can redistribute it and/or                 *
--- 4,8 ----
  *                                                                               *
  *********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp.   All Rights Reserved.        *
  *********************************************************************************
  * This library is free software; you can redistribute it and/or                 *
***************
*** 20,28 ****
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.    *
  *********************************************************************************
! * $Id$                           *
  ********************************************************************************/
  #ifndef FXDC_H
  #define FXDC_H
  
  
  /// Drawing (BITBLT) functions
--- 20,29 ----
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.    *
  *********************************************************************************
! * $Id$                              *
  ********************************************************************************/
  #ifndef FXDC_H
  #define FXDC_H
  
+ namespace FX {
  
  /// Drawing (BITBLT) functions
***************
*** 75,79 ****
  enum FXFillStyle {
    FILL_SOLID,                     /// Fill with solid color
!   FILL_TILED,                     /// Fill with tiled bitmap 
    FILL_STIPPLED,                  /// Fill where stipple mask is 1
    FILL_OPAQUESTIPPLED             /// Fill with foreground where mask is 1, background otherwise
--- 76,80 ----
  enum FXFillStyle {
    FILL_SOLID,                     /// Fill with solid color
!   FILL_TILED,                     /// Fill with tiled bitmap
    FILL_STIPPLED,                  /// Fill where stipple mask is 1
    FILL_OPAQUESTIPPLED             /// Fill with foreground where mask is 1, background otherwise
***************
*** 121,132 ****
  
  /// Line segment
! struct FXSegment { 
!   FXshort x1,y1,x2,y2; 
    };
  
  
  /// Arc
! struct FXArc { 
!   FXshort x,y,w,h,a,b; 
    };
  
--- 122,133 ----
  
  /// Line segment
! struct FXSegment {
!   FXshort x1,y1,x2,y2;
    };
  
  
  /// Arc
! struct FXArc {
!   FXshort x,y,w,h,a,b;
    };
  
***************
*** 209,215 ****
    /**
    * Draw arcs.
!   * The argument ang1 specifies the start of the arc relative to the 
    * three-o'clock position from the center, in units of degrees*64.
!   * The argument ang2 specifies the path and extent of the arc relative 
    * to the start of the arc, in units of degrees*64.
    * The arguments x,y,w,h specify the bounding rectangle.
--- 210,216 ----
    /**
    * Draw arcs.
!   * The argument ang1 specifies the start of the arc relative to the
    * three-o'clock position from the center, in units of degrees*64.
!   * The argument ang2 specifies the path and extent of the arc relative
    * to the start of the arc, in units of degrees*64.
    * The arguments x,y,w,h specify the bounding rectangle.
***************
*** 222,225 ****
--- 223,230 ----
    virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
  
+   /// Fill chord
+   virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+   virtual void fillChords(const FXArc* chords,FXuint nchords);
+ 
    /// Draw arcs
    virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
***************
*** 241,245 ****
    /// Draw focus rectangle
    virtual void drawFocusRectangle(FXint x,FXint y,FXint w,FXint h);
!   
    /// Draw area from source
    virtual void drawArea(const FXDrawable* source,FXint sx,FXint sy,FXint sw,FXint sh,FXint dx,FXint dy);
--- 246,250 ----
    /// Draw focus rectangle
    virtual void drawFocusRectangle(FXint x,FXint y,FXint w,FXint h);
! 
    /// Draw area from source
    virtual void drawArea(const FXDrawable* source,FXint sx,FXint sy,FXint sw,FXint sh,FXint dx,FXint dy);
***************
*** 274,278 ****
    /**
    * Set dash pattern and dash offset.
!   * A dash pattern of [1 2 3 4] is a repeating pattern of 1 foreground pixel, 
    * 2 background pixels, 3 foreground pixels, and 4 background pixels.
    * The offset is where in the pattern the system will start counting.
--- 279,283 ----
    /**
    * Set dash pattern and dash offset.
!   * A dash pattern of [1 2 3 4] is a repeating pattern of 1 foreground pixel,
    * 2 background pixels, 3 foreground pixels, and 4 background pixels.
    * The offset is where in the pattern the system will start counting.
***************
*** 355,362 ****
    /// Set clip rectangle
    virtual void setClipRectangle(FXint x,FXint y,FXint w,FXint h);
!   
    /// Change clip rectangle
    virtual void setClipRectangle(const FXRectangle& rectangle);
!   
    /// Return clip rectangle
    const FXRectangle& getClipRectangle() const { return clip; }
--- 360,367 ----
    /// Set clip rectangle
    virtual void setClipRectangle(FXint x,FXint y,FXint w,FXint h);
! 
    /// Change clip rectangle
    virtual void setClipRectangle(const FXRectangle& rectangle);
! 
    /// Return clip rectangle
    const FXRectangle& getClipRectangle() const { return clip; }
***************
*** 396,399 ****
--- 401,405 ----
    };
  
+ }
  
  #endif

Index: FXDCPrint.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDCPrint.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXDCPrint.h	26 Nov 2001 16:13:03 -0000	1.8
--- FXDCPrint.h	11 Jul 2002 18:00:23 -0000	1.9
***************
*** 4,8 ****
  *                                                                               *
  *********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp.   All Rights Reserved.        *
  *********************************************************************************
  * This library is free software; you can redistribute it and/or                 *
--- 4,8 ----
  *                                                                               *
  *********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp.   All Rights Reserved.        *
  *********************************************************************************
  * This library is free software; you can redistribute it and/or                 *
***************
*** 20,24 ****
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.    *
  *********************************************************************************
! * $Id$                      *
  ********************************************************************************/
  #ifndef FXDCPRINT_H
--- 20,24 ----
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.    *
  *********************************************************************************
! * $Id$                         *
  ********************************************************************************/
  #ifndef FXDCPRINT_H
***************
*** 31,34 ****
--- 31,36 ----
  //////////////////////////////  UNDER DEVELOPMENT  //////////////////////////////
  
+ namespace FX {
+ 
  class FXApp;
  class FXDrawable;
***************
*** 160,163 ****
--- 162,169 ----
    virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
  
+   /// Fill chord
+   virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+   virtual void fillChords(const FXArc* chords,FXuint nchords);
+   
    /// Draw arcs
    virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
***************
*** 257,260 ****
--- 263,267 ----
    };
  
+ }
  
  #endif

Index: FXDCWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDCWindow.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXDCWindow.h	2 Jan 2002 22:23:56 -0000	1.7
--- FXDCWindow.h	11 Jul 2002 18:00:23 -0000	1.8
***************
*** 4,8 ****
  *                                                                               *
  *********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp.   All Rights Reserved.        *
  *********************************************************************************
  * This library is free software; you can redistribute it and/or                 *
--- 4,8 ----
  *                                                                               *
  *********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp.   All Rights Reserved.        *
  *********************************************************************************
  * This library is free software; you can redistribute it and/or                 *
***************
*** 20,24 ****
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.    *
  *********************************************************************************
! * $Id$                     *
  ********************************************************************************/
  #ifndef FXDCWINDOW_H
--- 20,24 ----
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.    *
  *********************************************************************************
! * $Id$                        *
  ********************************************************************************/
  #ifndef FXDCWINDOW_H
***************
*** 29,32 ****
--- 29,33 ----
  #endif
  
+ namespace FX {
  
  
***************
*** 40,44 ****
  
  
- 
  /**
  * Window Device Context
--- 41,44 ----
***************
*** 122,125 ****
--- 122,129 ----
    virtual void fillRectangles(const FXRectangle* rectangles,FXuint nrectangles);
  
+   /// Fill chord
+   virtual void fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
+   virtual void fillChords(const FXArc* chords,FXuint nchords);
+ 
    /// Draw arcs
    virtual void fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2);
***************
*** 225,228 ****
--- 229,233 ----
    };
  
+ }
  
  #endif

Thread: [Fxruby-commits] CVS: FXRuby/fox-includes FXDC.h,1.7,1.8 FXDCPrint.h,1.8,1.9 FXDCWindow.h,1.7,1.8

fxruby-commits