Commit fee41fb6 authored by LRN's avatar LRN

Revert "W32: Implement composition check for GDK"

This reverts commit 7ae5a569.

Pushed by accident.
parent 5c6e967b
......@@ -48,12 +48,6 @@ static gboolean gdk_synchronize = FALSE;
static gboolean dummy;
#ifdef HAVE_W32_DWM
static HMODULE dwmdll = NULL;
PFN_DwmEnableBlurBehindWindow dwmEnableBlurBehindWindow = NULL;
PFN_DwmIsCompositionEnabled dwmIsCompositionEnabled = NULL;
#endif
const GOptionEntry _gdk_windowing_args[] = {
{ "sync", 0, 0, G_OPTION_ARG_NONE, &gdk_synchronize,
/* Description of --sync in --help output */ N_("Don't batch GDI requests"), NULL },
......@@ -138,29 +132,6 @@ _gdk_win32_windowing_init (void)
_cf_text_html = RegisterClipboardFormat ("text/html");
_gdk_win32_selection_init ();
/* HAVE_W32_DWM means that we have necessary declarations at compile-time,
* but we'd still like to be able to run on XP, so we'll load the functions
* we need at runtime.
*/
#ifdef HAVE_W32_DWM
if (dwmdll == NULL)
{
dwmdll = LoadLibraryA ("dwmapi.dll");
if (dwmdll == NULL)
{
/* This will make sure that we only try this once */
dwmdll = INVALID_HANDLE_VALUE;
}
else
{
dwmEnableBlurBehindWindow = (PFN_DwmEnableBlurBehindWindow)
GetProcAddress (dwmdll, "DwmEnableBlurBehindWindow");
dwmIsCompositionEnabled = (PFN_DwmIsCompositionEnabled)
GetProcAddress (dwmdll, "DwmIsCompositionEnabled");
}
}
#endif
}
void
......
......@@ -41,15 +41,6 @@
#include "config.h"
#ifdef HAVE_W32_DWM
#include <dwmapi.h>
typedef HRESULT (WINAPI *PFN_DwmEnableBlurBehindWindow)(HWND,
const DWM_BLURBEHIND *);
typedef HRESULT (WINAPI *PFN_DwmIsCompositionEnabled)(BOOL *pfEnabled);
extern PFN_DwmEnableBlurBehindWindow dwmEnableBlurBehindWindow;
extern PFN_DwmIsCompositionEnabled dwmIsCompositionEnabled;
#endif
/* Make up for some minor w32api or MSVC6 header lossage */
#ifndef PS_JOIN_MASK
......@@ -505,7 +496,6 @@ gchar *_gdk_win32_display_manager_get_atom_name (GdkDisplayManager *manager,
GdkAtom atom);
void _gdk_win32_append_event (GdkEvent *event);
void _gdk_win32_emit_configure_event (GdkWindow *window);
gboolean _gdk_win32_is_desktop_composition_enabled ();
/* Initialization */
void _gdk_win32_windowing_init (void);
......
......@@ -174,23 +174,6 @@ gdk_win32_screen_is_composited (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
return _gdk_win32_is_desktop_composition_enabled ();
}
gboolean
_gdk_win32_is_desktop_composition_enabled ()
{
BOOL b;
DWORD sysver, major, minor;
sysver = GetVersion ();
major = (DWORD)(LOBYTE (LOWORD (sysver)));
minor = (DWORD)(HIBYTE (LOWORD (sysver)));
/* Composition is always enabled in W8 */
if (major >= 6 && minor >= 2)
return TRUE;
if (dwmIsCompositionEnabled && (S_OK == dwmIsCompositionEnabled (&b)))
return b;
return FALSE;
}
......
......@@ -3630,9 +3630,6 @@ gdk_window_supports_csd (GtkWindow *window)
screen = gtk_widget_get_screen (widget);
if (!gdk_screen_is_composited (screen))
return FALSE;
/* We need a visual with alpha */
visual = gdk_screen_get_rgba_visual (screen);
if (!visual)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment