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

win32: rename initialization function for clarity

Browse Source
This commit is contained in:
Paolo Borelli 2016-02-28 11:50:07 +01:00
parent 58e169c04c
commit 00f396dea9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ inner_display_change_window_procedure (HWND hwnd,
{ {
GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (_gdk_display); GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (_gdk_display);
_gdk_monitor_init (GDK_WIN32_SCREEN (win32_display->screen)); _gdk_screen_init_monitors (GDK_WIN32_SCREEN (win32_display->screen));
_gdk_screen_init_root_window_size (GDK_WIN32_SCREEN (win32_display->screen)); _gdk_screen_init_root_window_size (GDK_WIN32_SCREEN (win32_display->screen));
g_signal_emit_by_name (win32_display->screen, "size_changed"); g_signal_emit_by_name (win32_display->screen, "size_changed");
@ -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_monitor_init (GDK_WIN32_SCREEN (win32_display->screen));
_gdk_screen_init_root_window (GDK_WIN32_SCREEN (win32_display->screen)); _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);

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

@ -524,9 +524,9 @@ 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_root_window (GdkWin32Screen *screen_win32); 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_monitor_init(GdkWin32Screen *screen);
void _gdk_dnd_init (void); void _gdk_dnd_init (void);
void _gdk_events_init (void); void _gdk_events_init (void);
void _gdk_input_wintab_init_check (GdkDeviceManager *device_manager); void _gdk_input_wintab_init_check (GdkDeviceManager *device_manager);

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

@ -289,6 +289,8 @@ gdk_win32_screen_init (GdkWin32Screen *win32_screen)
win32_screen->available_visual_depths[0] = win32_screen->rgba_visual->depth; win32_screen->available_visual_depths[0] = win32_screen->rgba_visual->depth;
win32_screen->available_visual_types[0] = win32_screen->rgba_visual->type; win32_screen->available_visual_types[0] = win32_screen->rgba_visual->type;
_gdk_screen_init_monitors (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);
} }
@ -425,7 +427,7 @@ enum_monitor (HMONITOR hmonitor,
} }
void void
_gdk_monitor_init (GdkWin32Screen *screen) _gdk_screen_init_monitors (GdkWin32Screen *screen)
{ {
gint count; gint count;
EnumMonitorData data; EnumMonitorData data;