[gtk+/master.fcw: 131/648] Revert "Add GL Area Support for Windows (WIP)"

[Chun-wei Fan <fanchunwei src gnome org>]

commit fca690d206aae198dd70627eff2efc1562bac877
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Dec 2 14:44:07 2014 +0800

    Revert "Add GL Area Support for Windows (WIP)"
    
    This reverts commit 3441760a917ee2aee1f464d8523d4b0b8358fab3.

 gdk/win32/Makefile.am          |    4 -
 gdk/win32/gdkdisplay-win32.c   |   30 +--
 gdk/win32/gdkdisplay-win32.h   |   55 ---
 gdk/win32/gdkglcontext-win32.c |  710 ----------------------------------------
 gdk/win32/gdkglcontext-win32.h |   84 -----
 gdk/win32/gdkglobals-win32.c   |    8 -
 gdk/win32/gdkmain-win32.c      |    2 +-
 gdk/win32/gdkwin32.h           |    1 -
 gdk/win32/gdkwin32glcontext.h  |   49 ---
 gdk/win32/gdkwindow-win32.c    |   24 +-
 10 files changed, 12 insertions(+), 955 deletions(-)
---
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index aa31d04..640a215 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -41,8 +41,6 @@ libgdk_win32_la_SOURCES = \
        gdkdnd-win32.c \
        gdkevents-win32.c \
        gdkgeometry-win32.c \
-       gdkglcontext-win32.c \
-       gdkglcontext-win32.h \
        gdkglobals-win32.c \
        gdkinput.c \
        gdkkeys-win32.c \
@@ -57,7 +55,6 @@ libgdk_win32_la_SOURCES = \
        gdkwin32display.h \
        gdkwin32displaymanager.h \
        gdkwin32dnd.h \
-       gdkwin32glcontext.h             \
        gdkwin32.h \
        gdkwin32id.c \
        gdkwin32keys.h \
@@ -77,7 +74,6 @@ libgdkwin32include_HEADERS =  \
        gdkwin32display.h       \
        gdkwin32displaymanager.h\
        gdkwin32dnd.h           \
-       gdkwin32glcontext.h             \
        gdkwin32keys.h          \
        gdkwin32misc.h          \
        gdkwin32screen.h        \
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 476f930..97d0e3e 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #include "gdk.h"
 #include "gdkprivate-win32.h"
-#include "gdkdisplay-win32.h"
-#include "gdkglcontext-win32.h"
+#include "gdkdisplayprivate.h"
 #include "gdkwin32display.h"
 #include "gdkwin32screen.h"
 #include "gdkwin32window.h"
@@ -217,7 +216,6 @@ _gdk_win32_display_open (const gchar *display_name)
   return _gdk_display;
 }
 
-/*
 struct _GdkWin32Display
 {
   GdkDisplay display;
@@ -226,7 +224,7 @@ struct _GdkWin32Display
 struct _GdkWin32DisplayClass
 {
   GdkDisplayClass display_class;
-};*/
+};
 
 G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
 
@@ -573,28 +571,6 @@ gdk_win32_display_sync (GdkDisplay * display)
 static void
 gdk_win32_display_dispose (GObject *object)
 {
-  GdkDisplay *display = GDK_DISPLAY (object);
-  GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
-
-  if (display_win32->dummy_hglrc != NULL)
-    {
-      wglDeleteContext (display_win32->dummy_hglrc);
-      display_win32->dummy_hglrc = NULL;
-    }
-  if (display_win32->dummy_hdc != NULL)
-    {
-      ReleaseDC (display_win32->dummy_hwnd, display_win32->dummy_hdc);
-      display_win32->dummy_hdc = NULL;
-    }
-  if (display_win32->is_foreign_window && display_win32->dummy_hwnd != NULL)
-    {
-      DestroyWindow (display_win32->dummy_hwnd);
-      display_win32->dummy_hwnd = NULL;
-    }
-  if (display_win32->dummy_atom_wc != 0)
-    UnregisterClass (MAKEINTATOM (display_win32->dummy_atom_wc), GetModuleHandle (NULL));
-
-  G_OBJECT_CLASS (gdk_win32_display_parent_class)->dispose (object);
 }
 
 static void
