mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 18:15:11 +00:00
[ATL] Add GET_X_LPARAM and GET_Y_LPARAM to atlwin.h
Remove all local definitions
This commit is contained in:
parent
007ec0310c
commit
f9e50f5471
8 changed files with 9 additions and 24 deletions
|
@ -10,10 +10,6 @@
|
|||
#define __COMCTL32SUPP_H__
|
||||
|
||||
#include <windowsx.h>
|
||||
/*
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
*/
|
||||
|
||||
#define Button_IsEnabled(hwndCtl) IsWindowEnabled((hwndCtl))
|
||||
|
||||
|
|
|
@ -64,9 +64,6 @@ extern HANDLE hProcessHeap;
|
|||
extern HKEY hkExplorer;
|
||||
extern BOOL bExplorerIsShell;
|
||||
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
|
||||
/*
|
||||
* explorer.c
|
||||
*/
|
||||
|
|
|
@ -34,9 +34,6 @@ extern HINSTANCE g_hInstance;
|
|||
#define ID_ICON_HOTPLUG (WM_APP + 0x4CC)
|
||||
#define ID_ICON_POWER (WM_APP + 0x4CD)
|
||||
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
|
||||
#include "csystray.h"
|
||||
|
||||
typedef HRESULT(STDMETHODCALLTYPE * PFNSTINIT) (_In_ CSysTray * pSysTray);
|
||||
|
|
|
@ -25,10 +25,6 @@ toolbar, and address band for an explorer window
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
/* FIXME, I can't include windowsx because it conflicts with some #defines */
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
|
||||
#if 1
|
||||
|
||||
interface IAugmentedShellFolder : public IShellFolder
|
||||
|
|
|
@ -31,9 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui);
|
|||
#include "CBandSiteMenu.h"
|
||||
#include "CISFBand.h"
|
||||
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
|
||||
#define USE_SYSTEM_ISFBAND 0
|
||||
|
||||
#if USE_SYSTEM_ISFBAND
|
||||
|
|
|
@ -24,10 +24,6 @@ Implements the toolbar band of a cabinet window
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
/* FIXME, I can't include windowsx because it conflicts with some #defines */
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
|
||||
class CToolsBand :
|
||||
public CWindowImpl<CToolsBand, CWindow, CControlWinTraits>,
|
||||
public CComObjectRootEx<CComMultiThreadModelNoCS>,
|
||||
|
|
|
@ -28,9 +28,6 @@
|
|||
|
||||
#define IDS_MENU_EMPTY 34561
|
||||
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(CMenuToolbars);
|
||||
|
||||
// FIXME: Enable if/when wine comctl supports this flag properly
|
||||
|
|
|
@ -52,6 +52,15 @@ inline LONG_PTR GetWindowLongPtr(HWND hWnd, int nIndex)
|
|||
namespace ATL
|
||||
{
|
||||
|
||||
#ifndef GET_X_LPARAM
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#endif
|
||||
#ifndef GET_Y_LPARAM
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
struct _ATL_WNDCLASSINFOW;
|
||||
typedef _ATL_WNDCLASSINFOW CWndClassInfo;
|
||||
|
||||
|
|
Loading…
Reference in a new issue