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

data/ext/fox16_c/include/FXRbTreeList.h

@@ -129,11 +129,11 @@ protected:
 #include "FXRbObjectVirtuals.h"
 #include "FXRbTreeItemVirtuals.h"
 public:
-  // Pointer to this tree item's owner (if any)
-  FXWindow *owner;
+  // Is this tree item owned by an FXTreeList yet?
+  FXbool owned;
 public:
   // Constructor
-  FXRbTreeItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL) : FXTreeItem(text,oi,ci,ptr),owner(0){}
+  FXRbTreeItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL) : FXTreeItem(text,oi,ci,ptr),owned(FALSE){}
 
   // Mark dependencies for the GC
   static void markfunc(FXTreeItem* self);

data/ext/fox16_c/include/FXRuby.h

@@ -53,17 +53,18 @@ struct swig_type_info;
 
 // SWIG runtime functions we need
 extern "C" {
-const char *     SWIG_Ruby_TypeName(const swig_type_info *ty);
-swig_type_info * SWIG_Ruby_TypeQuery(const char *);
-VALUE            SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int own);
-int              SWIG_Ruby_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags);
+static const char * SWIG_TypeName(const swig_type_info *ty);
+static VALUE SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int own);
+#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
+typedef void (*ruby_owntype)(void*);
+static int SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own);
 }
 
 // Helper for overloaded show() functions
 template <class TYPE>
 VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typeinfo) {
   TYPE *win;
-  SWIG_Ruby_ConvertPtr(self,(void**)&win,typeinfo,1);
+  SWIG_ConvertPtr(self,(void**)&win,typeinfo,1);
   if (argc == 0) {
     win->_show();
     }
@@ -162,7 +163,7 @@ extern VALUE FXRbMakeColorArray(const FXColor* colors,FXint w,FXint h);
 extern FXuint FXRbNumberOfFXColors(VALUE string_or_ary);
 
 // Allocate a FXColor buffer and populate with data
-extern FXColor *FXRbConvertToFXColors(VALUE string_or_ary);
+extern FXColor *FXRbConvertToFXColors(VALUE string_or_ary, FXuint *opts);
 
 extern void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE data);
 

data/ext/fox16_c/markfuncs.cpp

@@ -18,7 +18,7 @@ static void delete_if_not_owned(BASECLASS* self,SUBCLASS*){
         if(!dynamic_cast<SUBCLASS*>(self)->owned){
           delete self; // also unregisters it
           }
-	}
+        }
       }
     FXRbUnregisterRubyObj(self);
     }
@@ -33,7 +33,7 @@ static void delete_if_not_owned_by_app(BASECLASS* self,SUBCLASS*){
         if(!dynamic_cast<SUBCLASS*>(self)->ownedByApp){
           delete self; // also unregisters it
           }
-	}
+        }
       }
     FXRbUnregisterRubyObj(self);
     }
@@ -419,26 +419,7 @@ void FXRbTreeItem::markfunc(FXTreeItem* self){
 
 
 void FXRbTreeItem::freefunc(FXTreeItem* self){
-  if(self!=0){
-    if(!FXRbIsBorrowed(self)){
-      if(self->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        FXRbTreeItem* treeItem=dynamic_cast<FXRbTreeItem*>(self);
-        FXASSERT(treeItem);
-        FXTreeList* treeList=dynamic_cast<FXTreeList*>(treeItem->owner);
-        if(treeList){
-          FXRbUnregisterRubyObj(self); // MAYBE
-          treeList->removeItem(self,TRUE);
-          }
-        else{
-          FXTreeListBox* treeListBox=dynamic_cast<FXTreeListBox*>(treeItem->owner);
-          if(treeListBox){
-            treeListBox->removeItem(self);
-            }
-          }
-        }
-      }
-    FXRbUnregisterRubyObj(self);
-    }
+  delete_if_not_owned(self,reinterpret_cast<FXRbTreeItem*>(0));
   }
 
 

data/ext/fox16_c/unregisterOwnedObjects.cpp

@@ -96,7 +96,7 @@ void FXRbTable::unregisterOwnedObjects(FXTable *self)
     FXRbUnregisterRubyObj(self->getColumnHeader());
     for(r=0; r<self->getNumRows(); r++){
       for(c=0; c<self->getNumColumns(); c++){
-	FXRbUnregisterRubyObj(self->getItem(r,c));
+        FXRbUnregisterRubyObj(self->getItem(r,c));
         }
       }
 }
