| リビジョン | a38785107b3987d3d1afa074e31fe61d4425b103 (tree) |
|---|---|
| 日時 | 2014-10-02 00:31:50 |
| 作者 | toshinagata1964 <toshinagata1964@a2be...> |
| コミッター | toshinagata1964 |
Molecule#on_modify is called during interrupt checking, which causes Ruby exception. Fixed.
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@577 a2be9bc6-48de-4e38-9406-05402d4bc13c
Makefile (diff)
MolLib/Ruby_bind/ruby_dialog.c (diff)
wxSources/ProgressFrame.cpp (diff)| @@ -19,7 +19,7 @@ ifeq ($(TARGET_PLATFORM),MSW) | ||
| 19 | 19 | WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/msw-unicode-static-3.0 |
| 20 | 20 | WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__ |
| 21 | 21 | WX_LDFLAGS = -L$(WX_LIB_DIR) -Wl,--subsystem,windows -mwindows -lwx_mswu_gl-3.0 -lopengl32 -lglu32 -lwx_mswu-3.0 -lwxregexu-3.0 -lwxexpat-3.0 -lwxtiff-3.0 -lwxjpeg-3.0 -lwxpng-3.0 -lwxzlib-3.0 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32 |
| 22 | - CPP_EXTRA_FLAGS = -isystem $(PWD)/../../CLAPACK-3.1.1.1-mingw/INCLUDE -isystem $(PWD)/../../fftw-3.3.2/msw-build/include | |
| 22 | + CPP_EXTRA_FLAGS = -isystem $(PWD)/../../CLAPACK-3.1.1.1-mingw/INCLUDE -isystem $(PWD)/../../fftw-3.3.2/msw-build/include -I$(PWD)/../MolLib | |
| 23 | 23 | LD_EXTRA_FLAGS = -L$(PWD)/../../CLAPACK-3.1.1.1-mingw/lib -L$(PWD)/../../fftw-3.3.2/msw-build/lib -llapackMinGW -lblasMinGW -lf2c_nomain -lfftw3 -static-libgcc |
| 24 | 24 | RUBY_DIR = $(PWD)/../../ruby-2.0.0-p353 |
| 25 | 25 | RUBY_CFLAGS = -isystem $(RUBY_DIR)/msw-build/include/ruby-2.0.0 -I$(RUBY_DIR) -I$(RUBY_DIR)/msw-build/include/ruby-2.0.0/i386-mingw32 |
| @@ -18,7 +18,6 @@ | ||
| 18 | 18 | #include <ruby.h> |
| 19 | 19 | #include <math.h> /* For floor() */ |
| 20 | 20 | #include "ruby_dialog.h" |
| 21 | -#include "IntGroup.h" | |
| 22 | 21 | |
| 23 | 22 | static VALUE |
| 24 | 23 | sTextSymbol, sTextFieldSymbol, sRadioSymbol, sButtonSymbol, |
| @@ -21,6 +21,7 @@ | ||
| 21 | 21 | #include "wx/stattext.h" |
| 22 | 22 | #include "wx/gauge.h" |
| 23 | 23 | #include "wx/sizer.h" |
| 24 | +#include "wx/evtloop.h" | |
| 24 | 25 | |
| 25 | 26 | #if __WXMAC__ |
| 26 | 27 | #include <Carbon/Carbon.h> |
| @@ -113,6 +114,10 @@ ProgressFrame::CheckInterrupt() | ||
| 113 | 114 | return save; |
| 114 | 115 | } |
| 115 | 116 | |
| 117 | +#if 1 | |
| 118 | + wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); | |
| 119 | + loop->YieldFor(wxEVT_CATEGORY_UI); | |
| 120 | +#else | |
| 116 | 121 | #if __WXMAC__ |
| 117 | 122 | ::wxYield(); |
| 118 | 123 | #else |
| @@ -125,6 +130,7 @@ ProgressFrame::CheckInterrupt() | ||
| 125 | 130 | ::wxSafeYield(activeWin); |
| 126 | 131 | } |
| 127 | 132 | #endif |
| 133 | +#endif | |
| 128 | 134 | if (::wxGetKeyState(WXK_ESCAPE)) |
| 129 | 135 | return 1; |
| 130 | 136 | else return 0; |
Fork