Changeset 302 in dev for trunk/abdev/ProjectEditor/ProjectControl.cpp

Timestamp:

Aug 24, 2007, 2:13:12 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/ProjectEditor/ProjectControl.cpp (modified) (6 diffs)

trunk/abdev/ProjectEditor/ProjectControl.cpp

@@ -277 +277 @@
                     for(i=0;i<ProjectInfo.NumberOfMenu;i++){
                         if(ProjectInfo.pMenuInfo[i].hTreeItem==hTreeItem){
-                            if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,DlgProject_MenuID_Input,(long)ProjectInfo.pMenuInfo[i].IdName)) break;
+                            if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_INPUTID),hOwner,(DLGPROC)DlgProject_MenuID_Input,(long)ProjectInfo.pMenuInfo[i].IdName)) break;
 
                             //重複チェック
@@ -437 +437 @@
             SendMessage(hButton,WM_SETFONT,(long)hStatusFont,0);
 
-            OldTabProc=(WNDPROC)GetWindowLong(hProjectViewTab,GWL_WNDPROC);
-            SetWindowLong(hProjectViewTab,GWL_WNDPROC,(long)TabProc);
+            OldTabProc=(WNDPROC)GetWindowLongPtr(hProjectViewTab,GWLP_WNDPROC);
+            SetWindowLongPtr(hProjectViewTab,GWLP_WNDPROC,(long)TabProc);
 
             //タブを設定
@@ -460 +460 @@
                 0,0,0,0,
                 hProjectViewTab,0,hInst,0);
-            OldProcedureTreeViewProc=(WNDPROC)GetWindowLong(hProcedureTreeView,GWL_WNDPROC);
-            SetWindowLong(hProcedureTreeView,GWL_WNDPROC,(long)ProcedureTreeViewProc);
+            OldProcedureTreeViewProc=(WNDPROC)GetWindowLongPtr(hProcedureTreeView,GWLP_WNDPROC);
+            SetWindowLongPtr(hProcedureTreeView,GWLP_WNDPROC,(long)ProcedureTreeViewProc);
             //イメージリスト読み込み、設定
             hProcedureTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,8,0);
@@ -479 +479 @@
                 0,0,0,0,
                 hProjectViewTab,0,hInst,0);
-            OldMaterialTreeViewProc=(WNDPROC)GetWindowLong(hMaterialTreeView,GWL_WNDPROC);
-            SetWindowLong(hMaterialTreeView,GWL_WNDPROC,(long)MaterialTreeViewProc);
+            OldMaterialTreeViewProc=(WNDPROC)GetWindowLongPtr(hMaterialTreeView,GWLP_WNDPROC);
+            SetWindowLongPtr(hMaterialTreeView,GWLP_WNDPROC,(long)MaterialTreeViewProc);
             //イメージリスト読み込み、設定
             hMaterialTreeViewImageList=ImageList_Create(16,16,ILC_COLOR24|ILC_MASK,3,0);
@@ -502 +502 @@
                         pobj_nv->bClipProjectView=1;
 
-                        SetWindowLong(hwnd,GWL_EXSTYLE,WS_EX_STATICEDGE);
+                        SetWindowLongPtr(hwnd,GWL_EXSTYLE,WS_EX_STATICEDGE);
                         SetParent(hwnd,hOwner);
                         ResizeOwnerWnd();
@@ -511 +511 @@
                         pobj_nv->bClipProjectView=0;
 
-                        SetWindowLong(hwnd,GWL_EXSTYLE,0);
+                        SetWindowLongPtr(hwnd,GWL_EXSTYLE,0);
 
                         SetParent(hwnd,hProjectView_ToolWindow);