@@ -117,4 +117,3 @@ void FXRbTreeList::unregisterOwnedObjects(FXTreeList *self)
     // Now zero-out pointers held by still-alive Ruby objects
     for (FXint i = 0; i < items.no(); i++) FXRbUnregisterRubyObj(items[i]);
 }
-

data/lib/fox16.rb

@@ -1,9 +1,19 @@
-if RUBY_PLATFORM =~ /(mswin|mingw)/i
-  require "#{RUBY_VERSION.sub(/\.\d+$/, '')}/fox16_c.so"
-elsif RUBY_PLATFORM =~ /darwin/
-  require "fox16_c.bundle"
-else
-  require "fox16_c.so"
+begin
+  require 'fox16_c'
+rescue LoadError
+  # If it's a Windows binary gem, try the <major>.<minor> subdirectory
+  if RUBY_PLATFORM =~/(mswin|mingw)/i
+    major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+      raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+
+    # Set the PATH environment variable, so that libpq.dll can be found.
+    old_path = ENV['PATH']
+    ENV['PATH'] = "#{File.expand_path("../#{RUBY_PLATFORM.gsub("i386", "x86")}", __FILE__)};#{old_path}"
+    require "#{major_minor}/fox16_c"
+    ENV['PATH'] = old_path
+  else
+    raise
+  end
 end
 
 require "fox16/core"

data/lib/fox16/core.rb

@@ -696,5 +696,19 @@ module Fox
 =end
 
   end
+
+  class FXImage
+    alias initialize_without_data_string initialize
+    def initialize(a, pix, *args)
+      initialize_without_data_string(a, pix, *args)
+      @data_string = (options & IMAGE_OWNED) != 0 ? nil : pix
+    end
+
+    alias setPixels_without_data_string setPixels
+    def setPixels(pix, *args)
+      setPixels_without_data_string(pix, *args)
+      @data_string = (options & IMAGE_OWNED) != 0 ? nil : pix
+    end
+  end
 end
 

data/lib/fox16/glshapes.rb

@@ -1,4 +1,5 @@
 require 'opengl'
+require 'glu'
 
 module Fox
 

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.28"
+    "1.6.29"
   end
 end

data/rdoc-sources/FXBMPIcon.rb

@@ -30,7 +30,7 @@ module Fox
     # +width+:: width [Integer]
     # +height+:: height [Integer]
     #
-    def initialize(a, pix=nil, clr=FXRGB(192,192,192), opts=0, width=1, height=1) # :yields: theBMPIcon
+    def initialize(a, pix=nil, clr=Fox.FXRGB(192,192,192), opts=0, width=1, height=1) # :yields: theBMPIcon
     end
   end
 

data/rdoc-sources/FXImage.rb

@@ -17,7 +17,11 @@ module Fox
   #   if you intend to do repeated re-rendering of the image after it has been
   #   created.
   # +IMAGE_OWNED+::
-  #   Does nothing - for backward compatibility only.
+  #   If +IMAGE_OWNED+ is set, the image pixel data is copied into the image.
+  #   If +IMAGE_OWNED+ is not set, a image pixel string is directly used as
+  #   memory buffer of the image, without copying the data.
+  #   If pixel data is given as an Array instead of a string, data is copied in
+  #   any case.
   # +IMAGE_DITHER+::
   #   Dither image to look better
   # +IMAGE_NEAREST+::
@@ -91,7 +95,9 @@ module Fox
     #
     # Image pixels are stored bytewise as [RGBA] values.
     #
-    def pixel_string ; end
+    # Optional offset and size can be used to retrieve a part of
+    # the image data. Both are counted in bytes.
+    def pixel_string(offset=nil, size=nil) ; end
 
     #
     # Return the color of the pixel at (_x_, _y_).

data/swig-interfaces/FX4Splitter.i

