callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: make init_root_window private to the screen object

Browse Source 
It can be called during the screen object initilization
This commit is contained in:
Paolo Borelli
2016-02-28 11:56:01 +01:00
parent b20f80e65a
commit 48d693ea80
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/win32/gdkdisplay-win32.c
View File

@ -266,7 +266,6 @@ _gdk_win32_display_open (const gchar *display_name)
win32_display->screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL); win32_display->screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL);
_gdk_screen_init_root_window (GDK_WIN32_SCREEN (win32_display->screen));
_gdk_events_init (); _gdk_events_init ();
_gdk_input_init (_gdk_display); _gdk_input_init (_gdk_display);
_gdk_dnd_init (); _gdk_dnd_init ();

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

@ -525,7 +525,6 @@ guint32 _gdk_win32_keymap_get_decimal_mark (void);
/* Initialization */ /* Initialization */
void _gdk_win32_windowing_init (void); void _gdk_win32_windowing_init (void);
void _gdk_screen_init_monitors (GdkWin32Screen *screen); void _gdk_screen_init_monitors (GdkWin32Screen *screen);
void _gdk_screen_init_root_window (GdkWin32Screen *screen_win32);
void _gdk_screen_init_root_window_size (GdkWin32Screen *screen); void _gdk_screen_init_root_window_size (GdkWin32Screen *screen);
void _gdk_dnd_init (void); void _gdk_dnd_init (void);
void _gdk_events_init (void); void _gdk_events_init (void);

6
gdk/win32/gdkscreen-win32.c
View File

@ -270,8 +270,8 @@ _gdk_screen_init_root_window_size (GdkWin32Screen *screen)
screen->root_window->height = rect.height; screen->root_window->height = rect.height;
} }
void static void
_gdk_screen_init_root_window (GdkWin32Screen *screen_win32) init_root_window (GdkWin32Screen *screen_win32)
{ {
GdkScreen *screen; GdkScreen *screen;
GdkWindow *window; GdkWindow *window;
@ -463,6 +463,8 @@ gdk_win32_screen_init (GdkWin32Screen *win32_screen)
_gdk_screen_init_monitors (win32_screen); _gdk_screen_init_monitors (win32_screen);
init_root_window (win32_screen);
/* On Windows 8 and later, DWM (composition) is always enabled */ /* On Windows 8 and later, DWM (composition) is always enabled */
win32_screen->always_composited = g_win32_check_windows_version (6, 2, 0, G_WIN32_OS_ANY); win32_screen->always_composited = g_win32_check_windows_version (6, 2, 0, G_WIN32_OS_ANY);
} }