From 774cbae7824e4410b5523762496c0ddb35da13d8 Mon Sep 17 00:00:00 2001 From: Jonas Kümmerlin Date: Fri, 28 Dec 2018 21:43:24 +0100 Subject: create alfcompat.h header --- alf/alf.cpp | 4 ---- alf/alf.h | 15 --------------- alf/alfcompat.h | 19 +++++++++++++++++++ alf/alfpriv.h | 1 + 4 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 alf/alfcompat.h (limited to 'alf') diff --git a/alf/alf.cpp b/alf/alf.cpp index 9b2f60f..2f3af7c 100644 --- a/alf/alf.cpp +++ b/alf/alf.cpp @@ -1,9 +1,5 @@ #include "alfpriv.h" -#ifndef WM_DPICHANGED -#define WM_DPICHANGED 0x02E0 -#endif - /* ALF App and Window */ static void diff --git a/alf/alf.h b/alf/alf.h index 16767a7..5540ebb 100644 --- a/alf/alf.h +++ b/alf/alf.h @@ -69,18 +69,6 @@ typedef struct { UINT margins[4]; } ALFAddWidgetParams; -typedef LRESULT (CALLBACK *ALF_COMPAT_SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR); -typedef struct { - LRESULT (WINAPI *SetWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR, DWORD_PTR); - LRESULT (WINAPI *DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); - BOOL (WINAPI *RemoveWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR); - int (WINAPI *GetSystemMetricsForDpi)(int, UINT); - BOOL (WINAPI *IsAppThemed)(void); - UINT (WINAPI *GetDpiForWindow)(HWND); - BOOL (WINAPI *SystemParametersInfoForDpi)(UINT,UINT,PVOID,UINT,UINT); - BOOL (WINAPI *AdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT); -} ALFCompatFunctions; - typedef struct ALFAppPriv *ALFAPP; typedef enum { @@ -98,9 +86,6 @@ ALF_CreateApplication(HINSTANCE hInstance); void ALF_TeardownApplication(ALFAPP app); -const ALFCompatFunctions * -ALF_CompatFunctionTable(ALFAPP app); - LPTSTR ALF_RegisterWindowClass(ALFAPP app, const ALFWindowClassParams *params); diff --git a/alf/alfcompat.h b/alf/alfcompat.h new file mode 100644 index 0000000..a6c4a91 --- /dev/null +++ b/alf/alfcompat.h @@ -0,0 +1,19 @@ +#include + +#ifndef WM_DPICHANGED +#define WM_DPICHANGED 0x02E0 +#endif + +typedef LRESULT (CALLBACK *ALF_COMPAT_SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR); +typedef struct { + LRESULT (WINAPI *SetWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR, DWORD_PTR); + LRESULT (WINAPI *DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); + BOOL (WINAPI *RemoveWindowSubclass)(HWND, ALF_COMPAT_SUBCLASSPROC, UINT_PTR); + int (WINAPI *GetSystemMetricsForDpi)(int, UINT); + BOOL (WINAPI *IsAppThemed)(void); + UINT (WINAPI *GetDpiForWindow)(HWND); + BOOL (WINAPI *SystemParametersInfoForDpi)(UINT,UINT,PVOID,UINT,UINT); + BOOL (WINAPI *AdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT); +} ALFCompatFunctions; + + diff --git a/alf/alfpriv.h b/alf/alfpriv.h index 08f3832..14c529a 100644 --- a/alf/alfpriv.h +++ b/alf/alfpriv.h @@ -12,6 +12,7 @@ #endif #include "alflist.h" +#include "alfcompat.h" typedef struct { ALFListHeader list; -- cgit v1.2.3