mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-10 12:40:10 +00:00
Merge branch 'gdk-win32-cleanup' into 'main'
GdkWin32 Cleanup See merge request GNOME/gtk!7810
This commit is contained in:
Luca Bacci
commit
834f20e2a7
@ -81,23 +81,6 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#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
|
||||
@ -724,7 +707,6 @@ print_event_state (guint state)
|
||||
CASE (LOCK);
|
||||
CASE (CONTROL);
|
||||
CASE (ALT);
|
||||
CASE (MOD2);
|
||||
CASE (BUTTON1);
|
||||
CASE (BUTTON2);
|
||||
CASE (BUTTON3);
|
||||
|
||||
@ -242,9 +242,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);
|
||||
|
||||
@ -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, \
|
||||
|
||||
@ -31,9 +31,6 @@
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
#ifndef STRICT
|
||||
#define STRICT /* We want strict type checks */
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#include <commctrl.h>
|
||||
|
||||
@ -50,23 +47,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)
|
||||
|
||||
@ -67,8 +67,6 @@ libgdk_win32 = static_library('gdk-win32',
|
||||
'-DGTK_COMPILATION',
|
||||
'-DG_LOG_DOMAIN="Gdk"',
|
||||
'-DINSIDE_GDK_WIN32',
|
||||
'-D_WIN32_WINNT=0x0601',
|
||||
'-DWINVER=0x0601',
|
||||
],
|
||||
dependencies: [ gdk_deps, gdk_win32_deps ],
|
||||
)
|
||||
|
||||
@ -19,10 +19,6 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
/* Vista or newer */
|
||||
#define _WIN32_WINNT 0x0600
|
||||
#include <sdkddkver.h>
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include "gtkfilechoosernativeprivate.h"
|
||||
|
||||
@ -40,16 +40,7 @@
|
||||
#include "gtk/deprecated/gtkstylecontextprivate.h"
|
||||
#include "gtkwidgetprivate.h"
|
||||
|
||||
/* avoid warning */
|
||||
#ifdef STRICT
|
||||
# undef STRICT
|
||||
# include <pango/pangowin32.h>
|
||||
# ifndef STRICT
|
||||
# define STRICT 1
|
||||
# endif
|
||||
#else /* STRICT */
|
||||
# include <pango/pangowin32.h>
|
||||
#endif /* STRICT */
|
||||
#include <pango/pangowin32.h>
|
||||
|
||||
/* Determines what happens when focus is lost while preedit is in process. */
|
||||
typedef enum {
|
||||
|
||||
@ -43,9 +43,7 @@
|
||||
#include <sys/types.h> /* For uid_t, gid_t */
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#undef STRICT
|
||||
#endif
|
||||
|
||||
#include <hb-glib.h>
|
||||
|
||||
@ -28,10 +28,8 @@
|
||||
|
||||
#include "gtkprivate.h"
|
||||
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
#include <commctrl.h>
|
||||
#undef STRICT
|
||||
|
||||
extern IMAGE_DOS_HEADER __ImageBase;
|
||||
|
||||
|
||||
@ -16,16 +16,6 @@
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#ifndef _WIN32_WINNT
|
||||
/* Vista or newer */
|
||||
#define _WIN32_WINNT 0x0600
|
||||
#endif
|
||||
#ifndef WINVER
|
||||
#define WINVER _WIN32_WINNT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
#include "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;
|
||||
|
||||
@ -16,16 +16,6 @@
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#ifndef _WIN32_WINNT
|
||||
/* Vista or newer */
|
||||
#define _WIN32_WINNT 0x0600
|
||||
#endif
|
||||
#ifndef WINVER
|
||||
#define WINVER _WIN32_WINNT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define COBJMACROS
|
||||
#include "config.h"
|
||||
#include <math.h>
|
||||
|
||||
@ -62,7 +62,8 @@ add_project_arguments('-D_GNU_SOURCE', language: 'c')
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
add_project_arguments(['-DUNICODE',
|
||||
'-D_UNICODE'], language: 'c')
|
||||
'-D_UNICODE',
|
||||
'-D_WIN32_WINNT=_WIN32_WINNT_WIN7'], language: 'c')
|
||||
endif
|
||||
|
||||
# Use debug/optimization flags to determine whether to enable debug or disable
|
||||
|
||||
Loading…
Reference in New Issue
Block a user