Changeset 326

Timestamp:

03/14/10 19:59:00 (5 months ago)

Author:

svnusers

Message:

kp: Reapply fixes from r186 (using CWnd from thread other than the one that created it).

Location:

Mulberry/branches/users/kenneth_porter/From-shared-v4.1d1/Win32/Sources

Files:

• Application/Server/Browse_Dialog/CServerBrowseTable.cp (modified) (1 diff)
• Application/Status/CStatusWindow.cp (modified) (2 diffs)
• Application/Status/CStatusWindow.h (modified) (1 diff)
• Support/Toolbars/CToolbar.cp (modified) (1 diff)

Mulberry/branches/users/kenneth_porter/From-shared-v4.1d1/Win32/Sources/Application/Server/Browse_Dialog/CServerBrowseTable.cp

@@ -69 +69 @@
 
         // Allow multiple selections
-        ModifyStyle(0, LVS_SINGLESEL);
+        if (m_hWnd)
+                ModifyStyle(0, LVS_SINGLESEL);
 }
 

Mulberry/branches/users/kenneth_porter/From-shared-v4.1d1/Win32/Sources/Application/Status/CStatusWindow.cp

@@ -57 +57 @@
 BOOL CUTF8StatusBar::SetPaneTextUTF8(int nIndex, const char* utf8, BOOL bUpdate)
 {
+        // Don't call into CWnd code if this thread doesn't own this CWnd
+        if (!FromHandlePermanent(GetSafeHwnd()))
+                return FALSE;
 #ifdef _UNICODE
         cdustring utf16(utf8);
@@ -105 +108 @@
 }
 
+BOOL CUTF8StatusBar::RedrawWindow(LPCRECT lpRectUpdate,
+                                  CRgn* prgnUpdate,
+                                  UINT flags)
+{
+        // Don't call into CWnd code if this thread doesn't own this CWnd
+        return FromHandlePermanent(GetSafeHwnd()) ? CStatusBar::RedrawWindow(lpRectUpdate, prgnUpdate, flags) : FALSE;
+}
+
 // Init status
 void CStatusWindow::InitStatusBar(CUTF8StatusBar* statusBar)

Mulberry/branches/users/kenneth_porter/From-shared-v4.1d1/Win32/Sources/Application/Status/CStatusWindow.h

@@ -30 +30 @@
         
         BOOL SetPaneTextUTF8(int nIndex, const char* utf8, BOOL bUpdate = TRUE);
+
+        BOOL RedrawWindow(
+                          LPCRECT lpRectUpdate = NULL,
+                          CRgn* prgnUpdate = NULL,
+                          UINT flags = RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE 
+                         );
 };
 

Mulberry/branches/users/kenneth_porter/From-shared-v4.1d1/Win32/Sources/Support/Toolbars/CToolbar.cp

@@ -679 +679 @@
         
         // Only if commander available
-        if (GetCommander())
-                cmdui.DoUpdate(GetCommander(), true);
+        CWnd* commander = GetCommander();
+        if (commander)
+                // we recreate the CWnd as we got it from another thread
+                cmdui.DoUpdate(CWnd::FromHandle(commander->GetSafeHwnd()), true);
         
         // Check for visibility change tied to enable state