Changeset 624 in dev for trunk/ab5.0/abdev/abdev/RadProc.cpp
- Timestamp:
- May 23, 2008, 10:35:36 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/abdev/RadProc.cpp
r618 r624 4 4 #include "common.h" 5 5 6 void NewRadWindow( const WindowInfo &windowInfo )6 void NewRadWindow( const ActiveBasic::PM::WindowInfo &windowInfo ) 7 7 { 8 8 extern HINSTANCE hInst,hResInst; … … 153 153 } 154 154 155 int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,c har *IdName,char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,int ImageType,char *ImagePath,DWORD dwInsertType){155 int InsertDlgItem(int WndNum,int WndInfoNum,int ItemNum,POINT *pPos,SIZE *pSize,const char *IdName,const char *caption,DWORD style_or_WndNum,DWORD ExStyle,int Control,ActiveBasic::PM::ImageReferenceType::EnumType ImageType,const char *ImagePath,DWORD dwInsertType){ 156 156 //dwInsertType 157 157 //0 … 元に戻す、やり直し … … 164 164 char temporary[MAX_PATH]; 165 165 166 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];167 168 CHILDINFO *pChildInfo = new CHILDINFO();166 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 167 168 ActiveBasic::PM::ChildWindowInfo *pChildInfo = new ActiveBasic::PM::ChildWindowInfo(); 169 169 170 170 if(ItemNum==-1) … … 175 175 else 176 176 { 177 std::vector<CHILDINFO *>::iterator it = pWindowInfo->childWindowInfos.begin();177 ActiveBasic::PM::ChildWindowInfos::iterator it = pWindowInfo->childWindowInfos.begin(); 178 178 for( int i=0; i<ItemNum; i++ ) 179 179 { … … 187 187 //ID 188 188 if(ItemNum==-1){ 189 for(i=lstrlen(IdName)-1;i>=0;i--){ 190 if(!('0'<=IdName[i]&&IdName[i]<='9')) break; 189 char temp2[1024]; 190 lstrcpy( temp2, IdName ); 191 for(i=lstrlen(temp2)-1;i>=0;i--){ 192 if(!('0'<=temp2[i]&&temp2[i]<='9')) break; 191 193 } 192 194 i++; 193 195 194 if( IdName[i]!='\0'){195 i2=atoi( IdName+i)+1;196 if(temp2[i]!='\0'){ 197 i2=atoi(temp2+i)+1; 196 198 if(dwInsertType==2) i2--; 197 IdName[i]=0;199 temp2[i]=0; 198 200 } 199 201 else{ … … 202 204 } 203 205 204 if(i2==0) lstrcpy(temporary, IdName);205 else sprintf(temporary,"%s%d", IdName,i2);206 if(i2==0) lstrcpy(temporary,temp2); 207 else sprintf(temporary,"%s%d",temp2,i2); 206 208 SearchStart: 207 for(i=0;i<pWindowInfo->childWindowInfos.size();i++){ 208 if(i!=NewItemNum){ 209 if(lstrcmp(pWindowInfo->childWindowInfos[i]->IdName,temporary)==0){ 209 for( i=0; i<static_cast<int>(pWindowInfo->childWindowInfos.size()); i++ ) 210 { 211 if( i != NewItemNum ) 212 { 213 if( pWindowInfo->childWindowInfos[i]->GetName() == temporary ) 214 { 210 215 i2++; 211 sprintf(temporary,"%s%d", IdName,i2);216 sprintf(temporary,"%s%d",temp2,i2); 212 217 goto SearchStart; 213 218 } … … 216 221 } 217 222 else lstrcpy(temporary,IdName); 218 pChildInfo->IdName=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1); 219 lstrcpy(pChildInfo->IdName,temporary); 223 pChildInfo->SetName( temporary ); 220 224 221 225 //位置 … … 235 239 } 236 240 else lstrcpy(temporary,caption); 237 pChildInfo->caption=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1); 238 lstrcpy(pChildInfo->caption,temporary); 241 pChildInfo->SetCaption( temporary ); 239 242 240 243 //スタイル 241 pChildInfo-> style=style_or_WndNum;244 pChildInfo->SetStyle( style_or_WndNum ); 242 245 243 246 //拡張スタイル 244 pChildInfo-> ExStyle=ExStyle;247 pChildInfo->SetExStyle( ExStyle ); 245 248 246 249 //クラス名 … … 249 252 if(Control==CT_IMAGEBOX){ 250 253 //イメージ ボックスの場合 251 pChildInfo-> ImageCtrlInfo.type=ImageType;254 pChildInfo->image.type = ImageType; 252 255 if(!ImagePath) 253 pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1); 256 { 257 pChildInfo->image.path = ""; 258 } 254 259 else{ 255 pChildInfo->ImageCtrlInfo.path=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(ImagePath)+1); 256 lstrcpy(pChildInfo->ImageCtrlInfo.path,ImagePath); 260 pChildInfo->image.path = ImagePath; 257 261 } 258 262 } … … 269 273 extern MDIINFO MdiInfo[MAX_WNDNUM]; 270 274 271 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];275 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 272 276 273 277 //変更情報 … … 276 280 277 281 //子ウィンドウのメモリを解放 278 HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->IdName);279 HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->caption);280 if(pWindowInfo->childWindowInfos[ItemNum]->Control==CT_IMAGEBOX){281 //イメージ ボックスの場合282 HeapDefaultFree(pWindowInfo->childWindowInfos[ItemNum]->ImageCtrlInfo.path);283 }284 282 delete pWindowInfo->childWindowInfos[ItemNum]; 285 283 286 std::vector<CHILDINFO *>::iterator it = pWindowInfo->childWindowInfos.begin();284 ActiveBasic::PM::ChildWindowInfos::iterator it = pWindowInfo->childWindowInfos.begin(); 287 285 for( int i=0; i<ItemNum; i++ ) 288 286 { … … 346 344 RECT rect; 347 345 348 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];346 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 349 347 350 348 hdc=GetDC(hwnd); … … 352 350 sw=0; 353 351 if(pobj_nv->bLineAdjust&&bLA){ 354 for(i=0;i<pWindowInfo->childWindowInfos.size();i++){ 355 const CHILDINFO *pChildInfo = pWindowInfo->childWindowInfos[i]; 352 for( i=0; i<static_cast<int>(pWindowInfo->childWindowInfos.size()); i++ ) 353 { 354 const ActiveBasic::PM::ChildWindowInfo *pChildInfo = pWindowInfo->childWindowInfos[i]; 356 355 if(i==MdiInfo[WndNum].MdiRadInfo->SelectingItem[0]) continue; 357 356 if(pChildInfo->Control != … … 449 448 extern MDIINFO MdiInfo[MAX_WNDNUM]; 450 449 451 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];450 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 452 451 453 452 if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[num]==SELECT_WINDOW){ … … 546 545 SCROLLINFO ScrollInfo; 547 546 548 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];547 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 549 548 550 549 DestroyWindow(MdiInfo[WndNum].MdiRadInfo->hProp_Dlg); … … 607 606 int i; 608 607 609 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];608 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 610 609 611 610 for(i=pWindowInfo->childWindowInfos.size()-1;i>=0;i--){ 612 611 if(pWindowInfo->childWindowInfos[i]->Control==CT_COMBOBOX&& 613 (pWindowInfo->childWindowInfos[i]-> style&0x000F)!=CBS_SIMPLE){612 (pWindowInfo->childWindowInfos[i]->GetStyle()&0x000F)!=CBS_SIMPLE){ 614 613 //コンボ ボックスの場合は表示部分をターゲットに選択する(高さ20pixel) 615 614 if(x>=MdiInfo[WndNum].MdiRadInfo->ClientPos.x+pWindowInfo->childWindowInfos[i]->pos.x&& … … 676 675 RECT rect; 677 676 678 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];677 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 679 678 680 679 for(i=1;i<MAX_RAD_SELITEM;i++) MdiInfo[WndNum].MdiRadInfo->SelectingItem[i]=-1; … … 701 700 RECT rect; 702 701 703 WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum];702 ActiveBasic::PM::WindowInfo *pWindowInfo = projectInfo.windowInfos[WndInfoNum]; 704 703 705 704 if(MdiInfo[WndNum].MdiRadInfo->SelectingItem[1]!=-1){ … … 762 761 SIZE NeedSize; 763 762 764 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path);763 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[WndNum].path); 765 764 766 765 //必要な幅、高さを共に100ピクセル余裕を持たせる … … 817 816 i=GetWndNum(GetParent(hwnd)); 818 817 i2 = GetWndInfoNum(MdiInfo[i].path); 819 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);818 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 820 819 821 820 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ … … 897 896 i=GetWndNum(hParent); 898 897 i2 = GetWndInfoNum(MdiInfo[i].path); 899 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);898 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 900 899 901 900 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ … … 966 965 size.cx=rect.right-rect.left; 967 966 size.cy=rect.bottom-rect.top; 968 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"CommandButton","Button",WS_CHILD|WS_VISIBLE,0,CT_BUTTON,0,0,1); 967 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 968 i, 969 i2, 970 -1, 971 &pos, 972 &size, 973 "CommandButton", 974 "Button", 975 WS_CHILD|WS_VISIBLE,0,CT_BUTTON, 976 ActiveBasic::PM::ImageReferenceType::File, 977 0, 978 1 979 ); 969 980 } 970 981 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_CHECKBOX){ … … 985 996 size.cx=rect.right-rect.left; 986 997 size.cy=rect.bottom-rect.top; 987 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"CheckBox","Check",WS_CHILD|WS_VISIBLE|BS_AUTOCHECKBOX,0,CT_CHECKBOX,0,0,1); 998 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem( 999 i, 1000 i2, 1001 -1, 1002 &pos, 1003 &size, 1004 "CheckBox", 1005 "Check", 1006 WS_CHILD|WS_VISIBLE|BS_AUTOCHECKBOX, 1007 0, 1008 CT_CHECKBOX, 1009 ActiveBasic::PM::ImageReferenceType::File, 1010 0, 1011 1 1012 ); 988 1013 } 989 1014 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_COMBOBOX){ … … 1004 1029 size.cx=rect.right-rect.left; 1005 1030 size.cy=rect.bottom-rect.top; 1006 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ComboBox","",WS_CHILD|WS_VISIBLE|CBS_DROPDOWN|CBS_SORT|WS_VSCROLL,0,CT_COMBOBOX,0,0,1); 1031 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1032 i, 1033 i2, 1034 -1, 1035 &pos, 1036 &size, 1037 "ComboBox", 1038 "", 1039 WS_CHILD|WS_VISIBLE|CBS_DROPDOWN|CBS_SORT|WS_VSCROLL, 1040 0, 1041 CT_COMBOBOX, 1042 ActiveBasic::PM::ImageReferenceType::File, 1043 0, 1044 1 1045 ); 1007 1046 } 1008 1047 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_EDIT){ … … 1023 1062 size.cx=rect.right-rect.left; 1024 1063 size.cy=rect.bottom-rect.top; 1025 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"EditBox","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_EDIT,0,0,1); 1064 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1065 i, 1066 i2, 1067 -1, 1068 &pos, 1069 &size, 1070 "EditBox", 1071 "", 1072 WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE, 1073 CT_EDIT, 1074 ActiveBasic::PM::ImageReferenceType::File, 1075 0, 1076 1 1077 ); 1026 1078 } 1027 1079 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_GROUPBOX){ … … 1042 1094 size.cx=rect.right-rect.left; 1043 1095 size.cy=rect.bottom-rect.top; 1044 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"GroupBox","Group",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,0,CT_GROUPBOX,0,0,1); 1096 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1097 i, 1098 i2, 1099 -1, 1100 &pos, 1101 &size, 1102 "GroupBox", 1103 "Group", 1104 WS_CHILD|WS_VISIBLE|BS_GROUPBOX, 1105 0, 1106 CT_GROUPBOX, 1107 ActiveBasic::PM::ImageReferenceType::File, 1108 0, 1109 1 1110 ); 1045 1111 } 1046 1112 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_HSCROLLBAR){ … … 1061 1127 size.cx=rect.right-rect.left; 1062 1128 size.cy=rect.bottom-rect.top; 1063 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"HScrollBar","",WS_CHILD|WS_VISIBLE|SBS_HORZ,0,CT_HSCROLLBAR,0,0,1); 1129 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem( 1130 i, 1131 i2, 1132 -1, 1133 &pos, 1134 &size, 1135 "HScrollBar", 1136 "", 1137 WS_CHILD|WS_VISIBLE|SBS_HORZ, 1138 0, 1139 CT_HSCROLLBAR, 1140 ActiveBasic::PM::ImageReferenceType::File, 1141 0, 1142 1 1143 ); 1064 1144 } 1065 1145 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_IMAGEBOX){ … … 1080 1160 size.cx=rect.right-rect.left; 1081 1161 size.cy=rect.bottom-rect.top; 1082 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ImageBox","",WS_CHILD|WS_VISIBLE|SS_BLACKFRAME,0,CT_IMAGEBOX,IMGTYPE_FILE,0,1); 1162 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1163 i, 1164 i2, 1165 -1, 1166 &pos, 1167 &size, 1168 "ImageBox", 1169 "", 1170 WS_CHILD|WS_VISIBLE|SS_BLACKFRAME,0,CT_IMAGEBOX, 1171 ActiveBasic::PM::ImageReferenceType::File, 1172 0, 1173 1 1174 ); 1083 1175 } 1084 1176 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTBOX){ … … 1099 1191 size.cx=rect.right-rect.left; 1100 1192 size.cy=rect.bottom-rect.top; 1101 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ListBox","",WS_CHILD|WS_VISIBLE|WS_VSCROLL|LBS_SORT|LBS_NOTIFY,WS_EX_CLIENTEDGE,CT_LISTBOX,0,0,1); 1193 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1194 i, 1195 i2, 1196 -1, 1197 &pos, 1198 &size, 1199 "ListBox", 1200 "", 1201 WS_CHILD|WS_VISIBLE|WS_VSCROLL|LBS_SORT|LBS_NOTIFY,WS_EX_CLIENTEDGE, 1202 CT_LISTBOX, 1203 ActiveBasic::PM::ImageReferenceType::File, 1204 0, 1205 1 1206 ); 1102 1207 } 1103 1208 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_LISTVIEW){ … … 1118 1223 size.cx=rect.right-rect.left; 1119 1224 size.cy=rect.bottom-rect.top; 1120 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ListView","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_LISTVIEW,0,0,1); 1225 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1226 i, 1227 i2, 1228 -1, 1229 &pos, 1230 &size, 1231 "ListView", 1232 "", 1233 WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE, 1234 CT_LISTVIEW, 1235 ActiveBasic::PM::ImageReferenceType::File, 1236 0, 1237 1 1238 ); 1121 1239 } 1122 1240 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_PROGRESSBAR){ … … 1137 1255 size.cx=rect.right-rect.left; 1138 1256 size.cy=rect.bottom-rect.top; 1139 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"ProgressBar","",WS_CHILD|WS_VISIBLE,WS_EX_STATICEDGE,CT_PROGRESSBAR,0,0,1); 1257 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1258 i, 1259 i2, 1260 -1, 1261 &pos, 1262 &size, 1263 "ProgressBar", 1264 "", 1265 WS_CHILD|WS_VISIBLE,WS_EX_STATICEDGE, 1266 CT_PROGRESSBAR, 1267 ActiveBasic::PM::ImageReferenceType::File, 1268 0, 1269 1 1270 ); 1140 1271 } 1141 1272 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_RADIOBUTTON){ … … 1156 1287 size.cx=rect.right-rect.left; 1157 1288 size.cy=rect.bottom-rect.top; 1158 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"RadioButton","radio",WS_CHILD|WS_VISIBLE|BS_AUTORADIOBUTTON,0,CT_RADIOBUTTON,0,0,1); 1289 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1290 i, 1291 i2, 1292 -1, 1293 &pos, 1294 &size, 1295 "RadioButton", 1296 "radio", 1297 WS_CHILD|WS_VISIBLE|BS_AUTORADIOBUTTON, 1298 0, 1299 CT_RADIOBUTTON, 1300 ActiveBasic::PM::ImageReferenceType::File, 1301 0, 1302 1 1303 ); 1159 1304 } 1160 1305 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_STATIC){ … … 1175 1320 size.cx=rect.right-rect.left; 1176 1321 size.cy=rect.bottom-rect.top; 1177 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"Static","Text",WS_CHILD|WS_VISIBLE,0,CT_STATIC,0,0,1); 1322 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1323 i, 1324 i2, 1325 -1, 1326 &pos, 1327 &size, 1328 "Static", 1329 "Text", 1330 WS_CHILD|WS_VISIBLE, 1331 0, 1332 CT_STATIC, 1333 ActiveBasic::PM::ImageReferenceType::File, 1334 0, 1335 1 1336 ); 1178 1337 } 1179 1338 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TRACKBAR){ … … 1194 1353 size.cx=rect.right-rect.left; 1195 1354 size.cy=rect.bottom-rect.top; 1196 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"TrackBar","",WS_CHILD|WS_VISIBLE|TBS_BOTH|TBS_NOTICKS,0,CT_TRACKBAR,0,0,1); 1355 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1356 i, 1357 i2, 1358 -1, 1359 &pos, 1360 &size, 1361 "TrackBar", 1362 "", 1363 WS_CHILD|WS_VISIBLE|TBS_BOTH|TBS_NOTICKS, 1364 0, 1365 CT_TRACKBAR, 1366 ActiveBasic::PM::ImageReferenceType::File, 1367 0, 1368 1 1369 ); 1197 1370 } 1198 1371 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_TREEVIEW){ … … 1213 1386 size.cx=rect.right-rect.left; 1214 1387 size.cy=rect.bottom-rect.top; 1215 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"TreeView","",WS_CHILD|WS_VISIBLE,WS_EX_CLIENTEDGE,CT_TREEVIEW,0,0,1); 1388 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1389 i, 1390 i2, 1391 -1, 1392 &pos, 1393 &size, 1394 "TreeView", 1395 "", 1396 WS_CHILD|WS_VISIBLE, 1397 WS_EX_CLIENTEDGE, 1398 CT_TREEVIEW, 1399 ActiveBasic::PM::ImageReferenceType::File, 1400 0, 1401 1 1402 ); 1216 1403 } 1217 1404 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_UPDOWN){ … … 1232 1419 size.cx=rect.right-rect.left; 1233 1420 size.cy=rect.bottom-rect.top; 1234 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"UpDown","",WS_CHILD|WS_VISIBLE,0,CT_UPDOWN,0,0,1); 1421 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1422 i, 1423 i2, 1424 -1, 1425 &pos, 1426 &size, 1427 "UpDown", 1428 "", 1429 WS_CHILD|WS_VISIBLE, 1430 0, 1431 CT_UPDOWN, 1432 ActiveBasic::PM::ImageReferenceType::File, 1433 0, 1434 1 1435 ); 1235 1436 } 1236 1437 else if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_VSCROLLBAR){ … … 1251 1452 size.cx=rect.right-rect.left; 1252 1453 size.cy=rect.bottom-rect.top; 1253 MdiInfo[i].MdiRadInfo->SelectingItem[0]=InsertDlgItem(i,i2,-1,&pos,&size,"VScrollBar","",WS_CHILD|WS_VISIBLE|SBS_VERT,0,CT_VSCROLLBAR,0,0,1); 1454 MdiInfo[i].MdiRadInfo->SelectingItem[0] = InsertDlgItem( 1455 i, 1456 i2, 1457 -1, 1458 &pos, 1459 &size, 1460 "VScrollBar", 1461 "", 1462 WS_CHILD|WS_VISIBLE|SBS_VERT, 1463 0, 1464 CT_VSCROLLBAR, 1465 ActiveBasic::PM::ImageReferenceType::File, 1466 0, 1467 1 1468 ); 1254 1469 } 1255 1470 SendMessage(GetWindow(MdiInfo[i].MdiRadInfo->hTools,GW_CHILD),WM_COMMAND,IDC_TOOL_MOUSE,0); … … 1275 1490 i=GetWndNum(hParent); 1276 1491 i2 = GetWndInfoNum(MdiInfo[i].path); 1277 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1492 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1278 1493 1279 1494 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ … … 1440 1655 i=GetWndNum(hParent); 1441 1656 i2=GetWndInfoNum(MdiInfo[i].path); 1442 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1657 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1443 1658 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ 1444 1659 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]!=SELECT_WINDOW){ … … 1452 1667 sprintf(temporary,"%s_%s_Click", 1453 1668 pWindowInfo->GetName().c_str(), 1454 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName1669 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str() 1455 1670 ); 1456 1671 } … … 1459 1674 sprintf(temporary,"%s_%s_EditChange", 1460 1675 pWindowInfo->GetName().c_str(), 1461 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1676 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1462 1677 } 1463 1678 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_EDIT) … … 1465 1680 sprintf(temporary,"%s_%s_Change", 1466 1681 pWindowInfo->GetName().c_str(), 1467 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1682 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1468 1683 } 1469 1684 else if(pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->Control==CT_LISTBOX) … … 1471 1686 sprintf(temporary,"%s_%s_SelChange", 1472 1687 pWindowInfo->GetName().c_str(), 1473 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]-> IdName);1688 pWindowInfo->childWindowInfos[MdiInfo[i].MdiRadInfo->SelectingItem[0]]->GetName().c_str()); 1474 1689 } 1475 1690 else temporary[0]=0; … … 1483 1698 hParent=GetParent(hwnd); 1484 1699 i=GetWndNum(hParent); 1485 WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path);1700 ActiveBasic::PM::WindowInfo *pWindowInfo = GetWndInfo(MdiInfo[i].path); 1486 1701 if(MdiInfo[i].MdiRadInfo->ButtonSelect==IDC_TOOL_MOUSE){ 1487 1702 if(MdiInfo[i].MdiRadInfo->SelectingItem[0]==SELECT_WINDOW){
Note:
See TracChangeset
for help on using the changeset viewer.