@@ -39,12 +39,6 @@ enum {
 * proportionally resized, maintaining the same split-percentage.
 */
 class FX4Splitter : public FXComposite {
-protected:
-  FX4Splitter();
-  FXuchar getMode(FXint x,FXint y);
-  void moveSplit(FXint x,FXint y);
-  void drawSplit(FXint x,FXint y);
-  void adjustLayout();
 public:
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FX7Segment.i

@@ -50,14 +50,6 @@ enum {
 * display widget can also display some letters and punctuations.
 */
 class FX7Segment : public FXFrame {
-protected:
-  FXString label;       // Text being shown
-  FXColor  textColor;   // Text color
-  FXint    thickness;   // Segment thickness
-  FXint    cellwidth;   // Width of cell
-  FXint    cellheight;  // height of cell
-protected:
-  FX7Segment();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onCmdSetValue(FXObject*,FXSelector,void*); // FIXME

data/swig-interfaces/FXAccelTable.i

@@ -27,13 +27,6 @@
  */
 
 class FXAccelTable : public FXObject {
-protected:
-  struct FXAccelKey {
-    FXObject    *target;    // Target object of message
-    FXSelector   messagedn; // Message being sent
-    FXSelector   messageup; // Message being sent
-    FXHotKey     code;      // Keysym and modifier mask to match
-    };
 public:
   long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
   long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXApp.i

@@ -133,14 +133,6 @@ struct FXTimer {
 
 /// Application Object
 class FXApp : public FXObject {
-protected:
-
-  /// Return TRUE when new raw event is available
-  virtual bool getNextEvent(FXRawEvent& ev,FXbool blocking=TRUE);
-
-  /// Dispatch raw event
-  virtual bool dispatchEvent(FXRawEvent& ev);
-
 public:
   long onCmdQuit(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdDump(FXObject*,FXSelector,void* PTR_IGNORE);
@@ -178,7 +170,7 @@ public:
         return 0;
         }
       else{
-	      return FXRbApp::constructAndInit(name,vendor);
+        return FXRbApp::constructAndInit(name,vendor);
         }
       }
   }
@@ -368,15 +360,15 @@ public:
       FXuint m;
       if(mode&INPUT_READ){
         m=INPUT_READ;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetReadFileHandle(obj);
-	self->addInput(fd,m,tgt,sel);
+        self->addInput(fd,m,tgt,sel);
         }
       if(mode&INPUT_WRITE){
         m=INPUT_WRITE;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetWriteFileHandle(obj);
-	self->addInput(fd,m,tgt,sel);
+        self->addInput(fd,m,tgt,sel);
         }
       return true;
       }
@@ -390,15 +382,15 @@ public:
       FXuint m;
       if(mode&INPUT_READ){
         m=INPUT_READ;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetReadFileHandle(obj);
-	self->removeInput(fd,m);
+        self->removeInput(fd,m);
         }
       if(mode&INPUT_WRITE){
         m=INPUT_WRITE;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetWriteFileHandle(obj);
-	self->removeInput(fd,m);
+        self->removeInput(fd,m);
         }
       return true;
       }
@@ -557,13 +549,13 @@ public:
       FXASSERT(cur);
       if(cur->isMemberOf(FXMETACLASS(FXRbCursor))){
         dynamic_cast<FXRbCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbCURCursor))){
         dynamic_cast<FXRbCURCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbGIFCursor))){
         dynamic_cast<FXRbGIFCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       self->setWaitCursor(cur);
       }
   }
@@ -580,13 +572,13 @@ public:
       FXASSERT(cur);
       if(cur->isMemberOf(FXMETACLASS(FXRbCursor))){
         dynamic_cast<FXRbCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbCURCursor))){
         dynamic_cast<FXRbCURCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbGIFCursor))){
         dynamic_cast<FXRbGIFCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       self->setDefaultCursor(which,cur);
       }
   }

data/swig-interfaces/FXArrowButton.i

@@ -38,16 +38,6 @@ enum {
 
 /// Button with an arrow
 class FXArrowButton : public FXFrame {
-protected:
-  FXColor   arrowColor;     // Arrow color
-  FXint     arrowSize;      // Arrow size
-  FXTimer  *repeater;       // Timer for auto-repeat
-  FXString  tip;            // Tooltip value
-  FXString  help;           // Help value
-  FXbool    state;          // State of button
-  FXbool    fired;          // Timer has fired
-protected:
-  FXArrowButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_NULL);

data/swig-interfaces/FXBMPIcon.i

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

data/swig-interfaces/FXBMPImage.i

@@ -23,8 +23,6 @@
 
 /// Microsoft Bitmap image
 class FXBMPImage : public FXImage {
-protected:
-  FXBMPImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXBitmap.i

@@ -41,12 +41,6 @@ enum {
 * words 8 pixels packed into a single byte, starting at bit 0 on the left.
 */
 class FXBitmap : public FXDrawable {
-protected:
-  FXuchar *data;                // Pixel data
-  FXint    bytewidth;   // Number of bytes across
-  FXuint   options;             // Options
-protected:
-  FXBitmap();
 public:
   %extend {
      /**

data/swig-interfaces/FXButton.i

@@ -41,10 +41,6 @@ enum {
 
 /// FXButton provides a push button. Buttons can have icons and/or labels.
 class FXButton : public FXLabel {
-protected:
-  FXuchar  state;
-protected:
-  FXButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_NULL);