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

Timestamp:

May 27, 2008, 9:17:34 PM (16 years ago)

Author:

dai_9181

Message:

・WindowInfoクラスをリファクタリング
・MdiInfoを単純配列からvectorに変更した。

File:

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

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

@@ -39 +39 @@
 
     NameLen=pWindowInfo->GetName().size();
-    CallBackNameLen=lstrlen(pWindowInfo->CallBackName);
-
-    buffer = ReadBuffer( projectInfo.GetWorkDir().GetPath() + pWindowInfo->filepath );
+    CallBackNameLen=pWindowInfo->GetCallbackName().size();
+
+    buffer = ReadBuffer( projectInfo.GetWorkDir().GetPath() + pWindowInfo->GetSourceFileName() );
 
     *num=0;
@@ -117 +117 @@
                 i2+=9;
                 while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
-                if(memicmp(buffer+i2,pWindowInfo->CallBackName,CallBackNameLen)==0&&
+                if(memicmp(buffer+i2,pWindowInfo->GetCallbackName().c_str(),CallBackNameLen)==0&&
                     (buffer[i2+CallBackNameLen]==' '||buffer[i2+CallBackNameLen]=='\t'||buffer[i2+CallBackNameLen]=='(')){
                     *pbAlways=1;
@@ -129 +129 @@
 }
 void SelectProcedureOfMessageCall(int WndInfoNum,char *ProcedureName,char *Parameter){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,WndNum;
     char temporary[MAX_PATH],*pBuf;
@@ -137 +136 @@
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
 
-    hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->filepath );
+    hChild=OpenFileWithExtension( projectInfo.GetWorkDir().GetPath() + pWindowInfo->GetSourceFileName() );
     if(!hChild) return;
     WndNum=GetWndNum(hChild);
@@ -216 +215 @@
 }
 BOOL GetEventProcedureNameFromListView(HWND hList,int WndNum,int WndInfoNum,char *EventName,char *Parameter,DWORD dwEventType){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,MaxCount;
     char temporary[MAX_PATH];
@@ -394 +392 @@
 }
 void SetEventToList(HWND hDlg,DWORD dwEventType){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,WndNum;
     HWND hList;
@@ -586 +583 @@
 }
 BOOL CALLBACK DlgEventCode(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int WndNum,WndInfoNum,i,i2;
     char temporary[MAX_PATH],temp2[MAX_PATH];