Changeset 783 in dev for branches/egtra

Timestamp:

Jan 29, 2011, 6:08:57 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

Windows 7以前で、新しくMDI子ウィンドウを作るなどしたときに落ちる問題の修正

File:

• branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp (modified) (2 diffs)

branches/egtra/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -294 +294 @@
         if (taskbarList)
         {
-        taskbarList->SetTabOrder(*mapAt(hwndChild),
-            hwndInsertBefore
-            ? static_cast<HWND>(*mapAt(hwndInsertBefore))
-            : 0);
+            taskbarList->SetTabOrder(*mapAt(hwndChild),
+                hwndInsertBefore
+                ? static_cast<HWND>(*mapAt(hwndInsertBefore))
+                : 0);
         }
     }
@@ -929 +929 @@
 void MainFrame::AddChildWindow( HWND hwndChild )
 {
-    taskbarList->RegisterTab( hwndChild );
+    if (taskbarList)
+    {
+        taskbarList->RegisterTab( hwndChild );
+    }
 }
 
 void MainFrame::DeleteChildWindow( HWND hwndChild )
 {
-    taskbarList->UnregisterTab( hwndChild );
+    if (taskbarList)
+    {
+        taskbarList->UnregisterTab( hwndChild );
+    }
 }
 
 void MainFrame::ActivateChildWindow( HWND hwndChild )
 {
-    taskbarList->SetTabActivate( hwndChild );
+    if (taskbarList)
+    {
+        taskbarList->SetTabActivate( hwndChild );
+    }
 }
 
 void MainFrame::SetTabOrder( HWND hwndChild, HWND hwndInsertBefore )
 {
-    taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
+    if (taskbarList)
+    {
+        taskbarList->SetTabOrder( hwndChild, hwndInsertBefore );
+    }
 }
 
 void MainFrame::InvalidateBitmap( HWND hwndChild )
 {
-    taskbarList->InvalidateIconicBitmaps( hwndChild );
+    if (taskbarList)
+    {
+        taskbarList->InvalidateIconicBitmaps( hwndChild );
+    }
 }