Changeset 625 in dev for trunk

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler_Common/BasicCompiler.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/common.h (modified) (1 diff)
• abdev/BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (1 diff)
• abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp (modified) (1 diff)
• abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp (modified) (1 diff)
• abdev/abdev/Backup.cpp (modified) (3 diffs)
• abdev/abdev/Caret.cpp (modified) (16 diffs)
• abdev/abdev/ChildWndOnRebar.cpp (modified) (4 diffs)
• abdev/abdev/ClassTree.cpp (modified) (1 diff)
• abdev/abdev/Common.h (modified) (9 diffs)
• abdev/abdev/Complement.cpp (modified) (2 diffs)
• abdev/abdev/Debugger.cpp (modified) (8 diffs)
• abdev/abdev/Debugger.h (modified) (2 diffs)
• abdev/abdev/DocumentAdvice.cpp (modified) (1 diff)
• abdev/abdev/DrawBuffer.cpp (modified) (2 diffs)
• abdev/abdev/DrawWindow.cpp (modified) (8 diffs)
• abdev/abdev/ExtensionLink.cpp (modified) (1 diff)
• abdev/abdev/ExtensionLink.h (modified) (1 diff)
• abdev/abdev/FileOperation.cpp (modified) (10 diffs)
• abdev/abdev/History.cpp (modified) (1 diff)
• abdev/abdev/IconEditor.cpp (modified) (8 diffs)
• abdev/abdev/IconEditor_Color.cpp (modified) (1 diff)
• abdev/abdev/IconEditor_Main.cpp (modified) (23 diffs)
• abdev/abdev/IconEditor_Tool.cpp (modified) (3 diffs)
• abdev/abdev/IconEditor_UndoRedo.cpp (modified) (3 diffs)
• abdev/abdev/MenuProc.cpp (modified) (11 diffs)
• abdev/abdev/MessageCallOperation.cpp (modified) (7 diffs)
• abdev/abdev/ParameterHint.cpp (modified) (4 diffs)
• abdev/abdev/ProjectControl.cpp (modified) (12 diffs)
• abdev/abdev/RadProc.cpp (modified) (17 diffs)
• abdev/abdev/RadSupport.cpp (modified) (2 diffs)
• abdev/abdev/RadToolsAndPropertyProc.cpp (modified) (33 diffs)
• abdev/abdev/Rad_UndoRedo.cpp (modified) (10 diffs)
• abdev/abdev/Replace.cpp (modified) (5 diffs)
• abdev/abdev/Resource.cpp (modified) (3 diffs)
• abdev/abdev/Search.cpp (modified) (5 diffs)
• abdev/abdev/SubOperation.cpp (modified) (7 diffs)
• abdev/abdev/TabCtrl.cpp (modified) (1 diff)
• abdev/abdev/TextEditor.cpp (modified) (5 diffs)
• abdev/abdev/TextEditor_EventProc.cpp (modified) (1 diff)
• abdev/abdev/TextEditor_KeyEvent.cpp (modified) (1 diff)
• abdev/abdev/TextEditor_MouseEvent.cpp (modified) (1 diff)
• abdev/abdev/TextEditor_UndoRedo.cpp (modified) (3 diffs)
• abdev/abdev/WebSearch.cpp (modified) (2 diffs)
• abdev/abdev/WindowControl.cpp (modified) (30 diffs)
• abdev/abdev/abdev.cpp (modified) (9 diffs)
• abdev/abdev/abdev.h (modified) (1 diff)
• abdev/abdev/abdev.vcproj (modified) (3 diffs)
• abdev/abdev/include/ProjectManager/WindowManager.h (modified) (5 diffs)
• abdev/abdev/nkf_class.cpp (modified) (1 diff)
• abdev/abdev/src/MainFrame.cpp (modified) (14 diffs)
• abdev/abdev/src/ProjectManager/ProjectManager.cpp (modified) (8 diffs)
• abdev/res/res.rc (modified) (2 diffs)
• abdev/res/resource.h (modified) (1 diff)
• jenga/include/common/SourceTemplate.h (added)
• jenga/include/jenga.h (modified) (1 diff)
• jenga/projects/jenga/jenga.vcproj (modified) (2 diffs)
• jenga/src/common/SourceTemplate.cpp (added)

trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -211 +211 @@
     lstrcat(temporary,path+i);
     lstrcpy(path,temporary);
