gdk: Don't include gdkinternals.h in gdk-private.h

This commit is contained in:
Benjamin Otte 2021-09-24 20:35:48 +02:00
parent c7992884ae
commit 811b5d995b
11 changed files with 25 additions and 10 deletions

View File

@ -1,7 +1,7 @@
#ifndef __GDK__PRIVATE_H__
#define __GDK__PRIVATE_H__
#include "gdk/gdkinternals.h"
#include "gdk/gdktypes.h"
/* Private API for use in GTK+ */

View File

@ -18,8 +18,11 @@
#ifndef __GDK_DEBUG_H__
#define __GDK_DEBUG_H__
G_BEGIN_DECLS
#include <glib.h>
#include "gdktypes.h"
G_BEGIN_DECLS
typedef enum {
GDK_DEBUG_MISC = 1 << 0,

View File

@ -19,10 +19,12 @@
#include "config.h"
#include "gdkintl.h"
#include "gdk-private.h"
#include "gdktoplevelprivate.h"
#include "gdkdisplay.h"
#include "gdkenumtypes.h"
#include "gdkintl.h"
#include <graphene-gobject.h>
#include <math.h>
@ -670,7 +672,7 @@ gdk_toplevel_begin_resize (GdkToplevel *toplevel,
if (device == NULL)
{
GdkSeat *seat = gdk_display_get_default_seat (GDK_SURFACE (toplevel)->display);
GdkSeat *seat = gdk_display_get_default_seat (gdk_surface_get_display (GDK_SURFACE (toplevel)));
if (button == 0)
device = gdk_seat_get_keyboard (seat);
else
@ -711,7 +713,7 @@ gdk_toplevel_begin_move (GdkToplevel *toplevel,
if (device == NULL)
{
GdkSeat *seat = gdk_display_get_default_seat (GDK_SURFACE (toplevel)->display);
GdkSeat *seat = gdk_display_get_default_seat (gdk_surface_get_display (GDK_SURFACE (toplevel)));
if (button == 0)
device = gdk_seat_get_keyboard (seat);
else

View File

@ -23,6 +23,8 @@
#include "gtkmarshalers.h"
#include "gtkintl.h"
#include "gdk/gdkeventsprivate.h"
/**
* GtkIMContext:
*

View File

@ -33,6 +33,8 @@
#include "gtkimmoduleprivate.h"
#include "gtkimcontextsimpleseqs.h"
#include "gdk/gdkeventsprivate.h"
#include "gdk/gdkprofilerprivate.h"
/**

View File

@ -70,6 +70,9 @@
#include "inspector/window.h"
#include "gdk/gdkeventsprivate.h"
#include "gdk/gdksurfaceprivate.h"
#define GDK_ARRAY_ELEMENT_TYPE GtkWidget *
#define GDK_ARRAY_TYPE_NAME GtkWidgetStack
#define GDK_ARRAY_NAME gtk_widget_stack

View File

@ -132,6 +132,8 @@
#include "gsk/gskroundedrectprivate.h"
#include "gtkcssshadowvalueprivate.h"
#include "gdk/gdksurfaceprivate.h"
#define MNEMONICS_DELAY 300 /* ms */
#define TAIL_GAP_WIDTH 24

View File

@ -68,9 +68,9 @@
#include "inspector/window.h"
#include "gdk/gdktextureprivate.h"
#include "gdk/gdk-private.h"
#include "gdk/gdkprofilerprivate.h"
#include "gdk/gdksurfaceprivate.h"
#include "gdk/gdktextureprivate.h"
#include <cairo-gobject.h>
#include <errno.h>

View File

@ -34,6 +34,7 @@
#include "gtkbinlayout.h"
#include "gtkmediafileprivate.h"
#include "gdk/gdkdebug.h"
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"

View File

@ -59,7 +59,7 @@
#include "broadway/gdkbroadway.h"
#endif
#include "gdk/gdk-private.h"
#include "gdk/gdkdebug.h"
#define EPSILON 1e-10

View File

@ -48,8 +48,8 @@
#include "general.h"
#include "logs.h"
#include "gdkdebug.h"
#include "gdkmarshalers.h"
#include "gdk-private.h"
#include "gskrendererprivate.h"
#include "gtkbutton.h"
#include "gtkcsswidgetnodeprivate.h"