Ignore:
Timestamp:
May 19, 2008, 4:31:37 PM (15 years ago)
Author:
dai_9181
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r616 r617  
    1515int GetWndInfoNum(char *name){
    1616    for( int i=0;i<static_cast<int>(ProjectInfo.windowInfos.size());i++){
    17         if(lstrcmpi(name,ProjectInfo.windowInfos[i]->name)==0) return i;
     17        if(lstrcmpi(name,ProjectInfo.windowInfos[i]->GetName().c_str())==0) return i;
    1818    }
    1919    return -1;
    … …  
    2323    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
    2424    {
    25         if(lstrcmpi(name,pWindowInfo->name)==0) return pWindowInfo;
     25        if(lstrcmpi(name,pWindowInfo->GetName().c_str())==0) return pWindowInfo;
    2626    }
    2727    return NULL;
    … …  
    374374                    sprintf(Command+i2,"%s\t\tCase %s\r\n",spaces,temporary);
    375375                    i2+=lstrlen(Command+i2);
    376                     sprintf(Command+i2,"%s\t\t\t%s_%s_%s(ByVal (pnmHdr As VoidPtr))\r\n",spaces,pWindowInfo->name,pItemEventInfo[i].IdName,pItemEventInfo[i].pEventNames[i3]);
     376                    sprintf(Command+i2,"%s\t\t\t%s_%s_%s(ByVal (pnmHdr As VoidPtr))\r\n",
     377                        spaces,
     378                        pWindowInfo->GetName().c_str(),
     379                        pItemEventInfo[i].IdName,pItemEventInfo[i].pEventNames[i3]
     380                    );
    377381                    i2+=lstrlen(Command+i2);
    378382                }
    … …  
    446450            i2+=lstrlen(Command+i2);
    447451            if(pItemEventInfo[i].ClassID==CT_MENU){
    448                 sprintf(Command+i2,"%s\t%s_%s_MenuClick()\r\n",spaces,pWindowInfo->name,pItemEventInfo[i].IdName);
     452                sprintf(Command+i2,"%s\t%s_%s_MenuClick()\r\n",spaces,pWindowInfo->GetName().c_str(),pItemEventInfo[i].IdName);
    449453                i2+=lstrlen(Command+i2);
    450454                for(i3=0;i3<pItemEventInfo[i].EventNum;i3++)
    … …  
    458462                    sprintf(Command+i2,"%s\t\tCase %s\r\n",spaces,temporary);
    459463                    i2+=lstrlen(Command+i2);
    460                     sprintf(Command+i2,"%s\t\t\t%s_%s_%s()\r\n",spaces,pWindowInfo->name,pItemEventInfo[i].IdName,pItemEventInfo[i].pEventNames[i3]);
     464                    sprintf(Command+i2,"%s\t\t\t%s_%s_%s()\r\n",spaces,pWindowInfo->GetName().c_str(),pItemEventInfo[i].IdName,pItemEventInfo[i].pEventNames[i3]);
    461465                    i2+=lstrlen(Command+i2);
    462466                    HeapDefaultFree(pItemEventInfo[i].pEventNames[i3]);
    … …  
    533537        sprintf(Command,"%sCase WM_ACTIVATE\r\n",spaces);
    534538        i=lstrlen(Command);
    535         sprintf(Command+i,"%s\t%s_%s(LOWORD(wParam),HIWORD(wParam))\r\n",spaces,pWindowInfo->name,MessageName);
     539        sprintf(Command+i,"%s\t%s_%s(LOWORD(wParam),HIWORD(wParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    536540    }
    537541    else if(lstrcmp(MessageName,"Create")==0){
    … …  
    541545        i=lstrlen(Command);
    542546
    543         sprintf(Command+i,"%s\t%s=hWnd\r\n",spaces,pWindowInfo->HandleName);
     547        sprintf(Command+i,"%s\t%s=hWnd\r\n",spaces,pWindowInfo->GetHandleName().c_str());
    544548        i+=lstrlen(Command+i);
    545549
    … …  
    587591                    spaces,
    588592                    pChildInfo->IdName,
    589                     pWindowInfo->name);
     593                    pWindowInfo->GetName().c_str());
    590594                i+=lstrlen(Command+i);
    591595
    … …  
    598602                                sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,\"%s\",IMAGE_ICON,0,0,LR_DEFAULTSIZE or LR_LOADFROMFILE)\r\n",
    599603                                    spaces,
    600                                     pWindowInfo->name,
     604                                    pWindowInfo->GetName().c_str(),
    601605                                    pChildInfo->IdName,
    602606                                    pChildInfo->ImageCtrlInfo.path);
    … …  
    628632                                sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,ImageFilePath,IMAGE_ICON,0,0,LR_DEFAULTSIZE or LR_LOADFROMFILE)\r\n",
    629633                                    spaces,
    630                                     pWindowInfo->name,
     634                                    pWindowInfo->GetName().c_str(),
    631635                                    pChildInfo->IdName);
    632636                            }
    … …  
    636640                            sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,%s As *Byte,IMAGE_ICON,0,0,LR_DEFAULTSIZE)\r\n",
    637641                                spaces,
    638                                 pWindowInfo->name,
     642                                pWindowInfo->GetName().c_str(),
    639643                                pChildInfo->IdName,
    640644                                pChildInfo->ImageCtrlInfo.path);
    … …  
    644648                            spaces,
    645649                            pChildInfo->IdName,
    646                             pWindowInfo->name,
     650                            pWindowInfo->GetName().c_str(),
    647651                            pChildInfo->IdName);
    648652                        i+=lstrlen(Command+i);
    … …  
    654658                                sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,\"%s\",IMAGE_BITMAP,0,0,LR_DEFAULTSIZE or LR_LOADFROMFILE)\r\n",
    655659                                    spaces,
    656                                     pWindowInfo->name,
     660                                    pWindowInfo->GetName().c_str(),
    657661                                    pChildInfo->IdName,
    658662                                    pChildInfo->ImageCtrlInfo.path);
    … …  
    684688                                sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,ImageFilePath,IMAGE_BITMAP,0,0,LR_LOADFROMFILE)\r\n",
    685689                                    spaces,
    686                                     pWindowInfo->name,
     690                                    pWindowInfo->GetName().c_str(),
    687691                                    pChildInfo->IdName);
    688692                            }
    … …  
    692696                            sprintf(Command+i,"%s\thImage_%s_%s=LoadImage(GetWindowLongPtr(hWnd,GWLP_HINSTANCE) As HINSTANCE,%s As *Byte,IMAGE_BITMAP,0,0,LR_DEFAULTSIZE)\r\n",
    693697                                spaces,
    694                                 pWindowInfo->name,
     698                                pWindowInfo->GetName().c_str(),
    695699                                pChildInfo->IdName,
    696700                                pChildInfo->ImageCtrlInfo.path);
    … …  
    700704                            spaces,
    701705                            pChildInfo->IdName,
    702                             pWindowInfo->name,
     706                            pWindowInfo->GetName().c_str(),
    703707                            pChildInfo->IdName);
    704708                        i+=lstrlen(Command+i);
    … …  
    709713
    710714        if(bProcedureCall)
    711             sprintf(Command+i,"%s\t%s_%s(ByVal (lParam As VoidPtr))\r\n",spaces,pWindowInfo->name,MessageName);
     715            sprintf(Command+i,"%s\t%s_%s(ByVal (lParam As VoidPtr))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    712716        return WM_CREATE;
    713717    }
    … …  
    716720        i=lstrlen(Command);
    717721        if(bProcedureCall){
    718             sprintf(Command+i,"%s\t%s_%s()\r\n",spaces,pWindowInfo->name,MessageName);
     722            sprintf(Command+i,"%s\t%s_%s()\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    719723            i+=lstrlen(Command+i);
    720724        }
    … …  
    736740            if(pChildInfo->Control==CT_IMAGEBOX){
    737741                if((pChildInfo->style&0x000F)==SS_ICON)
    738                     sprintf(Command+i,"%s\tDestroyIcon(hImage_%s_%s)\r\n",spaces,pWindowInfo->name,pChildInfo->IdName);
     742                    sprintf(Command+i,"%s\tDestroyIcon(hImage_%s_%s)\r\n",spaces,pWindowInfo->GetName().c_str(),pChildInfo->IdName);
    739743                else if((pChildInfo->style&0x000F)==SS_BITMAP)
    740                     sprintf(Command+i,"%s\tDeleteObject(hImage_%s_%s)\r\n",spaces,pWindowInfo->name,pChildInfo->IdName);
     744                    sprintf(Command+i,"%s\tDeleteObject(hImage_%s_%s)\r\n",spaces,pWindowInfo->GetName().c_str(),pChildInfo->IdName);
    741745                i+=lstrlen(Command+i);
    742746            }
    … …  
    747751        sprintf(Command,"%sCase WM_DROPFILES\r\n",spaces);
    748752        i=lstrlen(Command);
    749         sprintf(Command+i,"%s\t%s_%s(wParam As HDROP)\r\n",spaces,pWindowInfo->name,MessageName);
     753        sprintf(Command+i,"%s\t%s_%s(wParam As HDROP)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    750754    }
    751755    else if(lstrcmp(MessageName,"HScroll")==0){
    752756        sprintf(Command,"%sCase WM_HSCROLL\r\n",spaces);
    753757        i=lstrlen(Command);
    754         sprintf(Command+i,"%s\t%s_%s(LOWORD(wParam),HIWORD(wParam),lParam As HWND)\r\n",spaces,pWindowInfo->name,MessageName);
     758        sprintf(Command+i,"%s\t%s_%s(LOWORD(wParam),HIWORD(wParam),lParam As HWND)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    755759    }
    756760    else if(lstrcmp(MessageName,"KeyDown")==0){
    757761        sprintf(Command,"%sCase WM_KEYDOWN\r\n",spaces);
    758762        i=lstrlen(Command);
    759         sprintf(Command+i,"%s\t%s_%s(wParam As Long,lParam As Long)\r\n",spaces,pWindowInfo->name,MessageName);
     763        sprintf(Command+i,"%s\t%s_%s(wParam As Long,lParam As Long)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    760764    }
    761765    else if(lstrcmp(MessageName,"KeyPress")==0){
    762766        sprintf(Command,"%sCase WM_CHAR\r\n",spaces);
    763767        i=lstrlen(Command);
    764         sprintf(Command+i,"%s\t%s_%s(wParam As Long,lParam As Long)\r\n",spaces,pWindowInfo->name,MessageName);
     768        sprintf(Command+i,"%s\t%s_%s(wParam As Long,lParam As Long)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    765769    }
    766770    else if(lstrcmp(MessageName,"KeyUp")==0){
    767771        sprintf(Command,"%sCase WM_KEYUP\r\n",spaces);
    768772        i=lstrlen(Command);
    769         sprintf(Command+i,"%s\t%s_%s(wParam As Long,lParam As Long)\r\n",spaces,pWindowInfo->name,MessageName);
     773        sprintf(Command+i,"%s\t%s_%s(wParam As Long,lParam As Long)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    770774    }
    771775    else if(lstrcmp(MessageName,"LButtonDown")==0){
    772776        sprintf(Command,"%sCase WM_LBUTTONDOWN\r\n",spaces);
    773777        i=lstrlen(Command);
    774         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     778        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    775779    }
    776780    else if(lstrcmp(MessageName,"LButtonDblClick")==0){
    777781        sprintf(Command,"%sCase WM_LBUTTONDBLCLK\r\n",spaces);
    778782        i=lstrlen(Command);
    779         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     783        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    780784    }
    781785    else if(lstrcmp(MessageName,"LButtonUp")==0){
    782786        sprintf(Command,"%sCase WM_LBUTTONUP\r\n",spaces);
    783787        i=lstrlen(Command);
    784         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     788        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    785789    }
    786790    else if(lstrcmp(MessageName,"MButtonDown")==0){
    787791        sprintf(Command,"%sCase WM_MBUTTONDOWN\r\n",spaces);
    788792        i=lstrlen(Command);
    789         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     793        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    790794    }
    791795    else if(lstrcmp(MessageName,"MButtonDblClick")==0){
    792796        sprintf(Command,"%sCase WM_MBUTTONDBLCLK\r\n",spaces);
    793797        i=lstrlen(Command);
    794         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     798        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    795799    }
    796800    else if(lstrcmp(MessageName,"MButtonUp")==0){
    797801        sprintf(Command,"%sCase WM_MBUTTONUP\r\n",spaces);
    798802        i=lstrlen(Command);
    799         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     803        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    800804    }
    801805    else if(lstrcmp(MessageName,"MouseMove")==0){
    802806        sprintf(Command,"%sCase WM_MOUSEMOVE\r\n",spaces);
    803807        i=lstrlen(Command);
    804         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     808        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    805809    }
    806810    else if(lstrcmp(MessageName,"Move")==0){
    807811        sprintf(Command,"%sCase WM_MOVE\r\n",spaces);
    808812        i=lstrlen(Command);
    809         sprintf(Command+i,"%s\t%s_%s(LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     813        sprintf(Command+i,"%s\t%s_%s(LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    810814    }
    811815    else if(lstrcmp(MessageName,"Notify")==0){
    … …  
    822826        sprintf(Command+i,"%s\thDC=BeginPaint(hWnd,ps)\r\n",spaces);
    823827        i+=lstrlen(Command+i);
    824         sprintf(Command+i,"%s\t%s_%s(hDC)\r\n",spaces,pWindowInfo->name,MessageName);
     828        sprintf(Command+i,"%s\t%s_%s(hDC)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    825829        i+=lstrlen(Command+i);
    826830        sprintf(Command+i,"%s\tEndPaint(hWnd,ps)\r\n",spaces);
    … …  
    833837        i+=lstrlen(Command+i);
    834838        if(bProcedureCall){
    835             sprintf(Command+i,"%s\t%s_%s(cancel)\r\n",spaces,pWindowInfo->name,MessageName);
     839            sprintf(Command+i,"%s\t%s_%s(cancel)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    836840            i+=lstrlen(Command+i);
    837841        }
    … …  
    845849        sprintf(Command,"%sCase WM_RBUTTONDBLCLK\r\n",spaces);
    846850        i=lstrlen(Command);
    847         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     851        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    848852    }
    849853    else if(lstrcmp(MessageName,"RButtonDown")==0){
    850854        sprintf(Command,"%sCase WM_RBUTTONDOWN\r\n",spaces);
    851855        i=lstrlen(Command);
    852         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     856        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    853857    }
    854858    else if(lstrcmp(MessageName,"RButtonUp")==0){
    855859        sprintf(Command,"%sCase WM_RBUTTONUP\r\n",spaces);
    856860        i=lstrlen(Command);
    857         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     861        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    858862    }
    859863    else if(lstrcmp(MessageName,"Resize")==0){
    860864        sprintf(Command,"%sCase WM_SIZE\r\n",spaces);
    861865        i=lstrlen(Command);
    862         sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->name,MessageName);
     866        sprintf(Command+i,"%s\t%s_%s(wParam As Long,LOWORD(lParam),HIWORD(lParam))\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    863867    }
    864868    else if(lstrcmp(MessageName,"SetFocus")==0){
    865869        sprintf(Command,"%sCase WM_SETFOCUS\r\n",spaces);
    866870        i=lstrlen(Command);
    867         sprintf(Command+i,"%s\t%s_%s()\r\n",spaces,pWindowInfo->name,MessageName);
     871        sprintf(Command+i,"%s\t%s_%s()\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    868872    }
    869873    else if(lstrcmp(MessageName,"Timer")==0){
    870874        sprintf(Command,"%sCase WM_TIMER\r\n",spaces);
    871875        i=lstrlen(Command);
    872         sprintf(Command+i,"%s\t%s_%s(wParam As DWord)\r\n",spaces,pWindowInfo->name,MessageName);
     876        sprintf(Command+i,"%s\t%s_%s(wParam As DWord)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    873877    }
    874878    else if(lstrcmp(MessageName,"VScroll")==0){
    875879        sprintf(Command,"%sCase WM_VSCROLL\r\n",spaces);
    876880        i=lstrlen(Command);
    877         sprintf(Command+i,"%s\t%s_%s(LOWORD(wParam),HIWORD(wParam),lParam As HWND)\r\n",spaces,pWindowInfo->name,MessageName);
     881        sprintf(Command+i,"%s\t%s_%s(LOWORD(wParam),HIWORD(wParam),lParam As HWND)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    878882    }
    879883
    … …  
    885889        sprintf(Command,"%sCase MM_MCINOTIFY\r\n",spaces);
    886890        i=lstrlen(Command);
    887         sprintf(Command+i,"%s\t%s_%s(wParam,lParam)\r\n",spaces,pWindowInfo->name,MessageName);
     891        sprintf(Command+i,"%s\t%s_%s(wParam,lParam)\r\n",spaces,pWindowInfo->GetName().c_str(),MessageName);
    888892    }
    889893    return 0;
    … …  
    10441048    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
    10451049    {
    1046         sprintf(buffer+i2,"Dim %s As HWND\r\n",pWindowInfo->HandleName);
    1047         i2+=lstrlen(buffer+i2);
    1048         sprintf(buffer+i2,"Dim hFont_%s As HFONT\r\n",pWindowInfo->name);
     1050        sprintf(buffer+i2,"Dim %s As HWND\r\n",pWindowInfo->GetHandleName().c_str());
     1051        i2+=lstrlen(buffer+i2);
     1052        sprintf(buffer+i2,"Dim hFont_%s As HFONT\r\n",pWindowInfo->GetName().c_str());
    10491053        i2+=lstrlen(buffer+i2);
    10501054        sprintf(buffer+i2,"hFont_%s=CreateFont(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,\"%s\")\r\n",
    1051             pWindowInfo->name,
     1055            pWindowInfo->GetName().c_str(),
    10521056            pWindowInfo->LogFont.lfHeight,
    10531057            pWindowInfo->LogFont.lfWidth,
    … …  
    11111115                if((pChildInfo->style&0x000F)==SS_ICON||
    11121116                    (pChildInfo->style&0x000F)==SS_BITMAP){
    1113                     sprintf(buffer+i2,"Dim hImage_%s_%s As HANDLE\r\n",pWindowInfo->name,pChildInfo->IdName);
     1117                    sprintf(buffer+i2,"Dim hImage_%s_%s As HANDLE\r\n",pWindowInfo->GetName().c_str(),pChildInfo->IdName);
    11141118                    i2+=lstrlen(buffer+i2);
    11151119
    … …  
    11621166    {
    11631167        //フォントハンドル解放
    1164         sprintf(buffer+i2,"\tDeleteObject(hFont_%s)\r\n",pWindowInfo->name);
     1168        sprintf(buffer+i2,"\tDeleteObject(hFont_%s)\r\n",pWindowInfo->GetName().c_str());
    11651169        i2+=lstrlen(buffer+i2);
    11661170
    … …  
    12081212        ppNames=GetProcedureNamesOfMessageCall(i,&pItemEventInfo,&i3,&bAvailUserProc[i]);
    12091213
    1210         sprintf(buffer+i2,"Function EventCall_%s(hWnd As HWND, message As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT\r\n",pWindowInfo->name);
     1214        sprintf(buffer+i2,"Function EventCall_%s(hWnd As HWND, message As DWord, wParam As WPARAM, lParam As LPARAM) As LRESULT\r\n",pWindowInfo->GetName().c_str());
    12111215        i2+=lstrlen(buffer+i2);
    12121216
    … …  
    12461250            i2+=lstrlen(buffer+i2);
    12471251            if(sw4){
    1248                 sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",pWindowInfo->name);
     1252                sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",pWindowInfo->GetName().c_str());
    12491253                i2+=lstrlen(buffer+i2);
    12501254            }
    … …  
    12721276            lstrcpy(buffer+i2,"\t\tCase WM_NOTIFY\r\n");
    12731277            i2+=lstrlen(buffer+i2);
    1274             sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",pWindowInfo->name);
     1278            sprintf(buffer+i2,"\t\t\t%s_Notify(ByVal (lParam As *NMHDR))\r\n",pWindowInfo->GetName().c_str());
    12751279            i2+=lstrlen(buffer+i2);
    12761280        }
    … …  
    12951299        lstrcpy(buffer+i2,"\t\tCase Else\r\n");
    12961300        i2+=lstrlen(buffer+i2);
    1297         sprintf(buffer+i2,"\t\t\tEventCall_%s=DefWindowProc(hWnd,message,wParam,lParam)\r\n",pWindowInfo->name);
     1301        sprintf(buffer+i2,"\t\t\tEventCall_%s=DefWindowProc(hWnd,message,wParam,lParam)\r\n",pWindowInfo->GetName().c_str());
    12981302        i2+=lstrlen(buffer+i2);
    12991303        lstrcpy(buffer+i2,"\t\t\tExit Function\r\n");
    … …  
    13031307        i2+=lstrlen(buffer+i2);
    13041308
    1305         sprintf(buffer+i2,"\tEventCall_%s=0\r\n",pWindowInfo->name);
     1309        sprintf(buffer+i2,"\tEventCall_%s=0\r\n",pWindowInfo->GetName().c_str());
    13061310        i2+=lstrlen(buffer+i2);
    13071311        lstrcpy(buffer+i2,"End Function\r\n");
    … …  
    13631367        if(pWindowInfo->type==WNDTYPE_MODALDLG){
    13641368            if(sw1==0){
    1365                 sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->name);
     1369                sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->GetName().c_str());
    13661370                i2+=lstrlen(buffer+i2);
    13671371                sw1=1;
    13681372            }
    13691373            else{
    1370                 sprintf(buffer+i2,"\tElseIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->name);
     1374                sprintf(buffer+i2,"\tElseIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->GetName().c_str());
    13711375                i2+=lstrlen(buffer+i2);
    13721376            }
    13731377            sprintf(buffer+i2,"\t\t%s=CreateWindowEx(&H%08x,\"NORMALDLG\",\"%s\",&H%08x,%d,%d,%d,%d,hOwnerWnd,%d As HMENU,GetModuleHandle(0),0)\r\n",
    1374                 pWindowInfo->HandleName,
     1378                pWindowInfo->GetHandleName().c_str(),
    13751379                pWindowInfo->ExStyle,
    13761380                pWindowInfo->caption,
    … …  
    13831387            i2+=lstrlen(buffer+i2);
    13841388            sprintf(buffer+i2,"\t\thDlg=%s\r\n",
    1385                 pWindowInfo->HandleName);
     1389                pWindowInfo->GetHandleName().c_str());
    13861390            i2+=lstrlen(buffer+i2);
    13871391            if(bAvailUserProc[i]){
    13881392                sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(%s) As LONG_PTR)\r\n",
    1389                     pWindowInfo->HandleName,
     1393                    pWindowInfo->GetHandleName().c_str(),
    13901394                    pWindowInfo->CallBackName);
    13911395            }
    13921396            else{
    13931397                sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(EventCall_%s) As LONG_PTR)\r\n",
    1394                     pWindowInfo->HandleName,
    1395                     pWindowInfo->name);
    1396             }
    1397             i2+=lstrlen(buffer+i2);
    1398             sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->HandleName);
     1398                    pWindowInfo->GetHandleName().c_str(),
     1399                    pWindowInfo->GetName().c_str());
     1400            }
     1401            i2+=lstrlen(buffer+i2);
     1402            sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->GetHandleName().c_str());
    13991403            i2+=lstrlen(buffer+i2);
    14001404            if(pWindowInfo->IconResName){
    1401                 sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->HandleName,pWindowInfo->IconResName);
     1405                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->GetHandleName().c_str(),pWindowInfo->IconResName);
    14021406                i2+=lstrlen(buffer+i2);
    14031407            }
    1404             sprintf(buffer+i2,"\t\tShowWindow(%s,SW_SHOW)\r\n",pWindowInfo->HandleName);
     1408            sprintf(buffer+i2,"\t\tShowWindow(%s,SW_SHOW)\r\n",pWindowInfo->GetHandleName().c_str());
    14051409            i2+=lstrlen(buffer+i2);
    14061410        }
    … …  
    14611465    {
    14621466        if(pWindowInfo->type==WNDTYPE_MODELESSDLG){
    1463             sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->name);
     1467            sprintf(buffer+i2,"\tIf lstrcmp(TemplateName,\"%s\")=0 Then\r\n",pWindowInfo->GetName().c_str());
    14641468            i2+=lstrlen(buffer+i2);
    14651469
    14661470            sprintf(buffer+i2,"\t\t%s=CreateWindowEx(&H%08x,\"NORMALDLG\",\"%s\",&H%08x,%d,%d,%d,%d,hOwnerWnd,%d As HMENU,GetModuleHandle(0),0)\r\n",
    1467                 pWindowInfo->HandleName,
     1471                pWindowInfo->GetHandleName().c_str(),
    14681472                pWindowInfo->ExStyle,
    14691473                pWindowInfo->caption,
    … …  
    14751479                pWindowInfo->id);
    14761480            i2+=lstrlen(buffer+i2);
    1477             sprintf(buffer+i2,"\t\tCreateDialog=%s\r\n",pWindowInfo->HandleName);
     1481            sprintf(buffer+i2,"\t\tCreateDialog=%s\r\n",pWindowInfo->GetHandleName().c_str());
    14781482            i2+=lstrlen(buffer+i2);
    14791483            if(bAvailUserProc[i]){
    14801484                sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(%s) As LONG_PTR)\r\n",
    1481                     pWindowInfo->HandleName,
     1485                    pWindowInfo->GetHandleName().c_str(),
    14821486                    pWindowInfo->CallBackName);
    14831487            }
    14841488            else{
    14851489                sprintf(buffer+i2,"\t\tSetWindowLongPtr(%s,GWLP_WNDPROC,AddressOf(EventCall_%s) As LONG_PTR)\r\n",
    1486                     pWindowInfo->HandleName,
    1487                     pWindowInfo->name);
    1488             }
    1489             i2+=lstrlen(buffer+i2);
    1490             sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->HandleName);
     1490                    pWindowInfo->GetHandleName().c_str(),
     1491                    pWindowInfo->GetName().c_str());
     1492            }
     1493            i2+=lstrlen(buffer+i2);
     1494            sprintf(buffer+i2,"\t\tSendMessage(%s,WM_INITDIALOG,0,0)\r\n",pWindowInfo->GetHandleName().c_str());
    14911495            i2+=lstrlen(buffer+i2);
    14921496            if(pWindowInfo->IconResName){
    1493                 sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->HandleName,pWindowInfo->IconResName);
     1497                sprintf(buffer+i2,"\t\tSendMessage(%s,WM_SETICON,ICON_SMALL,LoadIcon(GetModuleHandle(0),MAKEINTRESOURCE(%s)) As LPARAM)\r\n",pWindowInfo->GetHandleName().c_str(),pWindowInfo->IconResName);
    14941498                i2+=lstrlen(buffer+i2);
    14951499            }
    1496             sprintf(buffer+i2,"\tEnd If\r\n",pWindowInfo->name);
     1500            sprintf(buffer+i2,"\tEnd If\r\n",pWindowInfo->GetName().c_str());
    14971501            i2+=lstrlen(buffer+i2);
    14981502        }
    … …  
    15571561            if(bAvailUserProc[i])
    15581562                sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(%s)\r\n",pWindowInfo->CallBackName);
    1559             else sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(EventCall_%s)\r\n",pWindowInfo->name);
     1563            else sprintf(buffer+i2,"_RadSys_wcl.lpfnWndProc=AddressOf(EventCall_%s)\r\n",pWindowInfo->GetName().c_str());
    15601564            i2+=lstrlen(buffer+i2);
    15611565            if(pWindowInfo->bgColor==COLOR_3DFACE)
    … …  
    16381642    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
    16391643    {
    1640         sprintf(buffer+i2,"WINDOW:%s\r\n",pWindowInfo->name);
    1641         i2+=lstrlen(buffer+i2);
    1642         sprintf(buffer+i2,"    HANDLE    = %s\r\n",pWindowInfo->HandleName);
     1644        sprintf(buffer+i2,"WINDOW:%s\r\n",pWindowInfo->GetName().c_str());
     1645        i2+=lstrlen(buffer+i2);
     1646        sprintf(buffer+i2,"    HANDLE    = %s\r\n",pWindowInfo->GetHandleName().c_str());
    16431647        i2+=lstrlen(buffer+i2);
    16441648        sprintf(buffer+i2,"    POINT     = %d,%d\r\n",pWindowInfo->pos.x,pWindowInfo->pos.y);
    … …  
    17131717            }
    17141718        }
    1715         sprintf(buffer+i2,"END\r\n",pWindowInfo->name);
     1719        sprintf(buffer+i2,"END\r\n",pWindowInfo->GetName().c_str());
    17161720        i2+=lstrlen(buffer+i2);
    17171721        if(i2-GENERAL_SIZE<GENERAL_SIZE){
    … …  
    17241728        i2+=lstrlen(buffer+i2);
    17251729        i2+=GetSaveMenuData(buffer+i2,1,ProjectInfo.pMenuInfo[i].pMenuInfo,ProjectInfo.pMenuInfo[i].NumberOfMenu);
    1726         sprintf(buffer+i2,"END\r\n",windowInfos[i]->name);
     1730        sprintf(buffer+i2,"END\r\n",windowInfos[i]->GetName().c_str());
    17271731        i2+=lstrlen(buffer+i2);
    17281732        if(i2-GENERAL_SIZE<GENERAL_SIZE){
    … …  
    18821886                i3=1;
    18831887
    1884                 ProjectInfo.windowInfos.back()->name=(char *)HeapAlloc(hHeap,0,i2+1);
    1885                 lstrcpy(ProjectInfo.windowInfos.back()->name,temp2);
     1888                ProjectInfo.windowInfos.back()->SetName( temp2 );
    18861889            }
    18871890            else if(lstrcmpi(temporary,"HANDLE")==0&&i3==1){
    1888                 ProjectInfo.windowInfos.back()->HandleName=(char *)HeapAlloc(hHeap,0,i2+1);
    1889                 lstrcpy(ProjectInfo.windowInfos.back()->HandleName,temp2);
     1891                ProjectInfo.windowInfos.back()->SetHandleName( temp2 );
    18901892            }
    18911893            else if(lstrcmpi(temporary,"POINT")==0&&i3==1){
    … …  
    21772179    BOOST_FOREACH( WindowInfo *pWindowInfo, ProjectInfo.windowInfos )
    21782180    {
    2179         if(lstrcmpi(NewWindow.name,pWindowInfo->name)==0){
     2181        if(lstrcmpi(NewWindow.name,pWindowInfo->GetName().c_str())==0){
    21802182            //"\"%s\" ウィンドウは既にプロジェクト内に存在します。"
    2181             sprintf(temporary,STRING_DUPLICATIONERROR_WINDOW_IN_PROJECT,pWindowInfo->name);
     2183            sprintf(temporary,STRING_DUPLICATIONERROR_WINDOW_IN_PROJECT,pWindowInfo->GetName().c_str());
    21822184            MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
    21832185            return;
    21842186        }
    2185         if(lstrcmpi(NewWindow.HandleName,pWindowInfo->HandleName)==0){
     2187        if(lstrcmpi(NewWindow.HandleName,pWindowInfo->GetHandleName().c_str())==0){
    21862188            //"\"%s\" ハンドルは既にプロジェクト内に存在します。"
    2187             sprintf(temporary,STRING_DUPLICATIONERROR_HANDLE_IN_PROJECT,pWindowInfo->HandleName);
     2189            sprintf(temporary,STRING_DUPLICATIONERROR_HANDLE_IN_PROJECT,pWindowInfo->GetHandleName().c_str());
    21882190            MessageBox(hOwner,temporary,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
    21892191            return;
    … …  
    22052207
    22062208    //ウィンドウ名
    2207     ProjectInfo.windowInfos.back()->name=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.name)+1);
    2208     lstrcpy(ProjectInfo.windowInfos.back()->name,NewWindow.name);
     2209    ProjectInfo.windowInfos.back()->SetName( NewWindow.name );
    22092210
    22102211    //ハンドル名
    2211     ProjectInfo.windowInfos.back()->HandleName=(char *)HeapAlloc(hHeap,0,lstrlen(NewWindow.HandleName)+1);
    2212     lstrcpy(ProjectInfo.windowInfos.back()->HandleName,NewWindow.HandleName);
     2212    ProjectInfo.windowInfos.back()->SetHandleName( NewWindow.HandleName );
    22132213
    22142214    //位置情報
    … …  
    22672267
    22682268    //メッセージ処理ファイル名
    2269     sprintf(temporary,"%s.ab",ProjectInfo.windowInfos.back()->name);
     2269    sprintf(temporary,"%s.ab",ProjectInfo.windowInfos.back()->GetName().c_str());
    22702270    ProjectInfo.windowInfos.back()->filepath=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
    22712271    lstrcpy(ProjectInfo.windowInfos.back()->filepath,temporary);
    … …  
    22872287        NewWindow.CallBackName);
    22882288
    2289     sprintf(temporary,"%s%s.ab",ProjectInfo.dir,ProjectInfo.windowInfos.back()->name);
     2289    sprintf(temporary,"%s%s.ab",ProjectInfo.dir,ProjectInfo.windowInfos.back()->GetName().c_str());
    22902290
    22912291    //書き込み
    … …  
    23062306    tv.item.iSelectedImage=2;
    23072307    tv.hParent=ProjectInfo.hWindowTreeItem;
    2308     tv.item.pszText=ProjectInfo.windowInfos.back()->name;
     2308    lstrcpy( temp2, ProjectInfo.windowInfos.back()->GetName().c_str() );
     2309    tv.item.pszText = temp2;
    23092310
    23102311    ProjectInfo.windowInfos.back()->hTreeItem=TreeView_InsertItem(hMaterialTreeView,&tv);
    … …  
    23262327    //ウィンドウが開かれている場合は閉じる
    23272328    for(i=0;i<MAX_WNDNUM;i++){
    2328         if(MdiInfo[i].hwnd&&lstrcmpi(pWindowInfo->name,MdiInfo[i].path)==0){
     2329        if(MdiInfo[i].hwnd&&lstrcmpi(pWindowInfo->GetName().c_str(),MdiInfo[i].path)==0){
    23292330            SendMessage(MdiInfo[i].hwnd,WM_CLOSE,0,0);
    23302331            break;
    … …  
    23332334
    23342335    //ウィンドウ情報のメモリを解放
    2335     HeapDefaultFree(pWindowInfo->name);
    23362336    HeapDefaultFree(pWindowInfo->filepath);
    2337     HeapDefaultFree(pWindowInfo->HandleName);
    23382337    HeapDefaultFree(pWindowInfo->caption);
    23392338    HeapDefaultFree(pWindowInfo->ClassName);
Note: See TracChangeset for help on using the changeset viewer.