Remove the argument of CString of SetDialogData and UpdateDialogData

in each of CProperties and its children.

diff --git a/xkeymacs/properties.cpp b/xkeymacs/properties.cpp
index cf70d21..66b7a70 100644 (file)
--- a/xkeymacs/properties.cpp
+++ b/xkeymacs/properties.cpp
@@ -90,7 +90,7 @@ BOOL CProperties::OnInitDialog()
 \r
        CProfile::LoadData();\r
        m_szCurrentApplication.LoadString(IDS_DEFAULT);\r
-       SetDialogData(m_szCurrentApplication);\r
+       SetDialogData();\r
        EnableUseDefaultButton(FALSE);\r
        EnableLoadDefaultButton(FALSE);\r
 \r
@@ -111,7 +111,7 @@ void CProperties::OnDropdownApplication()
                GetDialogData();\r
                m_szCurrentApplication.LoadString(IDS_DEFAULT_TITLE);\r
                m_cApplication.SelectString(-1, m_szCurrentApplication);\r
-               SetDialogData(m_szCurrentApplication);\r
+               SetDialogData();\r
        }\r
 }\r
 \r
@@ -127,7 +127,7 @@ void CProperties::OnSelchangeApplication()
                        m_szCurrentApplication.Mid(nStart, m_szCurrentApplication.GetLength() - nStart - 1);\r
        }\r
 \r
-       SetDialogData(m_szCurrentApplication);\r
+       SetDialogData();\r
        EnableControl(ACTIVE_TAB);\r
 }\r
 \r
@@ -146,7 +146,7 @@ void CProperties::GetDialogData()
        if (m_nSettingStyle == SETTING_DEFAULT) {\r
                CProfile::ClearData(m_szCurrentApplication);\r
        } else {\r
-               UpdateDialogData(m_szCurrentApplication, TRUE);\r
+               UpdateDialogData(TRUE);\r
 \r
                if (m_sheet.GetActivePage() == &m_basic) {                      // FIXME\r
                        m_basic.GetDialogData();\r
@@ -160,31 +160,31 @@ void CProperties::GetDialogData()
        }\r
 }\r
 \r
-void CProperties::SetDialogData(CString szApplicationName)\r
+void CProperties::SetDialogData()\r
 {\r
-       UpdateDialogData(szApplicationName, FALSE);\r
+       UpdateDialogData(FALSE);\r
 \r
        if (m_sheet.GetActivePage() == &m_basic) {                      // FIXME\r
-               m_basic.SetDialogData(szApplicationName);\r
+               m_basic.SetDialogData();\r
        } else if (m_sheet.GetActivePage() == &m_advanced) {\r
-               m_advanced.SetDialogData(szApplicationName);\r
+               m_advanced.SetDialogData();\r
        } else if (m_sheet.GetActivePage() ==  &m_list) {\r
-               m_list.SetDialogData(szApplicationName);\r
+               m_list.SetDialogData();\r
        } else {\r
                ASSERT(0);\r
        }\r
 }\r
 \r
-void CProperties::UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate)\r
+void CProperties::UpdateDialogData(BOOL bSaveAndValidate)\r
 {\r
        if (bSaveAndValidate) { // GetDialogData\r
                UpdateData();\r
        }\r
 \r
-       m_nApplicationID = CProfile::GetApplicationIndex(szApplicationName, bSaveAndValidate, &m_nSettingStyle);\r
+       m_nApplicationID = CProfile::GetApplicationIndex(m_szCurrentApplication, bSaveAndValidate, &m_nSettingStyle);\r
 \r
-       if (CProfile::IsDefault(szApplicationName)\r
-        || CProfile::IsDialog(szApplicationName)) {\r
+       if (CProfile::IsDefault(m_szCurrentApplication)\r
+        || CProfile::IsDialog(m_szCurrentApplication)) {\r
                EnableUseDefaultButton(FALSE);\r
        } else {\r
                EnableUseDefaultButton(TRUE);\r
@@ -302,7 +302,7 @@ void CProperties::OnApply()
 void CProperties::OnLoadDefault() \r
 {\r
        CProfile::CopyData(m_szCurrentApplication, CString(MAKEINTRESOURCE(IDS_DEFAULT)));\r
-       SetDialogData(m_szCurrentApplication);\r
+       SetDialogData();\r
 }\r
 \r
 void CProperties::OnSelectAll() \r
@@ -344,7 +344,7 @@ void CProperties::OnSettingSpecific()
 \r
        if (CProfile::GetApplicationIndex(m_szCurrentApplication) == MAX_APP) {\r
                CProfile::CopyData(m_szCurrentApplication, CString(MAKEINTRESOURCE(IDS_DEFAULT)));\r
-               SetDialogData(m_szCurrentApplication);\r
+               SetDialogData();\r
        }\r
 }\r
 \r

diff --git a/xkeymacs/properties.h b/xkeymacs/properties.h
index c00cd61..d39f14a 100644 (file)
--- a/xkeymacs/properties.h
+++ b/xkeymacs/properties.h
@@ -80,8 +80,8 @@ private:
        int GetCurrentApplicationID();\r
        void GetDialogData();\r
        void InitApplicationList();\r
-       void SetDialogData(CString szApplicationName);\r
-       void UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate = TRUE);\r
+       void SetDialogData();\r
+       void UpdateDialogData(BOOL bSaveAndValidate = TRUE);\r
 };\r
 \r
 //{{AFX_INSERT_LOCATION}}\r

