diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2015-01-03 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:53 +0300 |
| commit | 0713a3ab803e57401f18432148b4139e5fe6e5dd (patch) | |
| tree | b66fd26676cf817f2bc2a889b6123c00da96d6d0 /CPP/Windows/Control | |
| parent | 7e021179cd9f46b5bf2d48aac84783ff431dd5ac (diff) | |
9.389.38
Diffstat (limited to 'CPP/Windows/Control')
| -rw-r--r-- | CPP/Windows/Control/Dialog.cpp | 2 | ||||
| -rw-r--r-- | CPP/Windows/Control/ImageList.cpp | 3 | ||||
| -rw-r--r-- | CPP/Windows/Control/ImageList.h | 6 | ||||
| -rw-r--r-- | CPP/Windows/Control/PropertyPage.h | 2 | ||||
| -rw-r--r-- | CPP/Windows/Control/Window2.cpp | 8 |
5 files changed, 12 insertions, 9 deletions
diff --git a/CPP/Windows/Control/Dialog.cpp b/CPP/Windows/Control/Dialog.cpp index 01bc7d43..9df3ef5e 100644 --- a/CPP/Windows/Control/Dialog.cpp +++ b/CPP/Windows/Control/Dialog.cpp @@ -81,7 +81,7 @@ bool CDialog::OnButtonClicked(int buttonID, HWND /* buttonHWND */) static bool GetWorkAreaRect(RECT *rect) { // use another function for multi-monitor. - return BOOLToBool(::SystemParametersInfo(SPI_GETWORKAREA, NULL, rect, NULL)); + return BOOLToBool(::SystemParametersInfo(SPI_GETWORKAREA, 0, rect, 0)); } bool IsDialogSizeOK(int xSize, int ySize) diff --git a/CPP/Windows/Control/ImageList.cpp b/CPP/Windows/Control/ImageList.cpp index 16a46fa4..3e22b956 100644 --- a/CPP/Windows/Control/ImageList.cpp +++ b/CPP/Windows/Control/ImageList.cpp @@ -2,10 +2,9 @@ #include "StdAfx.h" -#include "Windows/Control/ImageList.h" +#include "ImageList.h" namespace NWindows { namespace NControl { }} - diff --git a/CPP/Windows/Control/ImageList.h b/CPP/Windows/Control/ImageList.h index 72094399..0d9c9313 100644 --- a/CPP/Windows/Control/ImageList.h +++ b/CPP/Windows/Control/ImageList.h @@ -1,7 +1,9 @@ // Windows/Control/ImageList.h -#ifndef __WINDOWS_CONTROL_IMAGELIST_H -#define __WINDOWS_CONTROL_IMAGELIST_H +#ifndef __WINDOWS_CONTROL_IMAGE_LIST_H +#define __WINDOWS_CONTROL_IMAGE_LIST_H + +#include <commctrl.h> #include "../Defs.h" diff --git a/CPP/Windows/Control/PropertyPage.h b/CPP/Windows/Control/PropertyPage.h index 4e7e088e..7df8645e 100644 --- a/CPP/Windows/Control/PropertyPage.h +++ b/CPP/Windows/Control/PropertyPage.h @@ -3,6 +3,8 @@ #ifndef __WINDOWS_CONTROL_PROPERTYPAGE_H #define __WINDOWS_CONTROL_PROPERTYPAGE_H +#include <prsht.h> + #include "Dialog.h" namespace NWindows { diff --git a/CPP/Windows/Control/Window2.cpp b/CPP/Windows/Control/Window2.cpp index e6ddb6d0..019046cd 100644 --- a/CPP/Windows/Control/Window2.cpp +++ b/CPP/Windows/Control/Window2.cpp @@ -56,8 +56,8 @@ bool CWindow2::CreateEx(DWORD exStyle, LPCTSTR className, LPCTSTR windowName, // wc.style = CS_HREDRAW | CS_VREDRAW; wc.style = 0; wc.lpfnWndProc = WindowProcedure; - wc.cbClsExtra = NULL; - wc.cbWndExtra = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; wc.hInstance = instance; wc.hIcon = NULL; wc.hCursor = LoadCursor(NULL, IDC_ARROW); @@ -103,8 +103,8 @@ bool CWindow2::CreateEx(DWORD exStyle, LPCWSTR className, LPCWSTR windowName, // wc.style = CS_HREDRAW | CS_VREDRAW; wc.style = 0; wc.lpfnWndProc = WindowProcedure; - wc.cbClsExtra = NULL; - wc.cbWndExtra = NULL; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; wc.hInstance = instance; wc.hIcon = NULL; wc.hCursor = LoadCursor(NULL, IDC_ARROW); |