fxruby 1.6.14 → 1.6.15

data/ext/fox16/core_wrap.cpp

@@ -593,6 +593,65 @@ static void SWIG_AsVal(VALUE obj, int *val)
 #include "FXRbCommon.h"
 
 
+#define  SWIG_MemoryError    1
+#define  SWIG_IOError        2
+#define  SWIG_RuntimeError   3
+#define  SWIG_IndexError     4
+#define  SWIG_TypeError      5
+#define  SWIG_DivisionByZero 6
+#define  SWIG_OverflowError  7
+#define  SWIG_SyntaxError    8
+#define  SWIG_ValueError     9
+#define  SWIG_SystemError   10
+#define  SWIG_UnknownError  99
+
+
+static void SWIG_exception_(int code, const char *msg) {
+    switch (code) {
+        case SWIG_MemoryError:
+            rb_raise(rb_eNoMemError, msg);
+            break;
+        case SWIG_IOError:
+            rb_raise(rb_eIOError, msg);
+            break;
+        case SWIG_RuntimeError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        case SWIG_IndexError:
+            rb_raise(rb_eIndexError, msg);
+            break;
+        case SWIG_TypeError:
+            rb_raise(rb_eTypeError, msg);
+            break;
+        case SWIG_DivisionByZero:
+            rb_raise(rb_eZeroDivError, msg);
+            break;
+        case SWIG_OverflowError:
+            rb_raise(rb_eRangeError, msg);
+            break;
+        case SWIG_SyntaxError:
+            rb_raise(rb_eSyntaxError, msg);
+            break;
+        case SWIG_ValueError:
+            rb_raise(rb_eArgError, msg);
+            break;
+        case SWIG_SystemError:
+            rb_raise(rb_eFatal, msg);
+            break;
+        case SWIG_UnknownError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        default:
+            break;
+    }
+}
+
+#define SWIG_exception(a, b) SWIG_exception_((a), (b))
+
+
+#include <stdexcept>
+
+
 inline FXColor to_FXColor(VALUE obj){
   if(TYPE(obj)==T_STRING){
     return fxcolorfromname(StringValuePtr(obj));
@@ -932,7 +991,13 @@ VALUE FXApp_copyright(){
       return rb_str_new2((const char *) FXApp::copyright);
     }
 FXApp *new_FXApp(FXchar const *name,FXchar const *vendor){
-      return FXRbApp::constructAndInit(name,vendor);
+      if(FXApp::instance()){
+        rb_raise(rb_eRuntimeError,"attempted to create more than one FXApp instance");
+        return 0;
+        }
+      else{
+	      return FXRbApp::constructAndInit(name,vendor);
+        }
       }
 unsigned long FXApp_getDisplay(FXApp const *self){
       return reinterpret_cast<unsigned long>(self->getDisplay());
@@ -1864,8 +1929,8 @@ static swig_type_info *FXTopWindow_dynamic_cast(void **ptr) {
     return 0;
 }
 
-FXMainWindow *new_FXMainWindow(FXApp *a,FXString const &name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
-      return new FXRbMainWindow(a,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
+FXMainWindow *new_FXMainWindow(FXApp *APP,FXString const &name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
+      return new FXRbMainWindow(APP,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
       }
 
 swig_class cFXMainWindow;
@@ -4499,13 +4564,6 @@ static VALUE _wrap_FXSettings_readColorEntry(int argc, VALUE *argv, VALUE self)
     arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = to_FXColor(argv[2]); } 
     result = (FXColor)(arg1)->readColorEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = UINT2NUM(result);
     return vresult; }
-static VALUE _wrap_FXSettings_readBoolEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
-    FXchar *arg2 ; FXchar *arg3 ; FXbool arg4 = (FXbool) 0 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 3))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
-    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); if (argc > 2) { arg4 = to_FXbool(argv[2]); } 
-    result = (FXbool)(arg1)->readBoolEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
 static VALUE _wrap_FXSettings_writeStringEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; FXchar *arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
@@ -4541,13 +4599,6 @@ static VALUE _wrap_FXSettings_writeColorEntry(int argc, VALUE *argv, VALUE self)
     arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = to_FXColor(argv[2]);
     result = (bool)(arg1)->writeColorEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
     return vresult; }
