• R/O
  • HTTP
  • SSH
  • HTTPS

Molby: コミット

Molecular Modeling Software


コミットメタ情報

リビジョン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

変更サマリ

差分

--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ ifeq ($(TARGET_PLATFORM),MSW)
1919 WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/msw-unicode-static-3.0
2020 WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__
2121 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
2323 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
2424 RUBY_DIR = $(PWD)/../../ruby-2.0.0-p353
2525 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
--- a/MolLib/Ruby_bind/ruby_dialog.c
+++ b/MolLib/Ruby_bind/ruby_dialog.c
@@ -18,7 +18,6 @@
1818 #include <ruby.h>
1919 #include <math.h> /* For floor() */
2020 #include "ruby_dialog.h"
21-#include "IntGroup.h"
2221
2322 static VALUE
2423 sTextSymbol, sTextFieldSymbol, sRadioSymbol, sButtonSymbol,
--- a/wxSources/ProgressFrame.cpp
+++ b/wxSources/ProgressFrame.cpp
@@ -21,6 +21,7 @@
2121 #include "wx/stattext.h"
2222 #include "wx/gauge.h"
2323 #include "wx/sizer.h"
24+#include "wx/evtloop.h"
2425
2526 #if __WXMAC__
2627 #include <Carbon/Carbon.h>
@@ -113,6 +114,10 @@ ProgressFrame::CheckInterrupt()
113114 return save;
114115 }
115116
117+#if 1
118+ wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
119+ loop->YieldFor(wxEVT_CATEGORY_UI);
120+#else
116121 #if __WXMAC__
117122 ::wxYield();
118123 #else
@@ -125,6 +130,7 @@ ProgressFrame::CheckInterrupt()
125130 ::wxSafeYield(activeWin);
126131 }
127132 #endif
133+#endif
128134 if (::wxGetKeyState(WXK_ESCAPE))
129135 return 1;
130136 else return 0;
旧リポジトリブラウザで表示