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

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

commit f6b67f52cf41febb7423d1f20e7d8d85943d4ed0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Dec 15 11:04:34 2014 +0800

    Revert "Add GL Area Support for Windows (WIP ii)"
    
    This reverts commit 502ff23b0ec7a8d4c331b77944bca2636005a306.

 gdk/win32/Makefile.am          |    5 -
 gdk/win32/gdkdisplay-win32.c   |   37 +--
 gdk/win32/gdkdisplay-win32.h   |   55 -----
 gdk/win32/gdkglcontext-win32.c |  510 ----------------------------------------
 gdk/win32/gdkglcontext-win32.h |   85 -------
 gdk/win32/gdkwin32.h           |    1 -
 gdk/win32/gdkwin32glcontext.h  |   49 ----
 gdk/win32/gdkwindow-win32.c    |   25 +--
 8 files changed, 18 insertions(+), 749 deletions(-)
---
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 9366867..640a215 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -37,13 +37,10 @@ libgdk_win32_la_SOURCES = \
        gdkdevice-wintab.c \
        gdkdevice-wintab.h \
        gdkdisplay-win32.c \
-       gdkdisplay-win32.h \
        gdkdisplaymanager-win32.c \
        gdkdnd-win32.c \
        gdkevents-win32.c \
        gdkgeometry-win32.c \
-       gdkglcontext-win32.c \
-       gdkglcontext-win32.h \
        gdkglobals-win32.c \
        gdkinput.c \
        gdkkeys-win32.c \
@@ -58,7 +55,6 @@ libgdk_win32_la_SOURCES = \
        gdkwin32display.h \
        gdkwin32displaymanager.h \
        gdkwin32dnd.h \
-       gdkwin32glcontext.h             \
        gdkwin32.h \
        gdkwin32id.c \
        gdkwin32keys.h \
@@ -78,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 cc6fb67..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,6 +216,16 @@ _gdk_win32_display_open (const gchar *display_name)
   return _gdk_display;
 }
 
+struct _GdkWin32Display
+{
+  GdkDisplay display;
+};
+
+struct _GdkWin32DisplayClass
+{
+  GdkDisplayClass display_class;
+};
+
 G_DEFINE_TYPE (GdkWin32Display, gdk_win32_display, GDK_TYPE_DISPLAY)
 
 static const gchar *
@@ -562,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
@@ -594,7 +581,6 @@ gdk_win32_display_finalize (GObject *object)
 static void
 gdk_win32_display_init(GdkWin32Display *display)
 {
-  display->pixel_format = 0;
 }
 
 static void
@@ -678,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/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 bd9e39c..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,14 +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);
-        }
-      /* MSDN: CS_OWNDC is needed for OpenGL contexts */
-      wcl.style |= CS_OWNDC;
+       {
+         wcl.lpszClassName = L"gdkWindowToplevel";
+         
+         ONCE_PER_CLASS ();
+         klassTOPLEVEL = RegisterClassExW (&wcl);
+       }
       klass = klassTOPLEVEL;
       break;
       
@@ -354,10 +351,6 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint)
        {
          wcl.lpszClassName = L"gdkWindowChild";
          
-    /* XXX: Find out whether GL Widgets are done for GDK_WINDOW_CHILD
-     *      MSDN says CS_PARENTDC should not be used for GL Context
-     *      creation
-     */
          wcl.style |= CS_PARENTDC; /* MSDN: ... enhances system performance. */
          ONCE_PER_CLASS ();
          klassCHILD = RegisterClassExW (&wcl);
@@ -531,9 +524,8 @@ _gdk_win32_display_create_window_impl (GdkDisplay    *display,
        }
       else
        {
-         /* MSDN: We need WS_CLIPCHILDREN and WS_CLIPSIBLINGS for GL Context Creation */
          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;
 
@@ -3448,9 +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