1 files changed, 21 insertions, 20 deletions

diff --git a/src/T2DLL/T2SettingDialog.cpp b/src/T2DLL/T2SettingDialog.cpp
index 408b2af..5eb6551 100644
--- a/src/T2DLL/T2SettingDialog.cpp
+++ b/src/T2DLL/T2SettingDialog.cpp
@@ -8,6 +8,7 @@
 #include "WalkerDlg.h"
 
 T2SettingDialog::T2SettingDialog(T2TowerDoc* inDoc) {
+#pragma var_order(theRadio, rect, tmpl, theText, theModule, pt, theDlgTitle)
     mDocument = inDoc;
 
     CRect rect;
@@ -43,9 +44,9 @@ T2SettingDialog::T2SettingDialog(T2TowerDoc* inDoc) {
     theRadio->SetValue(1);
 
     T2DlgItem *theText = GetT2DlgItem(120);
-    CString str;
-    mSpeedDlg->GetWindowText(str);
-    theText->SetDescriptor(str);
+    CString theDlgTitle;
+    mSpeedDlg->GetWindowText(theDlgTitle);
+    theText->SetDescriptor(theDlgTitle);
 }
 
 /*virtual*/ T2SettingDialog::~T2SettingDialog() {
@@ -55,28 +56,28 @@ T2SettingDialog::T2SettingDialog(T2TowerDoc* inDoc) {
         delete mBitImage;
 }
 
-/*virtual*/ int T2SettingDialog::OnT2DialogCommand(unsigned int cmd, long data) {
-    int result = 1;
+/*virtual*/ BOOL T2SettingDialog::OnT2DialogCommand(WPARAM inWParam, LPARAM inLParam) {
+    BOOL done = true;
 
-    WORD hi = HIWORD(cmd);
-    WORD lo = LOWORD(cmd);
+    WORD code = HIWORD(inWParam);
+    WORD id = LOWORD(inWParam);
 
     T2DlgItem *theSpeedTabRadio = GetT2DlgItem(108);
     T2DlgItem *theSoundTabRadio = GetT2DlgItem(109);
     T2DlgItem *theWalkerTabRadio = GetT2DlgItem(110);
-    T2DlgItem *theText = GetT2DlgItem(120);
+    T2DlgItem *theHeaderText = GetT2DlgItem(120);
 
-    CString str;
+    CString theDlgTitle;
 
-    switch (lo) {
+    switch (id) {
         case 108:
             mSoundDlg->ShowWindow(SW_HIDE);
             mWalkerDlg->ShowWindow(SW_HIDE);
             mSpeedDlg->ShowWindow(SW_SHOW);
             theSoundTabRadio->SetValue(0);
             theWalkerTabRadio->SetValue(0);
-            mSpeedDlg->GetWindowText(str);
-            theText->SetDescriptor(str);
+            mSpeedDlg->GetWindowText(theDlgTitle);
+            theHeaderText->SetDescriptor(theDlgTitle);
             break;
 
         case 109:
@@ -85,8 +86,8 @@ T2SettingDialog::T2SettingDialog(T2TowerDoc* inDoc) {
             mSoundDlg->ShowWindow(SW_SHOW);
             theSpeedTabRadio->SetValue(0);
             theWalkerTabRadio->SetValue(0);
-            mSoundDlg->GetWindowText(str);
-            theText->SetDescriptor(str);
+            mSoundDlg->GetWindowText(theDlgTitle);
+            theHeaderText->SetDescriptor(theDlgTitle);
             break;
 
         case 110:
@@ -95,8 +96,8 @@ T2SettingDialog::T2SettingDialog(T2TowerDoc* inDoc) {
             mWalkerDlg->ShowWindow(SW_SHOW);
             theSpeedTabRadio->SetValue(0);
             theSoundTabRadio->SetValue(0);
-            mWalkerDlg->GetWindowText(str);
-            theText->SetDescriptor(str);
+            mWalkerDlg->GetWindowText(theDlgTitle);
+            theHeaderText->SetDescriptor(theDlgTitle);
             break;
 
         case 111:
@@ -110,17 +111,17 @@ T2SettingDialog::T2SettingDialog(T2TowerDoc* inDoc) {
             mSoundDlg->Save();
             mWalkerDlg->Save();
             OnT2OK();
-            DoClose(lo);
+            DoClose(id);
             break;
 
         case 113:
             OnT2OK();
-            DoClose(lo);
+            DoClose(id);
             break;
 
         default:
-            result = T2Dialog::OnT2DialogCommand(cmd, data);
+            done = T2Dialog::OnT2DialogCommand(inWParam, inLParam);
     }
 
-    return result;
+    return done;
 }