From 0ee985bd5b8a4424e8f437f17fe9490e16a7d415 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Wed, 2 Oct 2024 11:27:20 +0200 Subject: [PATCH] Remove unneeded defines --- gdk/win32/gdkevents-win32.c | 18 ------------------ gdk/win32/gdkmain-win32.c | 3 --- gdk/win32/gdkmonitor-win32.c | 4 ---- gdk/win32/gdkwin32misc.h | 17 ----------------- gtk/print/gtkprint-win32.h | 18 ------------------ 5 files changed, 60 deletions(-) diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 93a3bb6e0a..cef445af18 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -81,23 +81,6 @@ #include -#define GDK_MOD2_MASK (1 << 4) - -#ifndef XBUTTON1 -#define XBUTTON1 1 -#define XBUTTON2 2 -#endif - -#ifndef VK_XBUTTON1 -#define VK_XBUTTON1 5 -#define VK_XBUTTON2 6 -#endif - -#ifndef MK_XBUTTON1 -#define MK_XBUTTON1 32 -#define MK_XBUTTON2 64 -#endif - /* Undefined flags: */ #define SWP_NOCLIENTSIZE 0x0800 #define SWP_NOCLIENTMOVE 0x1000 @@ -722,7 +705,6 @@ print_event_state (guint state) CASE (LOCK); CASE (CONTROL); CASE (ALT); - CASE (MOD2); CASE (BUTTON1); CASE (BUTTON2); CASE (BUTTON3); diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 2239d286d3..126fa2eedd 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -243,9 +243,6 @@ _gdk_win32_surface_exstyle_to_string (LONG style) BIT (ACCEPTFILES); BIT (APPWINDOW); BIT (CLIENTEDGE); -#ifndef WS_EX_COMPOSITED -# define WS_EX_COMPOSITED 0x02000000L -#endif BIT (COMPOSITED); BIT (CONTEXTHELP); BIT (CONTROLPARENT); diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c index d8b8600488..8300f0d6ac 100644 --- a/gdk/win32/gdkmonitor-win32.c +++ b/gdk/win32/gdkmonitor-win32.c @@ -124,10 +124,6 @@ typedef LONG typedef LONG (WINAPI *funcDisplayConfigGetDeviceInfo) (DISPLAYCONFIG_DEVICE_INFO_HEADER* requestPacket); -#ifndef MONITORINFOF_PRIMARY -#define MONITORINFOF_PRIMARY 1 -#endif - #define G_GUID_FORMAT "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X" #define g_format_guid(guid) (guid)->Data1, \ (guid)->Data2, \ diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h index b6cd98345e..d2b215b431 100644 --- a/gdk/win32/gdkwin32misc.h +++ b/gdk/win32/gdkwin32misc.h @@ -50,23 +50,6 @@ G_BEGIN_DECLS #endif /* INSIDE_GDK_WIN32 */ -/* These need to be here so gtkstatusicon.c can pick them up if needed. */ -#ifndef WM_XBUTTONDOWN -#define WM_XBUTTONDOWN 0x020B -#endif -#ifndef WM_XBUTTONUP -#define WM_XBUTTONUP 0x020C -#endif -#ifndef GET_XBUTTON_WPARAM -#define GET_XBUTTON_WPARAM(w) (HIWORD(w)) -#endif -#ifndef XBUTTON1 -#define XBUTTON1 1 -#endif -#ifndef XBUTTON2 -#define XBUTTON2 2 -#endif - GDK_DEPRECATED_IN_4_8_FOR(GDK_IS_WIN32_SURFACE) gboolean gdk_win32_surface_is_win32 (GdkSurface *surface); GDK_DEPRECATED_IN_4_8_FOR(gdk_win32_surface_get_handle) diff --git a/gtk/print/gtkprint-win32.h b/gtk/print/gtkprint-win32.h index 626e15de05..1558b13227 100644 --- a/gtk/print/gtkprint-win32.h +++ b/gtk/print/gtkprint-win32.h @@ -22,24 +22,6 @@ G_BEGIN_DECLS -#ifndef START_PAGE_GENERAL -#define START_PAGE_GENERAL 0xffffffff -#endif - -#ifndef PD_RESULT_CANCEL -#define PD_RESULT_CANCEL 0 -#define PD_RESULT_PRINT 1 -#define PD_RESULT_APPLY 2 -#endif - -#ifndef PD_NOCURRENTPAGE -#define PD_NOCURRENTPAGE 0x00800000 -#endif - -#ifndef PD_CURRENTPAGE -#define PD_CURRENTPAGE 0x00400000 -#endif - typedef struct { char *driver; char *device;