AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

gdk: Drop old debug macros

Browse Source 
Drop the old GDK_NOTE() and GDK_DISPLAY_NOTE()
macros from gdkdebug.h. Reintroduce them in the
win32 backend, where they are still used.
This commit is contained in:
Matthias Clasen 2022-09-23 10:32:07 -04:00
parent 1f166ae071
commit bc159207bd
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/gdkdebug.h
View File

@ -65,9 +65,6 @@ void gdk_display_set_debug_flags (GdkDisplay *display,
#define GDK_DISPLAY_DEBUG_CHECK(display,type) \ #define GDK_DISPLAY_DEBUG_CHECK(display,type) \
G_UNLIKELY (gdk_display_get_debug_flags (display) & GDK_DEBUG_##type) G_UNLIKELY (gdk_display_get_debug_flags (display) & GDK_DEBUG_##type)
#define GDK_DISPLAY_NOTE(display,type,action) G_STMT_START { \
if (GDK_DISPLAY_DEBUG_CHECK (display,type)) \
{ action; }; } G_STMT_END
#define GDK_DISPLAY_DEBUG(display,type,...) \ #define GDK_DISPLAY_DEBUG(display,type,...) \
if (GDK_DISPLAY_DEBUG_CHECK (display,type)) \ if (GDK_DISPLAY_DEBUG_CHECK (display,type)) \
@ -76,13 +73,11 @@ void gdk_display_set_debug_flags (GdkDisplay *display,
#else /* !G_ENABLE_DEBUG */ #else /* !G_ENABLE_DEBUG */
#define GDK_DISPLAY_DEBUG_CHECK(display,type) 0 #define GDK_DISPLAY_DEBUG_CHECK(display,type) 0
#define GDK_DISPLAY_NOTE(display,type,action)
#define GDK_DISPLAY_DEBUG(display,type,...) #define GDK_DISPLAY_DEBUG(display,type,...)
#endif /* G_ENABLE_DEBUG */ #endif /* G_ENABLE_DEBUG */
#define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type) #define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type)
#define GDK_NOTE(type,action) GDK_DISPLAY_NOTE (NULL,type,action)
#define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__) #define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__)
#endif #endif

2
gdk/win32/gdkdrag-win32.c
View File

@ -37,6 +37,8 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#define GDK_NOTE(a,b)
/* /*
* Support for OLE-2 drag and drop added at Archaeopteryx Software, 2001 * Support for OLE-2 drag and drop added at Archaeopteryx Software, 2001
* For more information, do not contact Stephan R.A. Deibel (sdeibel@archaeopteryx.com), * For more information, do not contact Stephan R.A. Deibel (sdeibel@archaeopteryx.com),

18
gdk/win32/gdkprivate-win32.h
View File

@ -26,6 +26,7 @@
#define __GDK_PRIVATE_WIN32_H__ #define __GDK_PRIVATE_WIN32_H__
#include <gdk/gdkcursorprivate.h> #include <gdk/gdkcursorprivate.h>
#include <gdk/gdkdebug.h>
#include <gdk/win32/gdksurface-win32.h> #include <gdk/win32/gdksurface-win32.h>
#include <gdk/win32/gdkwin32display.h> #include <gdk/win32/gdkwin32display.h>
#include <gdk/win32/gdkwin32screen.h> #include <gdk/win32/gdkwin32screen.h>
@ -37,6 +38,23 @@
#include "config.h" #include "config.h"
/* Old debug macros */
#ifdef G_ENABLE_DEBUG
#define GDK_NOTE(type,action) \
G_STMT_START { \
if (GDK_DEBUG_CHECK (type)) \
{ action; }; \
} G_STMT_END
#else
#define GDK_NOTE(type,action)
#endif
/* Make up for some minor w32api or MSVC6 header lossage */ /* Make up for some minor w32api or MSVC6 header lossage */
#ifndef PS_JOIN_MASK #ifndef PS_JOIN_MASK