AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

GDK/Win32: Deal with leftovers from removal of GdkWindow items

Browse Source 
We need to further remove items for the removal of:
-GdkWindow->depth (commit 6cc94ff)
-gdk_window_get_visual()/GdkWindow->visual (commit f420dc7)
-GDK visual query APIs (commit 45c0379)

https://bugzilla.gnome.org/show_bug.cgi?id=773299
This commit is contained in:
Chun-wei Fan 2016-10-28 13:42:55 +08:00
parent 45c0379f87
commit fcecec1a9d
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/win32/gdkglcontext-win32.c
View File

@ -420,9 +420,8 @@ _create_gl_context (HDC hdc,
}
static gboolean
_set_pixformat_for_hdc (HDC hdc,
gint *best_idx,
const gboolean need_alpha_bits)
_set_pixformat_for_hdc (HDC hdc,
gint *best_idx)
{
PIXELFORMATDESCRIPTOR pfd;
gboolean set_pixel_format_result = FALSE;
@ -430,7 +429,7 @@ _set_pixformat_for_hdc (HDC hdc,
/* one is only allowed to call SetPixelFormat(), and so ChoosePixelFormat()
* one single time per window HDC
*/
*best_idx = _get_wgl_pfd (hdc, need_alpha_bits, &pfd);
*best_idx = _get_wgl_pfd (hdc, &pfd);
if (*best_idx != 0)
set_pixel_format_result = SetPixelFormat (hdc, *best_idx, &pfd);
@ -461,8 +460,7 @@ _gdk_win32_gl_context_realize (GdkGLContext *context,
GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
if (!_set_pixformat_for_hdc (context_win32->gl_hdc,
&pixel_format,
context_win32->need_alpha_bits))
&pixel_format))
{
g_set_error_literal (error, GDK_GL_ERROR,
GDK_GL_ERROR_UNSUPPORTED_FORMAT,

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

@ -297,10 +297,8 @@ init_root_window (GdkWin32Screen *screen_win32)
impl_win32->wrapper = window;
window->impl_window = window;
window->visual = gdk_screen_get_system_visual (screen);
window->window_type = GDK_WINDOW_ROOT;
window->depth = window->visual->depth;
screen_win32->root_window = window;

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

@ -953,7 +953,6 @@ gdk_win32_window_foreign_new_for_display (GdkDisplay *display,
return g_object_ref (window);
window = _gdk_display_create_window (display);
window->visual = gdk_screen_get_system_visual (gdk_display_get_default_screen (display));
window->impl = g_object_new (GDK_TYPE_WINDOW_IMPL_WIN32, NULL);
window->impl_window = window;
impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
@ -992,7 +991,6 @@ gdk_win32_window_foreign_new_for_display (GdkDisplay *display,
window->state &= (~GDK_WINDOW_STATE_BELOW);
window->viewable = TRUE;
window->depth = gdk_visual_get_system ()->depth;
GDK_WINDOW_HWND (window) = anid;
g_object_ref (window);