Changeset 624 in dev for trunk/ab5.0/abdev/abdev/MessageCallOperation.cpp

Timestamp:

May 23, 2008, 10:35:36 PM (16 years ago)

Author:

dai_9181

Message:

WindowInfoクラスをリファクタリング

File:

• trunk/ab5.0/abdev/abdev/MessageCallOperation.cpp (modified) (8 diffs)

trunk/ab5.0/abdev/abdev/MessageCallOperation.cpp

@@ -20 +20 @@
     if(lstrcmp(EventName,"MenuClick")==0) return CT_MENU;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
-    BOOST_FOREACH( CHILDINFO *pChildInfo, pWindowInfo->childWindowInfos )
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
     {
-        if(lstrcmp(buffer,pChildInfo->IdName)==0)
+        if( pChildInfo->GetName() == buffer )
         {
             return pChildInfo->Control;
@@ -36 +36 @@
     char *buffer,**ppNames,temporary[MAX_PATH],temp2[MAX_PATH];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     NameLen=pWindowInfo->GetName().size();
@@ -135 +135 @@
     POINT pos;
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->filepath );
@@ -220 +220 @@
     char temporary[MAX_PATH];
 
-    WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
+    ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
     MaxCount=ListView_GetItemCount(hList);
@@ -298 +298 @@
                 sprintf(EventName,"%s_%s_%s",
                     pWindowInfo->GetName().c_str(),
-                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->IdName,
+                    pWindowInfo->childWindowInfos[MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]]->GetName().c_str(),
                     temporary);
                 break;
@@ -403 +403 @@
 
     WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-    WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+    ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
     i=0;
     if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
@@ -441 +441 @@
             //メニュー イベント
             SendDlgItemMessage(hDlg,IDC_MENU,BM_SETCHECK,BST_CHECKED,0);
-            if(pWindowInfo->MenuID){
+            if( pWindowInfo->HasMenu() )
+            {
                 int MenuInfoNum;
-                MenuInfoNum=GetMenuInfoNum(pWindowInfo->MenuID);
+                MenuInfoNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str());
                 i=0;
                 i2=0;
@@ -647 +648 @@
             {
                 WndNum=GetWndNum(GetWindow(hClient,GW_CHILD));
-                WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
-                NowMenuNum=GetMenuInfoNum(pWindowInfo->MenuID);
+                ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);
+                NowMenuNum=GetMenuInfoNum(pWindowInfo->GetMenuIdName().c_str());
             }
             break;