Split GetApplicationIndex into DefaultAppID, AssingAppID,

[xkeymacs/xkeymacs.git] / xkeymacs / properties.cpp

diff --git a/xkeymacs/properties.cpp b/xkeymacs/properties.cpp
index ad606cf..2dfdff4 100644 (file)
--- a/xkeymacs/properties.cpp
+++ b/xkeymacs/properties.cpp
@@ -148,7 +148,8 @@ void CProperties::GetDialogData()
                CProfile::ClearData(m_szCurrentApplication);\r
                return;\r
        }\r
-       m_nApplicationID = CProfile::GetApplicationIndex(m_szCurrentApplication, TRUE, &m_nSettingStyle);\r
+       m_nApplicationID = CProfile::AssignAppID(m_szCurrentApplication);\r
+       CProfile::SetSettingStyle(m_nApplicationID, m_nSettingStyle);\r
        CProfile::UpdateApplicationTitle(&m_cApplication, m_szCurrentApplication, m_nApplicationID, TRUE);\r
        CProfile::SetKillRingMax(m_nApplicationID, m_nKillRingMax);\r
        CProfile::SetUseDialogSetting(m_nApplicationID, m_cUseDialogSetting.GetCheck() == BST_CHECKED);\r
@@ -166,7 +167,10 @@ void CProperties::GetDialogData()
 \r
 void CProperties::SetDialogData()\r
 {\r
-       m_nApplicationID = CProfile::GetApplicationIndex(m_szCurrentApplication, FALSE, &m_nSettingStyle);\r
+       m_nApplicationID = CProfile::GetAppID(m_szCurrentApplication);\r
+       m_nSettingStyle = CProfile::GetSettingStyle(m_nApplicationID);\r
+       if (m_nApplicationID == MAX_APP)\r
+               m_nApplicationID = CProfile::DefaultAppID(); // fall back to the default\r
        EnableUseDefaultButton(!CProfile::IsDefault(m_szCurrentApplication) && !CProfile::IsDialog(m_szCurrentApplication));\r
        CProfile::UpdateApplicationTitle(&m_cApplication, m_szCurrentApplication, m_nApplicationID, FALSE);\r
        m_nKillRingMax = CProfile::GetKillRingMax(m_nApplicationID);\r