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

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/ProjectEditor/DialogBoxes.cpp (modified) (17 diffs)

trunk/abdev/ProjectEditor/DialogBoxes.cpp

@@ -439 +439 @@
                         //"プロジェクト名の先頭文字はアルファベット（A～Z、a～z）またはアンダーバー（_）でなければなりません。"
                         MessageBox(hwnd,STRING_ERROR_PROJECTTOPCHAR,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
-                        SetWindowLong(hwnd,DWL_MSGRESULT,-1);
+                        SetWindowLongPtr(hwnd,DWLP_MSGRESULT,-1);
                         return 1;
                     }
@@ -447 +447 @@
                             //"プロジェクト名に不正な文字コードが含まれています。"
                             MessageBox(hwnd,STRING_ERROR_PROJECTNAME,STRING_ERROR,MB_OK|MB_ICONEXCLAMATION);
-                            SetWindowLong(hwnd,DWL_MSGRESULT,-1);
+                            SetWindowLongPtr(hwnd,DWLP_MSGRESULT,-1);
                             return 1;
                         }
@@ -490 +490 @@
     i=0;
     psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE1);
-    psp.pfnDlgProc=DlgNewProject_Page1;
+    psp.pfnDlgProc=(DLGPROC)DlgNewProject_Page1;
     hpsp[i]=CreatePropertySheetPage(&psp);
     i++;
     psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE2);
-    psp.pfnDlgProc=DlgNewProject_Page2;
+    psp.pfnDlgProc=(DLGPROC)DlgNewProject_Page2;
     hpsp[i]=CreatePropertySheetPage(&psp);
     i++;
     psp.pszTemplate=MAKEINTRESOURCE(IDD_NEWPROJECT_PAGE3);
-    psp.pfnDlgProc=DlgNewProject_Page3;
+    psp.pfnDlgProc=(DLGPROC)DlgNewProject_Page3;
     hpsp[i]=CreatePropertySheetPage(&psp);
 
@@ -952 +952 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION1);
-    psp[i].pfnDlgProc=DlgProjectOption_Whole;
+    psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Whole;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
     i++;
@@ -959 +959 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION2);
-    psp[i].pfnDlgProc=DlgProjectOption_Win32API;
+    psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Win32API;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
     i++;
@@ -966 +966 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION3);
-    psp[i].pfnDlgProc=DlgProjectOption_Manifest;
+    psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Manifest;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
     i++;
@@ -973 +973 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_PJ_OPTION4);
-    psp[i].pfnDlgProc=DlgProjectOption_Debug;
+    psp[i].pfnDlgProc=(DLGPROC)DlgProjectOption_Debug;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
 
@@ -1599 +1599 @@
 #ifdef THETEXT
                 case IDC_SAVE:
-                    if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_OPTION_THEME_SAVE),hwnd,DlgOptionThemeSave)) return 1;
+                    if(!DialogBox(hResInst,MAKEINTRESOURCE(IDD_OPTION_THEME_SAVE),hwnd,(DLGPROC)DlgOptionThemeSave)) return 1;
 
                     pobj_Theme=pobj_DBTheme->dupli_check(szNewThemeName);
@@ -2024 +2024 @@
             switch(LOWORD(wParam)){
                 case IDC_ADD:
-                    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,Dlg_Option_Web_Domain_Add,-1)) return 1;
+                    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,(DLGPROC)Dlg_Option_Web_Domain_Add,-1)) return 1;
 
                     pobj_temp_DBDomain->add(szDomainAdd_Name,szDomainAdd_Domain);
@@ -2047 +2047 @@
                             ListView_GetItemText(hListView,i,1,szDomainAdd_Domain,255);
                             lstrcpy(temporary,szDomainAdd_Name);
-                            if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,Dlg_Option_Web_Domain_Add,i)) return 1;
+                            if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,(DLGPROC)Dlg_Option_Web_Domain_Add,i)) return 1;
 
                             pobj_temp_DBDomain->change(temporary,szDomainAdd_Name,szDomainAdd_Domain);
@@ -2078 +2078 @@
                     ListView_GetItemText(nmhdr->hwndFrom,lpnmListView->iItem,1,szDomainAdd_Domain,255);
                     lstrcpy(szBeforeName,szDomainAdd_Name);
-                    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,Dlg_Option_Web_Domain_Add,lpnmListView->iItem)) return 1;
+                    if(!DialogBoxParam(hResInst,MAKEINTRESOURCE(IDD_OPTION_WEB_DOMAIN_ADD),hwnd,(DLGPROC)Dlg_Option_Web_Domain_Add,lpnmListView->iItem)) return 1;
 
                     pobj_temp_DBDomain->change(szBeforeName,szDomainAdd_Name,szDomainAdd_Domain);
@@ -2108 +2108 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_WHOLE);
-    psp[i].pfnDlgProc=Dlg_Option_Whole;
+    psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Whole;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
     i++;
@@ -2115 +2115 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_EDITOR);
-    psp[i].pfnDlgProc=Dlg_Option_Editor;
+    psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Editor;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
     i++;
@@ -2122 +2122 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_COLOR);
-    psp[i].pfnDlgProc=Dlg_Option_Color;
+    psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Color;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
     i++;
@@ -2129 +2129 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_TOOLBAR);
-    psp[i].pfnDlgProc=Dlg_Option_Toolbar;
+    psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Toolbar;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
 
@@ -2139 +2139 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_RAD);
-    psp[i].pfnDlgProc=Dlg_Option_Rad;
+    psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Rad;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);
 #endif
@@ -2148 +2148 @@
     psp[i].hInstance=hResInst;
     psp[i].pszTemplate=MAKEINTRESOURCE(IDD_OPTION_WEB);
-    psp[i].pfnDlgProc=Dlg_Option_Web;
+    psp[i].pfnDlgProc=(DLGPROC)Dlg_Option_Web;
     hpsp[i]=CreatePropertySheetPage(&psp[i]);