svnno****@sourc*****
svnno****@sourc*****
2010年 12月 4日 (土) 09:59:46 JST
Revision: 1165
http://sourceforge.jp/projects/tween/svn/view?view=rev&revision=1165
Author: anis774
Date: 2010-12-04 09:59:46 +0900 (Sat, 04 Dec 2010)
Log Message:
-----------
以下のエラーに対応。再現手順不明なので当て振り。
例外 System.InvalidOperationException: 既に表示されているフォームをモーダル ダイアログ ボックスとして表示できません。showDialog を呼び出す前に、フォームの Visible プロパティを false にしてください。
場所 System.Windows.Forms.Form.ShowDialog(IWin32Window owner)
場所 System.Windows.Forms.Form.ShowDialog()
場所 Tween.TweenMain.ShowSuplDialog(TextBox owner, AtIdSupplement dialog, Int32 offset, String startswith)
場所 Tween.TweenMain.StatusText_KeyPress(Object sender, KeyPressEventArgs e)
場所 System.Windows.Forms.Control.OnKeyPress(KeyPressEventArgs e)
場所 System.Windows.Forms.Control.ProcessKeyEventArgs(Message& m)
場所 System.Windows.Forms.Control.WmImeChar(Message& m)
場所 System.Windows.Forms.Control.WndProc(Message& m)
場所 System.Windows.Forms.TextBoxBase.WndProc(Message& m)
場所 System.Windows.Forms.TextBox.WndProc(Message& m)
場所 System.Windows.Forms.Control.ControlNativeWindow.OnMessage(Message& m)
場所 System.Windows.Forms.Control.ControlNativeWindow.WndProc(Message& m)
場所 System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)
Modified Paths:
--------------
trunk/Tween/AtIdSupplement.resx
trunk/Tween/Tween.vb
Property Changed:
----------------
trunk/
-------------- next part --------------
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/APIchangeevent:723-746
/branches/FixedImage:787-910
/branches/UserStream:1077-1144
/branches/editlist:667-697
/branches/panelswitch:447-572
/branches/tm:782-794
+ /branches/tm:782-794
/branches/editlist:667-697
/branches/panelswitch:447-572
/branches/APIchangeevent:723-746
/branches/UserStream:1077-1144
/branches/FixedImage:787-910
Modified: trunk/Tween/AtIdSupplement.resx
===================================================================
--- trunk/Tween/AtIdSupplement.resx 2010-12-03 19:14:27 UTC (rev 1164)
+++ trunk/Tween/AtIdSupplement.resx 2010-12-04 00:59:46 UTC (rev 1165)
@@ -112,19 +112,19 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ButtonOK.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 121</value>
</data>
<data name="ButtonOK.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ButtonOK.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
@@ -135,7 +135,7 @@
<value>ButtonOK</value>
</data>
<data name=">>ButtonOK.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ButtonOK.Parent" xml:space="preserve">
<value>$this</value>
@@ -159,7 +159,7 @@
<value>ButtonCancel</value>
</data>
<data name=">>ButtonCancel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ButtonCancel.Parent" xml:space="preserve">
<value>$this</value>
@@ -167,7 +167,7 @@
<data name=">>ButtonCancel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="TextId.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -187,7 +187,7 @@
<value>TextId</value>
</data>
<data name=">>TextId.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>TextId.Parent" xml:space="preserve">
<value>$this</value>
@@ -214,7 +214,7 @@
<value>Label1</value>
</data>
<data name=">>Label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Label1.Parent" xml:space="preserve">
<value>$this</value>
@@ -222,7 +222,7 @@
<data name=">>Label1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
@@ -238,6 +238,6 @@
<value>AtIdSupplement</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tween/Tween.vb
===================================================================
--- trunk/Tween/Tween.vb 2010-12-03 19:14:27 UTC (rev 1164)
+++ trunk/Tween/Tween.vb 2010-12-04 00:59:46 UTC (rev 1165)
@@ -3696,7 +3696,11 @@
Public Overloads Sub ShowSuplDialog(ByVal owner As TextBox, ByVal dialog As AtIdSupplement, ByVal offset As Integer, ByVal startswith As String)
dialog.StartsWith = startswith
- dialog.ShowDialog()
+ If dialog.Visible Then
+ dialog.Focus()
+ Else
+ dialog.ShowDialog()
+ End If
Me.TopMost = SettingDialog.AlwaysTop
Dim selStart As Integer = owner.SelectionStart
Dim fHalf As String = ""