diff --git a/xkeymacs/propertiesadvanced.cpp b/xkeymacs/propertiesadvanced.cpp
index 7fb37fc..b01c5fe 100644 (file)
--- a/xkeymacs/propertiesadvanced.cpp
+++ b/xkeymacs/propertiesadvanced.cpp
@@ -84,17 +84,17 @@ END_MESSAGE_MAP()
 BOOL CPropertiesAdvanced::OnSetActive() \r
 {\r
        m_pProperties->EnableControl(ADVANCED_TAB);\r
-       SetDialogData(m_pProperties->GetCurrentApplication());\r
+       SetDialogData();\r
 \r
        return CPropertyPage::OnSetActive();\r
 }\r
 \r
-void CPropertiesAdvanced::SetDialogData(CString szApplicationName)\r
+void CPropertiesAdvanced::SetDialogData()\r
 {\r
-       UpdateDialogData(szApplicationName, FALSE);\r
+       UpdateDialogData(FALSE);\r
 }\r
 \r
-void CPropertiesAdvanced::UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate)\r
+void CPropertiesAdvanced::UpdateDialogData(BOOL bSaveAndValidate)\r
 {\r
        m_nApplicationID = m_pProperties->GetApplicationID();\r
 \r
@@ -120,7 +120,7 @@ void CPropertiesAdvanced::UpdateDialogData(CString szApplicationName, BOOL bSave
 \r
 void CPropertiesAdvanced::GetDialogData()\r
 {\r
-       UpdateDialogData(m_pProperties->GetCurrentApplication(), TRUE);\r
+       UpdateDialogData(TRUE);\r
 }\r
 \r
 int CPropertiesAdvanced::OnCreate(LPCREATESTRUCT lpCreateStruct) \r
@@ -162,7 +162,7 @@ BOOL CPropertiesAdvanced::OnInitDialog()
        InitCategoryList();\r
        SetCommands();\r
 \r
-       SetDialogData(m_pProperties->GetCurrentApplication());\r
+       SetDialogData();\r
 \r
        m_cAssign.EnableWindow(FALSE);\r
        m_cRemove.EnableWindow(FALSE);\r

diff --git a/xkeymacs/propertiesadvanced.h b/xkeymacs/propertiesadvanced.h
index 27d9664..f2ccb38 100644 (file)
--- a/xkeymacs/propertiesadvanced.h
+++ b/xkeymacs/propertiesadvanced.h
@@ -18,7 +18,7 @@ class CPropertiesAdvanced : public CPropertyPage
 public:\r
        void EnableControl();\r
        void GetDialogData();\r
-       void SetDialogData(CString szApplicationName);\r
+       void SetDialogData();\r
        CPropertiesAdvanced();\r
        ~CPropertiesAdvanced();\r
 \r
@@ -96,7 +96,7 @@ private:
        void SetCommands();\r
        void InitCategoryList();\r
        CProperties* m_pProperties;\r
-       void UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate = TRUE);\r
+       void UpdateDialogData(BOOL bSaveAndValidate = TRUE);\r
 };\r
 \r
 //{{AFX_INSERT_LOCATION}}\r

diff --git a/xkeymacs/propertiesbasic.cpp b/xkeymacs/propertiesbasic.cpp
index 8b0f536..9e1c9f6 100644 (file)
--- a/xkeymacs/propertiesbasic.cpp
+++ b/xkeymacs/propertiesbasic.cpp
@@ -117,7 +117,7 @@ END_MESSAGE_MAP()
 BOOL CPropertiesBasic::OnSetActive() \r
 {\r
        m_pProperties->EnableControl(BASIC_TAB);\r
-       SetDialogData(m_pProperties->GetCurrentApplication());\r
+       SetDialogData();\r
 \r
        return CPropertyPage::OnSetActive();\r
 }\r
@@ -144,12 +144,12 @@ void CPropertiesBasic::SetAllDialogData(UINT nCheck, BOOL bChanged)
        InitChanged(bChanged);\r
 }\r
 \r
