Changeset 772 in dev for trunk/ab5.0/abdev/abdev/TabCtrl.cpp

Timestamp:

Aug 29, 2009, 7:55:19 AM (15 years ago)

Author:

イグトランス (egtra)

Message:

Windows 7タスクバーへの対応を実装。
(#245)

File:

• trunk/ab5.0/abdev/abdev/TabCtrl.cpp (modified) (11 diffs)

trunk/ab5.0/abdev/abdev/TabCtrl.cpp

@@ -3 +3 @@
 #include "Common.h"
 
+struct ItemInfo
+{
+    HWND hwndChild;
+    COLORREF Color;
+
+    ItemInfo( HWND hChild, COLORREF color) :
+        hwndChild( hChild ),
+        Color( color )
+    {
+    }
+};
+
+ItemInfo* GetItemInfo( HWND hTab, int i )
+{
+    TC_ITEM tcItem;
+    tcItem.mask=TCIF_PARAM;
+    TabCtrl_GetItem( hTab, i, &tcItem );
+    return reinterpret_cast<ItemInfo*>( tcItem.lParam );
+}
+
+void SetTabOrder( HWND hTab, ItemInfo* itemInfo, int pos )
+{
+    HWND next =
+        pos + 1 < TabCtrl_GetItemCount( hTab )
+        ? GetItemInfo( hTab, pos + 1 )->hwndChild
+        : 0
+        ;
+    ActiveBasic::IDE::Program::mainFrame.SetTabOrder( itemInfo->hwndChild, next );
+}
 
 CMainTab *pobj_MainTab=0;
@@ -57 +86 @@
 
                     indexDrag=iNewPos;
+                    SetTabOrder( hwnd, GetItemInfo( hwnd, iNewPos ), iNewPos );
 
                     LockWindowUpdate(0);
@@ -148 +178 @@
 
     //サブクラス化
-    OldMainTabWndProc=(WNDPROC)GetWindowLongPtr(hTab,GWLP_WNDPROC);
-    SetWindowLongPtr(hTab,GWLP_WNDPROC,(LONG_PTR)MainTabWndProc);
+    OldMainTabWndProc = (WNDPROC)SetWindowLongPtr(hTab,GWLP_WNDPROC,(LONG_PTR)MainTabWndProc);
 
     //ボールド体フォントを生成
@@ -157 +186 @@
     hBoldFont=CreateFontIndirect(&lf);
 
-    SendMessage(hTab,WM_SETFONT,(long)hBoldFont,0);
+    SetWindowFont(hTab,hBoldFont,FALSE);
 }
 
@@ -164 +193 @@
 }
 
-void CMainTab::InsertItem( const char *lpszText, bool isResize, COLORREF color ){
+void CMainTab::InsertItem( HWND hwnd, const char *lpszText, bool isResize, COLORREF color ){
     int sw=0;
     if(TabCtrl_GetItemCount(hTab)==0) sw=1;
-
+OutputDebugString("CMainTab::InsertItem--------------------------------------------------------\r\n");
     if(color==-1) color=RGB(230,230,230);
+
+    ItemInfo* itemInfo = new ItemInfo( hwnd, color );
 
     TC_ITEM tcItem;
     tcItem.mask=TCIF_TEXT|TCIF_PARAM;
     tcItem.pszText=(LPSTR)lpszText;
-    tcItem.lParam=color;
+    tcItem.lParam=reinterpret_cast<LPARAM>( itemInfo );
     TabCtrl_InsertItem(hTab,0,&tcItem);
     TabCtrl_SetCurSel(hTab,0);
+    ActiveBasic::IDE::Program::mainFrame.AddChildWindow( hwnd );
+    SetTabOrder( hTab, itemInfo, 0 );
 
     if(isResize){
@@ -186 +219 @@
     i2=SearchItemIndex(lpszText);
     if(i2==-1) return;
-
+OutputDebugString("CMainTab::DeleteItem--------------------------------------------------------\r\n");
+    ItemInfo* p = GetItemInfo( hTab, i2 );
+    ActiveBasic::IDE::Program::mainFrame.DeleteChildWindow( p->hwndChild );
+    delete p;
     TabCtrl_DeleteItem(hTab,i2);
 
@@ -195 +231 @@
 
 void CMainTab::RenameItem( const char *lpszOldText, const char *lpszNewText ){
-    int i2;
-    i2=SearchItemIndex(lpszOldText);
+    int i2=SearchItemIndex(lpszOldText);
     if(i2==-1) return;
 
@@ -242 +277 @@
     tcItem.mask = TCIF_PARAM;
     TabCtrl_GetItem( hTab, index, &tcItem );
-    return tcItem.lParam;
+    return reinterpret_cast<ItemInfo*>( tcItem.lParam )->Color;
 }
 
@@ -272 +307 @@
 
     TabCtrl_SetCurSel(hTab,i2);
+//  ActiveBasic::IDE::Program::mainFrame.ActivateChildWindow( *GetItemInfo( hTab, i2 )->TaskbarButtonWindow );
 }
 
@@ -321 +357 @@
         // タブ枠を描画
         ////////////////////////////
-        colorGray=item.lParam;
+        colorGray=reinterpret_cast<ItemInfo*>( item.lParam )->Color;
 
         //ブラシを生成
@@ -376 +412 @@
         // タブ枠を描画
         ////////////////////////////
-        colorGray=item.lParam;
+        colorGray=reinterpret_cast<ItemInfo*>( item.lParam )->Color;
 
         //ブラシを生成