AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove gdkprivate.h

Browse Source 
This is one-too-many private headers. Move the few
declarations here to gdkinternals.h.
This commit is contained in:
Matthias Clasen 2017-11-17 00:34:04 -05:00
parent cc97c71883
commit fc0f7dc217
18 changed files with 13 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/broadway/gdkprivate-broadway.h
View File

@ -30,7 +30,6 @@
#define __GDK_PRIVATE_BROADWAY_H__
#include <gdk/gdkcursor.h>
#include <gdk/gdkprivate.h>
#include <gdk/gdkinternals.h>
#include "gdkwindow-broadway.h"
#include "gdkdisplay-broadway.h"

1
gdk/broadway/gdkproperty-broadway.c
View File

@ -26,7 +26,6 @@
#include "gdkproperty.h"
#include "gdkprivate.h"
#include "gdkinternals.h"
#include "gdkdisplay-broadway.h"
#include "gdkprivate-broadway.h"

1
gdk/broadway/gdkselection-broadway.c
View File

@ -27,7 +27,6 @@
#include "gdkselection.h"
#include "gdkproperty.h"
#include "gdkprivate.h"
#include "gdkprivate-broadway.h"
#include "gdkdisplay-broadway.h"

1
gdk/gdkcursor.c
View File

@ -29,6 +29,7 @@
#include "gdkcursor.h"
#include "gdkcursorprivate.h"
#include "gdktexture.h"
#include "gdkintl.h"
#include "gdkinternals.h"

11
gdk/gdkinternals.h
View File

@ -28,10 +28,11 @@
#define __GDK_INTERNALS_H__
#include <gio/gio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkwindowimpl.h"
#include "gdkdisplay.h"
#include "gdkprivate.h"
#include "gdkeventsprivate.h"
#include "gdkenumtypes.h"
G_BEGIN_DECLS
@ -445,6 +446,14 @@ void _gdk_display_set_window_under_pointer (GdkDisplay *display,
gboolean _gdk_window_has_impl (GdkWindow *window);
GdkWindow * _gdk_window_get_impl_window (GdkWindow *window);
void gdk_window_destroy_notify (GdkWindow *window);
void gdk_synthesize_window_state (GdkWindow *window,
GdkWindowState unset_flags,
GdkWindowState set_flags);
const char * _gdk_atom_name_const (GdkAtom atom);
G_END_DECLS
#endif /* __GDK_INTERNALS_H__ */

44
gdk/gdkprivate.h
View File

@ -1,44 +0,0 @@
/* GDK - The GIMP Drawing Kit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GDK_PRIVATE_H__
#define __GDK_PRIVATE_H__
#include <gdk/gdk.h>
G_BEGIN_DECLS
const char * _gdk_atom_name_const (GdkAtom atom);
GDK_AVAILABLE_IN_ALL
void gdk_window_destroy_notify (GdkWindow *window);
GDK_AVAILABLE_IN_ALL
void gdk_synthesize_window_state (GdkWindow *window,
GdkWindowState unset_flags,
GdkWindowState set_flags);
G_END_DECLS
#endif /* __GDK_PRIVATE_H__ */

2
gdk/gdkproperty.c
View File

@ -20,7 +20,7 @@
#include "gdkproperty.h"
#include "gdkprivate.h"
#include "gdkinternals.h"
/**
* SECTION:properties

1
gdk/gdktexture.c
View File

@ -37,6 +37,7 @@
#include "gdktextureprivate.h"
#include "gdkinternals.h"
#include "gdkcairo.h"
/**
* GdkTexture:

2
gdk/meson.build
View File

@ -61,7 +61,6 @@ gdk_public_headers = files([
'gdkmonitor.h',
'gdkpango.h',
'gdkpixbuf.h',
'gdkprivate.h',
'gdkproperty.h',
'gdkrectangle.h',
'gdkrgba.h',
@ -82,7 +81,6 @@ gdk_private_h_sources = files([
'gdkdevicetoolprivate.h',
'gdkdrawingcontextprivate.h',
'gdkmonitorprivate.h',
'gdkprivate.h',
'gdkseatdefaultprivate.h',
])

1
gdk/quartz/gdkglobals-quartz.c
View File

@ -18,7 +18,6 @@
#include "config.h"
#include "gdktypes.h"
#include "gdkprivate.h"
#include "gdkquartz.h"
GdkDisplay *_gdk_display = NULL;

1
gdk/quartz/gdkprivate-quartz.h
View File

@ -22,7 +22,6 @@
#define GDK_QUARTZ_ALLOC_POOL NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]
#define GDK_QUARTZ_RELEASE_POOL [pool release]
#include <gdk/gdkprivate.h>
#include <gdk/quartz/gdkquartz.h>
#include <gdk/quartz/gdkdevicemanager-core-quartz.h>
#include <gdk/quartz/gdkdnd-quartz.h>

1
gdk/quartz/gdkquartz.h
View File

@ -23,7 +23,6 @@
#include <AppKit/AppKit.h>
#include <gdk/gdk.h>
#include <gdk/gdkprivate.h>
G_BEGIN_DECLS

1
gdk/wayland/gdkprivate-wayland.h
View File

@ -30,7 +30,6 @@
#define __GDK_PRIVATE_WAYLAND_H__
#include <gdk/gdkcursor.h>
#include <gdk/gdkprivate.h>
#include <gdk/wayland/gdkwayland.h>
#include <gdk/wayland/gdkdisplay-wayland.h>

1
gdk/wayland/gdkselection-wayland.c
View File

@ -30,7 +30,6 @@
#include "gdkdndprivate.h"
#include "gdkselection.h"
#include "gdkproperty.h"
#include "gdkprivate.h"
#include <string.h>

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

@ -34,7 +34,6 @@
#define _WIN32_WINNT WINVER
#endif
#include <gdk/gdkprivate.h>
#include <gdk/gdkcursorprivate.h>
#include <gdk/win32/gdkwindow-win32.h>
#include <gdk/win32/gdkwin32display.h>

1
gdk/x11/gdkprivate-x11.h
View File

@ -30,7 +30,6 @@
#define __GDK_PRIVATE_X11_H__
#include "gdkcursor.h"
#include "gdkprivate.h"
#include "gdkinternals.h"
#include "gdkx.h"
#include "gdkwindow-x11.h"

1
gdk/x11/gdkproperty-x11.c
View File

@ -25,7 +25,6 @@
#include "config.h"
#include "gdkproperty.h"
#include "gdkprivate.h"
#include "gdkinternals.h"
#include "gdkselection.h"
#include "gdkprivate-x11.h"

1
gdk/x11/gdkselection-x11.c
View File

@ -26,7 +26,6 @@
#include "gdkselection.h"
#include "gdkproperty.h"
#include "gdkprivate.h"
#include "gdkprivate-x11.h"
#include "gdkdisplay-x11.h"