Changeset 133 for Mulberry/branches/win32-merge-121/Win32/Sources/Support/CSDIFrame.cp

Timestamp:

11/19/07 21:50:28 (1 year ago)

Author:

daboo

Message:

Fix for Win32 build.

Files:

• Mulberry/branches/win32-merge-121/Win32/Sources/Support/CSDIFrame.cp (modified) (6 diffs)

Mulberry/branches/win32-merge-121/Win32/Sources/Support/CSDIFrame.cp

@@ -34 +34 @@
 // CSDIFrame
 
-svector<CWnd*> CSDIFrame::sModalWnd;
+vector<CWnd*> CSDIFrame::sModalWnd;
 CWnd* CSDIFrame::sTaskbarParent = NULL;
 int CSDIFrame::sTaskbarCount = 0;
 HMENU CSDIFrame::sWindowsMenu = NULL;
-svector<CWnd*> CSDIFrame::sWindowList;
-svector<CWnd*> CSDIFrame::sWindowZList;
+vector<CWnd*> CSDIFrame::sWindowList;
+vector<CWnd*> CSDIFrame::sWindowZList;
 bool CSDIFrame::sWindowZListActive = false;
 CWnd* CSDIFrame::sTopWindow = NULL;
@@ -273 +273 @@
         // Find position in list
         sWindowZList.erase(std::remove(sWindowZList.begin(), sWindowZList.end(), aWnd), sWindowZList.end());
-        svector<CWnd*>::iterator found = ::find(sWindowList.begin(), sWindowList.end(), aWnd);
+        vector<CWnd*>::iterator found = ::find(sWindowList.begin(), sWindowList.end(), aWnd);
         if (found != sWindowList.end())
         {
@@ -307 +307 @@
         // Refresh entire list
         int pos = 0;
-        for(svector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindowList.end(); iter++, pos++)
+        for(vector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindowList.end(); iter++, pos++)
         {
                 cdstring title = CUnicodeUtils::GetWindowTextUTF8(*iter);
@@ -321 +321 @@
 {
         int pos = IDM_WINDOWS_First;
-        for(svector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindowList.end(); iter++, pos++)
+        for(vector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindowList.end(); iter++, pos++)
         {
                 cdstring title = CUnicodeUtils::GetWindowTextUTF8(*iter);
@@ -343 +343 @@
                 {
                         sWindowZListActive = true;
-                        for(svector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindowList.end(); iter++)
+                        for(vector<CWnd*>::const_iterator iter = sWindowList.begin(); iter != sWindowList.end(); iter++)
                                 (*iter)->ShowWindow(SW_HIDE);
                 }
@@ -350 +350 @@
                         sWindowZListActive = false;
                         StValueChanger<bool> _change(sWindowZListActive, true);
-                        for(svector<CWnd*>::const_iterator iter = sWindowZList.begin(); iter != sWindowZList.end(); iter++)
+                        for(vector<CWnd*>::const_iterator iter = sWindowZList.begin(); iter != sWindowZList.end(); iter++)
                                 (*iter)->ShowWindow(SW_SHOW);
                 }