• R/O
  • HTTP
  • SSH
  • HTTPS

Molby: コミット

Molecular Modeling Software


コミットメタ情報

リビジョンd552f0bfeab0d462ebed2c925a712281488ecca8 (tree)
日時2014-10-16 11:33:26
作者toshinagata1964 <toshinagata1964@a2be...>
コミッターtoshinagata1964

ログメッセージ

Crash if Molby is invoked by dragging & dropping a LOG file. Fixed.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@580 a2be9bc6-48de-4e38-9406-05402d4bc13c

変更サマリ

差分

--- a/wxSources/ProgressFrame.cpp
+++ b/wxSources/ProgressFrame.cpp
@@ -116,7 +116,8 @@ ProgressFrame::CheckInterrupt()
116116
117117 #if 1
118118 wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
119- loop->YieldFor(wxEVT_CATEGORY_UI);
119+ if (loop != NULL)
120+ loop->YieldFor(wxEVT_CATEGORY_UI);
120121 #else
121122 #if __WXMAC__
122123 ::wxYield();
--- a/wxSources/modalwindow_osx.mm
+++ b/wxSources/modalwindow_osx.mm
@@ -34,3 +34,14 @@ MacGetActiveWindow(void)
3434 {
3535 return [NSApp mainWindow];
3636 }
37+
38+/*
39+int
40+MacCheckEscapeKeyPressed(void)
41+{
42+ NSEvent *ep = [NSApp nextEventMatchingMask:NSKeyDownMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES];
43+ if (ep != nil && [[ep charactersIgnoringModifiers] characterAtIndex:0] == 0x1e) {
44+ return 1;
45+ } else return 0;
46+}
47+*/
旧リポジトリブラウザで表示