diff options
Diffstat (limited to 'Windows/Control/PropertyPage.cpp')
| -rwxr-xr-x | Windows/Control/PropertyPage.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Windows/Control/PropertyPage.cpp b/Windows/Control/PropertyPage.cpp index 9198131c..f8996be1 100755 --- a/Windows/Control/PropertyPage.cpp +++ b/Windows/Control/PropertyPage.cpp @@ -32,14 +32,14 @@ INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message, case WM_COMMAND: return dialog->OnCommand(wParam, lParam); case WM_NOTIFY: - return dialog->OnNotify(wParam, (LPNMHDR) lParam); + return dialog->OnNotify((UINT)wParam, (LPNMHDR) lParam); } if (dialog == NULL) return false; return dialog->OnMessage(message, wParam, lParam); } -bool CPropertyPage::OnNotify(UINT controlID, LPNMHDR lParam) +bool CPropertyPage::OnNotify(UINT /* controlID */, LPNMHDR lParam) { switch(lParam->code) { @@ -64,7 +64,7 @@ bool CPropertyPage::OnNotify(UINT controlID, LPNMHDR lParam) return true; } -int MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, const UString &title) +INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, const UString &title) { #ifndef _UNICODE AStringVector titles; @@ -127,7 +127,6 @@ int MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, } } - int res; #ifndef _UNICODE if (!g_IsNT) { @@ -142,7 +141,7 @@ int MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, sheet.nStartPage = 0; sheet.ppsp = &pagesA.Front(); sheet.pfnCallback = NULL; - res = ::PropertySheetA(&sheet); + return ::PropertySheetA(&sheet); } else #endif @@ -157,9 +156,8 @@ int MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndParent, sheet.nStartPage = 0; sheet.ppsp = &pagesW.Front(); sheet.pfnCallback = NULL; - res = ::PropertySheetW(&sheet); + return ::PropertySheetW(&sheet); } - return res; } }} |