-}
-std::string GetApplicationBaseFullPath( const std::string &relationalPath )
-{
-    char fullPath[1024];
-    lstrcpy( fullPath, relationalPath.c_str() );
-    GetFullPath( fullPath, Jenga::Common::Environment::GetAppDir() );
-    return fullPath;
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/common.h

@@ -217 +217 @@
 void GetRelationalPath(char *path,char *dir);
 void GetFullPath( char *path, const std::string &baseDirPath );
-std::string GetApplicationBaseFullPath( const std::string &relationalPath );
 void ShowErrorLine(int LineNum,const char *FileName);
 BOOL GetFilePathDialog(HWND hwnd,char *filename,LPSTR Filter,LPSTR Title,BOOL bOpen);

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -6 +6 @@
 class LexicalAnalyzer
 {
-    class SourceTemplate
-    {
-        std::string source;
-    public:
-        SourceTemplate( const std::string &filePath );
-        ~SourceTemplate()
-        {
-        }
-
-        std::string GetResult( const std::map<std::string,std::string> &values );
-    };
-
 public:
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp

@@ -2 +2 @@
 
 using namespace ActiveBasic::Compiler;
-
-LexicalAnalyzer::SourceTemplate::SourceTemplate( const std::string &filePath )
-{
-    Jenga::Common::File file = Jenga::Common::File( GetApplicationBaseFullPath( filePath ) );
-    source = file.Read();
-}
-std::string LexicalAnalyzer::SourceTemplate::GetResult( const std::map<std::string,std::string> &values )
-{
-    std::string result = source;
-
-    std::map<std::string,std::string>::const_iterator it = values.begin();
-    while( it != values.end() )
-    {
-        while( true )
-        {
-            std::string::size_type index = result.find( it->first );
-            if( index == std::string::npos )
-            {
-                break;
-            }
-
-            result = result.substr( 0, index ) + it->second + result.substr( index + it->first.length() );
-        }
-        it++;
-    }
-
-    return result;
-}
-
 
 bool LexicalAnalyzer::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp

@@ -124 +124 @@
     std::string destSource = "";
 
-    SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
+    Jenga::Common::SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
 
     delegates.Iterator_Reset();

trunk/ab5.0/abdev/abdev/Backup.cpp

@@ -48 +48 @@
     sprintf(temp2,"%x\r\n",hOwner);
 
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(MdiInfo[i].hwnd){
             int WndNum;
@@ -60 +60 @@
 
             //情報を追加
-            sprintf(temp2+lstrlen(temp2),"%s\r\n",MdiInfo[WndNum].path);
+            sprintf(temp2+lstrlen(temp2),"%s\r\n",MdiInfo[WndNum].path.c_str());
 
             iNum++;
@@ -115 +115 @@
 
         //パスを変更
-        GlobalFree(MdiInfo[WndNum].path);
-        MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(szBeforeFilePath)+1);
-        lstrcpy(MdiInfo[WndNum].path,szBeforeFilePath);
+        MdiInfo[WndNum].path = szBeforeFilePath;
 
         //ドキュメント セレクト コンボボックスに挿入

trunk/ab5.0/abdev/abdev/Caret.cpp

@@ -122 +122 @@
     // 選択範囲（バッファインデックス）を取得
     //////////////////////////////////////////
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     pCharRange->cpMin=GetBufferIndexFromCaretPos(
@@ -149 +148 @@
 }
 void TextEdit_GetSelText(int WndNum,CHARRANGE *pCharRange,char *buffer){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     memcpy(buffer,
@@ -158 +156 @@
 
 void GetScrollBaseCaretPos(int WndNum,int *pNaturalBaseX,int *pNaturalBaseY){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     HWND hEdit;
@@ -176 +173 @@
 
 void GetNaturalBaseCaretPos(int WndNum,int *pScrollBaseX,int *pScrollBaseY){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     HWND hEdit;
@@ -194 +190 @@
 
 void TextEdit_SetSel(int WndNum,int StartIndex,int EndIndex,BOOL bShowCenter){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     GetCaretPosFromBufferIndex(
@@ -216 +211 @@
 }
 void TextEdit_SelectOneLine(int WndNum,int code_pos,BOOL bShowCenter){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     ///////////////////////
@@ -235 +229 @@
 void ResetCaretPos(int WndNum,BOOL bInputAndReset){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int x,y;
 
@@ -465 +458 @@
 }
 BOOL TextEdit_ScrollCaret(int WndNum,BOOL bScrollOneStep_x,BOOL bShowCenter){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int x,y;
     BOOL bScroll=0;
@@ -537 +529 @@
 
 void CaretPos_LooseToNatural(int WndNum,int loose_x,int loose_y,POINT *pCaretPos){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,LastPos;
     int x,y;
@@ -650 +641 @@
     /////////////////////////////
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     //ピクセル座標をカーソル座標（文字単位）に変更
@@ -664 +654 @@
     ///////////////////////////
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     int x,y;
@@ -719 +708 @@
     ///////////////////////////
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     char *pBuf;
@@ -773 +761 @@
     // キャレット移動（上キー）
     ///////////////////////////
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     if(pCaretPos->y==0){
@@ -795 +782 @@
     // キャレット移動（下キー）
     ///////////////////////////
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     //上下のキャレット移動時には、左右方向の位置を保持する
@@ -812 +798 @@
     // キャレット移動（PageUpキー）
     ///////////////////////////////
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     if(pCaretPos->y==0){
@@ -839 +824 @@
     // キャレット移動（PageUpキー）
     ///////////////////////////////
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     //上下のキャレット移動時には、左右方向の位置を保持する

trunk/ab5.0/abdev/abdev/ChildWndOnRebar.cpp

@@ -40 +40 @@
 LRESULT CALLBACK DocComboProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern WNDPROC OldDocComboProc;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     char str[MAX_PATH];
@@ -48 +47 @@
             if(HIWORD(wParam)==CBN_SELCHANGE){
                 SendMessage(hwnd,CB_GETLBTEXT,SendMessage(hwnd,CB_GETCURSEL,0,0),(long)str);
-                for(i=0;i<MAX_WNDNUM;i++){
+                for(i=0;i<MdiInfo.size();i++){
                     if(lstrcmpi(str,MdiInfo[i].title)==0) break;
                 }
@@ -181 +180 @@
     extern WNDPROC OldDocComboProc;
     extern HFONT hStatusFont;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     HWND hTempWnd;
@@ -200 +198 @@
     hTempWnd=GetWindow(hClient,GW_CHILD);
     if(IsWindow(hTempWnd)){
-        for(i=0,i2=0;i<MAX_WNDNUM;i++){
+        for(i=0,i2=0;i<MdiInfo.size();i++){
             if(MdiInfo[i].hwnd){
                 GetWindowText(MdiInfo[i].hwnd,buffer,MAX_PATH);

trunk/ab5.0/abdev/abdev/ClassTree.cpp

@@ -444 +444 @@
 }
 void SetClassTreeFromOneFile(char *lpszFilePath,int iFileNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int WndNum;
     HWND hChild=GetWindow(hClient,GW_CHILD);
     while(hChild){
         WndNum=GetWndNum(hChild);
-        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-            if(lstrcmpi(MdiInfo[WndNum].path,lpszFilePath)==0) break;
-        }
-        hChild=GetNextWindow(hChild,GW_HWNDNEXT);
+        if( WndNum != -1 )
+        {
+            if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),lpszFilePath)==0) break;
+            }
+            hChild=GetNextWindow(hChild,GW_HWNDNEXT);
+        }
     }
 

trunk/ab5.0/abdev/abdev/Common.h

@@ -258 +258 @@
 struct RAD_UNDOSTATE_NAME{
     std::string name;
-    std::string HandleName;
-    char *CallBackName;
 };
 #define RAD_UNDO_INSERTWND  1
@@ -357 +355 @@
     int DocType;
     char *title;
-    char *path;
+    std::string path;
 
     union{
@@ -368 +366 @@
     char *IndentStr;
 };
-extern MDIINFO MdiInfo[MAX_WNDNUM];
+extern std::vector<MDIINFO> MdiInfo;
 
 //RADツールのマウスドラッグ
@@ -483 +481 @@
 #define EVENTTYPE_MMSYS     2
 
-//ウィンドウ タイプ
-#define WNDTYPE_DEFAULT     0
-#define WNDTYPE_MODALDLG    1
-#define WNDTYPE_MODELESSDLG 3
 
 struct NEWPROJECTINFO{
@@ -648 +642 @@
 char *ReadBuffer( const std::string &path );
 char *ReadBuffer_NonErrMsg( const std::string &path );
-_int8 WriteBuffer(const std::string &path,char *buffer,int length, bool isEnableError = true);
+_int8 WriteBuffer(const std::string &path,const char *buffer,int length, bool isEnableError = true);
 _int8 WriteBuffer_NonErrMsg(const std::string &path,char *buffer,int length);
 void GetRelationalPath(char *path,char *dir);
@@ -738 +732 @@
 void SetupWindow(HWND hwnd);
 BOOL SetRunning(HWND hChild);
-BOOL IsNeedCompile(char *FileName,BOOL bDebug);
+BOOL IsNeedCompile( const std::string &filepath, BOOL bDebug );
 std::string GetLastErrorString();
 
@@ -875 +869 @@
 
     void add(char *path);
-    void insert(char *path);
+    void insert(const char *path);
 
     void ResetFileMenu(CSubMenuEx *pobj_SubMenu,BOOL bOwnerDraw);
@@ -969 +963 @@
 
 //WindowControl.cpp
-int GetWndInfoNum(char *name);
-ActiveBasic::PM::WindowInfo *GetWndInfo( char *name );
+int GetWndInfoNum( const std::string &name );
+ActiveBasic::PM::WindowInfo *GetWndInfo( const std::string &name );
 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum);
 void Rad_PasteChildInfoClipboardData(int WndNum,HGLOBAL hGlobal);
 char *PermutationWndPgmTemplate(char *pBuf,const char *pPjName, char *pWndName, char *pHandleName, char *pProcName);
+const std::string PermutationWndPgmTemplate( const std::string &templateFilePath, const std::string &projectName, std::string &windowName, std::string &handleName, std::string &procName );
 void GetItemClassName(char *buffer,int Control);
 void SaveWindowProgram();
@@ -1057 +1052 @@
 
 //MenuProc.cpp
-int GetMenuInfoNum(const char *name);
+int GetMenuInfoNum(const std::string &name);
 void HeapMenuDataFree(MENU_INFO *pMenuInfo,int ItemNum,int *NumberOfFreedItem);
 BOOL CALLBACK DlgProject_MenuID_Input(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam);

trunk/ab5.0/abdev/abdev/Complement.cpp

@@ -388 +388 @@
     iControlTabSpace=MdiInfo[WndNum].pMdiTextEdit->iWidth_ControlTabSpace;
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern int font_width,font_height;
     POINT pos;
@@ -612 +611 @@
 
 LRESULT CALLBACK ComplementListViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern COMPLEMENT_WINDOW_INFO ComplementWndInfo;
     int i,WndNum;

trunk/ab5.0/abdev/abdev/Debugger.cpp

@@ -251 +251 @@
 
         char temporary[MAX_PATH];
-        sprintf(temporary,"\"%s\",%d",MdiInfo[WndNum].path,MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        sprintf(temporary,"\"%s\",%d",MdiInfo[WndNum].path.c_str(),MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
 
         char temp2[MAX_PATH];
@@ -281 +281 @@
 //////////////////////////
 
-CFileBreakPoint::CFileBreakPoint(char *lpszFileName,int iLineNum){
+CFileBreakPoint::CFileBreakPoint(const char *lpszFileName,int iLineNum){
     this->lpszFileName=(char *)HeapAlloc(hHeap,0,lstrlen(lpszFileName)+1);
     lstrcpy(this->lpszFileName,lpszFileName);
@@ -389 +389 @@
     HeapDefaultFree(ppItem);
 }
-void CDBBreakPoint::insert(char *lpszFileName,int iLineNum){
+void CDBBreakPoint::insert( const char *lpszFileName,int iLineNum){
     int i;
     for(i=0;i<num;i++){
@@ -404 +404 @@
     }
 }
-void CDBBreakPoint::remove(char *lpszFileName,int iLineNum){
+void CDBBreakPoint::remove( const char *lpszFileName,int iLineNum){
     int i;
     for(i=0;i<num;i++){
@@ -429 +429 @@
     if(WndNum==-1) return;
 
-    if(!IsExistFile(MdiInfo[WndNum].path)) return;
+    if( !Jenga::Common::Path( MdiInfo[WndNum].path ).IsExistFile() )
+    {
+        return;
+    }
 
     int i,i2,sw=0;
     for(i=0;i<num;i++){
-        if(lstrcmpi(MdiInfo[WndNum].path,ppItem[i]->lpszFileName)==0){
+        if(lstrcmpi(MdiInfo[WndNum].path.c_str(),ppItem[i]->lpszFileName)==0){
             for(i2=0;i2<ppItem[i]->num;i2++){
                 if(MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y==ppItem[i]->piLine[i2]){
@@ -446 +449 @@
     if(sw==0){
         //ブレークポイントを追加
-        insert(MdiInfo[WndNum].path,MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        insert(MdiInfo[WndNum].path.c_str(),MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
     }
     else{
         //ブレークポイントを削除
-        remove(MdiInfo[WndNum].path,MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
+        remove(MdiInfo[WndNum].path.c_str(),MdiInfo[WndNum].pMdiTextEdit->StartCaretPos.y);
     }
 
@@ -500 +503 @@
 
 
-CFileBreakPoint *CDBBreakPoint::EnumLines(char *lpszFilePath){
+CFileBreakPoint *CDBBreakPoint::EnumLines(const char *lpszFilePath){
     int i;
     for(i=0;i<num;i++){
@@ -510 +513 @@
 }
 
-void CDBBreakPoint::replace(LPSTR lpszFilePath,LPSTR lpszBuffer,CHARRANGE *pDelRange,CHARRANGE *pRange,LPSTR lpszNewStr){
+void CDBBreakPoint::replace(const char *lpszFilePath,LPSTR lpszBuffer,CHARRANGE *pDelRange,CHARRANGE *pRange,LPSTR lpszNewStr){
     int i;
     for(i=0;i<num;i++){

trunk/ab5.0/abdev/abdev/Debugger.h

@@ -53 +53 @@
     int num;
 
-    CFileBreakPoint(char *lpszFileName,int iLineNum);
+    CFileBreakPoint(const char *lpszFileName,int iLineNum);
     ~CFileBreakPoint();
 
@@ -72 +72 @@
     ~CDBBreakPoint();
 
-    void insert(char *lpszFileName,int iLineNum);
-    void remove(char *lpszFileName,int iLineNum);
+    void insert( const char *lpszFileName,int iLineNum);
+    void remove( const char *lpszFileName,int iLineNum);
 
     void Event_BreakPoint(void);
     void SaveToTempFile(void);
 
-    CFileBreakPoint *EnumLines(char *lpszFilePath);
+    CFileBreakPoint *EnumLines(const char *lpszFilePath);
 
-    void replace(LPSTR lpszFilePath,LPSTR lpszBuffer,CHARRANGE *pDelRange,CHARRANGE *pRange,LPSTR lpszNewStr);
+    void replace(const char *lpszFilePath,LPSTR lpszBuffer,CHARRANGE *pDelRange,CHARRANGE *pRange,LPSTR lpszNewStr);
 };

trunk/ab5.0/abdev/abdev/DocumentAdvice.cpp

@@ -179 +179 @@
 
 #define MEM_SPACE 1024 //強制終了を防ぐためのゆとりスペース
-            extern MDIINFO MdiInfo[MAX_WNDNUM];
-            for(i3=0;i3<MAX_WNDNUM;i3++){
+            for(i3=0;i3<MdiInfo.size();i3++){
                 if(MdiInfo[i3].hwnd){
-                    if(lstrcmpi(temporary,MdiInfo[i3].path)==0) break;
-                }
-            }
-            if(i3==MAX_WNDNUM){
+                    if(lstrcmpi(temporary,MdiInfo[i3].path.c_str())==0) break;
+                }
+            }
+            if(i3==MdiInfo.size()){
                 //ファイルから開く
                 HANDLE fh;

trunk/ab5.0/abdev/abdev/DrawBuffer.cpp

@@ -193 +193 @@
             if( projectInfo.IsOpened() ){
                 pobj_FileBreakPoint=
-                    projectInfo.pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum].path);
+                    projectInfo.pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum].path.c_str());
             }
             else{
                 extern CDBBreakPoint *pobj_DBBreakPoint;
-                pobj_FileBreakPoint=pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum].path);
+                pobj_FileBreakPoint=pobj_DBBreakPoint->EnumLines(MdiInfo[m_WndNum].path.c_str());
             }
 
@@ -266 +266 @@
 
 void TextEdit_DrawBuffer(HDC hdc,int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     int x,y;

trunk/ab5.0/abdev/abdev/DrawWindow.cpp

@@ -4 +4 @@
 
 void DrawLineInClient(int WndNum,long StartX,long StartY,long EndX,long EndY){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     MoveToEx(MdiInfo[WndNum].MdiRadInfo->hMemDC,
         StartX+MdiInfo[WndNum].MdiRadInfo->ClientPos.x,
@@ -14 +13 @@
 }
 void DrawRectangleInClient(int WndNum,long left,long top,long right,long bottom,COLORREF RGB_Pen,COLORREF RGB_Brush,BOOL bBrushing){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HPEN hPen,hOldPen;
     HBRUSH hBrush,hOldBrush;
@@ -36 +34 @@
 }
 void DrawButtonEdge(int WndNum,POINT *pPos,SIZE *pSize){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HPEN hPen,hOldPen;
 
@@ -86 +83 @@
 }
 void DrawItemEdgeByExStyle(int WndNum,int ExStyle,POINT *pPos,SIZE *pSize){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HPEN hPen,hOldPen;
     RECT rect;
@@ -172 +168 @@
 }
 void DrawScrollBar(int WndNum,DWORD style,BOOL bSwitch,POINT *pPos,SIZE *pSize){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     HPEN hPen,hOldPen;
@@ -487 +482 @@
 }
 void DrawUpDownControl(int WndNum,DWORD style,BOOL bSwitch,POINT *pPos,SIZE *pSize){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     HPEN hPen,hOldPen;
@@ -688 +682 @@
 }
 void DesigningWindow(int WndNum,HDC hdc,POINT *pBasePos,const ActiveBasic::PM::WindowInfo *pWindowInfo){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,i4;
     double red,green,blue,d_red,d_green,d_blue;
@@ -1773 +1766 @@
 }
 void DrawRadWindow(int WndNum,const ActiveBasic::PM::WindowInfo *pWindowInfo){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HBRUSH hOldBrush;
     POINT pos;

trunk/ab5.0/abdev/abdev/ExtensionLink.cpp

@@ -197 +197 @@
 }
 
-COLORREF CExtLink::GetTabColorFromFilePath(char *path){
+COLORREF CExtLink::GetTabColorFromFilePath( const std::string &filepath )
+{
     //拡張子を識別し、タブの色を決定
     char szExt[255],*lpszTemp;
-    _splitpath(path,NULL,NULL,NULL,szExt);
+    _splitpath(filepath.c_str(),NULL,NULL,NULL,szExt);
     if(szExt[0]=='.') lpszTemp=szExt+1;
     else lpszTemp=szExt;

trunk/ab5.0/abdev/abdev/ExtensionLink.h

@@ -31 +31 @@
     void ResetListView(HWND hListView);
 
-    COLORREF GetTabColorFromFilePath(char *path);
+    COLORREF GetTabColorFromFilePath( const std::string &filepath );
 };
 

trunk/ab5.0/abdev/abdev/FileOperation.cpp

@@ -57 +57 @@
     return buffer;
 }
-_int8 WriteBuffer(const std::string &path,char *buffer,int length, bool isEnableError){
+_int8 WriteBuffer(const std::string &path,const char *buffer,int length, bool isEnableError)
+{
     HANDLE hFile;
     DWORD dw;
@@ -328 +329 @@
 
     COLORREF TabColor;
-    TabColor=pobj_nv->pobj_ExtLink->GetTabColorFromFilePath(OpenFileName);
+    TabColor=pobj_nv->pobj_ExtLink->GetTabColorFromFilePath( filePath );
 
     return NewTextEditWindow(OpenFileName,DocumentType,TabColor);
@@ -335 +336 @@
     extern LPSTR IconFileFilter;
     extern HWND hClient,hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int WndNum,i2;
     char temporary[MAX_PATH],str[MAX_PATH],str2[32];
@@ -380 +380 @@
 
             //新しいパスをセット
-            GlobalFree(MdiInfo[WndNum].path);
-            MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(temporary)+1);
-            lstrcpy(MdiInfo[WndNum].path,temporary);
+            MdiInfo[WndNum].path = temporary;
 
             //ドキュメント セレクト コンボボックスに挿入
@@ -398 +396 @@
         }
         else{
-            if(MdiInfo[WndNum].path[0]=='\0'){
+            if(MdiInfo[WndNum].path.empty()){
                 //"保存先のファイルを指定してください"
 get_file_path:
@@ -418 +416 @@
                 return 1;
             }
-            lstrcpy(temporary,MdiInfo[WndNum].path);
+            lstrcpy(temporary,MdiInfo[WndNum].path.c_str());
         }
 
@@ -475 +473 @@
             }
             CloseHandle(fh);
-            GlobalFree(MdiInfo[WndNum].path);
-            MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(temporary)+1);
-            lstrcpy(MdiInfo[WndNum].path,temporary);
+            MdiInfo[WndNum].path = temporary;
             i2=SendMessage(hDocCombo,CB_FINDSTRINGEXACT,0,(long)MdiInfo[WndNum].title);
             SendMessage(hDocCombo,CB_DELETESTRING,i2,0);
@@ -489 +485 @@
         }
         else{
-            if(MdiInfo[WndNum].path[0]=='\0'){
+            if(MdiInfo[WndNum].path.empty()){
                 //"保存先のファイルを指定してください"
                 if(!GetFilePathDialog(hOwner,temporary,IconFileFilter,STRING_FILESAVETITLE_DEFAULT,FALSE)) return 0;
@@ -495 +491 @@
                 return 1;
             }
-            lstrcpy(temporary,MdiInfo[WndNum].path);
+            lstrcpy(temporary,MdiInfo[WndNum].path.c_str());
         }
         SaveIconFile(temporary,hChild);
@@ -515 +511 @@
 
     //「最近使ったファイル」を更新
-    pobj_nv->pobj_History->insert(MdiInfo[WndNum].path);
+    pobj_nv->pobj_History->insert(MdiInfo[WndNum].path.c_str());
 
     return 1;

trunk/ab5.0/abdev/abdev/History.cpp

@@ -57 +57 @@
     iNum++;
 }
-void CHistory::insert(char *path){
+void CHistory::insert(const char *path){
     //重複チェック
     int i;

trunk/ab5.0/abdev/abdev/IconEditor.cpp

@@ -29 +29 @@
 }
 void ResetIconType(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     HWND hCombo;
@@ -127 +126 @@
 void AddIconType(int WndNum,int IconType){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,width,BitCount;
 
@@ -192 +190 @@
 }
 void DeleteIconType(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -241 +238 @@
     extern HANDLE hHeap;
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,IconNum;
     char str[MAX_PATH],str2[32],*buffer;
@@ -257 +253 @@
             i=GetWndNum(hChild);
             if(MdiInfo[i].DocType==WNDTYPE_ICONEDIT){
-                if(lstrcmpi(MdiInfo[i].path,filepath)==0) break;
+                if(lstrcmpi(MdiInfo[i].path.c_str(),filepath)==0) break;
             }
             hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -373 +369 @@
 
     //ウィンドウのID登録
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd==0){
-            MdiInfo[i].hwnd=hChild;
-            MdiInfo[i].DocType=WNDTYPE_ICONEDIT;
-            MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
-            lstrcpy(MdiInfo[i].title,str);
-            if(filepath){
-                MdiInfo[i].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(filepath)+1);
-                lstrcpy(MdiInfo[i].path,filepath);
-            }
-            else MdiInfo[i].path=(char *)GlobalAlloc(GPTR,1);
-
-            MdiInfo[i].MdiIconEditInfo=(MDIICONEDITINFO *)HeapAlloc(hHeap,0,sizeof(MDIICONEDITINFO));
-            MdiInfo[i].MdiIconEditInfo->hMain=hMain;
-            MdiInfo[i].MdiIconEditInfo->hToolDlg=hToolDlg;
-            MdiInfo[i].MdiIconEditInfo->hButtonsDlg=hButtonsDlg;
-            MdiInfo[i].MdiIconEditInfo->hColorDlg=hColorDlg;
-            hdc=GetDC(hMain);
-            MdiInfo[i].MdiIconEditInfo->memdc=CreateCompatibleDC(hdc);
-            MdiInfo[i].MdiIconEditInfo->hMemBmp=CreateCompatibleBitmap(hdc,600,400);
-            SelectObject(MdiInfo[i].MdiIconEditInfo->memdc,MdiInfo[i].MdiIconEditInfo->hMemBmp);
-            ReleaseDC(hMain,hdc);
-
-            MdiInfo[i].MdiIconEditInfo->SelectLevel=0;
-
-            MdiInfo[i].MdiIconEditInfo->num=IconNum;
-            MdiInfo[i].MdiIconEditInfo->SelectIconNum=0;
-            memcpy(MdiInfo[i].MdiIconEditInfo->pIconImage,pImageBuffer,sizeof(DWORD)*IconNum);
-
-            memcpy(MdiInfo[i].MdiIconEditInfo->dwBytesInRes,dwBytesInRes,sizeof(DWORD)*IconNum);
-
-            MdiInfo[i].MdiIconEditInfo->NowTool=IDC_TOOL_PEN;
-            MdiInfo[i].MdiIconEditInfo->MainColor=RGB(0,0,0);
-            extern COLORREF TransparentClrRef;
-            MdiInfo[i].MdiIconEditInfo->SubColor=TransparentClrRef;
-
-            for(i2=0;i2<MdiInfo[i].MdiIconEditInfo->num;i2++){
-                MdiInfo[i].MdiIconEditInfo->undo[i2].NowPos=0;
-                memset(MdiInfo[i].MdiIconEditInfo->undo[i2].lpData,0,sizeof(BYTE *)*MAX_ICONEDIT_UNDONUM);
-            }
-            MdiInfo[i].MdiIconEditInfo->bModify=0;
-            break;
-        }
-    }
+    MdiInfo.push_back( MDIINFO() );
+    i = MdiInfo.size()-1;
+    MdiInfo[i].hwnd=hChild;
+    MdiInfo[i].DocType=WNDTYPE_ICONEDIT;
+    MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
+    lstrcpy(MdiInfo[i].title,str);
+    if(filepath)
+    {
+        MdiInfo[i].path = filepath;
+    }
+    else
+    {
+        MdiInfo[i].path = "";
+    }
+
+    MdiInfo[i].MdiIconEditInfo=(MDIICONEDITINFO *)HeapAlloc(hHeap,0,sizeof(MDIICONEDITINFO));
+    MdiInfo[i].MdiIconEditInfo->hMain=hMain;
+    MdiInfo[i].MdiIconEditInfo->hToolDlg=hToolDlg;
+    MdiInfo[i].MdiIconEditInfo->hButtonsDlg=hButtonsDlg;
+    MdiInfo[i].MdiIconEditInfo->hColorDlg=hColorDlg;
+    hdc=GetDC(hMain);
+    MdiInfo[i].MdiIconEditInfo->memdc=CreateCompatibleDC(hdc);
+    MdiInfo[i].MdiIconEditInfo->hMemBmp=CreateCompatibleBitmap(hdc,600,400);
+    SelectObject(MdiInfo[i].MdiIconEditInfo->memdc,MdiInfo[i].MdiIconEditInfo->hMemBmp);
+    ReleaseDC(hMain,hdc);
+
+    MdiInfo[i].MdiIconEditInfo->SelectLevel=0;
+
+    MdiInfo[i].MdiIconEditInfo->num=IconNum;
+    MdiInfo[i].MdiIconEditInfo->SelectIconNum=0;
+    memcpy(MdiInfo[i].MdiIconEditInfo->pIconImage,pImageBuffer,sizeof(DWORD)*IconNum);
+
+    memcpy(MdiInfo[i].MdiIconEditInfo->dwBytesInRes,dwBytesInRes,sizeof(DWORD)*IconNum);
+
+    MdiInfo[i].MdiIconEditInfo->NowTool=IDC_TOOL_PEN;
+    MdiInfo[i].MdiIconEditInfo->MainColor=RGB(0,0,0);
+    extern COLORREF TransparentClrRef;
+    MdiInfo[i].MdiIconEditInfo->SubColor=TransparentClrRef;
+
+    for(i2=0;i2<MdiInfo[i].MdiIconEditInfo->num;i2++){
+        MdiInfo[i].MdiIconEditInfo->undo[i2].NowPos=0;
+        memset(MdiInfo[i].MdiIconEditInfo->undo[i2].lpData,0,sizeof(BYTE *)*MAX_ICONEDIT_UNDONUM);
+    }
+    MdiInfo[i].MdiIconEditInfo->bModify=0;
+
+
 
     //メモリへ初期描画を行う
@@ -449 +447 @@
 }
 void SaveIconFile(char *filepath,HWND hwnd){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,WndNum;
     char buffer[8192],temporary[MAX_PATH];
@@ -534 +531 @@
 LRESULT CALLBACK MDIClientWindow_IconEdit(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
 

trunk/ab5.0/abdev/abdev/IconEditor_Color.cpp

@@ -7 +7 @@
 BOOL CALLBACK DlgIconColorProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern COLORREF TransparentClrRef;
     int i,i2,WndNum;

trunk/ab5.0/abdev/abdev/IconEditor_Main.cpp

@@ -13 +13 @@
 void LimitRectFormat(int WndNum,RECT *pRect){
     //はみ出した場合は範囲内におさめる
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     if(pRect->left<0) pRect->left=0;
     if(pRect->top<0) pRect->top=0;
@@ -33 +32 @@
 }
 void SetZoomedPixel(HDC hdc,int WndNum,int x,int y){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     POINT pos;
 
@@ -47 +45 @@
 }
 DWORD GetColorCode(int WndNum,COLORREF ColorRef){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     RGBQUAD *pRgbq;
@@ -70 +67 @@
     //////////////////////////////////////////////
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HDC hDC;
     HBITMAP hBmp;
@@ -114 +110 @@
     ////////////////////////////////////
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HDC hDC,hDC2;
     BITMAP Bitmap;
@@ -147 +142 @@
 
 void IconEdit_SelectImage(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     SIZE size;
     HDC hDC;
@@ -169 +163 @@
 void IconEdit_PasteImage(int WndNum){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,x,y,y2,selecting_x,selecting_y;
     DWORD dwRgbq;
@@ -299 +292 @@
 
 void DrawIconToMemBmp(int WndNum,RECT *pRect){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HPEN hPen,hOldPen;
     HBRUSH hBrush,hOldBrush;
@@ -406 +398 @@
 
 void PixelChange(int WndNum,int x,int y,DWORD ColorCode){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     int y2;
@@ -467 +458 @@
 }
 COLORREF IconEdit_GetPixel(int WndNum,int x,int y){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     int y2;
@@ -525 +515 @@
 }
 void IconEdit_DrawLine(int WndNum,int x1,int y1,int x2,int y2,DWORD ColorCode){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int dx,dy,s,step;
 
@@ -576 +565 @@
 }
 void IconEdit_FloodFill(int WndNum,int x,int y,COLORREF FilledColor,DWORD ColorCode){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     if(x<0||y<0) return;
@@ -610 +598 @@
 }
 void IconEdit_DrawEllipse(int WndNum,int x1,int y1,int x2,int y2,DWORD ColorCode){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     RECT rect,rc2;
 
@@ -680 +667 @@
 
 void IconEdit_EraseRect(int WndNum,RECT *pRect){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     //変更情報
@@ -698 +684 @@
 
 void IconEdit_DrawFrame(HWND hwnd,int WndNum,RECT *pRect){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HDC hdc;
     HPEN hPen,hOldPen;
@@ -744 +729 @@
 }
 void IconEdit_DrawSelectingRect(HDC hdc,int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i2,i3;
     HPEN hPen,hOldPen;
@@ -817 +801 @@
 void DrawZoomedBitmap(HDC hdc,int WndNum,POINT *pPos){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int x,y;
     RGBQUAD rgbq;
@@ -869 +852 @@
 }
 int IconEdit_GetStateOfDraggingFrame(int WndNum,int x,int y){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     POINT pos;
     RECT rect;
@@ -892 +874 @@
     // 選択されているイメージを表示
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HDC hDC2;
     SIZE size;
@@ -914 +895 @@
 }
 void TempLine(HDC hdc,int WndNum,int x1,int y1,int x2,int y2,COLORREF ColorRef){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int dx,dy,s,step;
     HPEN hPen,hOldPen;
@@ -977 +957 @@
 }
 void TempRectangle(HDC hdc,int WndNum,int x1,int y1,int x2,int y2,COLORREF ColorRef,COLORREF FillClrRef,BOOL bFill){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int x,y;
     HPEN hPen,hOldPen;
@@ -1038 +1017 @@
 }
 void TempEllipse(HDC hdc,int WndNum,int x1,int y1,int x2,int y2,COLORREF ColorRef){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HPEN hPen,hOldPen;
     HBRUSH hBrush,hOldBrush;
@@ -1137 +1115 @@
 }
 LRESULT CALLBACK IconEditWindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int WndNum,dx,dy;
     BOOL bRedrawMemBmp;

trunk/ab5.0/abdev/abdev/IconEditor_Tool.cpp

@@ -32 +32 @@
 
 BOOL CALLBACK DlgIconButtons(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int WndNum;
     RECT rect;
@@ -105 +104 @@
 }
 BOOL CALLBACK DlgIconType(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
     HWND hList;
@@ -180 +178 @@
 }
 BOOL CALLBACK DlgIconToolProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
 

trunk/ab5.0/abdev/abdev/IconEditor_UndoRedo.cpp

@@ -4 +4 @@
 
 void IconEdit_UndoCommand(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     BYTE *pByte;
@@ -40 +39 @@
 }
 void IconEdit_RedoCommand(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     BYTE *pByte;
     ICONEDIT_UNDOSTATE *pUndoState;
@@ -68 +66 @@
 void IconEdit_NoticeChanging(int WndNum){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     ICONEDIT_UNDOSTATE *pUndoState;

trunk/ab5.0/abdev/abdev/MenuProc.cpp

@@ -11 +11 @@
 #endif
 
-int GetMenuInfoNum(const char *name){
+int GetMenuInfoNum(const std::string &name){
     int i;
     for(i=0;i<projectInfo.NumberOfMenu;i++){
-        if(lstrcmpi(name,projectInfo.pMenuInfo[i].IdName)==0) return i;
+        if(lstrcmpi(name.c_str(),projectInfo.pMenuInfo[i].IdName)==0) return i;
     }
     return -1;
@@ -68 +68 @@
 void Project_Menu_Insert(void){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern char NewIdName[MAX_PATH];
     int i;
@@ -121 +120 @@
     ////////////////////////////////
     // ウィンドウ プロパティを更新
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
             if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
@@ -132 +131 @@
 void Project_Menu_Delete(int MenuInfoNum){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
     //ウィンドウが開かれている場合は閉じる
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd&&lstrcmpi(projectInfo.pMenuInfo[MenuInfoNum].IdName,MdiInfo[i].path)==0){
+    for(i=0;i<MdiInfo.size();i++){
+        if(MdiInfo[i].hwnd&&lstrcmpi(projectInfo.pMenuInfo[MenuInfoNum].IdName,MdiInfo[i].path.c_str())==0){
             SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
             break;
@@ -166 +164 @@
     ////////////////////////////////
     // ウィンドウ プロパティを更新
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
             if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
-                ChangePropertyWindow(i,GetWndInfoNum(MdiInfo[i].path));
+                ChangePropertyWindow(i,GetWndInfoNum(MdiInfo[i].path.c_str()));
         }
     }
@@ -192 +190 @@
     extern HINSTANCE hInst;
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     HWND hChild,hListWnd,hMenuEdit;
@@ -203 +200 @@
         i=GetWndNum(hChild);
         if(MdiInfo[i].DocType==WNDTYPE_MENU){
-            if(lstrcmpi(MdiInfo[i].path,pMenuInfo->IdName)==0) break;
+            if(lstrcmpi(MdiInfo[i].path.c_str(),pMenuInfo->IdName)==0) break;
         }
         hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -249 +246 @@
         hChild,NULL,hInst,NULL);
 
+
     //ウィンドウのID登録
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd==0){
-            MdiInfo[i].hwnd=hChild;
-            MdiInfo[i].DocType=WNDTYPE_MENU;
-            MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(pMenuInfo->IdName)+1);
-            lstrcpy(MdiInfo[i].title,pMenuInfo->IdName);
-            MdiInfo[i].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(pMenuInfo->IdName)+1);
-            lstrcpy(MdiInfo[i].path,pMenuInfo->IdName);
-
-
-            /////////////////////
-            //MENU ウィンドウ情報
-
-            MdiInfo[i].MdiMenuInfo=(MDIMENUINFO *)GlobalAlloc(GPTR,sizeof(MDIMENUINFO));
-
-            MdiInfo[i].MdiMenuInfo->hList=hListWnd;
-
-            MdiInfo[i].MdiMenuInfo->hMenuEdit=hMenuEdit;
-            MdiInfo[i].MdiMenuInfo->hEdit_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENUEDIT),hMenuEdit,(DLGPROC)MenuEditDlg);
-
-            SCROLLINFO ScrollInfo;
-            ScrollInfo.cbSize=sizeof(SCROLLINFO);
-            ScrollInfo.fMask=SIF_POS;
-            ScrollInfo.nPos=0;
-            SetScrollInfo(MdiInfo[i].MdiMenuInfo->hMenuEdit,SB_VERT,&ScrollInfo,1);
-
-            SendMessage(hListWnd,LB_RESETCONTENT,0,0);
-            SetMenuDataList(hListWnd,pMenuInfo,0);
-            if(pMenuInfo->NumberOfMenu){
-                SendMessage(hListWnd,LB_SETCURSEL,0,0);
-                SendMessage(hChild,WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)hListWnd);
-            }
-            break;
-        }
-    }
+    MdiInfo.push_back( MDIINFO() );
+    i = MdiInfo.size()-1;
+    MdiInfo[i].hwnd=hChild;
+    MdiInfo[i].DocType=WNDTYPE_MENU;
+    MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(pMenuInfo->IdName)+1);
+    lstrcpy(MdiInfo[i].title,pMenuInfo->IdName);
+    MdiInfo[i].path = pMenuInfo->IdName;
+
+
+    /////////////////////
+    //MENU ウィンドウ情報
+
+    MdiInfo[i].MdiMenuInfo=(MDIMENUINFO *)GlobalAlloc(GPTR,sizeof(MDIMENUINFO));
+
+    MdiInfo[i].MdiMenuInfo->hList=hListWnd;
+
+    MdiInfo[i].MdiMenuInfo->hMenuEdit=hMenuEdit;
+    MdiInfo[i].MdiMenuInfo->hEdit_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_PROJECT_MENUEDIT),hMenuEdit,(DLGPROC)MenuEditDlg);
+
+    SCROLLINFO ScrollInfo;
+    ScrollInfo.cbSize=sizeof(SCROLLINFO);
+    ScrollInfo.fMask=SIF_POS;
+    ScrollInfo.nPos=0;
+    SetScrollInfo(MdiInfo[i].MdiMenuInfo->hMenuEdit,SB_VERT,&ScrollInfo,1);
+
+    SendMessage(hListWnd,LB_RESETCONTENT,0,0);
+    SetMenuDataList(hListWnd,pMenuInfo,0);
+    if(pMenuInfo->NumberOfMenu){
+        SendMessage(hListWnd,LB_SETCURSEL,0,0);
+        SendMessage(hChild,WM_COMMAND,MAKELONG(0,LBN_SELCHANGE),(long)hListWnd);
+    }
+
 
     //ウィンドウ位置を初期化
@@ -332 +327 @@
     extern HANDLE hHeap;
     extern HWND hClient,hOwner;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     char temporary[MAX_PATH];
@@ -744 +738 @@
 LRESULT CALLBACK MenuEditWindow(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HINSTANCE hInst;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     RECT rect;
@@ -797 +790 @@
 LRESULT CALLBACK MDIClientWindow_Menu(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,WndNum,MenuInfoNum;
     MENU_INFO *pMenuInfo;

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];

trunk/ab5.0/abdev/abdev/ParameterHint.cpp

@@ -38 +38 @@
         lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
 
-        extern MDIINFO MdiInfo[MAX_WNDNUM];
-        for(i=0;i<MAX_WNDNUM;i++){
+        for(i=0;i<MdiInfo.size();i++){
             if(MdiInfo[i].hwnd){
-                if(lstrcmpi(MdiInfo[i].path,temporary)==0) break;
-            }
-        }
-        if(i==MAX_WNDNUM){
+                if(lstrcmpi(MdiInfo[i].path.c_str(),temporary)==0) break;
+            }
+        }
+        if(i==MdiInfo.size()){
             //ファイルから開く
             pBuf=ReadBuffer(temporary);
@@ -56 +55 @@
     else{
         //単体ソースコードのとき
-        extern MDIINFO MdiInfo[MAX_WNDNUM];
         int WndNum;
 
@@ -682 +680 @@
 void ShowParameterHint(int WndNum){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern METHODCHECKINFO MethodCheckInfo;
     int i,i2,i3,IsStr,IsComment,PareNum,iPos;
@@ -1238 +1235 @@
         extern HINSTANCE hInst;
         extern METHODCHECKINFO MethodCheckInfo;
-        extern MDIINFO MdiInfo[MAX_WNDNUM];
         HDC hdc,memdc;
         RECT rect,rc2;

trunk/ab5.0/abdev/abdev/ProjectControl.cpp

@@ -42 +42 @@
 LRESULT CALLBACK TabProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern LPSTR DefFileFilter;
     int i,i2,WndNum;
@@ -1057 +1056 @@
         windowInfos.push_back( new ActiveBasic::PM::WindowInfo() );
         windowInfos.back()->SetName( "MainWnd" );
-        windowInfos.back()->SetHandleName( "hMainWnd" );
         windowInfos.back()->pos.x=CW_USEDEFAULT;
         windowInfos.back()->pos.y=CW_USEDEFAULT;
@@ -1077 +1075 @@
         windowInfos.back()->SetIconResourceName( "" );
         windowInfos.back()->SetClassName( "NORMAL" );
-        windowInfos.back()->CallBackName="MainWndProc";
-        windowInfos.back()->type=WNDTYPE_DEFAULT;
-        windowInfos.back()->filepath="MainWnd.ab";
+        windowInfos.back()->SetType( ActiveBasic::PM::WindowType::Default );
         sprintf(temporary,"%s%s.wnd",dir,NewProjectInfo.name);
 
@@ -1244 +1240 @@
     //////////////////////////////////////////
     //ワークファイル（*.wrk）をオープン
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HTREEITEM hTreeItem;
     HANDLE hFind;
@@ -1571 +1566 @@
 }
 BOOL ProjectModifyCheck(BOOL bRun){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum,sw;
     HWND hChild;
@@ -1601 +1595 @@
                 for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){
                     projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1;
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) sw=1;
                 }
             }
@@ -1611 +1605 @@
                     lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) sw=1;
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) sw=1;
                 }
             }
@@ -1639 +1633 @@
 }
 void MakeWorkFile(void){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,WndNum;
     char temporary[MAX_PATH],buffer[32767];
@@ -1658 +1651 @@
             for(i=0;i<projectInfo.pobj_DBFileInfo->iNum;i++){
                 projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                     TextEdit_GetSel(WndNum,&CharRange);
 
@@ -1684 +1677 @@
             BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
             {
-                if(lstrcmpi(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str())==0){
-                    sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path);
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),pWindowInfo->GetName().c_str())==0){
+                    sprintf(buffer+i2,"rad,%s\r\n",MdiInfo[WndNum].path.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;
@@ -1693 +1686 @@
         else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
             for(i=0;i<projectInfo.NumberOfMenu;i++){
-                if(lstrcmpi(MdiInfo[WndNum].path,projectInfo.pMenuInfo[i].IdName)==0){
-                    sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum].path);
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),projectInfo.pMenuInfo[i].IdName)==0){
+                    sprintf(buffer+i2,"menu,%s\r\n",MdiInfo[WndNum].path.c_str());
                     i2+=lstrlen(buffer+i2);
                     break;
@@ -1705 +1698 @@
                 lstrcpy(temporary,resourceItem.filepath.c_str());
                 lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                     sprintf(buffer+i2,"icon,%s\r\n",resourceItem.filepath.c_str());
                     i2+=lstrlen(buffer+i2);

trunk/ab5.0/abdev/abdev/RadProc.cpp

@@ -8 +8 @@
     extern HINSTANCE hInst,hResInst;
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     HWND hChild;
@@ -19 +18 @@
         i=GetWndNum(hChild);
         if(MdiInfo[i].DocType==WNDTYPE_RAD){
-            if(lstrcmpi(MdiInfo[i].path,windowInfo.GetName().c_str())==0) break;
+            if(lstrcmpi(MdiInfo[i].path.c_str(),windowInfo.GetName().c_str())==0) break;
         }
         hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -81 +80 @@
     //ウィンドウのID登録
     HDC hdc;
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd==0){
-            MdiInfo[i].hwnd=hChild;
-            MdiInfo[i].DocType=WNDTYPE_RAD;
-            MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,windowInfo.GetName().size()+1);
-            lstrcpy(MdiInfo[i].title,windowInfo.GetName().c_str());
-            MdiInfo[i].path=(char *)GlobalAlloc(GMEM_FIXED,windowInfo.GetName().size()+1);
-            lstrcpy(MdiInfo[i].path,windowInfo.GetName().c_str());
-
-
-            ////////////////////////////
-            // MDIRADINFO構造体をセット
-            ////////////////////////////
-
-            MdiInfo[i].MdiRadInfo=(MDIRADINFO *)GlobalAlloc(GPTR,sizeof(MDIRADINFO));
-
-            MdiInfo[i].MdiRadInfo->hTools=hTools;
-            MdiInfo[i].MdiRadInfo->hProperty=hProperty;
-            MdiInfo[i].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty,(DLGPROC)RadProperty_WindowProc);
-
-            SCROLLINFO ScrollInfo;
-            ScrollInfo.cbSize=sizeof(SCROLLINFO);
-            ScrollInfo.fMask=SIF_POS;
-            ScrollInfo.nPos=0;
-            SetScrollInfo(MdiInfo[i].MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
-
-            MdiInfo[i].MdiRadInfo->hRad=hRad;
-
-            MdiInfo[i].MdiRadInfo->hSupport=hSupport;
-
-            hdc=GetDC(hRad);
-            MdiInfo[i].MdiRadInfo->hBitmap=CreateCompatibleBitmap(hdc,ScreenX*2,ScreenY*2);
-            MdiInfo[i].MdiRadInfo->hMemDC=CreateCompatibleDC(hdc);
-            MdiInfo[i].MdiRadInfo->hOldBitmap=
-                (HBITMAP)SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,MdiInfo[i].MdiRadInfo->hBitmap);
-            ReleaseDC(hRad,hdc);
-
-            for(i2=0;i2<MAX_RAD_SELITEM;i2++) MdiInfo[i].MdiRadInfo->SelectingItem[i2]=-1;
-            MdiInfo[i].MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
-
-            //変更情報を初期化
-            MdiInfo[i].MdiRadInfo->undo.NowPos=0;
-            memset(MdiInfo[i].MdiRadInfo->undo.Command,0,sizeof(int)*MAX_UNDONUM);
-
-
-            DrawRadWindow(i,&windowInfo);
-
-            //サポートダイアログの内容をセット
-            SetSupportDlgData(i,windowInfo);
-
-            break;
-        }
-    }
+    MdiInfo.push_back( MDIINFO() );
+    i = MdiInfo.size()-1;
+
+    MdiInfo[i].hwnd=hChild;
+    MdiInfo[i].DocType=WNDTYPE_RAD;
+    MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,windowInfo.GetName().size()+1);
+    lstrcpy(MdiInfo[i].title,windowInfo.GetName().c_str());
+    MdiInfo[i].path = windowInfo.GetName();
+
+
+    ////////////////////////////
+    // MDIRADINFO構造体をセット
+    ////////////////////////////
+
+    MdiInfo[i].MdiRadInfo=(MDIRADINFO *)GlobalAlloc(GPTR,sizeof(MDIRADINFO));
+
+    MdiInfo[i].MdiRadInfo->hTools=hTools;
+    MdiInfo[i].MdiRadInfo->hProperty=hProperty;
+    MdiInfo[i].MdiRadInfo->hProp_Dlg=CreateDialog(hResInst,MAKEINTRESOURCE(IDD_RAD_PROP_WINDOW),hProperty,(DLGPROC)RadProperty_WindowProc);
+
+    SCROLLINFO ScrollInfo;
+    ScrollInfo.cbSize=sizeof(SCROLLINFO);
+    ScrollInfo.fMask=SIF_POS;
+    ScrollInfo.nPos=0;
+    SetScrollInfo(MdiInfo[i].MdiRadInfo->hProperty,SB_VERT,&ScrollInfo,1);
+
+    MdiInfo[i].MdiRadInfo->hRad=hRad;
+
+    MdiInfo[i].MdiRadInfo->hSupport=hSupport;
+
+    hdc=GetDC(hRad);
+    MdiInfo[i].MdiRadInfo->hBitmap=CreateCompatibleBitmap(hdc,ScreenX*2,ScreenY*2);
+    MdiInfo[i].MdiRadInfo->hMemDC=CreateCompatibleDC(hdc);
+    MdiInfo[i].MdiRadInfo->hOldBitmap=
+        (HBITMAP)SelectObject(MdiInfo[i].MdiRadInfo->hMemDC,MdiInfo[i].MdiRadInfo->hBitmap);
+    ReleaseDC(hRad,hdc);
+
+    for(i2=0;i2<MAX_RAD_SELITEM;i2++) MdiInfo[i].MdiRadInfo->SelectingItem[i2]=-1;
+    MdiInfo[i].MdiRadInfo->ButtonSelect=IDC_TOOL_MOUSE;
+
+    //変更情報を初期化
+    MdiInfo[i].MdiRadInfo->undo.NowPos=0;
+    memset(MdiInfo[i].MdiRadInfo->undo.Command,0,sizeof(int)*MAX_UNDONUM);
+
+    DrawRadWindow(i,&windowInfo);
+
+    //サポートダイアログの内容をセット
+    SetSupportDlgData(i,windowInfo);
+
 
     ShowWindow(hSupport,SW_SHOW);
@@ -160 +155 @@
 
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,NewItemNum;
     char temporary[MAX_PATH];
@@ -271 +265 @@
 void DeleteDlgItem(int WndNum,int WndInfoNum,int ItemNum,BOOL bNoticeChanging){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
@@ -335 +328 @@
 }
 void DrawFrame(HWND hwnd,int WndNum,int WndInfoNum,RECT *NewRect,RECT *OldRect,BOOL bLA){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     static int swLineStop;
     int i,sw;
@@ -446 +438 @@
 }
 void GetSelectingRect(int WndNum,int WndInfoNum,int num,RECT *rect){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
@@ -466 +457 @@
 }
 void DrawSelectingRect(HWND hwnd,int WndNum,int WndInfoNum,int ButtonSelect){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern RADINFO RadInfo;
     int i,i2,i3;
@@ -541 +531 @@
 }
 void ChangePropertyWindow(int WndNum,int WndInfoNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     RECT rect;
     SCROLLINFO ScrollInfo;
@@ -603 +592 @@
 }
 int GetItemNumOnMouse(int WndNum,int WndInfoNum,int x,int y){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -648 +636 @@
 void SelectItemNumOnMouse(int WndNum,int WndInfoNum,int x,int y){
     //マウス座標をもとにコントロールアイテムを選択
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -671 +658 @@
 }
 void SetItemNumOnFrame(int WndNum,int WndInfoNum,RECT *pRect){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,sw;
     RECT rect;
@@ -696 +682 @@
 }
 int GetStateOfDraggingFrame(int WndNum,int WndInfoNum,int x,int y){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     RECT rect;
@@ -757 +742 @@
 }
 void ResetScrollbarOfRadEditor(int WndNum,int weight,int height){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     SCROLLINFO ScrollInfo;
     SIZE NeedSize;
@@ -791 +775 @@
 }
 LRESULT CALLBACK RadWindow(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern RADINFO RadInfo;
     int i,i2,i3,i4;
@@ -1964 +1947 @@
 }
 void ResizeToRadToolWindows(int WndNum,int weight,int height){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     RECT rect;
@@ -2002 +1984 @@
 LRESULT CALLBACK MDIClientWindow_Rad(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
 

trunk/ab5.0/abdev/abdev/RadSupport.cpp

@@ -189 +189 @@
     // サポートダイアログの内容をセット
     ////////////////////////////////////
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern RADINFO RadInfo;
     char temporary[255];
@@ -268 +267 @@
 
 BOOL CALLBACK DlgRadSupport(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     static BOOL bTimer;
     int i,i3;

trunk/ab5.0/abdev/abdev/RadToolsAndPropertyProc.cpp

@@ -100 +100 @@
 }
 BOOL CALLBACK RadToolButtonsProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,WndNum;
     HWND hParent;
@@ -198 +197 @@
 }
 LRESULT CALLBACK RadToolsWindow(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern HFONT hStatusFont;
     int i;
@@ -352 +350 @@
     extern HANDLE hHeap;
     extern HWND hClient,hOwner;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i3;
     char temporary[MAX_PATH],temp2[MAX_PATH];
@@ -361 +358 @@
                 i=GetWndNum(GetWindow(hClient,GW_CHILD));
                 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);
-                sprintf(temporary,"h%s",pWindowInfo->GetName().c_str());
-                sprintf(temp2,"%sProc",pWindowInfo->GetName().c_str());
-                if( pWindowInfo->GetHandleName() == temporary &&
-                    lstrcmp(temp2,pWindowInfo->CallBackName)==0){
-                    SendDlgItemMessage(hwnd,IDC_AUTOSET,BM_SETCHECK,BST_CHECKED,0);
-                    SendMessage(hwnd,WM_COMMAND,IDC_AUTOSET,0);
-                }
                 SetDlgItemText(hwnd,IDC_WINDOWNAME,pWindowInfo->GetName().c_str());
-                SetDlgItemText(hwnd,IDC_WINDOWHANDLE,pWindowInfo->GetHandleName().c_str());
-                SetDlgItemText(hwnd,IDC_WINDOWPROC,pWindowInfo->CallBackName);
+                SetDlgItemText(hwnd,IDC_WINDOWHANDLE,( "h" + pWindowInfo->GetName() ).c_str());
+                SetDlgItemText(hwnd,IDC_WINDOWPROC,( pWindowInfo->GetName() + "Proc" ).c_str());
                 break;
             }
@@ -402 +392 @@
                         names.name = temporary;
 
-                        i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_WINDOWHANDLE))+1;
-                        GetDlgItemText(hwnd,IDC_WINDOWHANDLE,temporary,i3);
-                        names.HandleName = temporary;
-
-                        i3=GetWindowTextLength(GetDlgItem(hwnd,IDC_WINDOWPROC))+1;
-                        names.CallBackName=(char *)HeapAlloc(hHeap,0,i3);
-                        GetDlgItemText(hwnd,IDC_WINDOWPROC,names.CallBackName,i3);
-
-                        if( names.name == pWindowInfo->GetName() &&
-                            pWindowInfo->GetHandleName() == names.HandleName &&
-                            lstrcmp(names.CallBackName,pWindowInfo->CallBackName)==0){
-                            HeapDefaultFree(names.CallBackName);
+                        if( names.name == pWindowInfo->GetName() )
+                        {
                             SendMessage(hwnd,WM_COMMAND,IDCANCEL,0);
                             return 1;
@@ -423 +403 @@
                         //変更情報を更新
                         NoticeNames.name=pWindowInfo->GetName();
-                        NoticeNames.HandleName=pWindowInfo->GetHandleName();
-                        NoticeNames.CallBackName=pWindowInfo->CallBackName;
                         Rad_NoticeChanging(i,RAD_UNDO_NAME,SELECT_WINDOW,(DWORD)&NoticeNames);
 
                         pWindowInfo->SetName( names.name );
-                        GlobalFree(MdiInfo[i].path);
-                        MdiInfo[i].path=(char *)GlobalAlloc(GMEM_FIXED,names.name.size()+1);
-                        lstrcpy(MdiInfo[i].path,names.name.c_str());
-
-                        pWindowInfo->SetHandleName( names.HandleName );
-
-                        HeapDefaultFree(pWindowInfo->CallBackName);
-                        pWindowInfo->CallBackName=names.CallBackName;
+                        MdiInfo[i].path = names.name;
 
                         EndDialog(hwnd,1);
@@ -444 +415 @@
                     return 1;
                 case IDC_WINDOWNAME:
-                    if(HIWORD(wParam)==EN_CHANGE) SendMessage(hwnd,WM_COMMAND,IDC_AUTOSET,0);
-                    return 1;
-                case IDC_AUTOSET:
-                    if(SendDlgItemMessage(hwnd,IDC_AUTOSET,BM_GETCHECK,0,0)){
-                        SendDlgItemMessage(hwnd,IDC_WINDOWHANDLE,EM_SETREADONLY,1,0);
-                        SendDlgItemMessage(hwnd,IDC_WINDOWPROC,EM_SETREADONLY,1,0);
+                    {
                         GetDlgItemText(hwnd,IDC_WINDOWNAME,temporary,MAX_PATH);
                         if(temporary[0]){
@@ -462 +428 @@
                         }
                     }
-                    else{
-                        SendDlgItemMessage(hwnd,IDC_WINDOWHANDLE,EM_SETREADONLY,0,0);
-                        SendDlgItemMessage(hwnd,IDC_WINDOWPROC,EM_SETREADONLY,0,0);
-                    }
                     return 1;
             }
@@ -473 +435 @@
 }
 BOOL CALLBACK DlgRadProperty_Window_ExStyle(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -544 +505 @@
 BOOL CALLBACK RadProperty_WindowProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i3,i4;
     static BOOL bInitial;
@@ -568 +528 @@
                     SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_ADDSTRING,0,(long)resourceItem.idName.c_str());
                 }
-                if(pWindowInfo->type==WNDTYPE_MODALDLG||
-                    pWindowInfo->type==WNDTYPE_MODELESSDLG){
+                if( pWindowInfo->IsModalDlg() || pWindowInfo->IsModelessDlg() )
+                {
                     SendDlgItemMessage(hwnd,IDC_BGCOLOR,CB_SETCURSEL,0,0);
                     EnableWindow(GetDlgItem(hwnd,IDC_BGCOLOR),0);
@@ -688 +648 @@
                 //////////
                 //タイプ
-                switch(pWindowInfo->type){
-                    case WNDTYPE_DEFAULT:
-                        SendDlgItemMessage(hwnd,IDC_DEFWINDOW,BM_SETCHECK,BST_CHECKED,0);
-                        break;
-                    case WNDTYPE_MODALDLG:
-                        SendDlgItemMessage(hwnd,IDC_MODALDLG,BM_SETCHECK,BST_CHECKED,0);
-                        break;
-                    case WNDTYPE_MODELESSDLG:
-                        SendDlgItemMessage(hwnd,IDC_MODELESSDLG,BM_SETCHECK,BST_CHECKED,0);
-                        break;
+                if( pWindowInfo->IsDefaultWindow() )
+                {
+                    SendDlgItemMessage(hwnd,IDC_DEFWINDOW,BM_SETCHECK,BST_CHECKED,0);
+                }
+                else if( pWindowInfo->IsModalDlg() )
+                {
+                    SendDlgItemMessage(hwnd,IDC_MODALDLG,BM_SETCHECK,BST_CHECKED,0);
+                }
+                else if( pWindowInfo->IsModelessDlg() )
+                {
+                    SendDlgItemMessage(hwnd,IDC_MODELESSDLG,BM_SETCHECK,BST_CHECKED,0);
+                }
+                else
+                {
+                    throw;
                 }
 
@@ -1115 +1080 @@
 
                         //変更情報
-                        Rad_NoticeChanging(i,RAD_UNDO_TYPE,SELECT_WINDOW,pWindowInfo->type);
+                        Rad_NoticeChanging(i,RAD_UNDO_TYPE,SELECT_WINDOW,(DWORD)pWindowInfo->GetType());
 
                         if(SendDlgItemMessage(hwnd,IDC_DEFWINDOW,BM_GETCHECK,0,0))
-                            pWindowInfo->type=WNDTYPE_DEFAULT;
+                        {
+                            pWindowInfo->SetType( ActiveBasic::PM::WindowType::Default );
+                        }
                         else if(SendDlgItemMessage(hwnd,IDC_MODALDLG,BM_GETCHECK,0,0))
-                            pWindowInfo->type=WNDTYPE_MODALDLG;
+                        {
+                            pWindowInfo->SetType( ActiveBasic::PM::WindowType::ModalDlg );
+                        }
                         else if(SendDlgItemMessage(hwnd,IDC_MODELESSDLG,BM_GETCHECK,0,0))
-                            pWindowInfo->type=WNDTYPE_MODELESSDLG;
+                        {
+                            pWindowInfo->SetType( ActiveBasic::PM::WindowType::ModelessDlg );
+                        }
                         return 1;
                     }
@@ -1134 +1105 @@
 BOOL CALLBACK DlgRadProperty_Item_RenameCaption(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i3;
     char *temporary;
@@ -1267 +1237 @@
     extern HANDLE hHeap;
     extern HWND hClient,hOwner;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i3;
     char *temporary;
@@ -1323 +1292 @@
 BOOL DefaultItemStyles(HWND hwnd,int WndNum,int WndInfoNum,WPARAM wParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
 
     ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];
@@ -1389 +1357 @@
 }
 BOOL CALLBACK DlgRadProperty_Item_ExStyle(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -1451 +1418 @@
 
 BOOL CALLBACK RadProperty_ButtonProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -1673 +1639 @@
 // CHECKBOX プロパティ
 BOOL CALLBACK RadProperty_CheckBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -1964 +1929 @@
 }
 BOOL CALLBACK RadProperty_ComboBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -2232 +2196 @@
 }
 BOOL CALLBACK RadProperty_EditProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -2518 +2481 @@
 
 BOOL CALLBACK RadProperty_GroupBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -2670 +2632 @@
 BOOL CALLBACK RadProperty_ImageBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     char temporary[MAX_PATH];
@@ -3066 +3027 @@
 // LISTVIEW プロパティ
 BOOL CALLBACK RadProperty_ListViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -3358 +3318 @@
 }
 BOOL CALLBACK RadProperty_ListBoxProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -3616 +3575 @@
 // PROGRESSBAR プロパティ
 BOOL CALLBACK RadProperty_ProgressBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     static BOOL bInitial;
@@ -3701 +3659 @@
 
 BOOL CALLBACK RadProperty_RadioButtonProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -3935 +3892 @@
 
 BOOL CALLBACK RadProperty_ScrollBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -4020 +3976 @@
 
 BOOL CALLBACK RadProperty_StaticProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -4151 +4106 @@
 // TRACKBAR プロパティ
 BOOL CALLBACK RadProperty_TrackBarProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -4304 +4258 @@
 // TREEVIEW プロパティ
 BOOL CALLBACK RadProperty_TreeViewProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2;
     static BOOL bInitial;
@@ -4516 +4469 @@
 // UPDOWN プロパティ
 BOOL CALLBACK RadProperty_UpDownProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3;
     static BOOL bInitial;
@@ -4689 +4641 @@
 
 LRESULT CALLBACK RadPropertyWindow(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     RECT rect;

trunk/ab5.0/abdev/abdev/Rad_UndoRedo.cpp

@@ -5 +5 @@
 void Rad_UndoCommand(int WndNum){
     extern HINSTANCE hInst;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     DWORD dw;
-    char *temporary;
     RAD_UNDOSTATE *pUndoState;
 
@@ -47 +45 @@
                 names->name = tempStr;
 
-                GlobalFree(MdiInfo[WndNum].path);
-                MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,pWindowInfo->GetName().size()+1);
-                lstrcpy(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str());
-
-                tempStr = pWindowInfo->GetHandleName();
-                pWindowInfo->SetHandleName( names->HandleName );
-                names->HandleName = tempStr;
-
-                temporary=pWindowInfo->CallBackName;
-                pWindowInfo->CallBackName=names->CallBackName;
-                names->CallBackName=temporary;
+                MdiInfo[WndNum].path = pWindowInfo->GetName();
             }
             else{
@@ -195 +183 @@
             break;
         case RAD_UNDO_TYPE:
-            dw=pWindowInfo->type;
-            pWindowInfo->type=pUndoState->lpdwData[pUndoState->NowPos];
+            dw=(DWORD)pWindowInfo->GetType();
+            pWindowInfo->SetType( (ActiveBasic::PM::WindowType::EnumType)pUndoState->lpdwData[pUndoState->NowPos] );
             pUndoState->lpdwData[pUndoState->NowPos]=dw;
+
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -209 +198 @@
 void Rad_RedoCommand(int WndNum){
     extern HINSTANCE hInst;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     DWORD dw;
-    char *temporary;
     RAD_UNDOSTATE *pUndoState;
     ActiveBasic::PM::ChildWindowInfo *pChildInfo;
@@ -247 +234 @@
                 names->name = tempStr;
 
-                GlobalFree(MdiInfo[WndNum].path);
-                MdiInfo[WndNum].path=(char *)GlobalAlloc(GMEM_FIXED,pWindowInfo->GetName().size()+1);
-                lstrcpy(MdiInfo[WndNum].path,pWindowInfo->GetName().c_str());
-
-                tempStr = pWindowInfo->GetHandleName();
-                pWindowInfo->SetHandleName( names->HandleName );
-                names->HandleName = tempStr;
-
-                temporary=pWindowInfo->CallBackName;
-                pWindowInfo->CallBackName=names->CallBackName;
-                names->CallBackName=temporary;
+                MdiInfo[WndNum].path = pWindowInfo->GetName();
             }
             else{
@@ -394 +371 @@
             }
         case RAD_UNDO_TYPE:
-            dw=pWindowInfo->type;
-            pWindowInfo->type=pUndoState->lpdwData[pUndoState->NowPos];
+            dw=(DWORD)pWindowInfo->GetType();
+            pWindowInfo->SetType( (ActiveBasic::PM::WindowType::EnumType)pUndoState->lpdwData[pUndoState->NowPos] );
             pUndoState->lpdwData[pUndoState->NowPos]=dw;
+
             if(pUndoState->SelectItemNum[pUndoState->NowPos]==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0])
                 ChangePropertyWindow(WndNum,WndInfoNum);
@@ -411 +389 @@
 void Rad_DeleteUndoData(int WndNum,int pos){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     RAD_UNDOSTATE *pUndoState;
 
@@ -425 +402 @@
             if(pUndoState->SelectItemNum[pos]==SELECT_WINDOW){
                 RAD_UNDOSTATE_NAME *names = (RAD_UNDOSTATE_NAME *)pUndoState->lpdwData[pos];
-                HeapDefaultFree(names->CallBackName);
                 delete names;
             }
@@ -471 +447 @@
 void Rad_NoticeChanging(int WndNum,int Command,int SelectItemNum,DWORD dwData){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     RAD_UNDOSTATE *pUndoState;
@@ -510 +485 @@
                 RAD_UNDOSTATE_NAME *SaveNames = new RAD_UNDOSTATE_NAME();
                 SaveNames->name = names->name;
-                SaveNames->HandleName = names->HandleName;
-                SaveNames->CallBackName=(char *)HeapAlloc(hHeap,0,lstrlen(names->CallBackName)+1);
-                lstrcpy(SaveNames->CallBackName,names->CallBackName);
                 pUndoState->lpdwData[pUndoState->NowPos]=(DWORD)SaveNames;
             }

trunk/ab5.0/abdev/abdev/Replace.cpp

@@ -5 +5 @@
 void TextEdit_ResetWordColor(int WndNum,CHARRANGE *pCharRange,int DocType){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,IsStr;
     char *pBuf,*pTemp;
@@ -82 +81 @@
 void TextEdit_Replace(int WndNum,char *str,BOOL bRedraw){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     CHARRANGE Range,DelRange;
 
@@ -116 +114 @@
     if( projectInfo.IsOpened() ){
         projectInfo.pobj_DBBreakPoint->replace(
-            MdiInfo[WndNum].path,
+            MdiInfo[WndNum].path.c_str(),
             MdiInfo[WndNum].pMdiTextEdit->buffer,
             &DelRange,
@@ -125 +123 @@
         extern CDBBreakPoint *pobj_DBBreakPoint;
         pobj_DBBreakPoint->replace(
-            MdiInfo[WndNum].path,
+            MdiInfo[WndNum].path.c_str(),
             MdiInfo[WndNum].pMdiTextEdit->buffer,
             &DelRange,
@@ -190 +188 @@
 void TextEdit_ReplaceUpdateUndoData(int WndNum,char *str,BOOL bPaste,BOOL bRedraw){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int Command;
     char *KeyStr,*DelStr;

trunk/ab5.0/abdev/abdev/Resource.cpp

@@ -161 +161 @@
     ////////////////////////////////
     // ウィンドウ プロパティを更新
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
-    for(i2=0;i2<MAX_WNDNUM;i2++){
+    for(i2=0;i2<MdiInfo.size();i2++){
         if(MdiInfo[i2].hwnd&&MdiInfo[i2].DocType==WNDTYPE_RAD){
             if(MdiInfo[i2].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
@@ -269 +268 @@
     ////////////////////////////////
     // ウィンドウ プロパティを更新
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
-    for(i2=0;i2<MAX_WNDNUM;i2++){
+    for(i2=0;i2<MdiInfo.size();i2++){
         if(MdiInfo[i2].hwnd&&MdiInfo[i2].DocType==WNDTYPE_RAD){
             if(MdiInfo[i2].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)
@@ -304 +302 @@
     ////////////////////////////////
     // ウィンドウ プロパティを更新
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
-    for(i2=0;i2<MAX_WNDNUM;i2++){
+    for(i2=0;i2<MdiInfo.size();i2++){
         if(MdiInfo[i2].hwnd&&MdiInfo[i2].DocType==WNDTYPE_RAD){
             if(MdiInfo[i2].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW)

trunk/ab5.0/abdev/abdev/Search.cpp

@@ -27 +27 @@
 void SetSearchData(HWND hDlg,char *str,_int8 IsBigSmall, bool isWordUnit){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,i4,i5,length;
     int WndNum;
@@ -82 +81 @@
 }
 BOOL CALLBACK DlgFindAll(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
 
@@ -139 +137 @@
 }
 BOOL StartSearch(HWND hDlg,char *FindString,_int8 IsBigSmall, bool isWordUnit, BOOL IsShowMessage){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     char *pBuf,msg[255];
@@ -213 +210 @@
 BOOL CALLBACK DlgFind(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HWND FindAllDlg;
     int i,WndNum;
@@ -314 +310 @@
     extern HANDLE hHeap;
     extern HINSTANCE hInst;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     int WndNum;

trunk/ab5.0/abdev/abdev/SubOperation.cpp

@@ -891 +891 @@
     if(bRedraw){
         //再描画
-        extern MDIINFO MdiInfo[MAX_WNDNUM];
         int i;
-        for(i=0;i<MAX_WNDNUM;i++){
+        for(i=0;i<MdiInfo.size();i++){
             if(MdiInfo[i].hwnd){
                 if(IS_DOCUMENT_TEXT(MdiInfo[i].DocType)){
@@ -1456 +1455 @@
 //実行コマンド
 BOOL SetRunning(HWND hChild){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     extern LPSTR DefFileFilter;
     int WndNum;
@@ -1474 +1472 @@
     WndNum=GetWndNum(hChild);
     if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-        if(MdiInfo[WndNum].path[0]=='\0'){
+        if(MdiInfo[WndNum].path.empty()){
             //"保存先のファイルを指定してください"
             if(!GetFilePathDialog(hOwner,temp2,DefFileFilter,STRING_FILESAVETITLE_DEFAULT,0)) return FALSE;
@@ -1485 +1483 @@
             }
             else{
-                if(hFind=FindFirstFile(MdiInfo[WndNum].path,&wfd)){
+                if(hFind=FindFirstFile(MdiInfo[WndNum].path.c_str(),&wfd)){
                     if(hFind==INVALID_HANDLE_VALUE){
                         if(!SaveDocument(hChild,NULL)) return 0;
@@ -1497 +1495 @@
 }
 
-BOOL IsNeedCompile(char *FileName,BOOL bDebug){
+BOOL IsNeedCompile( const std::string &filepath, BOOL bDebug )
+{
     char temporary[MAX_PATH],temp2[MAX_PATH],temp3[MAX_PATH];
     HANDLE hFind,hFile;
@@ -1503 +1502 @@
     FILETIME SourceTime,ExeTime;
 
-    _splitpath(FileName,temporary,temp2,temp3,NULL);
+    _splitpath(filepath.c_str(),temporary,temp2,temp3,NULL);
     lstrcat(temporary,temp2);
     lstrcat(temporary,temp3);
@@ -1513 +1512 @@
     FindClose(hFind);
 
-    hFile=CreateFile(FileName,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(filepath.c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     GetFileTime(hFile,NULL,NULL,&SourceTime);
     CloseHandle(hFile);

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

@@ -261 +261 @@
     }
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(lstrcmpi(ItemText,MdiInfo[i].title)==0) break;
     }

trunk/ab5.0/abdev/abdev/TextEditor.cpp

@@ -9 +9 @@
 int GetControlTabSpace(int WndNum,int *piCount){
     if(pobj_nv->bEditor_LineNumber){
-        extern MDIINFO MdiInfo[MAX_WNDNUM];
 
         char *pBuf;
@@ -82 +81 @@
 }
 void SetTextEditWordColor(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,IsStr;
     char str[255];
@@ -153 +151 @@
 }
 void ResetScrollbar(int WndNum,int max_x,int max_y){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     RECT rect;
 
@@ -215 +212 @@
 }
 void TextEdit_GetWordCaret(HWND hwnd,int WndNum,POINT *pPos,int *piStart,int *piEnd,BOOL bBeforeAfterFlag){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,start,end;
     char *pBuf;
@@ -328 +324 @@
 }
 void CancelBeforeAutoIndent(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 

trunk/ab5.0/abdev/abdev/TextEditor_EventProc.cpp

@@ -30 +30 @@
     extern HANDLE hHeap;
     extern HWND hDocCombo;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     static DWORD dwAutoScroll;
     extern COMPLEMENT_WINDOW_INFO ComplementWndInfo;

trunk/ab5.0/abdev/abdev/TextEditor_KeyEvent.cpp

@@ -156 +156 @@
 
 int TextEdit_GetLineIndex(int WndNum,int iPos){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     char *pBuf;

trunk/ab5.0/abdev/abdev/TextEditor_MouseEvent.cpp

@@ -152 +152 @@
     //////////////////////////////
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int WndNum;
     POINT pos;

trunk/ab5.0/abdev/abdev/TextEditor_UndoRedo.cpp

@@ -4 +4 @@
 
 void TextEdit_UndoCommand(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     TEXTEDIT_UNDOSTATE *pUndoState;
@@ -48 +47 @@
 }
 void TextEdit_RedoCommand(int WndNum){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     TEXTEDIT_UNDOSTATE *pUndoState;
 
@@ -106 +104 @@
 void TextEdit_NoticeChanging(int WndNum,int Command,char *KeyStr,char *DelStr,CHARRANGE *Range,CHARRANGE *DelRange){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
     TEXTEDIT_UNDOSTATE *pUndoState;

trunk/ab5.0/abdev/abdev/WebSearch.cpp

@@ -590 +590 @@
 
 
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     MdiInfo[WndNum].pMdiTextEdit->pobj_WebResult->add(WndNum,str);
 
@@ -863 +862 @@
 
 void CSideWeb::SelChangeEvent(){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     char temporary[MAX_PATH];
 

trunk/ab5.0/abdev/abdev/WindowControl.cpp

@@ -13 +13 @@
 #endif
 
-int GetWndInfoNum(char *name){
+int GetWndInfoNum( const std::string &name )
+{
     for( int i=0;i<static_cast<int>(projectInfo.windowInfos.size());i++){
-        if(lstrcmpi(name,projectInfo.windowInfos[i]->GetName().c_str())==0) return i;
+        if(lstrcmpi(name.c_str(),projectInfo.windowInfos[i]->GetName().c_str())==0) return i;
     }
     return -1;
 }
-ActiveBasic::PM::WindowInfo *GetWndInfo( char *name )
+ActiveBasic::PM::WindowInfo *GetWndInfo( const std::string &name )
 {
     BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        if(lstrcmpi(name,pWindowInfo->GetName().c_str())==0) return pWindowInfo;
+        if(lstrcmpi(name.c_str(),pWindowInfo->GetName().c_str())==0) return pWindowInfo;
     }
     return NULL;
@@ -66 +67 @@
 HGLOBAL Rad_GetChildInfoClipboardData(int WndNum,int WndInfoNum){
     //ChildWindowInfo構造体をクリップボード用データ（pByteが示すバッファ）に変換する
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     HGLOBAL hGlobal;
     BYTE *pByte;
@@ -141 +141 @@
 void Rad_PasteChildInfoClipboardData(int WndNum,HGLOBAL hGlobal){
     //hGlobalに格納されているクリップボードデータをRAD画面に挿入する
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     BYTE *pByte;
     int i2,i3,WndInfoNum;
@@ -307 +306 @@
 
     return pBuf;
+}
+const std::string PermutationWndPgmTemplate( const std::string &templateFilePath, const std::string &projectName, const std::string &windowName, const std::string &handleName, const std::string &procName )
+{
+    Jenga::Common::SourceTemplate sourceTemplate( templateFilePath );
+    Jenga::Common::SourceTemplate::Values values;
+
+    values.Insert( "#name#", projectName );
+    values.Insert( "#window#", windowName );
+    values.Insert( "#handle#", handleName );
+    values.Insert( "#procedure#", procName );
+
+    return sourceTemplate.GetResult( values );
 }
 
@@ -535 +546 @@
     }
     else if(lstrcmp(MessageName,"Create")==0){
-        if(pWindowInfo->type==WNDTYPE_MODALDLG||pWindowInfo->type==WNDTYPE_MODELESSDLG)
+        if( pWindowInfo->IsModalDlg() || pWindowInfo->IsModelessDlg() )
+        {
             sprintf(Command,"%sCase WM_INITDIALOG\r\n",spaces);
-        else sprintf(Command,"%sCase WM_CREATE\r\n",spaces);
+        }
+        else
+        {
+            sprintf(Command,"%sCase WM_CREATE\r\n",spaces);
+        }
         i=lstrlen(Command);
 
@@ -833 +849 @@
         sprintf(Command+i,"%s\tDim cancel=0 As Integer\r\n",spaces);
         i+=lstrlen(Command+i);
-        if(bProcedureCall){
+        if(bProcedureCall)
+        {
             sprintf(Command+i,"%s\t%s_%s(cancel)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
             i+=lstrlen(Command+i);
         }
-        if(pWindowInfo->type==WNDTYPE_MODALDLG)
+
+        if( pWindowInfo->IsModalDlg() )
+        {
             sprintf(Command+i,"%s\tIf cancel=0 Then EndDialog(hWnd,0)\r\n",spaces);
+        }
         else
+        {
             sprintf(Command+i,"%s\tIf cancel=0 Then DestroyWindow(hWnd)\r\n",spaces);
+        }
         return WM_CLOSE;
     }
@@ -1362 +1384 @@
     BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        if(pWindowInfo->type==WNDTYPE_MODALDLG){
+        if( pWindowInfo->IsModalDlg() )
+        {
             if(sw1==0){
                 sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->GetName().c_str());
@@ -1388 +1411 @@
                 sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(%s) As LONG_PTR)\r\n",
                     pWindowInfo->GetHandleName().c_str(),
-                    pWindowInfo->CallBackName);
+                    pWindowInfo->GetCallbackName().c_str());
             }
             else{
@@ -1461 +1484 @@
     BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        if(pWindowInfo->type==WNDTYPE_MODELESSDLG){
+        if( pWindowInfo->IsModelessDlg() )
+        {
             sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->GetName().c_str());
             i2+=lstrlen(buffer+i2);
@@ -1480 +1504 @@
                 sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(%s) As LONG_PTR)\r\n",
                     pWindowInfo->GetHandleName().c_str(),
-                    pWindowInfo->CallBackName);
+                    pWindowInfo->GetCallbackName().c_str());
             }
             else{
@@ -1534 +1558 @@
     BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
     {
-        if(pWindowInfo->type==WNDTYPE_DEFAULT){
+        if( pWindowInfo->IsDefaultWindow() )
+        {
             //////////////////////
             //通常ウィンドウ作成
@@ -1558 +1583 @@
             i2+=lstrlen(buffer+i2);
             if(bAvailUserProc[i])
-                sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(%s)\r\n",pWindowInfo->CallBackName);
+                sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(%s)\r\n",pWindowInfo->GetCallbackName().c_str());
             else sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(EventCall_%s)\r\n",pWindowInfo->GetName().c_str());
             i2+=lstrlen(buffer+i2);
@@ -1631 +1656 @@
 {
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,size;
     char *buffer,*temporary;
@@ -1638 +1662 @@
     buffer=(char *)HeapAlloc(hHeap,0,GENERAL_SIZE*size);
     i2=0;
-    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, projectInfo.windowInfos )
+    BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, windowInfos )
     {
         sprintf(buffer+i2,"WINDOW:%s\r\n",pWindowInfo->GetName().c_str());
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    HANDLE    = %s\r\n",pWindowInfo->GetHandleName().c_str());
         i2+=lstrlen(buffer+i2);
         sprintf(buffer+i2,"    POINT     = %d,%d\r\n",pWindowInfo->pos.x,pWindowInfo->pos.y);
@@ -1684 +1706 @@
         sprintf(buffer+i2,"    CLASS     = \"%s\"\r\n",pWindowInfo->GetClassName().c_str());
         i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    CALLBACK  = %s\r\n",pWindowInfo->CallBackName);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    TYPE      = %d\r\n",pWindowInfo->type);
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"    FILEPATH  = %s\r\n",pWindowInfo->filepath);
+        sprintf(buffer+i2,"    TYPE      = %d\r\n",(DWORD)pWindowInfo->GetType());
         i2+=lstrlen(buffer+i2);
         BOOST_FOREACH( const ActiveBasic::PM::ChildWindowInfo *pChildInfo, pWindowInfo->childWindowInfos )
@@ -1887 +1905 @@
             }
             else if(lstrcmpi(temporary,"HANDLE")==0&&i3==1){
-                projectInfo.windowInfos.back()->SetHandleName( temp2 );
+                //無視
             }
             else if(lstrcmpi(temporary,"POINT")==0&&i3==1){
@@ -1977 +1995 @@
                 }
             }
-            else if(lstrcmpi(temporary,"CALLBACK")==0&&i3==1){
-                projectInfo.windowInfos.back()->CallBackName=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(projectInfo.windowInfos.back()->CallBackName,temp2);
+            else if(lstrcmpi(temporary,"CALLBACK")==0&&i3==1)
+            {
+                // 無視
             }
 
             //以前のバージョンとの互換用
-            else if(lstrcmpi(temporary,"DLGTMP")==0&&i3==1) projectInfo.windowInfos.back()->type=GetValue(temp2);
-
-            else if(lstrcmpi(temporary,"TYPE")==0&&i3==1) projectInfo.windowInfos.back()->type=GetValue(temp2);
-            else if(lstrcmpi(temporary,"FILEPATH")==0&&i3==1){
-                projectInfo.windowInfos.back()->filepath=(char *)HeapAlloc(hHeap,0,i2+1);
-                lstrcpy(projectInfo.windowInfos.back()->filepath,temp2);
+            else if(lstrcmpi(temporary,"DLGTMP")==0&&i3==1) projectInfo.windowInfos.back()->SetType( (ActiveBasic::PM::WindowType::EnumType)GetValue(temp2) );
+
+            else if(lstrcmpi(temporary,"TYPE")==0&&i3==1) projectInfo.windowInfos.back()->SetType( (ActiveBasic::PM::WindowType::EnumType)GetValue(temp2) );
+            else if(lstrcmpi(temporary,"FILEPATH")==0&&i3==1)
+            {
+                // 無視
             }
             else if(lstrcmpi(temporary,"ITEM")==0&&i3==1){
@@ -2082 +2100 @@
 struct NEW_WINDOW{
     char name[MAX_PATH];
-    char HandleName[MAX_PATH];
-    char CallBackName[MAX_PATH];
-    BOOL type;
+    ActiveBasic::PM::WindowType::EnumType type;
 };
 NEW_WINDOW NewWindow;
@@ -2092 +2108 @@
         case WM_INITDIALOG:
             SetPosCenter(hwnd);
-            SendDlgItemMessage(hwnd,IDC_AUTOSET,BM_SETCHECK,BST_CHECKED,0);
-            SendMessage(hwnd,WM_COMMAND,IDC_AUTOSET,0);
             SendDlgItemMessage(hwnd,IDC_MODALDLG,BM_SETCHECK,BST_CHECKED,0);
             break;
@@ -2100 +2114 @@
                 case IDOK:
                     GetDlgItemText(hwnd,IDC_WINDOWNAME,NewWindow.name,MAX_PATH);
-                    GetDlgItemText(hwnd,IDC_WINDOWHANDLE,NewWindow.HandleName,MAX_PATH);
-                    GetDlgItemText(hwnd,IDC_WINDOWPROC,NewWindow.CallBackName,MAX_PATH);
                     if(SendDlgItemMessage(hwnd,IDC_DEFWINDOW,BM_GETCHECK,0,0))
-                        NewWindow.type=WNDTYPE_DEFAULT;
+                    {
+                        NewWindow.type = ActiveBasic::PM::WindowType::Default;
+                    }
                     else if(SendDlgItemMessage(hwnd,IDC_MODALDLG,BM_GETCHECK,0,0))
-                        NewWindow.type=WNDTYPE_MODALDLG;
+                    {
+                        NewWindow.type = ActiveBasic::PM::WindowType::ModalDlg;
+                    }
                     else if(SendDlgItemMessage(hwnd,IDC_MODELESSDLG,BM_GETCHECK,0,0))
-                        NewWindow.type=WNDTYPE_MODELESSDLG;
+                    {
+                        NewWindow.type = ActiveBasic::PM::WindowType::ModelessDlg;
+                    }
                     EndDialog(hwnd,1);
                     return 1;
@@ -2114 +2132 @@
                     return 1;
                 case IDC_WINDOWNAME:
-                    if(HIWORD(wParam)==EN_CHANGE) SendMessage(hwnd,WM_COMMAND,IDC_AUTOSET,0);
-                    return 1;
-                case IDC_AUTOSET:
-                    if(SendDlgItemMessage(hwnd,IDC_AUTOSET,BM_GETCHECK,0,0)){
-                        SendDlgItemMessage(hwnd,IDC_WINDOWHANDLE,EM_SETREADONLY,1,0);
-                        SendDlgItemMessage(hwnd,IDC_WINDOWPROC,EM_SETREADONLY,1,0);
+                    if(HIWORD(wParam)==EN_CHANGE)
+                    {
                         GetDlgItemText(hwnd,IDC_WINDOWNAME,temporary,MAX_PATH);
                         if(temporary[0]){
@@ -2131 +2145 @@
                             SetDlgItemText(hwnd,IDC_WINDOWPROC,"");
                         }
-                    }
-                    else{
-                        SendDlgItemMessage(hwnd,IDC_WINDOWHANDLE,EM_SETREADONLY,0,0);
-                        SendDlgItemMessage(hwnd,IDC_WINDOWPROC,EM_SETREADONLY,0,0);
                     }
                     return 1;
@@ -2160 +2170 @@
 void Project_Window_Insert(void){
     extern HANDLE hHeap;
-    char temporary[MAX_PATH],temp2[1024],*pTemp;
+    char temporary[MAX_PATH],temp2[1024];
 
     if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_PROJECT_NEWWINDOW),hOwner,(DLGPROC)DlgProject_NewWindow)) return;
@@ -2179 +2189 @@
             return;
         }
-        if(lstrcmpi(NewWindow.HandleName,pWindowInfo->GetHandleName().c_str())==0){
-            //"\"%s\" ハンドルは既にプロジェクト内に存在します。"
-            sprintf(temporary,STRING_DUPLICATIONERROR_HANDLE_IN_PROJECT,pWindowInfo->GetHandleName().c_str());
-            MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
-            return;
-        }
-        if(lstrcmpi(NewWindow.CallBackName,pWindowInfo->CallBackName)==0){
-            //"\"%s\" プロシージャは既にプロジェクト内に存在します。"
-            sprintf(temporary,STRING_DUPLICATIONERROR_PROC_IN_PROJECT,pWindowInfo->CallBackName);
-            MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
-            return;
-        }
     }
 
@@ -2202 +2200 @@
     //ウィンドウ名
     projectInfo.windowInfos.back()->SetName( NewWindow.name );
-
-    //ハンドル名
-    projectInfo.windowInfos.back()->SetHandleName( NewWindow.HandleName );
 
     //位置情報
@@ -2217 +2212 @@
     //スタイル
     switch(NewWindow.type){
-        case WNDTYPE_DEFAULT:
+        case ActiveBasic::PM::WindowType::Default:
             //通常ウィンドウ
             projectInfo.windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX );
             break;
-        case WNDTYPE_MODALDLG:
-        case WNDTYPE_MODELESSDLG:
+        case ActiveBasic::PM::WindowType::ModalDlg:
+        case ActiveBasic::PM::WindowType::ModelessDlg:
             //ダイアログ テンプレート（最大化、最小化ボタンをなくして、細枠にする）
             projectInfo.windowInfos.back()->SetStyle( WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU );
@@ -2247 +2242 @@
     projectInfo.windowInfos.back()->SetClassName( temporary );
 
-    //コールバック関数名
-    projectInfo.windowInfos.back()->CallBackName=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.CallBackName)+1);
-    lstrcpy(projectInfo.windowInfos.back()->CallBackName,NewWindow.CallBackName);
-
     //タイプ識別
-    projectInfo.windowInfos.back()->type=NewWindow.type;
-
-
-    //メッセージ処理ファイル名
-    sprintf(temporary,"%s.ab",projectInfo.windowInfos.back()->GetName().c_str());
-    projectInfo.windowInfos.back()->filepath=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(projectInfo.windowInfos.back()->filepath,temporary);
+    projectInfo.windowInfos.back()->SetType( NewWindow.type );
+
 
 
@@ -2265 +2251 @@
     //////////////////////////
 
-    //テンプレートを読み込む
-    const std::string newWindowTemplateSbpPath = ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\new_window_template.sbp";
-    pTemp = ReadBuffer( newWindowTemplateSbpPath );
-
-    //#name#をプロジェクト名に置換
-    pTemp=PermutationWndPgmTemplate(pTemp,
-        projectInfo.GetName().c_str(),
-        NewWindow.name,
-        NewWindow.HandleName,
-        NewWindow.CallBackName);
+    // テンプレートを使ってMainWnd.abを生成する
+    const std::string resultStr = PermutationWndPgmTemplate(
+        ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\new_window_template.sbp",
+        projectInfo.GetName(),
+        (std::string)NewWindow.name,
+        (std::string)"h" + NewWindow.name,
+        (std::string)NewWindow.name + "Proc"
+    );
 
     sprintf(temporary,"%s%s.ab",projectInfo.GetWorkDir().GetPath().c_str(),projectInfo.windowInfos.back()->GetName().c_str());
 
     //書き込み
-    WriteBuffer(temporary,pTemp,lstrlen(pTemp));
+    WriteBuffer(temporary,resultStr.c_str(),resultStr.size());
     Project_File_Insert(temporary);
 
-    HeapDefaultFree(pTemp);
 
 
@@ -2309 +2292 @@
 void Project_Window_Delete(int WndInfoNum){
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i;
 
@@ -2315 +2297 @@
 
     //ウィンドウが開かれている場合は閉じる
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd&&lstrcmpi(pWindowInfo->GetName().c_str(),MdiInfo[i].path)==0){
+    for(i=0;i<MdiInfo.size();i++){
+        if(MdiInfo[i].hwnd&&lstrcmpi(pWindowInfo->GetName().c_str(),MdiInfo[i].path.c_str())==0){
             SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
             break;
         }
     }
-
-    //ウィンドウ情報のメモリを解放
-    HeapDefaultFree(pWindowInfo->filepath);
-    HeapDefaultFree(pWindowInfo->CallBackName);
 
     //子ウィンドウのメモリを解放

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

@@ -99 +99 @@
     int i;
     if(!IsWindow(hChild)) return -1;
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(hChild==MdiInfo[i].hwnd) break;
     }
-    if(i==MAX_WNDNUM) i=-1;
+    if(i==MdiInfo.size()) i=-1;
     return i;
 }
@@ -119 +119 @@
         projectInfo.pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
 
-        if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) return i;
+        if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) return i;
     }
     return -1;
@@ -643 +643 @@
     }
     WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-        pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_ENABLED);
-
-        pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_ENABLED);
-
-        pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_ENABLED);
-    }
-    else{
-        pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_GRAYED);
-
-        pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_GRAYED);
-
-        pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_GRAYED);
+    if( WndNum != -1 )
+    {
+        if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
+            pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_ENABLED);
+
+            pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_ENABLED);
+
+            pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_ENABLED);
+        }
+        else{
+            pobj_MainMenu->EnableItem(IDM_PAGESET,MF_BYCOMMAND|MF_GRAYED);
+
+            pobj_MainMenu->EnableItem(IDM_PREVIEW,MF_BYCOMMAND|MF_GRAYED);
+
+            pobj_MainMenu->EnableItem(IDM_PRINTOUT,MF_BYCOMMAND|MF_GRAYED);
+        }
     }
 }
@@ -722 +725 @@
 void DuplicateTitleCheck(char *lpszTitle){
     int i;
-    for(i=0;i<MAX_WNDNUM;i++){
+    for(i=0;i<MdiInfo.size();i++){
         if(MdiInfo[i].hwnd){
             if(lstrcmpi(MdiInfo[i].title,lpszTitle)==0){
@@ -747 +750 @@
             i=GetWndNum(hChild);
             if(IS_DOCUMENT_TEXT(MdiInfo[i].DocType)){
-                if(lstrcmpi(MdiInfo[i].path,filepath)==0) break;
+                if(lstrcmpi(MdiInfo[i].path.c_str(),filepath)==0) break;
             }
             hChild=GetNextWindow(hChild,GW_HWNDNEXT);
@@ -890 +893 @@
         hChild,NULL,hInst,NULL);
 
+
     //ウィンドウのID登録
-    for(i=0;i<MAX_WNDNUM;i++){
-        if(MdiInfo[i].hwnd==0){
-            MdiInfo[i].hwnd=hChild;
-            MdiInfo[i].DocType=DocumentType;
-            DuplicateTitleCheck(str);
-            MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
-            lstrcpy(MdiInfo[i].title,str);
-            if(filepath){
-                MdiInfo[i].path=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(filepath)+1);
-                lstrcpy(MdiInfo[i].path,filepath);
-            }
-            else{
-                MdiInfo[i].path=(char *)GlobalAlloc(GPTR,1);
-            }
-
-            MdiInfo[i].pMdiTextEdit = new CMdiTextEdit( &MdiInfo[i] );
-
-            MdiInfo[i].pMdiTextEdit->hEdit=hEdit;
-            MdiInfo[i].pMdiTextEdit->pobj_WebResult=new CWebResult(hChild);
-            MdiInfo[i].pMdiTextEdit->pobj_Ruler=new CRuler(hChild,i);
-            MdiInfo[i].pMdiTextEdit->hIcon=shfi.hIcon;
-            MdiInfo[i].pMdiTextEdit->buffer=buffer;
-            MdiInfo[i].pMdiTextEdit->pColorRef=(COLORREF *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(COLORREF)*lstrlen(buffer));
-            MdiInfo[i].pMdiTextEdit->iUnderStart=-1;
-            MdiInfo[i].pMdiTextEdit->iUnderEnd=-1;
-            MdiInfo[i].pMdiTextEdit->StartCaretPos.x=0;
-            MdiInfo[i].pMdiTextEdit->StartCaretPos.y=0;
-            MdiInfo[i].pMdiTextEdit->EndCaretPos.x=0;
-            MdiInfo[i].pMdiTextEdit->EndCaretPos.y=0;
-            MdiInfo[i].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
-            MdiInfo[i].pMdiTextEdit->bAutoScroll=0;
-            MdiInfo[i].pMdiTextEdit->iWidth_ControlTabSpace=
-                GetControlTabSpace(i,&MdiInfo[i].pMdiTextEdit->iLineNumberTextCount);
-            MdiInfo[i].pMdiTextEdit->iCharCode=iCharCode;
-            MdiInfo[i].pMdiTextEdit->iLfCode=iLfCode;
-
-            MdiInfo[i].IndentStr=0;
-
-            int flag;
-            if(mdic.style&WS_MAXIMIZE) flag=SIZE_MAXIMIZED;
-            else flag=0;
-            SendTextEditResizeEvent(hChild);
-            break;
-        }
-    }
+    MdiInfo.push_back( MDIINFO() );
+    i = MdiInfo.size()-1;
+    MdiInfo[i].hwnd=hChild;
+    MdiInfo[i].DocType=DocumentType;
+    MdiInfo[i].title="";
+    DuplicateTitleCheck(str);
+    MdiInfo[i].title=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(str)+1);
+    lstrcpy(MdiInfo[i].title,str);
+    if(filepath)
+    {
+        MdiInfo[i].path = filepath;
+    }
+    else
+    {
+        MdiInfo[i].path = "";
+    }
+
+    MdiInfo[i].pMdiTextEdit = new CMdiTextEdit( &MdiInfo[i] );
+
+    MdiInfo[i].pMdiTextEdit->hEdit=hEdit;
+    MdiInfo[i].pMdiTextEdit->pobj_WebResult=new CWebResult(hChild);
+    MdiInfo[i].pMdiTextEdit->pobj_Ruler=new CRuler(hChild,i);
+    MdiInfo[i].pMdiTextEdit->hIcon=shfi.hIcon;
+    MdiInfo[i].pMdiTextEdit->buffer=buffer;
+    MdiInfo[i].pMdiTextEdit->pColorRef=(COLORREF *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(COLORREF)*lstrlen(buffer));
+    MdiInfo[i].pMdiTextEdit->iUnderStart=-1;
+    MdiInfo[i].pMdiTextEdit->iUnderEnd=-1;
+    MdiInfo[i].pMdiTextEdit->StartCaretPos.x=0;
+    MdiInfo[i].pMdiTextEdit->StartCaretPos.y=0;
+    MdiInfo[i].pMdiTextEdit->EndCaretPos.x=0;
+    MdiInfo[i].pMdiTextEdit->EndCaretPos.y=0;
+    MdiInfo[i].pMdiTextEdit->Temp_UpDown_CaretXPos=-1;
+    MdiInfo[i].pMdiTextEdit->bAutoScroll=0;
+    MdiInfo[i].pMdiTextEdit->iWidth_ControlTabSpace=
+        GetControlTabSpace(i,&MdiInfo[i].pMdiTextEdit->iLineNumberTextCount);
+    MdiInfo[i].pMdiTextEdit->iCharCode=iCharCode;
+    MdiInfo[i].pMdiTextEdit->iLfCode=iLfCode;
+    MdiInfo[i].IndentStr=0;
+
+
+    int flag;
+    if(mdic.style&WS_MAXIMIZE) flag=SIZE_MAXIMIZED;
+    else flag=0;
+    SendTextEditResizeEvent(hChild);
+
 
     //ワードカラーをセット
-    if(IS_DOCUMENT_TEXT(DocumentType)) SetTextEditWordColor(i);
+    if(IS_DOCUMENT_TEXT(DocumentType)) SetTextEditWordColor(MdiInfo.size()-1);
 
     //Docコンボボックスに追加
@@ -983 +987 @@
 
     GlobalFree(MdiInfo[WndNum].title);
-    GlobalFree(MdiInfo[WndNum].path);
 
     if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
@@ -1063 +1066 @@
         HeapDefaultFree(MdiInfo[WndNum].MdiIconEditInfo);
     }
+    else
+    {
+        throw;
+    }
+
+    Jenga::Common::EraseVectorItem<std::vector<MDIINFO>>( MdiInfo, WndNum );
 }
 void ResizeTextEditWnd(HWND hwnd,int cx,int cy){
@@ -1711 +1720 @@
         if(!TranslateAccelerator(hOwner,hAccel,&msg)){
             if( projectInfo.IsOpened() ){
-                for(i=0,i2=0;i<MAX_WNDNUM;i++){
+                for(i=0,i2=0;i<MdiInfo.size();i++){
                     if(MdiInfo[i].hwnd&&MdiInfo[i].DocType==WNDTYPE_RAD){
                         if(IsDialogMessage(MdiInfo[i].MdiRadInfo->hProp_Dlg,&msg)) i2=1;

trunk/ab5.0/abdev/abdev/abdev.h

@@ -48 +48 @@
 HWND hClient;                   //MDIクライアントウィンドウ
 HWND hStatusBar;                //ステータスバー
-MDIINFO MdiInfo[MAX_WNDNUM];    //MDIドキュメントウィンドウ情報
+std::vector<MDIINFO> MdiInfo;   //MDIドキュメントウィンドウ情報
 
 /* メニュー */

trunk/ab5.0/abdev/abdev/abdev.vcproj

@@ -433 +433 @@
                     >
                 </File>
+                <Filter
+                    Name="PartialManager"
+                    >
+                    <File
+                        RelativePath=".\src\WindowComponents\PartialManager\TextEditPartialManager.cpp"
+                        >
+                    </File>
+                </Filter>
             </Filter>
             <Filter
@@ -2768 +2776 @@
             </Filter>
             <Filter
-                Name="Window Components"
+                Name="WindowComponents"
                 >
                 <File
@@ -2790 +2798 @@
                     >
                 </File>
+                <Filter
+                    Name="PartialManager"
+                    >
+                    <File
+                        RelativePath=".\include\WindowComponents\PartialManager\PartialManager.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath=".\include\WindowComponents\PartialManager\TextEditPartialManager.h"
+                        >
+                    </File>
+                </Filter>
             </Filter>
             <Filter

trunk/ab5.0/abdev/abdev/include/ProjectManager/WindowManager.h

@@ -105 +105 @@
 };
 typedef std::vector<ChildWindowInfo *> ChildWindowInfos;
+
+struct WindowType
+{
+    enum EnumType
+    {
+        Default = 0,
+        ModalDlg = 1,
+        ModelessDlg = 3,
+    };
+};
+
 class WindowInfo
     : public WindowInfoBase
 {
 public:
-    WindowInfo()
-        : WindowInfoBase()
-        , CallBackName( NULL )
-    {
+
+    const std::string GetSourceFileName() const
+    {
+        return this->GetName() + ".ab";
     }
 
@@ -124 +135 @@
     }
 
-    const std::string &GetHandleName() const
-    {
-        return handleName;
-    }
-    void SetHandleName( const std::string &handleName )
-    {
-        this->handleName = handleName;
+    const std::string GetHandleName() const
+    {
+        return "h" + this->GetName();
+    }
+
+    const std::string GetCallbackName() const
+    {
+        return this->GetName() + "Proc";
     }
 
@@ -166 +178 @@
     {
         return !iconResourceName.empty();
+    }
+
+    WindowType::EnumType GetType() const
+    {
+        return type;
+    }
+    void SetType( WindowType::EnumType type )
+    {
+        this->type = type;
+    }
+    bool IsDefaultWindow() const
+    {
+        return ( type == WindowType::Default );
+    }
+    bool IsModalDlg() const
+    {
+        return ( type == WindowType::ModalDlg );
+    }
+    bool IsModelessDlg() const
+    {
+        return ( type == WindowType::ModelessDlg );
     }
 
     //ウィンドウデータ
     LOGFONT LogFont;
-    char *CallBackName;
-    long type;
-    char *filepath;
 
     //子ウィンドウ管理
@@ -186 +216 @@
     int backgroundColor;
     std::string iconResourceName;
+    WindowType::EnumType type;
 };
 
@@ -211 +242 @@
     {
         WindowInfos::iterator it = this->begin();
-        for( int i=0; i!=index ;i++, it++ )
+        int i = 0;
+        while( i < index )
         {
-            delete *it;
+            i ++;
+            it ++;
         }
         this->erase( it );

trunk/ab5.0/abdev/abdev/nkf_class.cpp

@@ -156 +156 @@
 
 BOOL CALLBACK nkfDlgCodeSave(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     static int WndNum;
     HWND hList;

trunk/ab5.0/abdev/abdev/src/MainFrame.cpp

@@ -316 +316 @@
                 mii.dwTypeData=temporary;
                 mii.fType=MFT_STRING;
-                if(MdiInfo[WndNum].path[0]){
-                    _splitpath(MdiInfo[WndNum].path,NULL,NULL,temporary,temp2);
+                if(!MdiInfo[WndNum].path.empty()){
+                    _splitpath(MdiInfo[WndNum].path.c_str(),NULL,NULL,temporary,temp2);
                     lstrcat(temporary,temp2);
                     lstrcat(temporary," を保存(&S)");
@@ -329 +329 @@
                 /*「絶対パスをコピー」「フォルダを開く」「ファイルを削除」
                                                 コマンドを場合によって無効化にする */
-                if(MdiInfo[WndNum].path[0]){
+                if(!MdiInfo[WndNum].path.empty()){
                     EnableMenuItem(hTabMenu,IDM_PATH_COPY,MF_BYCOMMAND|MF_ENABLED);
                     EnableMenuItem(hTabMenu,IDM_FOLDER_OPEN,MF_BYCOMMAND|MF_ENABLED);
@@ -383 +383 @@
         WndNum=GetWndNum(hChild);
         if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType)){
-            if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0) break;
+            if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0) break;
         }
         hChild=::GetNextWindow(hChild,GW_HWNDNEXT);
@@ -548 +548 @@
 void MainFrame::OnCmdAllSave( UINT uNotifyCode, int nID, CWindow wndCtl )
 {
-    for( int i=0;i<MAX_WNDNUM;i++){
+    for( int i=0;i<MdiInfo.size();i++){
         if(MdiInfo[i].hwnd) SaveDocument(MdiInfo[i].hwnd,NULL);
     }
@@ -585 +585 @@
     if(!hChild) return;
     int WndNum=GetWndNum(hChild);
-    if(IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType))
+    if( IS_DOCUMENT_TEXT(MdiInfo[WndNum].DocType) )
+    {
         TextEdit_UndoCommand(WndNum);
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_RAD)
+    }
+    else if( MdiInfo[WndNum].DocType == WNDTYPE_RAD )
+    {
         Rad_UndoCommand(WndNum);
-    else if(MdiInfo[WndNum].DocType==WNDTYPE_ICONEDIT)
+    }
+    else if( MdiInfo[WndNum].DocType == WNDTYPE_ICONEDIT )
+    {
         IconEdit_UndoCommand(WndNum);
+    }
 }
 
@@ -986 +992 @@
         if(!SetRunning(hChild)) return;
         if(IsNeedCompile(MdiInfo[GetWndNum(hChild)].path,1))
-            sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path,m_hWnd);
+            sprintf(temporary,"\"%s\" /debug /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
         else
-            sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path,m_hWnd);
+            sprintf(temporary,"\"%s\" /run /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
 
         //ブレークポイントをセーブ
@@ -1051 +1057 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)].path,m_hWnd);
+        sprintf(temporary,"\"%s\" /debug /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
     }
 
@@ -1165 +1171 @@
         //単独ソースコード
         if(!SetRunning(hChild)) return;
-        sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)].path,m_hWnd);
+        sprintf(temporary,"\"%s\" /wnd:%08x",MdiInfo[GetWndNum(hChild)].path.c_str(),m_hWnd);
     }
 
@@ -1224 +1230 @@
 
         //単独ソースコード
-        _splitpath(MdiInfo[GetWndNum(hChild)].path,temporary,temp2,temp3,NULL);
+        _splitpath(MdiInfo[GetWndNum(hChild)].path.c_str(),temporary,temp2,temp3,NULL);
         lstrcat(temporary,temp2);
         lstrcat(temporary,temp3);
@@ -1403 +1409 @@
     HWND hChild=::GetWindow(hClient,GW_CHILD);
     int WndNum=GetWndNum(hChild);
-    for(int i=0;i<MAX_WNDNUM;i++){
+    for(int i=0;i<MdiInfo.size();i++){
         if(i==WndNum) continue;
         if(MdiInfo[i].hwnd) SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
@@ -1415 +1421 @@
 
     //絶対パスをコピー
-    HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,lstrlen(MdiInfo[WndNum].path)+1);
+    HGLOBAL hGlobal=(char *)GlobalAlloc(GMEM_MOVEABLE,MdiInfo[WndNum].path.size()+1);
     char *pTemp=(char *)GlobalLock(hGlobal);
-    lstrcpy(pTemp,MdiInfo[WndNum].path);
+    lstrcpy(pTemp,MdiInfo[WndNum].path.c_str());
     GlobalUnlock(hGlobal);
 
@@ -1433 +1439 @@
 
     char temporary[1024], temp2[1024];
-    _splitpath(MdiInfo[WndNum].path,temporary,temp2,NULL,NULL);
+    _splitpath(MdiInfo[WndNum].path.c_str(),temporary,temp2,NULL,NULL);
     lstrcat(temporary,temp2);
 
@@ -1445 +1451 @@
 
     char temporary[1024], temp2[1024];
-    _splitpath(MdiInfo[WndNum].path,NULL,NULL,temporary,temp2);
+    _splitpath(MdiInfo[WndNum].path.c_str(),NULL,NULL,temporary,temp2);
     lstrcat(temporary,temp2);
 
@@ -1455 +1461 @@
     fo.hwnd=m_hWnd;
     fo.wFunc=FO_DELETE;
-    fo.pFrom =MdiInfo[WndNum].path;
+    fo.pFrom =MdiInfo[WndNum].path.c_str();
     fo.pTo="\0";
     fo.fFlags =FOF_ALLOWUNDO|FOF_NOCONFIRMATION;

trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp

@@ -267 +267 @@
 void Project::Save()
 {
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,i2,i3,WndNum;
     char temporary[MAX_PATH],buffer[32767];
@@ -284 +283 @@
                 for(i=0;i<this->pobj_DBFileInfo->iNum;i++){
                     this->pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                         SaveDocument(hChild,NULL);
                         break;
@@ -297 +296 @@
                     lstrcpy(temporary,resourceItem.filepath.c_str());
                     lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-                    if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                    if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                         SaveDocument(hChild,NULL);
                         break;
@@ -533 +532 @@
 {
     extern HANDLE hHeap;
-    extern MDIINFO MdiInfo[MAX_WNDNUM];
     int i,WndNum;
     HWND hChild,hCloseChild;
@@ -553 +551 @@
             for(i=0;i<this->pobj_DBFileInfo->iNum;i++){
                 this->pobj_DBFileInfo->ppobj_FileInfo[i]->GetFullPath(temporary);
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
 
                     //変更フラグをオフにする
@@ -575 +573 @@
         else if(MdiInfo[WndNum].DocType==WNDTYPE_MENU){
             for(i=0;i<this->NumberOfMenu;i++){
-                if(lstrcmp(MdiInfo[WndNum].path,this->pMenuInfo[i].IdName)==0){
+                if( MdiInfo[WndNum].path == this->pMenuInfo[i].IdName )
+                {
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -585 +584 @@
                 lstrcpy(temporary,this->resourceManager.iconResources[i].filepath.c_str());
                 lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-                if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
+                if(lstrcmpi(MdiInfo[WndNum].path.c_str(),temporary)==0){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);
                     break;
@@ -602 +601 @@
     BOOST_FOREACH( ActiveBasic::PM::WindowInfo *pWindowInfo, windowInfos )
     {
-        HeapDefaultFree(pWindowInfo->CallBackName);
-        HeapDefaultFree(pWindowInfo->filepath);
-
         //子ウィンドウのメモリを解放
         BOOST_FOREACH( ActiveBasic::PM::ChildWindowInfo *pChildWindowInfo, pWindowInfo->childWindowInfos )

trunk/ab5.0/abdev/res/res.rc

@@ -643 +643 @@
 END
 
-IDD_PROJECT_NEWWINDOW DIALOG  0, 0, 171, 153
+IDD_PROJECT_NEWWINDOW DIALOGEX 0, 0, 171, 153
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "新規ウィンドウ"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x0
 BEGIN
     LTEXT           "ウィンドウ名:",IDC_STATIC,13,11,36,8
-    LTEXT           "ハンドル:",IDC_STATIC,13,60,26,8
-    LTEXT           "プロシージャ:",IDC_STATIC,13,77,39,8
-    GROUPBOX        "詳細",IDC_STATIC,7,29,96,64
+    LTEXT           "ハンドル:",IDC_STATIC,13,54,26,8
+    LTEXT           "プロシージャ:",IDC_STATIC,13,71,39,8
+    GROUPBOX        "詳細",IDC_STATIC,7,33,96,56
     GROUPBOX        "タイプ",IDC_STATIC,7,99,157,47
     EDITTEXT        IDC_WINDOWNAME,56,7,40,14,ES_AUTOHSCROLL
-    CONTROL         "自動設定",IDC_AUTOSET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,42,43,10
-    EDITTEXT        IDC_WINDOWHANDLE,56,56,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_WINDOWPROC,56,73,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_WINDOWHANDLE,56,50,40,14,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_WINDOWPROC,56,67,40,14,ES_AUTOHSCROLL | ES_READONLY
     CONTROL         "通常ウィンドウ",IDC_DEFWINDOW,"Button",BS_AUTORADIOBUTTON,13,111,57,10
     CONTROL         "ダイアログ テンプレート（モーダル）",IDC_MODALDLG,"Button",BS_AUTORADIOBUTTON,13,122,117,10
@@ -736 +735 @@
 END
 
-IDD_RAD_PROP_WINDOW_RENAME DIALOG  0, 0, 170, 99
+IDD_RAD_PROP_WINDOW_RENAME DIALOGEX 0, 0, 170, 99
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "識別設定"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "ＭＳ Ｐゴシック", 0, 0, 0x0
 BEGIN
     LTEXT           "ウィンドウ名:",IDC_STATIC,13,11,36,8
-    LTEXT           "ハンドル:",IDC_STATIC,13,60,26,8
-    LTEXT           "プロシージャ:",IDC_STATIC,13,77,39,8
-    GROUPBOX        "詳細",IDC_STATIC,7,29,96,64
+    LTEXT           "ハンドル:",IDC_STATIC,13,53,26,8
+    LTEXT           "プロシージャ:",IDC_STATIC,13,70,39,8
+    GROUPBOX        "詳細",IDC_STATIC,7,33,96,56
     EDITTEXT        IDC_WINDOWNAME,56,7,40,14,ES_AUTOHSCROLL
-    CONTROL         "自動設定",IDC_AUTOSET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,42,43,10
-    EDITTEXT        IDC_WINDOWHANDLE,56,56,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_WINDOWPROC,56,73,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_WINDOWHANDLE,56,49,40,14,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_WINDOWPROC,56,66,40,14,ES_AUTOHSCROLL | ES_READONLY
     DEFPUSHBUTTON   "OK",IDOK,113,7,50,14
     PUSHBUTTON      "ｷｬﾝｾﾙ",IDCANCEL,113,24,50,14

trunk/ab5.0/abdev/res/resource.h

@@ -201 +201 @@
 #define IDC_WINDOWPROC                  1082
 #define IDC_TOOL_HSCROLLBAR             1082
-#define IDC_AUTOSET                     1083
 #define IDC_TOOL_VSCROLLBAR             1083
 #define IDC_TOOL_COMBOBOX               1084

trunk/ab5.0/jenga/include/jenga.h

@@ -11 +11 @@
 #include "common/Hashmap.h"
 #include "common/Path.h"
+#include "common/SourceTemplate.h"
 #include "common/String.h"
 #include "common/VectorSupporter.h"

trunk/ab5.0/jenga/projects/jenga/jenga.vcproj

@@ -299 +299 @@
             <File
                 RelativePath="..\..\src\common\Path.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\..\src\common\SourceTemplate.cpp"
                 >
             </File>
@@ -392 +396 @@
             </File>
             <File
+                RelativePath="..\..\include\common\SourceTemplate.h"
+                >
+            </File>
+            <File
                 RelativePath=".\stdafx.h"
                 >