fxruby 1.6.28-x86-mingw32 → 1.6.29-x86-mingw32

data/swig-interfaces/FXFrame.i

@@ -40,26 +40,6 @@ enum { DEFAULT_PAD = 2 };
 
 /// Base Frame
 class FXFrame : public FXWindow {
-protected:
-  FXColor baseColor;    // Base color
-  FXColor hiliteColor;  // Highlight color
-  FXColor shadowColor;  // Shadow color
-  FXColor borderColor;  // Border color
-  FXint   padtop;       // Top padding
-  FXint   padbottom;    // Bottom padding
-  FXint   padleft;      // Left padding
-  FXint   padright;     // right padding
-  FXint   border;       // Border size
-protected:
-  FXFrame();
-  void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:

data/swig-interfaces/FXGIFIcon.i

@@ -23,8 +23,6 @@
 
 /// GIF Icon class
 class FXGIFIcon : public FXIcon {
-protected:
-  FXGIFIcon(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXGIFImage.i

@@ -23,8 +23,6 @@
 
 /// GIF Image class
 class FXGIFImage : public FXImage {
-protected:
-  FXGIFImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXGLCanvas.i

@@ -24,10 +24,6 @@
 
 /// GLCanvas, an area drawn by another object
 class FXGLCanvas : public FXCanvas {
-protected:
-  void        *ctx;     // GL Context
-protected:
-  FXGLCanvas();
 public:
   %extend {
     /**

data/swig-interfaces/FXGLContext.i

@@ -36,10 +36,6 @@ class FXGLVisual;
 * However, display lists may be shared between different GL contexts.
 */
 class FXGLContext : public FXId {
-protected:
-  void           *ctx;        // GL Context
-protected:
-  FXGLContext();
 public:
   %extend {
     /**

data/swig-interfaces/FXGLShape.i

@@ -43,17 +43,6 @@ enum {
 
 /// OpenGL Shape Object
 class FXGLShape : public FXGLObject {
-protected:
-  FXVec3f	position;	      // Middle of the Bounding Box
-  FXMaterial    material[2];          // Front and back material properties
-  FXRangef      range;                // Range box
-  FXuint	options;              // Drawing options
-  FXString	tip;
-protected:
-  FXGLShape();
-  virtual void drawshape(FXGLViewer*){}  // To be overloaded by derived class
-  void drawbox();
-  void drawhandles();
 public:
   long onDNDDrop(FXObject*,FXSelector,void*);
   long onDNDMotion(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXGLViewer.i

@@ -83,76 +83,11 @@ struct FXMaterial {
 
 /// Canvas, an area drawn by another object
 class FXGLViewer : public FXGLCanvas {
-protected:
-  FXViewport      wvt;              // Window viewport transform
-  FXMat4f         transform;        // Current transformation matrix
-  FXMat4f         itransform;       // Inverse of current transformation matrix
-  FXuint          projection;       // Projection mode
-  FXQuatf         rotation;         // Viewer orientation
-  FXdouble        fov;              // Field of view
-  FXdouble        zoom;             // Zoom factor
-  FXVec3f         center;           // Model center
-  FXVec3f         scale;            // Model scale
-  FXdouble        worldpx;          // Pixel size in world
-  FXdouble        modelpx;          // Pixel size in model
-  FXint           maxhits;          // Maximum number of hits
-  FXdouble        ax,ay;            // Quick view->world coordinate mapping
-  FXdouble        diameter;         // Size of model diameter ( always > 0)
-  FXdouble        distance;         // Distance of PRP to target
-  FXVec4f         background[2];    // Background colors
-  FXVec4f         ambient;          // Global ambient light
-  FXLight         light;            // Light source
-  FXMaterial      material;         // Base material properties
-  FXint           dial[3];          // Dial positions
-  FXString        help;             // Status help
-  FXString        tip;              // Tooltip for background
-  FXGLObject     *dropped;          // Object being dropped on
-  FXGLObject     *selection;        // Current object
-  FXZSortFunc     zsortfunc;        // Routine to sort feedback buffer
-  FXGLObject     *scene;            // What we're looking at
-  FXbool          doesturbo;        // Doing turbo mode
-  FXbool          turbomode;        // Turbo mode
-  FXuchar         mode;             // Mode the widget is in
 public:
 
   // Common DND types
   static FXDragType objectType;     // GL Object type
 
-protected:
-
-  // Mouse actions when in viewing window
-  enum {
-    HOVERING,                       // Hovering mouse w/o doing anything
-    PICKING,                        // Pick mode
-    ROTATING,                       // Rotating camera around target
-    POSTING,                        // Posting right-mouse menu
-    TRANSLATING,                    // Translating camera
-    ZOOMING,                        // Zooming
-    FOVING,                         // Change field-of-view
-    DRAGGING,                       // Dragging objects
-    TRUCKING,                       // Trucking camera
-    GYRATING,                       // Rotation of camera around eye
-    DO_LASSOSELECT,                 // Lasso select when mouse pressed
-    LASSOSELECT,                    // Anchor of lasso rectangle
-    DO_LASSOZOOM,                   // Zoom when mouse pressed
-    LASSOZOOM                       // Zoom rectangle
-    };
-
-protected:
-  FXGLViewer();
-  void glsetup();
-  virtual void updateProjection();
-  virtual void updateTransform();
-  FXVec3fspherePoint(FXint px,FXint py);
-  FXQuatf turn(FXint fx,FXint fy,FXint tx,FXint ty);
-  void drawWorld(FXViewport& wv);
-  void drawAnti(FXViewport& wv);
-  void drawLasso(FXint x0,FXint y0,FXint x1,FXint y1);
-  // FXint selectHits(FXuint*& hits,FXint& nhits,FXint x,FXint y,FXint w,FXint h);
-  FXint renderFeedback(FXfloat *buffer,FXint x,FXint y,FXint w,FXint h,FXint maxbuffer);
-  void drawFeedback(FXDCPrint& pdc,const FXfloat* buffer,FXint used);
-  virtual FXGLObject* processHits(FXuint *pickbuffer,FXint nhits);
-  void setOp(FXuint o);
 public:
 
   // Events

data/swig-interfaces/FXGradientBar.i

@@ -239,19 +239,18 @@ public:
         if(FXMALLOC(&ramp,FXColor,nramp)){
           self->gradient(ramp,nramp);
           ary=rb_ary_new2(nramp);
-  	  for(i=0; i<nramp; i++){
-	    rb_ary_store(ary,i,to_ruby(ramp[i]));
-	    }
-	  FXFREE(&ramp);
-	  return ary;
-	  }
-        else{
-          rb_raise(rb_eNoMemError,"");
+          for(i=0; i<nramp; i++){
+            rb_ary_store(ary,i,to_ruby(ramp[i]));
           }
+          FXFREE(&ramp);
+          return ary;
+        }else{
+          rb_raise(rb_eNoMemError,"Out of memory");
         }
+      }
       else{
         return rb_ary_new();
-        }
+      }
     }
   }
 

data/swig-interfaces/FXGroupBox.i

@@ -39,12 +39,6 @@ enum {
 * be checked at any one time.
 */
 class FXGroupBox : public FXPacker {
-protected:
-  FXString  label;
-  FXFont   *font;
-  FXColor   textColor;
-protected:
-  FXGroupBox();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onCmdSetValue(FXObject*,FXSelector,void* PTR_IGNORE); // FIXME

data/swig-interfaces/FXHeader.i

@@ -39,16 +39,6 @@ enum {
 
 /// Header item
 class FXHeaderItem : public FXObject {
-protected:
-  FXString  label;      // Text of item
-  FXIcon   *icon;       // Icon of item
-  void     *data;       // Item user data pointer
-  FXint     size;       // Item size
-  FXint     pos;        // Item position
-  FXuint    state;      // Item state flags
-protected:
-  FXHeaderItem(){}
-  virtual void draw(const FXHeader* header,FXDC& dc,FXint x,FXint y,FXint w,FXint h);
 public:
   enum{
     ARROW_NONE = 0,     /// No arrow
@@ -164,20 +154,6 @@ DECLARE_FXHEADERITEM_VIRTUALS(FXHeaderItem)
 * The contents may be scrolled by calling setPosition().
 */
 class FXHeader : public FXFrame {
-protected:
-  FXHeaderItemList items;	// Item list
-  FXColor        textColor;           // Text color
-  FXFont        *font;                // Text font
-  FXString       help;                // Help text
-  FXint          pos;           // Scroll position
-  FXint          active;              // Active button
-  FXint          activepos;           // Position of active item
-  FXint          activesize;          // Size of active item
-  FXint          offset;        // Offset where split grabbed
-protected:
-  FXHeader();
-  void drawSplit(FXint pos);
-  virtual FXHeaderItem *createItem(const FXString& text,FXIcon* icon,FXint size,void* ptr);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXHorizontalFrame.i

@@ -27,8 +27,6 @@
 * depending on the child window's layout hints.
 */
 class FXHorizontalFrame : public FXPacker {
-protected:
-  FXHorizontalFrame(){}
 public:
   %extend {
     /// Construct a horizontal frame layout manager

data/swig-interfaces/FXICOIcon.i

@@ -23,8 +23,6 @@
 
 /// ICO icon
 class FXICOIcon : public FXIcon {
-protected:
-  FXICOIcon(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXICOImage.i

@@ -23,8 +23,6 @@
 
 /// ICO graphics file
 class FXICOImage : public FXImage {
-protected:
-  FXICOImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXIcon.i

@@ -23,13 +23,6 @@
 
 /// Icon class
 class FXIcon : public FXImage {
-protected:
-  FXID     shape;             // Shape pixmap
-  FXID     etch;              // Etch pixmap
-  FXColor  transp;            // Transparency color
-protected:
-  FXIcon(){}
-  FXColor guesstransp();
 public:
   %extend {
     /**

data/swig-interfaces/FXIconList.i

@@ -45,20 +45,6 @@ class FXIconList;
 
 /// Icon item
 class FXIconItem : public FXObject {
-protected:
-  FXString  label;
-  FXIcon   *bigIcon;
-  FXIcon   *miniIcon;
-  void     *data;
-  FXuint    state;
-protected:
-  FXIconItem():bigIcon(NULL),miniIcon(NULL),data(NULL),state(0){}
-  virtual void draw(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  virtual FXint hitItem(const FXIconList* list,FXint rx,FXint ry,FXint rw=1,FXint rh=1) const;
-protected:
-  virtual void drawBigIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  virtual void drawMiniIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  virtual void drawDetails(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
 public:
   enum {
     SELECTED      = 1,  /// Selected
@@ -158,43 +144,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXIconItem, FXIconItem_dynamic_cast);
 * 3rd argument of the message.
 */
 class FXIconList : public FXScrollArea {
-protected:
-  FXHeader          *header;            // Header control
-  FXIconItem       **items;             // Item list
-  FXint              nitems;            // Number of items
-  FXint              nrows;             // Number of rows
-  FXint              ncols;             // Number of columns
-  FXint              anchor;            // Anchor item
-  FXint              current;           // Current item
-  FXint              extent;            // Extent item
-  FXint              cursor;            // Cursor item
-  FXint              viewable;          // Visible item
-  FXFont            *font;              // Font
-  FXColor            textColor;         // Text color
-  FXColor            selbackColor;      // Selected back color
-  FXColor            seltextColor;      // Selected text color
-  FXint              itemWidth;         // Item width
-  FXint              itemHeight;        // Item height
-  FXint              itemSpace;         // Space for item label
-  FXint              anchorx;           // Rectangular selection
-  FXint              anchory;
-  FXint              currentx;
-  FXint              currenty;
-  FXint              grabx;             // Grab point x
-  FXint              graby;             // Grab point y
-  FXString           lookup;            // Lookup string
-  FXString           help;              // Help text
-  FXbool             state;             // State of item
-protected:
-  FXIconList();
-  void recompute();
-  void getrowscols(FXint& nr,FXint& nc,FXint w,FXint h) const;
-  void drawLasso(FXint x0,FXint y0,FXint x1,FXint y1);
-  void lassoChanged(FXint ox,FXint oy,FXint ow,FXint oh,FXint nx,FXint ny,FXint nw,FXint nh,FXbool notify);
-  virtual void moveContents(FXint x,FXint y);
-  virtual FXIconItem *createItem(const FXString& text,FXIcon *big,FXIcon* mini,void* ptr);
-  static FXint compareSection(const FXchar *p,const FXchar* q,FXint s);
-  static FXint compareSectionCase(const FXchar *p,const FXchar* q,FXint s);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXIconSource.i

@@ -33,10 +33,6 @@
 * realizing the icons.
 */
 class FXIconSource : public FXObject {
-protected:
-  FXApp *app;
-protected:
-  FXIconSource(){}
 public:
 
   %extend {

data/swig-interfaces/FXId.i

@@ -28,10 +28,6 @@ class FXApp;
 
 /// Encapsulates server side resource
 class FXId : public FXObject {
-protected:
-  FXID xid;
-protected:
-  FXId(FXApp* a);
 public:
 
   /// Get application

data/swig-interfaces/FXImage.i

@@ -62,8 +62,7 @@ public:
         if(w*h != len){
           rb_raise( rb_eArgError, "Array size does not match image size" );
         }
-        pix=FXRbConvertToFXColors(string_or_ary);
-        opts|=IMAGE_OWNED;
+        pix=FXRbConvertToFXColors(string_or_ary, &opts);
       }
       return new FXRbImage(a,pix,opts,w,h);
     }
@@ -99,8 +98,7 @@ public:
         rb_raise( rb_eArgError, "Array size does not match image size" );
       }
 
-      FXColor* pix=FXRbConvertToFXColors(string_or_ary);
-      opts|=IMAGE_OWNED;
+      FXColor* pix=FXRbConvertToFXColors(string_or_ary, &opts);
       if( NIL_P(w) || NIL_P(h) ){
         self->setData(pix,opts);
       }else{
@@ -129,6 +127,25 @@ public:
         return Qnil;
       }
     }
+
+    VALUE pixel_string(FXlong offset, FXlong size){
+      FXColor* data = self->getData();
+      if (data) {
+        FXlong maxsize = self->getWidth()*self->getHeight()*sizeof(FXColor);
+        if( offset > maxsize || offset < 0 ){
+          return Qnil;
+        }
+        if( offset+size > maxsize ){
+          size = maxsize-offset;
+        }else if( size < 0 ){
+          return Qnil;
+        }
+
+        return rb_str_new((char*)data + offset, size);
+      } else {
+        return Qnil;
+      }
+    }
   }
 
   /// Get pixel at x,y

data/swig-interfaces/FXImageFrame.i

@@ -26,13 +26,6 @@
 * it must be explicitly deleted elsewhere.
 */
 class FXImageFrame : public FXFrame {
-protected:
-  FXImage* image;       // The image being displayed
-protected:
-  FXImageFrame();
-private:
-  FXImageFrame(const FXImageFrame&);
-  FXImageFrame &operator=(const FXImageFrame&);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public: