fxruby 1.4.7 → 1.6.0

data/examples/styledtext.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'fox14'
-require 'fox14/colors'
+require 'fox16'
+require 'fox16/colors'
 
 include Fox
 

data/examples/tabbook.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox14'
+require 'fox16'
 
 include Fox
 

data/examples/table.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fox14'
+require 'fox16'
 require 'date'
 
 include Fox

data/examples/textedit/commands.rb

@@ -1,5 +1,5 @@
-require 'fox14'
-require 'fox14/undolist'
+require 'fox16'
+require 'fox16/undolist'
 
 include Fox
 

data/examples/textedit/helpwindow.rb

@@ -261,7 +261,7 @@ and is associated with two icons, a big icon "c_src.xpm" and a small icon "mini/
 which are to be found in either directory "/usr/share/icons" or "/home/jeroen/icons".
 END_OF_HELP
 
-require 'fox14'
+require 'fox16'
 
 include Fox
 

data/examples/textedit/prefdialog.rb

@@ -1,4 +1,4 @@
-require 'fox14'
+require 'fox16'
 
 include Fox
 

data/examples/textedit/textedit.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'fox14'
-require 'fox14/responder'
-require 'fox14/undolist'
+require 'fox16'
+require 'fox16/responder'
+require 'fox16/undolist'
 require 'prefdialog'
 require 'helpwindow'
 require 'commands'
@@ -712,6 +712,7 @@ class TextWindow < FXMainWindow
     delimiters = getApp().reg().readStringEntry("SETTINGS", "delimiters", '~.,/\\`\'!@#$%^&*()-=+{}|[]":;<>?')
 
     # Font
+=begin
     fontspec = getApp().reg().readStringEntry("SETTINGS", "font", "")
     if fontspec != ""
       fontdesc = fxparsefontdesc(fontspec)
@@ -720,6 +721,7 @@ class TextWindow < FXMainWindow
         @editor.font = font
       end
     end
+=end
 
     # Get size
     xx = getApp().reg().readIntEntry("SETTINGS", "x", 5)

data/ext/{fox14 → fox16}/FXRbApp.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbApp.cpp 2145 2005-08-17 01:04:21Z lyle $
+ * $Id: FXRbApp.cpp 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #include "FXRbCommon.h"

data/ext/{fox14 → fox16}/FXRbDataTarget.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbDataTarget.cpp 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbDataTarget.cpp 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #include "FXRbCommon.h"

data/ext/{fox14 → fox16}/FXRbGLViewer.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLViewer.cpp 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbGLViewer.cpp 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #include "FXRbCommon.h"

data/ext/{fox14 → fox16}/FXRuby.cpp

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRuby.cpp 2398 2006-04-26 00:14:18Z lyle $
+ * $Id: FXRuby.cpp 2387 2006-04-21 13:25:17Z lyle $
  ***********************************************************************/
 
 #ifdef _MSC_VER
@@ -489,7 +489,9 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
      type==SEL_DND_DROP ||
      type==SEL_DND_MOTION ||
      type==SEL_DND_REQUEST ||
-     type==SEL_PICKED) {
+     type==SEL_PICKED ||
+     type==SEL_SESSION_NOTIFY ||
+     type==SEL_SESSION_CLOSED) {
     return to_ruby(reinterpret_cast<FXEvent*>(ptr));
     }
   else if(type==SEL_DRAGGED && !sender->isMemberOf(FXMETACLASS(FXGLViewer))){
@@ -519,6 +521,9 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
     FXASSERT(ptr==0);
     return Qnil;
     }
+  else if(sender->isMemberOf(FXMETACLASS(FX4Splitter))){
+    if(type==SEL_CHANGED||type==SEL_COMMAND) return Qnil;
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXArrowButton))){
     if(type==SEL_COMMAND) return to_ruby(static_cast<FXuint>(reinterpret_cast<FXuval>(ptr)));
     }
@@ -531,6 +536,21 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
   else if(sender->isMemberOf(FXMETACLASS(FXCheckButton))){
     if(type==SEL_COMMAND) return to_ruby(static_cast<FXuchar>(reinterpret_cast<FXuval>(ptr)));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXColorBar))){
+    if(type==SEL_CHANGED || type==SEL_COMMAND){
+      FXfloat* hsv=reinterpret_cast<FXfloat*>(ptr);
+      return rb_ary_new3(3,to_ruby(hsv[0]),to_ruby(hsv[1]),to_ruby(hsv[2]));
+      }
+    }
+  else if(sender->isMemberOf(FXMETACLASS(FXColorDialog))){
+    if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby(static_cast<FXColor>(reinterpret_cast<unsigned long>(ptr)));
+    }
+  else if(sender->isMemberOf(FXMETACLASS(FXColorRing))){
+    if(type==SEL_CHANGED || type==SEL_COMMAND){
+      FXfloat* hsv=reinterpret_cast<FXfloat*>(ptr);
+      return rb_ary_new3(3,to_ruby(hsv[0]),to_ruby(hsv[1]),to_ruby(hsv[2]));
+      }
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXColorSelector))){
     if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby(static_cast<FXColor>(reinterpret_cast<unsigned long>(ptr)));
     }
@@ -541,6 +561,12 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
        type==SEL_DOUBLECLICKED ||
        type==SEL_TRIPLECLICKED) return to_ruby(static_cast<FXColor>(reinterpret_cast<unsigned long>(ptr)));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXColorWheel))){
+    if(type==SEL_CHANGED || type==SEL_COMMAND){
+      FXfloat* hsv=reinterpret_cast<FXfloat*>(ptr);
+      return rb_ary_new3(3,to_ruby(hsv[0]),to_ruby(hsv[1]),to_ruby(hsv[2]));
+      }
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXComboBox))){
     if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby(reinterpret_cast<FXchar*>(ptr));
     }
@@ -576,6 +602,9 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
   else if(sender->isMemberOf(FXMETACLASS(FXDirBox))){
     if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby(reinterpret_cast<FXchar*>(ptr));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXDockBar))){
+    if(type==SEL_DOCKED || type==SEL_FLOATED) return FXRbGetRubyObj(ptr,FXRbTypeQuery("FXDockSite *"));
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXFileList))){
     if (type==SEL_CHANGED ||
         type==SEL_CLICKED ||
@@ -619,12 +648,24 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
             type==SEL_DELETED ||
             type==SEL_SELECTED ||
             type==SEL_DESELECTED){
-      FXASSERT(FALSE); // FIXME
+      VALUE ary=rb_ary_new();
+      FXGLObject** objlist=reinterpret_cast<FXGLObject**>(ptr);
+      // FIXME: objlist is a NULL-terminated array of pointers to FXGLObject
+      return ary;
+      }
+    }
+  else if(sender->isMemberOf(FXMETACLASS(FXGradientBar))){
+    if(type==SEL_CHANGED){
+      return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
+      }
+    else if(type==SEL_SELECTED || type==SEL_DESELECTED){
+      return Qnil;
       }
     }
   else if(sender->isMemberOf(FXMETACLASS(FXHeader))){
     if(type==SEL_COMMAND ||
        type==SEL_CHANGED ||
+       type==SEL_CLICKED ||
        type==SEL_REPLACED ||
        type==SEL_INSERTED ||
        type==SEL_DELETED) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
@@ -641,6 +682,9 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
        type==SEL_INSERTED ||
        type==SEL_DELETED) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXKnob))){
+    if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXList))){
     if(type==SEL_CHANGED ||
        type==SEL_CLICKED ||
@@ -658,7 +702,16 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
     else if(type==SEL_CHANGED) return Qnil;
     }
   else if(sender->isMemberOf(FXMETACLASS(FXMDIChild))){
-    if(type==SEL_SELECTED || type==SEL_DESELECTED) return FXRbGetRubyObj(ptr,FXRbTypeQuery("FXMDIChild *"));
+    if(type==SEL_MINIMIZE ||
+       type==SEL_MAXIMIZE ||
+       type==SEL_CLOSE ||
+       type==SEL_RESTORE){
+       return Qnil;
+      }
+    else if(type==SEL_SELECTED ||
+            type==SEL_DESELECTED){
+      return FXRbGetRubyObj(ptr,FXRbTypeQuery("FXMDIChild *"));
+      }
     }
   else if(sender->isMemberOf(FXMETACLASS(FXMDIClient))){
     if(type==SEL_CHANGED) return FXRbGetRubyObj(ptr,FXRbTypeQuery("FXMDIChild *"));
@@ -675,6 +728,12 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
   else if(sender->isMemberOf(FXMETACLASS(FXOption))){
     if(type==SEL_COMMAND) return to_ruby(reinterpret_cast<FXEvent*>(ptr));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXOptionMenu))){
+    if(type==SEL_COMMAND) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
+    }
+  else if(sender->isMemberOf(FXMETACLASS(FXPicker))){
+    if(type==SEL_COMMAND || type==SEL_CHANGED) return to_ruby(reinterpret_cast<FXPoint*>(ptr));
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXRadioButton))){
     if(type==SEL_COMMAND) return to_ruby(static_cast<FXuchar>(reinterpret_cast<FXuval>(ptr)));
     }
@@ -688,6 +747,9 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
   else if(sender->isMemberOf(FXMETACLASS(FXRecentFiles))){
     if(type==SEL_COMMAND) return to_ruby(reinterpret_cast<FXchar*>(ptr));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXRuler))){
+    if(type==SEL_CHANGED) return Qnil;
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXScrollBar))){
     if(type==SEL_CHANGED || type==SEL_COMMAND) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
     }
@@ -702,15 +764,16 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
     if(type==SEL_CHANGED || type==SEL_COMMAND)
       return to_ruby(static_cast<FXint>(reinterpret_cast<long>(ptr)));
     }
+  else if(sender->isMemberOf(FXMETACLASS(FXSplitter))){
+    if(type==SEL_CHANGED || type==SEL_COMMAND)
+      return to_ruby(reinterpret_cast<FXWindow *>(ptr));
+    }
   else if(sender->isMemberOf(FXMETACLASS(FXSwitcher))){
     if(type==SEL_COMMAND) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
     }
   else if(sender->isMemberOf(FXMETACLASS(FXTabBar))){
     if(type==SEL_COMMAND) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
     }
-  else if(sender->isMemberOf(FXMETACLASS(FXTabBook))){
-    if(type==SEL_COMMAND) return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
-    }
   else if(sender->isMemberOf(FXMETACLASS(FXTable))){
     if(type==SEL_CLICKED ||
        type==SEL_DOUBLECLICKED ||
@@ -718,10 +781,10 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
        type==SEL_CHANGED ||
        type==SEL_COMMAND ||
        type==SEL_SELECTED ||
-       type==SEL_DESELECTED) return to_ruby(reinterpret_cast<FXTablePos*>(ptr));
+       type == SEL_DESELECTED) return to_ruby(reinterpret_cast<FXTablePos*>(ptr));
     else if(type == SEL_INSERTED ||
             type == SEL_DELETED ||
-	    type == SEL_REPLACED){
+            type == SEL_REPLACED){
 	      return to_ruby(reinterpret_cast<FXTableRange*>(ptr));
 	      }
     }
@@ -742,9 +805,7 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
       return to_ruby(static_cast<FXint>(reinterpret_cast<FXival>(ptr)));
       }
     else if(type==SEL_SELECTED ||
-            type == SEL_DESELECTED ||
-            type == SEL_INSERTED ||
-            type == SEL_DELETED) {
+            type == SEL_DESELECTED) {
       FXint* what=reinterpret_cast<FXint*>(ptr);
       FXASSERT(what!=0);
       VALUE ary=rb_ary_new();
@@ -752,14 +813,8 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
       rb_ary_push(ary,to_ruby(what[1])); // length of text
       return ary;
       }
-    else if(type==SEL_REPLACED) {
-      FXint* what=reinterpret_cast<FXint*>(ptr);
-      FXASSERT(what!=0);
-      VALUE ary=rb_ary_new();
-      rb_ary_push(ary,to_ruby(what[0])); // start position for replace
-      rb_ary_push(ary,to_ruby(what[1])); // length of old text
-      rb_ary_push(ary,to_ruby(what[2])); // length of new text
-      return ary;
+    else if(type==SEL_INSERTED || type==SEL_DELETED || type==SEL_REPLACED) {
+      return to_ruby(reinterpret_cast<FXTextChange*>(ptr));
       }
     }
   else if(sender->isMemberOf(FXMETACLASS(FXTextField))){
@@ -771,10 +826,19 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
     if(type==SEL_COMMAND) return to_ruby(static_cast<FXuchar>(reinterpret_cast<FXuval>(ptr)));
     }
   else if(sender->isMemberOf(FXMETACLASS(FXToolBarTab))){
-    if (type==SEL_CLICKED ||
-        type==SEL_DOUBLECLICKED ||
-        type==SEL_TRIPLECLICKED ||
-        type==SEL_COMMAND) return to_ruby(static_cast<FXbool>(reinterpret_cast<FXuval>(ptr)));
+    if (type==SEL_COMMAND) return to_ruby(static_cast<FXbool>(reinterpret_cast<FXuval>(ptr)));
+    }
+  else if(sender->isMemberOf(FXMETACLASS(FXTopWindow))){
+    if(type==SEL_MINIMIZE ||
+       type==SEL_MAXIMIZE ||
+       type==SEL_RESTORE ||
+       type==SEL_CLOSE){
+      return Qnil;
+      }
+    else if (type==SEL_SESSION_NOTIFY ||
+             type==SEL_SESSION_CLOSED) {
+      return to_ruby(reinterpret_cast<FXEvent*>(ptr));
+      }
     }
   else if(sender->isMemberOf(FXMETACLASS(FXTreeList))){
     if(type==SEL_COLLAPSED ||
@@ -951,7 +1015,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
           break;
         }
       }
-    
+
     // Handle FXTextField-specific message
     if(obj->isMemberOf(FXMETACLASS(FXTextField))){
       switch(id){
@@ -1260,17 +1324,17 @@ void FXRbCallVoidMethod(FXDC* recv,ID func) {
 
 //----------------------------------------------------------------------
 
-FXbool FXRbCallBoolMethod(const FXObject* recv,ID func){
+bool FXRbCallBoolMethod(const FXObject* recv,ID func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE v=rb_funcall(obj,func,0,NULL);
-  return (v==Qtrue)?TRUE:FALSE;
+  return (v==Qtrue);
   }
 
 //----------------------------------------------------------------------
 
 // Call function with "FXint" return value
-FXint FXRbCallIntMethod(FXObject* recv,ID func){
+FXint FXRbCallIntMethod(const FXObject* recv,ID func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   VALUE result=rb_funcall(obj,func,0,NULL);
@@ -1331,6 +1395,13 @@ FXTableItem* FXRbCallTableItemMethod(FXTable* recv,ID func,const FXString& text,
   return NIL_P(result)?0:reinterpret_cast<FXTableItem*>(DATA_PTR(result));
   }
 
+FXTableItem* FXRbCallTableItemMethod(FXTable* recv,ID func,FXint row,FXint col,FXbool notify){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,3,to_ruby(row),to_ruby(col),to_ruby(notify));
+  return NIL_P(result)?0:reinterpret_cast<FXTableItem*>(DATA_PTR(result));
+  }
+
 //----------------------------------------------------------------------
 
 FXTreeItem* FXRbCallTreeItemMethod(const FXTreeList* recv,ID func,FXint x,FXint y){
@@ -1398,6 +1469,33 @@ FXString FXRbCallStringMethod(const FXObject* recv, ID func){
 
 //----------------------------------------------------------------------
 
+// Call functions with const FXchar* return value
+const FXchar* FXRbCallCStringMethod(const FXObject* recv, ID func, const FXchar* message, const FXchar* hint){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,2,rb_str_new2(message),rb_str_new2(hint));
+  return STR2CSTR(result);
+  }
+
+// Call functions with const FXchar* return value
+const FXchar* FXRbCallCStringMethod(const FXObject* recv, ID func, const FXchar* context, const FXchar* message, const FXchar* hint){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,3,rb_str_new2(context),rb_str_new2(message),rb_str_new2(hint));
+  return STR2CSTR(result);
+  }
+//----------------------------------------------------------------------
+
+// Call functions with FXwchar return value
+FXwchar FXRbCallWCharMethod(const FXObject* recv, ID func){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE result=rb_funcall(obj,func,0,NULL);
+  return static_cast<FXwchar>(NUM2ULONG(result));
+  }
+
+//----------------------------------------------------------------------
+
 // Special destructors to handle order dependencies
 FXRbMenuCommand::~FXRbMenuCommand(){
   FXAccelTable *table;
@@ -1877,7 +1975,7 @@ extern "C" void Init_ui(void);
 #define REQUIRE(fname) rb_funcall(rb_mKernel,rb_intern("require"),1,rb_str_new2((fname))) 
 #endif
 
-extern "C" void Init_fox14(void) {
+extern "C" void Init_fox16(void) {
   Init_core();
   Init_dc();
   Init_frames();
@@ -1898,16 +1996,16 @@ extern "C" void Init_fox14(void) {
   Init_table();
   Init_text();
   Init_treelist();
-  REQUIRE("fox14/core");
-  REQUIRE("fox14/dict");
-  REQUIRE("fox14/settings");
-  REQUIRE("fox14/iterators");
-  REQUIRE("fox14/keys");
-  REQUIRE("fox14/aliases");
-  REQUIRE("fox14/responder2");
-  REQUIRE("fox14/glgroup");
-  REQUIRE("fox14/execute_nonmodal");
-  REQUIRE("fox14/version");
+  REQUIRE("fox16/core");
+  REQUIRE("fox16/dict");
+  REQUIRE("fox16/settings");
+  REQUIRE("fox16/iterators");
+  REQUIRE("fox16/keys");
+  REQUIRE("fox16/aliases");
+  REQUIRE("fox16/responder2");
+  REQUIRE("fox16/glgroup");
+  REQUIRE("fox16/execute_nonmodal");
+  REQUIRE("fox16/version");
   
   id_assocs=rb_intern("@assocs");
   id_backtrace=rb_intern("backtrace");