[dchapyshev] 33835: - More implement "Regional Options" dialog - Small fix "Advanced" dialog

Author: dchapyshev
Date: Tue Jun  3 06:55:02 2008
New Revision: 33835

URL: http://svn.reactos.org/svn/reactos?rev=33835&view=rev
Log:
- More implement "Regional Options" dialog
- Small fix "Advanced" dialog

Modified:
    trunk/reactos/dll/cpl/intl/advanced.c
    trunk/reactos/dll/cpl/intl/generalp.c

Modified: trunk/reactos/dll/cpl/intl/advanced.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?rev...
==============================================================================
--- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Tue Jun  3 06:55:02 2008
@@ -60,13 +60,6 @@
                 continue;
             }

-            /*_stprintf(Section, _T("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage);
-            if ((uiCPage == GetACP()) || (uiCPage == GetOEMCP()) || 
-                (!SetupFindFirstLine(hIntlInf, Section, _T("AddReg"), &infCont)))
-            {
-                lpCPage->Status |= (0x0001 | 0x0002);
-            }*/
-
             lpCPage->NextItem = PCPage;
             PCPage = lpCPage;
         }
@@ -336,6 +329,8 @@
                 LCID lcid;
                 INT iIndex;

+                PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg);
+
                 iIndex = SendMessage(hLangList, CB_GETCURSEL, 0, 0);
                 if (iIndex == CB_ERR)
                     break;
@@ -345,7 +340,6 @@
                     break;

SetNonUnicodeLang(hwndDlg, lcid);
-                PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg);
             }
         }
         break;

Modified: trunk/reactos/dll/cpl/intl/generalp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?rev...
==============================================================================
--- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Tue Jun  3 06:55:02 2008
@@ -235,7 +235,6 @@
 }

/* Location enumerate procedure */
-#if 0
 BOOL
 CALLBACK
 LocationsEnumProc(GEOID gId)
@@ -256,14 +255,12 @@

return TRUE;
 }
-#endif

/* Enumerate all system locations identifiers */
 static
 VOID
 CreateLocationsList(HWND hWnd)
 {
-#if 0
     GEOID userGeoID;
     TCHAR loc[MAX_STR_SIZE];

@@ -283,7 +280,6 @@
                 CB_SELECTSTRING,
                 (WPARAM) -1,
                 (LPARAM)loc);
-#endif
 }

DWORD
@@ -370,6 +366,12 @@
                     }
                     break;

+                case IDC_LOCATION_COMBO:
+                    if (HIWORD(wParam) == CBN_SELCHANGE)
+                    {
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                    }
+                    break;
                 case IDC_SETUP_BUTTON:
                     {
                         LCID NewLcid;
@@ -403,7 +405,10 @@
                 {
                     /* Apply changes */
                     LCID NewLcid;
+                    GEOID NewGeoID;
                     INT iCurSel;
+
+                    PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg);

/* Acquire new value */
                     iCurSel = SendMessage(hList,
@@ -420,8 +425,23 @@
                     if (NewLcid == (LCID)CB_ERR)
                         break;

+                    iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
+                                          CB_GETCURSEL,
+                                          0,
+                                          0);
+                    if (iCurSel == CB_ERR)
+                        break;
+
+                    NewGeoID = SendMessage(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO),
+                                           CB_GETITEMDATA,
+                                           iCurSel,
+                                           0);
+                    if (NewGeoID == (GEOID)CB_ERR)
+                        break;
+
                     /* Set new locale */
                     SetNewLocale(NewLcid);
+                    SetUserGeoID(NewGeoID);
                     SetNonUnicodeLang(hwndDlg, NewLcid);
                 }
             }