• R/O
  • HTTP
  • SSH
  • HTTPS

Molby: コミット

Molecular Modeling Software


コミットメタ情報

リビジョンbdca2829295e018c01f645a6b7b33437ccdbdfbc (tree)
日時2014-03-25 09:51:21
作者toshinagata1964 <toshinagata1964@a2be...>
コミッターtoshinagata1964

ログメッセージ

Table view on Mac sometimes crashes. Hopefully fixed (I am not sure)

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

変更サマリ

差分

--- a/wxSources/MyListCtrl.cpp
+++ b/wxSources/MyListCtrl.cpp
@@ -397,9 +397,9 @@ MyListCtrl::EndEditTextAndRestart(bool setValueFlag, int newRow, int newColumn)
397397 if (setValueFlag && dataSource) {
398398 sval = editText->GetValue();
399399 }
400- if (wxWindow::FindFocus() == editText) {
401- SetFocus();
402- }
400+ // if (wxWindow::FindFocus() == editText) {
401+ // SetFocus();
402+ // }
403403 #if defined(__WXMAC__)
404404 {
405405 /* Erase the focus ring */
@@ -409,8 +409,13 @@ MyListCtrl::EndEditTextAndRestart(bool setValueFlag, int newRow, int newColumn)
409409 Refresh();
410410 }
411411 #endif
412- editText->Hide(); /* Temporarily hide until new editing starts */
413-
412+ // Temporarily hide until new editing starts
413+ // (editText is set to NULL to avoid recursive calling of EndEditText())
414+ wxTextCtrl *saveEditText = editText;
415+ editText = NULL;
416+ saveEditText->Hide();
417+ editText = saveEditText;
418+
414419 if (setValueFlag && dataSource)
415420 dataSource->SetItemText(this, editRow, editColumn, sval);
416421
@@ -420,7 +425,7 @@ MyListCtrl::EndEditTextAndRestart(bool setValueFlag, int newRow, int newColumn)
420425 StartEditText(newRow, newColumn);
421426 } else {
422427 editRow = editColumn = -1;
423-#if defined(__WXMAC__)
428+#if 0 && defined(__WXMAC__)
424429 if (editText != NULL) {
425430 editText->Disconnect(wxID_ANY);
426431 editText->Destroy();
旧リポジトリブラウザで表示