| リビジョン | 32d5eb386a0d850c359c9a8a56b536a94949e0fe (tree) |
|---|---|
| 日時 | 2014-10-06 22:44:07 |
| 作者 | toshinagata1964 <toshinagata1964@a2be...> |
| コミッター | toshinagata1964 |
Hitting Return in non-modal Ruby dialog now does not cause closing the window
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@578 a2be9bc6-48de-4e38-9406-05402d4bc13c
MolLib/Ruby_bind/ruby_dialog.c (diff)
MolLib/Ruby_bind/ruby_dialog.h (diff)
wxSources/RubyDialogFrame.cpp (diff)| @@ -2101,14 +2101,18 @@ s_RubyDialog_doItemAction(VALUE val) | ||
| 2101 | 2101 | rb_funcall(itval, SYM2ID(aval), 0); |
| 2102 | 2102 | } else if (aval == sReturnActionSym || aval == sEscapeActionSym) { |
| 2103 | 2103 | /* Enter or escape is pressed on text field */ |
| 2104 | - rb_ivar_set(itval, SYM2ID(sIsProcessingActionSymbol), Qfalse); | |
| 2105 | - itval = s_RubyDialog_ItemAtIndex(self, (aval == sReturnActionSym ? INT2FIX(0) : INT2FIX(1))); | |
| 2106 | - s_RubyDialog_EndModal(1, &itval, self); | |
| 2104 | + if (RubyDialogCallback_isModal(dref)) { | |
| 2105 | + rb_ivar_set(itval, SYM2ID(sIsProcessingActionSymbol), Qfalse); | |
| 2106 | + itval = s_RubyDialog_ItemAtIndex(self, (aval == sReturnActionSym ? INT2FIX(0) : INT2FIX(1))); | |
| 2107 | + s_RubyDialog_EndModal(1, &itval, self); | |
| 2108 | + } | |
| 2107 | 2109 | } else { |
| 2108 | 2110 | /* Default action (only for default buttons) */ |
| 2109 | - if (idx == 0 || idx == 1) { | |
| 2110 | - rb_ivar_set(itval, SYM2ID(sIsProcessingActionSymbol), Qfalse); | |
| 2111 | - s_RubyDialog_EndModal(1, &itval, self); | |
| 2111 | + if (RubyDialogCallback_isModal(dref)) { | |
| 2112 | + if (idx == 0 || idx == 1) { | |
| 2113 | + rb_ivar_set(itval, SYM2ID(sIsProcessingActionSymbol), Qfalse); | |
| 2114 | + s_RubyDialog_EndModal(1, &itval, self); | |
| 2115 | + } | |
| 2112 | 2116 | } |
| 2113 | 2117 | } |
| 2114 | 2118 |
| @@ -99,6 +99,7 @@ STUB void RubyDialogCallback_release(RubyDialog *dref); | ||
| 99 | 99 | STUB void RubyDialogCallback_setRubyObject(RubyDialog *dref, RubyValue val); |
| 100 | 100 | STUB void RubyDialogCallback_setWindowTitle(RubyDialog *dref, const char *title); |
| 101 | 101 | STUB int RubyDialogCallback_runModal(RubyDialog *dref); |
| 102 | +STUB int RubyDialogCallback_isModal(RubyDialog *dref); | |
| 102 | 103 | STUB void RubyDialogCallback_endModal(RubyDialog *dref, int status); |
| 103 | 104 | STUB void RubyDialogCallback_destroy(RubyDialog *dref); |
| 104 | 105 | STUB void RubyDialogCallback_close(RubyDialog *dref); |
| @@ -758,6 +758,12 @@ RubyDialogCallback_runModal(RubyDialog *dref) | ||
| 758 | 758 | else return 1; /* Cancel */ |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | +int | |
| 762 | +RubyDialogCallback_isModal(RubyDialog *dref) | |
| 763 | +{ | |
| 764 | + return ((RubyDialogFrame *)dref)->IsModal(); | |
| 765 | +} | |
| 766 | + | |
| 761 | 767 | void |
| 762 | 768 | RubyDialogCallback_endModal(RubyDialog *dref, int status) |
| 763 | 769 | { |
Fork