-void CPropertiesBasic::SetDialogData(CString szApplicationName)\r
+void CPropertiesBasic::SetDialogData()\r
 {\r
-       UpdateDialogData(szApplicationName, FALSE);\r
+       UpdateDialogData(FALSE);\r
 }\r
 \r
-void CPropertiesBasic::UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate)\r
+void CPropertiesBasic::UpdateDialogData(BOOL bSaveAndValidate)\r
 {\r
        if (bSaveAndValidate) { // GetDialogData\r
                UpdateData();\r
@@ -247,7 +247,7 @@ int CPropertiesBasic::OnCreate(LPCREATESTRUCT lpCreateStruct)
 \r
 void CPropertiesBasic::GetDialogData()\r
 {\r
-       UpdateDialogData(m_pProperties->GetCurrentApplication(), TRUE);\r
+       UpdateDialogData(TRUE);\r
 }\r
 \r
 void CPropertiesBasic::OnAlt() \r

diff --git a/xkeymacs/propertiesbasic.h b/xkeymacs/propertiesbasic.h
index e383687..408f9e9 100644 (file)
--- a/xkeymacs/propertiesbasic.h
+++ b/xkeymacs/propertiesbasic.h
@@ -20,7 +20,7 @@ public:
        void EnableControl();\r
        void GetDialogData();\r
        void InitChanged(BOOL bChanged);\r
-       void SetDialogData(CString szApplicationName);\r
+       void SetDialogData();\r
        void SetAllDialogData(UINT nCheck, BOOL bChanged);\r
        CPropertiesBasic();\r
        ~CPropertiesBasic();\r
@@ -123,7 +123,7 @@ private:
        void Changed(int nObjectID);\r
        CProperties* m_pProperties;\r
        BOOL m_bChanged[MAX_COMMAND];\r
-       void UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate = TRUE);\r
+       void UpdateDialogData(BOOL bSaveAndValidate = TRUE);\r
 };\r
 \r
 //{{AFX_INSERT_LOCATION}}\r

diff --git a/xkeymacs/propertieslist.cpp b/xkeymacs/propertieslist.cpp
index 2fd1c9b..8095975 100644 (file)
--- a/xkeymacs/propertieslist.cpp
+++ b/xkeymacs/propertieslist.cpp
@@ -53,17 +53,17 @@ END_MESSAGE_MAP()
 BOOL CPropertiesList::OnSetActive() \r
 {\r
        m_pProperties->EnableControl(LIST_TAB);\r
-       SetDialogData(m_pProperties->GetCurrentApplication());\r
+       SetDialogData();\r
 \r
        return CPropertyPage::OnSetActive();\r
 }\r
 \r
-void CPropertiesList::SetDialogData(CString szApplicationName)\r
+void CPropertiesList::SetDialogData()\r
 {\r
-       UpdateDialogData(szApplicationName, FALSE);\r
+       UpdateDialogData(FALSE);\r
 }\r
 \r
-void CPropertiesList::UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate)\r
+void CPropertiesList::UpdateDialogData(BOOL bSaveAndValidate)\r
 {\r
        if (bSaveAndValidate) { // GetDialogData\r
                UpdateData();\r
@@ -117,7 +117,7 @@ void CPropertiesList::UpdateDialogData(CString szApplicationName, BOOL bSaveAndV
 \r
 void CPropertiesList::GetDialogData()\r
 {\r
-       UpdateDialogData(m_pProperties->GetCurrentApplication(), TRUE);\r
+       UpdateDialogData(TRUE);\r
 }\r
 \r
 int CPropertiesList::OnCreate(LPCREATESTRUCT lpCreateStruct) \r

diff --git a/xkeymacs/propertieslist.h b/xkeymacs/propertieslist.h
index 9cfd659..4afd6b7 100644 (file)
--- a/xkeymacs/propertieslist.h
+++ b/xkeymacs/propertieslist.h
@@ -21,7 +21,7 @@ class CPropertiesList : public CPropertyPage
 public:\r
        void EnableControl();\r
        void GetDialogData();\r
-       void SetDialogData(CString szApplicationName);\r
+       void SetDialogData();\r
        CPropertiesList();\r
        ~CPropertiesList();\r
 \r
@@ -65,7 +65,7 @@ private:
        static int CALLBACK SortCommand(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);\r
        static int CALLBACK SortCategory(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);\r
        CProperties* m_pProperties;\r
-       void UpdateDialogData(CString szApplicationName, BOOL bSaveAndValidate = TRUE);\r
+       void UpdateDialogData(BOOL bSaveAndValidate = TRUE);\r
 };\r
 \r
 //{{AFX_INSERT_LOCATION}}\r