@@ -605,7 +581,6 @@ gdk_win32_display_finalize (GObject *object)
 static void
 gdk_win32_display_init(GdkWin32Display *display)
 {
-  display->pixel_format = 0;
 }
 
 static void
@@ -689,7 +664,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->convert_selection = _gdk_win32_display_convert_selection;
   display_class->text_property_to_utf8_list = _gdk_win32_display_text_property_to_utf8_list;
   display_class->utf8_to_string_target = _gdk_win32_display_utf8_to_string_target;
-  display_class->make_gl_context_current = _gdk_win32_display_make_gl_context_current;
   
   _gdk_win32_windowing_init ();
 }
diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index 3752f3f..5248a00 100644
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -82,11 +82,3 @@ gboolean       _ignore_destroy_clipboard = FALSE;
 
 HGLOBAL           _delayed_rendering_data = NULL;
 GHashTable       *_format_atom_table = NULL;
-
-gboolean         _have_wgl;
-gint             _gl_version;
-HDC              _gl_hdc;
-
-gboolean    _hasWglARBCreateContext;
-gboolean    _hasWglEXTSwapControl;
-gboolean    _hasWglOMLSyncControl;
\ No newline at end of file
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 10488dd..905c729 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -129,7 +129,7 @@ _gdk_win32_windowing_init (void)
 
   _cf_url = RegisterClipboardFormat ("UniformResourceLocatorW");
   _cf_html_format = RegisterClipboardFormat ("HTML Format");
-  _cf_text_html = RegisterClipboardFormat ("text/html");
+  _cf_text_html = RegisterClipboardFormat ("text/html");
 
   _gdk_win32_selection_init ();
 }
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index 4550dc7..5256392 100644
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -35,7 +35,6 @@
 #include <gdk/win32/gdkwin32screen.h>
 #include <gdk/win32/gdkwin32window.h>
 #include <gdk/win32/gdkwin32misc.h>
-#include <gdk/win32/gdkwin32glcontext.h>
 
 #undef __GDKWIN32_H_INSIDE__
 
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index c83d29e..7b4bd79 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -38,7 +38,6 @@
 #include "gdkdisplayprivate.h"
 #include "gdkvisualprivate.h"
 #include "gdkwin32window.h"
-#include "gdkglcontext-win32.h"
 
 #include <cairo-win32.h>
 
@@ -338,13 +337,12 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint)
     {
     case GDK_WINDOW_TOPLEVEL:
       if (0 == klassTOPLEVEL)
-        {
-          wcl.lpszClassName = L"gdkWindowToplevel";
-
-          ONCE_PER_CLASS ();
-          klassTOPLEVEL = RegisterClassExW (&wcl);
-        }
-      wcl.style |= CS_OWNDC;
+       {
+         wcl.lpszClassName = L"gdkWindowToplevel";
+         
+         ONCE_PER_CLASS ();
+         klassTOPLEVEL = RegisterClassExW (&wcl);
+       }
       klass = klassTOPLEVEL;
       break;
       
@@ -525,11 +523,11 @@ _gdk_win32_display_create_window_impl (GdkDisplay    *display,
          dwStyle = WS_CHILDWINDOW | WS_CLIPCHILDREN;
        }
       else
-       { 
+       {
          if (window->window_type == GDK_WINDOW_TOPLEVEL)
-      dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+           dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN;
          else
-      dwStyle = WS_OVERLAPPED | WS_MINIMIZEBOX | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | WS_CLIPCHILDREN;
+           dwStyle = WS_OVERLAPPED | WS_MINIMIZEBOX | WS_SYSMENU | WS_CAPTION | WS_THICKFRAME | 
WS_CLIPCHILDREN;
 
          offset_x = _gdk_offset_x;
          offset_y = _gdk_offset_y;
@@ -3442,10 +3440,6 @@ gdk_window_impl_win32_class_init (GdkWindowImplWin32Class *klass)
   impl_class->get_property = _gdk_win32_window_get_property;
   impl_class->change_property = _gdk_win32_window_change_property;
   impl_class->delete_property = _gdk_win32_window_delete_property;
-
-  impl_class->create_gl_context = _gdk_win32_window_create_gl_context;
-  impl_class->invalidate_for_new_frame = _gdk_win32_window_invalidate_for_new_frame;
-
 }
 
 HGDIOBJ