-static VALUE _wrap_FXSettings_writeBoolEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
-    FXchar *arg2 ; FXchar *arg3 ; FXbool arg4 ; bool result; VALUE vresult = Qnil; if ((argc < 3) || (argc > 3))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXSettings, 1); arg2 = NIL_P(argv[0]) ? 0 : StringValuePtr(argv[0]);
-    arg3 = NIL_P(argv[1]) ? 0 : StringValuePtr(argv[1]); arg4 = to_FXbool(argv[2]);
-    result = (bool)(arg1)->writeBoolEntry((FXchar const *)arg2,(FXchar const *)arg3,arg4); vresult = result ? Qtrue : Qfalse;
-    return vresult; }
 static VALUE _wrap_FXSettings_deleteEntry(int argc, VALUE *argv, VALUE self) { FXSettings *arg1 = (FXSettings *) 0 ;
     FXchar *arg2 ; FXchar *arg3 ; bool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
@@ -8559,7 +8610,7 @@ static VALUE _wrap_new_FXMainWindow(int argc, VALUE *argv, VALUE self) { FXApp *
         arg8 = NUM2INT(argv[7]); }  if (argc > 8) { arg9 = NUM2INT(argv[8]); }  if (argc > 9) { arg10 = NUM2INT(argv[9]); } 
     if (argc > 10) { arg11 = NUM2INT(argv[10]); }  if (argc > 11) { arg12 = NUM2INT(argv[11]); }  if (argc > 12) {
         arg13 = NUM2INT(argv[12]); }  if (argc > 13) { arg14 = NUM2INT(argv[13]); }  if (argc > 14) {
-        arg15 = NUM2INT(argv[14]); }  {
+        arg15 = NUM2INT(argv[14]); }  { if (!arg1) { SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); }  }  {
         result = (FXMainWindow *)new_FXMainWindow(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static void
@@ -10236,13 +10287,11 @@ SWIGEXPORT(void) Init_core(void) {
     rb_define_method(cFXSettings.klass, "readUnsignedEntry", VALUEFUNC(_wrap_FXSettings_readUnsignedEntry), -1);
     rb_define_method(cFXSettings.klass, "readRealEntry", VALUEFUNC(_wrap_FXSettings_readRealEntry), -1);
     rb_define_method(cFXSettings.klass, "readColorEntry", VALUEFUNC(_wrap_FXSettings_readColorEntry), -1);
-    rb_define_method(cFXSettings.klass, "readBoolEntry", VALUEFUNC(_wrap_FXSettings_readBoolEntry), -1);
     rb_define_method(cFXSettings.klass, "writeStringEntry", VALUEFUNC(_wrap_FXSettings_writeStringEntry), -1);
     rb_define_method(cFXSettings.klass, "writeIntEntry", VALUEFUNC(_wrap_FXSettings_writeIntEntry), -1);
     rb_define_method(cFXSettings.klass, "writeUnsignedEntry", VALUEFUNC(_wrap_FXSettings_writeUnsignedEntry), -1);
     rb_define_method(cFXSettings.klass, "writeRealEntry", VALUEFUNC(_wrap_FXSettings_writeRealEntry), -1);
     rb_define_method(cFXSettings.klass, "writeColorEntry", VALUEFUNC(_wrap_FXSettings_writeColorEntry), -1);
-    rb_define_method(cFXSettings.klass, "writeBoolEntry", VALUEFUNC(_wrap_FXSettings_writeBoolEntry), -1);
     rb_define_method(cFXSettings.klass, "deleteEntry", VALUEFUNC(_wrap_FXSettings_deleteEntry), -1);
     rb_define_method(cFXSettings.klass, "existingEntry", VALUEFUNC(_wrap_FXSettings_existingEntry), -1);
     rb_define_method(cFXSettings.klass, "deleteSection", VALUEFUNC(_wrap_FXSettings_deleteSection), -1);

data/ext/fox16/dc_wrap.cpp

@@ -550,6 +550,65 @@ static void SWIG_AsVal(VALUE obj, int *val)
 #include "FXRbCommon.h"
 
 
+#define  SWIG_MemoryError    1
+#define  SWIG_IOError        2
+#define  SWIG_RuntimeError   3
+#define  SWIG_IndexError     4
+#define  SWIG_TypeError      5
+#define  SWIG_DivisionByZero 6
+#define  SWIG_OverflowError  7
+#define  SWIG_SyntaxError    8
+#define  SWIG_ValueError     9
+#define  SWIG_SystemError   10
+#define  SWIG_UnknownError  99
+
+
+static void SWIG_exception_(int code, const char *msg) {
+    switch (code) {
+        case SWIG_MemoryError:
+            rb_raise(rb_eNoMemError, msg);
+            break;
+        case SWIG_IOError:
+            rb_raise(rb_eIOError, msg);
+            break;
+        case SWIG_RuntimeError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        case SWIG_IndexError:
+            rb_raise(rb_eIndexError, msg);
+            break;
+        case SWIG_TypeError:
+            rb_raise(rb_eTypeError, msg);
+            break;
+        case SWIG_DivisionByZero:
+            rb_raise(rb_eZeroDivError, msg);
+            break;
+        case SWIG_OverflowError:
+            rb_raise(rb_eRangeError, msg);
+            break;
+        case SWIG_SyntaxError:
+            rb_raise(rb_eSyntaxError, msg);
+            break;
+        case SWIG_ValueError:
+            rb_raise(rb_eArgError, msg);
+            break;
+        case SWIG_SystemError:
+            rb_raise(rb_eFatal, msg);
+            break;
+        case SWIG_UnknownError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        default:
+            break;
+    }
+}
+
+#define SWIG_exception(a, b) SWIG_exception_((a), (b))
+
+
+#include <stdexcept>
+
+
 inline FXColor to_FXColor(VALUE obj){
   if(TYPE(obj)==T_STRING){
     return fxcolorfromname(StringValuePtr(obj));

data/ext/fox16/dialogs_wrap.cpp

@@ -564,6 +564,65 @@ static void SWIG_AsVal(VALUE obj, int *val)
 #include "FXRbCommon.h"
 
 
+#define  SWIG_MemoryError    1
+#define  SWIG_IOError        2
+#define  SWIG_RuntimeError   3
+#define  SWIG_IndexError     4
+#define  SWIG_TypeError      5
+#define  SWIG_DivisionByZero 6
+#define  SWIG_OverflowError  7
+#define  SWIG_SyntaxError    8
+#define  SWIG_ValueError     9
+#define  SWIG_SystemError   10
+#define  SWIG_UnknownError  99
+
+
+static void SWIG_exception_(int code, const char *msg) {
+    switch (code) {
+        case SWIG_MemoryError:
+            rb_raise(rb_eNoMemError, msg);
+            break;
+        case SWIG_IOError:
+            rb_raise(rb_eIOError, msg);
+            break;
+        case SWIG_RuntimeError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        case SWIG_IndexError:
+            rb_raise(rb_eIndexError, msg);
+            break;
+        case SWIG_TypeError:
+            rb_raise(rb_eTypeError, msg);
+            break;
+        case SWIG_DivisionByZero:
+            rb_raise(rb_eZeroDivError, msg);
+            break;
+        case SWIG_OverflowError:
+            rb_raise(rb_eRangeError, msg);
+            break;
+        case SWIG_SyntaxError:
+            rb_raise(rb_eSyntaxError, msg);
+            break;
+        case SWIG_ValueError:
+            rb_raise(rb_eArgError, msg);
+            break;
+        case SWIG_SystemError:
+            rb_raise(rb_eFatal, msg);
+            break;
+        case SWIG_UnknownError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        default:
+            break;
+    }
+}
+
+#define SWIG_exception(a, b) SWIG_exception_((a), (b))
+
+
+#include <stdexcept>
+
+
 inline FXColor to_FXColor(VALUE obj){
   if(TYPE(obj)==T_STRING){
     return fxcolorfromname(StringValuePtr(obj));
@@ -610,11 +669,11 @@ inline void* to_FXEvent(VALUE obj){
   return ptr;
   }
 
-FXDialogBox *new_FXDialogBox__SWIG_0(FXApp *a,FXString const &name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
-      return new FXRbDialogBox(a,name,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
+FXDialogBox *new_FXDialogBox__SWIG_0(FXApp *APP,FXString const &name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
+      return new FXRbDialogBox(APP,name,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
       }
-FXDialogBox *new_FXDialogBox__SWIG_1(FXWindow *owner,FXString const &name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
-      return new FXRbDialogBox(owner,name,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
+FXDialogBox *new_FXDialogBox__SWIG_1(FXWindow *OWNER,FXString const &name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs){
+      return new FXRbDialogBox(OWNER,name,opts,x,y,w,h,pl,pr,pt,pb,hs,vs);
       }
 
 swig_class cFXDialogBox;
@@ -950,7 +1009,7 @@ static VALUE _wrap_new_FXDialogBox__SWIG_0(int argc, VALUE *argv, VALUE self) {
     if (argc > 5) { arg6 = NUM2INT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) {
         arg8 = NUM2INT(argv[7]); }  if (argc > 8) { arg9 = NUM2INT(argv[8]); }  if (argc > 9) { arg10 = NUM2INT(argv[9]); } 
     if (argc > 10) { arg11 = NUM2INT(argv[10]); }  if (argc > 11) { arg12 = NUM2INT(argv[11]); }  if (argc > 12) {
-        arg13 = NUM2INT(argv[12]); }  {
+        arg13 = NUM2INT(argv[12]); }  { if (!arg1) { SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); }  }  {
         result = (FXDialogBox *)new_FXDialogBox__SWIG_0(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -974,7 +1033,7 @@ static VALUE _wrap_new_FXDialogBox__SWIG_1(int argc, VALUE *argv, VALUE self) {
     if (argc > 5) { arg6 = NUM2INT(argv[5]); }  if (argc > 6) { arg7 = NUM2INT(argv[6]); }  if (argc > 7) {
         arg8 = NUM2INT(argv[7]); }  if (argc > 8) { arg9 = NUM2INT(argv[8]); }  if (argc > 9) { arg10 = NUM2INT(argv[9]); } 
     if (argc > 10) { arg11 = NUM2INT(argv[10]); }  if (argc > 11) { arg12 = NUM2INT(argv[11]); }  if (argc > 12) {
-        arg13 = NUM2INT(argv[12]); }  {
+        arg13 = NUM2INT(argv[12]); }  { if (!arg1) { SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); }  }  {
         result = (FXDialogBox *)new_FXDialogBox__SWIG_1(arg1,(FXString const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_new_FXDialogBox(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[13]; int ii; argc = nargs;
@@ -7710,7 +7769,7 @@ SWIGEXPORT(void) Init_dialogs(void) {
     rb_define_const(mFox,"MBOX_QUIT_CANCEL", INT2NUM(MBOX_QUIT_CANCEL));
     rb_define_const(mFox,"MBOX_QUIT_SAVE_CANCEL", INT2NUM(MBOX_QUIT_SAVE_CANCEL));
     rb_define_const(mFox,"MBOX_SKIP_SKIPALL_CANCEL", INT2NUM(MBOX_SKIP_SKIPALL_CANCEL));
-    rb_define_const(mFox,"MBOX_SAVE_CANCEL_DONTSAVE", INT2NUM(MBOX_SAVE_CANCEL_DONTSAVE));
+    rb_define_const(mFox,"MBOX_SAVE_CANCEL_DONTSAVE", UINT2NUM(0x80000000));
     rb_define_const(mFox,"MBOX_CLICKED_YES", INT2NUM(MBOX_CLICKED_YES));
     rb_define_const(mFox,"MBOX_CLICKED_NO", INT2NUM(MBOX_CLICKED_NO));
     rb_define_const(mFox,"MBOX_CLICKED_OK", INT2NUM(MBOX_CLICKED_OK));
@@ -7719,6 +7778,7 @@ SWIGEXPORT(void) Init_dialogs(void) {
     rb_define_const(mFox,"MBOX_CLICKED_SAVE", INT2NUM(MBOX_CLICKED_SAVE));
     rb_define_const(mFox,"MBOX_CLICKED_SKIP", INT2NUM(MBOX_CLICKED_SKIP));
     rb_define_const(mFox,"MBOX_CLICKED_SKIPALL", INT2NUM(MBOX_CLICKED_SKIPALL));
+    rb_define_const(mFox,"MBOX_CLICKED_DONTSAVE", INT2NUM(MBOX_CLICKED_NO));
     
     cFXMessageBox.klass = rb_define_class_under(mFox, "FXMessageBox", ((swig_class *) SWIGTYPE_p_FXDialogBox->clientdata)->klass);
     SWIG_TypeClientData(SWIGTYPE_p_FXMessageBox, (void *) &cFXMessageBox);

data/ext/fox16/extconf.rb

@@ -1,6 +1,10 @@
 #!/bin/env ruby
 
-require 'ftools'
+begin
+  require 'ftools'
+rescue LoadError
+  # ftools is no longer present in Ruby 1.9
+end
 require 'mkmf'
 
 def find_installed_fox_version
@@ -158,6 +162,7 @@ def do_darwin_setup
   find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
   $libs = append_library($libs, "FOX-1.6")
   $libs = append_library($libs, "Xrandr")
+  $libs = append_library($libs, "Xcursor")
   $libs = append_library($libs, "png")
   $CFLAGS = $CFLAGS + " -O0 -Iinclude"
   if is_fxscintilla_build?

data/ext/fox16/frames_wrap.cpp

@@ -570,6 +570,65 @@ static void SWIG_AsVal(VALUE obj, int *val)
 #include "FXRbCommon.h"
 
 
+#define  SWIG_MemoryError    1
+#define  SWIG_IOError        2
+#define  SWIG_RuntimeError   3
+#define  SWIG_IndexError     4
+#define  SWIG_TypeError      5
+#define  SWIG_DivisionByZero 6
+#define  SWIG_OverflowError  7
+#define  SWIG_SyntaxError    8
+#define  SWIG_ValueError     9
+#define  SWIG_SystemError   10
+#define  SWIG_UnknownError  99
+
+
+static void SWIG_exception_(int code, const char *msg) {
+    switch (code) {
+        case SWIG_MemoryError:
+            rb_raise(rb_eNoMemError, msg);
+            break;
+        case SWIG_IOError:
+            rb_raise(rb_eIOError, msg);
+            break;
+        case SWIG_RuntimeError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        case SWIG_IndexError:
+            rb_raise(rb_eIndexError, msg);
+            break;
+        case SWIG_TypeError:
+            rb_raise(rb_eTypeError, msg);
+            break;
+        case SWIG_DivisionByZero:
+            rb_raise(rb_eZeroDivError, msg);
+            break;
+        case SWIG_OverflowError:
+            rb_raise(rb_eRangeError, msg);
+            break;
+        case SWIG_SyntaxError:
+            rb_raise(rb_eSyntaxError, msg);
+            break;
+        case SWIG_ValueError:
+            rb_raise(rb_eArgError, msg);
+            break;
+        case SWIG_SystemError:
+            rb_raise(rb_eFatal, msg);
+            break;
+        case SWIG_UnknownError:
+            rb_raise(rb_eRuntimeError, msg);
+            break;
+        default:
+            break;
+    }
+}
+
+#define SWIG_exception(a, b) SWIG_exception_((a), (b))
+
+
+#include <stdexcept>
+
+
 inline FXColor to_FXColor(VALUE obj){
   if(TYPE(obj)==T_STRING){
     return fxcolorfromname(StringValuePtr(obj));