fix for input

fixes an issue where the new tab control handles all keyboard input (whether it handled it or not). this fixes the reported problem where some text controls couldn't have their data changed (population, embark size, etc.)
pjf · Dec 23, 2013 · c5e6d56 · c5e6d56
1 parent 60956a7
commit c5e6d56
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/Masterwork Dwarf Fortress.exe b/Masterwork Dwarf Fortress.exe
diff --git a/MasterworkDwarfFortress/KRBTabControl.dll b/MasterworkDwarfFortress/KRBTabControl.dll
diff --git a/Settings Source/MainForm.Designer.vb b/Settings Source/MainForm.Designer.vb
diff --git a/Settings Source/My Project/AssemblyInfo.vb b/Settings Source/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.2")> 
-<Assembly: AssemblyFileVersion("2.0.0.2")> 
+<Assembly: AssemblyVersion("2.0.0.3")> 
+<Assembly: AssemblyFileVersion("2.0.0.3")> 
diff --git a/Settings Source/Third Party Extras/KRBTabControl/KRBTabControl/KRBTabControl.cs b/Settings Source/Third Party Extras/KRBTabControl/KRBTabControl/KRBTabControl.cs
@@ -1655,6 +1655,10 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
                     msg.Result = new IntPtr(1);
                     return true;
                 }
+                else
+                {
+                    return false;
+                }
             }
             else
             {
@@ -1697,6 +1701,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
                         {
                             TabPageEx tabPage = new TabPageEx();
                             this.Controls.Add(tabPage);
+                            return true;
                         }
                         break;
                     case Keys.Delete:
@@ -1716,27 +1721,33 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
                                         {
                                             this.TabPages.Remove(removingTabPage);
                                             SelectNextAvailableTabPage();
+                                            return true;
                                         }
                                         else
+                                        {
                                             MessageBox.Show("The operation was canceled by the user.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                                            return true;
+                                        }
                                     }
                                 }
                                 else
                                 {
                                     MessageBox.Show("The selected tab page could not be deleted!!!, it may be due to the following reasons;\r\n\r\n1.Tab page might be null or disposed by the application.\r\n2.Tab page might not be closable.\r\n3.Tab page might be disable.",
                                         Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                                    return true;
                                 }
                             }
                         }
                         break;
                     case Keys.Escape:
                         break;
                     case Keys.F1:
-                        break;
+                        break;                                          
                 }
+                return false;
             }
 
-            return true;
+
         }
 
         protected override bool ProcessMnemonic(char charCode)