[Fxruby-commits] CVS: FXRuby/ext/fox FXRbApp.cpp,1.9.2.1,1.9.2.2 core_wrap.cpp,1.62.2.5,1.62.2.6 dia
Status: Inactive
Brought to you by:
lyle
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:03:08
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv24207/ext/fox
Modified Files:
Tag: release10
FXRbApp.cpp core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp
image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp
ui_wrap.cpp
Log Message:
Removed the FXApp#enableThreads and FXApp#disableThreads instance methods
and replaced with a single method, FXApp#threadsEnabled=, which accepts
true or false. This makes the API more consistent with the recently added
FXApp#threadsEnabled? instance method.
Index: FXRbApp.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRbApp.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** FXRbApp.cpp 30 Apr 2002 02:12:33 -0000 1.9.2.1
--- FXRbApp.cpp 30 Apr 2002 19:02:41 -0000 1.9.2.2
***************
*** 68,84 ****
! // Enable threads
! void FXRbApp::enableThreads(){
! if(!m_bThreadsEnabled){
! m_bThreadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
}
! }
!
!
! // Disable threads
! void FXRbApp::disableThreads(){
! if(m_bThreadsEnabled){
m_bThreadsEnabled=FALSE;
if(threadsChore!=0){
--- 68,81 ----
! // Enable (or disable) threads
! void FXRbApp::setThreadsEnabled(FXbool enabled){
! if(enabled){
! if(!m_bThreadsEnabled){
! m_bThreadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
! }
}
! else{
m_bThreadsEnabled=FALSE;
if(threadsChore!=0){
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.5
retrieving revision 1.62.2.6
diff -C2 -d -r1.62.2.5 -r1.62.2.6
*** core_wrap.cpp 30 Apr 2002 02:12:33 -0000 1.62.2.5
--- core_wrap.cpp 30 Apr 2002 19:02:41 -0000 1.62.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
***************
*** 6450,6473 ****
static VALUE
! _wrap_FXApp_enableThreads(int argc, VALUE *argv, VALUE self) {
! FXRbApp *arg1 ;
!
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
! arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
! (arg1)->enableThreads();
!
! return Qnil;
! }
!
!
! static VALUE
! _wrap_FXApp_disableThreads(int argc, VALUE *argv, VALUE self) {
FXRbApp *arg1 ;
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
! (arg1)->disableThreads();
return Qnil;
--- 6450,6467 ----
static VALUE
! _wrap_FXApp_setThreadsEnabled(int argc, VALUE *argv, VALUE self) {
FXRbApp *arg1 ;
+ FXbool arg2 ;
! if ((argc < 1) || (argc > 1))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
! {
! if (argv[0] == Qtrue || argv[0] == Qfalse)
! arg2 = (argv[0] == Qtrue) ? TRUE : FALSE;
! else
! rb_raise(rb_eTypeError, "wrong argument type (expected true or false)");
! }
! (arg1)->setThreadsEnabled(arg2);
return Qnil;
***************
*** 18684,18689 ****
rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXRbApp::ID_LAST));
rb_define_method(cFXApp.klass, "onChoreThreads", VALUEFUNC(_wrap_FXApp_onChoreThreads), -1);
! rb_define_method(cFXApp.klass, "enableThreads", VALUEFUNC(_wrap_FXApp_enableThreads), -1);
! rb_define_method(cFXApp.klass, "disableThreads", VALUEFUNC(_wrap_FXApp_disableThreads), -1);
rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
--- 18678,18682 ----
rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXRbApp::ID_LAST));
rb_define_method(cFXApp.klass, "onChoreThreads", VALUEFUNC(_wrap_FXApp_onChoreThreads), -1);
! rb_define_method(cFXApp.klass, "setThreadsEnabled", VALUEFUNC(_wrap_FXApp_setThreadsEnabled), -1);
rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.5
retrieving revision 1.34.2.6
diff -C2 -d -r1.34.2.5 -r1.34.2.6
*** dialogs_wrap.cpp 30 Apr 2002 02:12:39 -0000 1.34.2.5
--- dialogs_wrap.cpp 30 Apr 2002 19:02:52 -0000 1.34.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.5
retrieving revision 1.37.2.6
diff -C2 -d -r1.37.2.5 -r1.37.2.6
*** icons_wrap.cpp 30 Apr 2002 02:12:39 -0000 1.37.2.5
--- icons_wrap.cpp 30 Apr 2002 19:02:54 -0000 1.37.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.5
retrieving revision 1.39.2.6
diff -C2 -d -r1.39.2.5 -r1.39.2.6
*** image_wrap.cpp 30 Apr 2002 02:12:40 -0000 1.39.2.5
--- image_wrap.cpp 30 Apr 2002 19:02:54 -0000 1.39.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -d -r1.8.2.5 -r1.8.2.6
*** layout_wrap.cpp 30 Apr 2002 02:12:40 -0000 1.8.2.5
--- layout_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.8.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -C2 -d -r1.36.2.5 -r1.36.2.6
*** mdi_wrap.cpp 30 Apr 2002 02:12:41 -0000 1.36.2.5
--- mdi_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.36.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.6
retrieving revision 1.41.2.7
diff -C2 -d -r1.41.2.6 -r1.41.2.7
*** opengl_wrap.cpp 30 Apr 2002 02:12:41 -0000 1.41.2.6
--- opengl_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.41.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -d -r1.9.2.5 -r1.9.2.6
*** ui_wrap.cpp 30 Apr 2002 02:12:42 -0000 1.9.2.5
--- ui_wrap.cpp 30 Apr 2002 19:02:56 -0000 1.9.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
|