diff --git a/panda/src/wcrdisplay/config_wcrdisplay.cxx b/panda/src/wcrdisplay/config_wcrdisplay.cxx
deleted file mode 100644
index 7ae4ed1abf..0000000000
--- a/panda/src/wcrdisplay/config_wcrdisplay.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-// Filename: config_wcrdisplay.cxx
-// Created by: skyler, based on wgl* file.
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license. You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "config_wcrdisplay.h"
-#include "wcrGraphicsPipe.h"
-#include "wcrGraphicsWindow.h"
-
-#include "dconfig.h"
-
-Configure(config_wcrdisplay);
-NotifyCategoryDef(wcrdisplay, "display");
-
-ConfigureFn(config_wcrdisplay) {
- init_libwcrdisplay();
-}
-
-// Configure this true to force the rendering to sync to the video
-// refresh, or false to let your frame rate go as high as it can,
-// irrespective of the video refresh. (if this capability is available in the ICD)
-bool gl_sync_video = config_wcrdisplay.GetBool("sync-video", true);
-
-bool gl_show_fps_meter = config_wcrdisplay.GetBool("show-fps-meter", false);
-float gl_fps_meter_update_interval = max(0.5,config_wcrdisplay.GetFloat("fps-meter-update-interval", 1.7));
-int gl_forced_pixfmt=config_wcrdisplay.GetInt("gl-force-pixfmt", 0);
-
-bool bResponsive_minimized_fullscreen_window = config_wcrdisplay.GetBool("responsive-minimized-fullscreen-window",false);
-
-// Set this true to not attempt to use any of the function calls that
-// will crab out WireGL.
-bool support_wiregl = config_wcrdisplay.GetBool("support-wiregl", false);
-
-extern void AtExitFn();
-
-////////////////////////////////////////////////////////////////////
-// Function: init_libwcrdisplay
-// Description: Initializes the library. This must be called at
-// least once before any of the functions or classes in
-// this library can be used. Normally it will be
-// called by the static initializers and need not be
-// called explicitly, but special cases exist.
-////////////////////////////////////////////////////////////////////
-void
-init_libwcrdisplay() {
- static bool initialized = false;
- if (initialized) {
- return;
- }
- initialized = true;
-
- wcrGraphicsPipe::init_type();
- GraphicsPipe::get_factory().register_factory(
- wcrGraphicsPipe::get_class_type(),
- wcrGraphicsPipe::make_wcrGraphicsPipe);
- wcrGraphicsWindow::init_type();
- GraphicsWindow::get_factory().register_factory(
- wcrGraphicsWindow::get_class_type(),
- wcrGraphicsWindow::make_wcrGraphicsWindow);
-
- atexit(AtExitFn);
-}
-
-// cant use global var cleanly because global var static init executed after init_libwcr(), incorrectly reiniting var
-Filename get_icon_filename_2() {
- string iconname = config_wcrdisplay.GetString("win32-window-icon","");
- return ExecutionEnvironment::expand_string(iconname);
-}
-
-Filename get_color_cursor_filename_2() {
- string cursorname = config_wcrdisplay.GetString("win32-color-cursor","");
- return ExecutionEnvironment::expand_string(cursorname);
-}
-
-Filename get_mono_cursor_filename_2() {
- string cursorname = config_wcrdisplay.GetString("win32-mono-cursor","");
- return ExecutionEnvironment::expand_string(cursorname);
-}
diff --git a/panda/src/wcrdisplay/config_wcrdisplay.h b/panda/src/wcrdisplay/config_wcrdisplay.h
deleted file mode 100644
index 172b0cffea..0000000000
--- a/panda/src/wcrdisplay/config_wcrdisplay.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Filename: config_wcrdisplay.h
-// Created by: skyler, based on wgl* file.
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license. You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef __CONFIG_WCRDISPLAY_H__
-#define __CONFIG_WCRDISPLAY_H__
-
-#include "pandabase.h"
-#include "filename.h"
-#include "notifyCategoryProxy.h"
-
-NotifyCategoryDecl(wcrdisplay, EXPCL_PANDACR, EXPTP_PANDACR);
-
-// for some reason there is a conflict with the pandadx versions of get_icon_filename during linking,
-// so appended '_2' to name
-extern Filename get_icon_filename_2();
-extern Filename get_color_cursor_filename_2();
-extern Filename get_mono_cursor_filename_2();
-
-extern bool gl_show_fps_meter;
-extern float gl_fps_meter_update_interval;
-extern bool gl_sync_video;
-extern int gl_forced_pixfmt;
-extern bool bResponsive_minimized_fullscreen_window;
-extern bool support_wiregl;
-
-extern EXPCL_PANDACR void init_libwcrdisplay();
-
-#endif /* __CONFIG_WCRDISPLAY_H__ */
diff --git a/panda/src/wcrdisplay/index.html b/panda/src/wcrdisplay/index.html
deleted file mode 100644
index 15e7b449a5..0000000000
--- a/panda/src/wcrdisplay/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
wcrdisplay
-Windows Chromium Display
-
-This directory contains pipe and window creation code for using
-chromium within
-panda.
-
-The plan is that chromium (network gl) and gl (local gl) will
-run together.
\ No newline at end of file
diff --git a/panda/src/wcrdisplay/test_wcr.cxx b/panda/src/wcrdisplay/test_wcr.cxx
deleted file mode 100644
index f2da19ef23..0000000000
--- a/panda/src/wcrdisplay/test_wcr.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-// Filename: test_wcr.cxx
-// Created by: skyler, based on wgl* file.
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license. You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "graphicsPipe.h"
-#include "interactiveGraphicsPipe.h"
-#include "notify.h"
-#include "pt_NamedNode.h"
-
-#include "wcrGraphicsWindow.h"
-
-PT(GraphicsPipe) main_pipe;
-PT(GraphicsWindow) main_win;
-PT_NamedNode render;
-
-void render_frame(GraphicsPipe *pipe) {
- GraphicsPipe::wins_iterator wi;
- for (wi = pipe->get_win_begin();
- wi != pipe->get_win_end();
- ++wi) {
- (*wi)->get_gsg()->render_frame();
- }
-}
-
-void display_func() {
- render_frame(main_pipe);
-}
-
-int main() {
-
- GraphicsPipe::resolve_modules();
-
- cout << "Known pipe types:" << endl;
- GraphicsPipe::PipeFactory::FactoryTypesIter pti;
- for (pti = GraphicsPipe::_factory.get_types_begin();
- pti != GraphicsPipe::_factory.get_types_end(); ++pti) {
- cout << " " << (*pti) << endl;
- }
- cout << "after Known pipe types" << endl;
-
- GraphicsPipe::PipeFactory& factory = GraphicsPipe::_factory;
- GraphicsPipe::PipePrioritiesIter pribegin =
- GraphicsPipe::get_priorities_begin();
- GraphicsPipe::PipePrioritiesIter priend = GraphicsPipe::get_priorities_end();
-
- GraphicsPipe::PipeParams ps1;
- if (pribegin == priend)
- main_pipe = factory.instance(InteractiveGraphicsPipe::get_class_type(),
- ps1.begin(), ps1.end());
- else
- main_pipe = factory.instance(InteractiveGraphicsPipe::get_class_type(),
- ps1.begin(), ps1.end(), pribegin, priend);
- nassertr(main_pipe != (GraphicsPipe*)0L, 0);
- cout << "Opened a '" << main_pipe->get_type().get_name()
- << "' interactive graphics pipe." << endl;
-
- main_win = new wcrGraphicsWindow(main_pipe);
-#if 0
- main_win->register_draw_function(display_func);
- main_win->main_loop();
-#endif
-
- return 0;
-}
diff --git a/panda/src/wcrdisplay/wcrGraphicsPipe.cxx b/panda/src/wcrdisplay/wcrGraphicsPipe.cxx
deleted file mode 100644
index 045fb5f939..0000000000
--- a/panda/src/wcrdisplay/wcrGraphicsPipe.cxx
+++ /dev/null
@@ -1,82 +0,0 @@
-// Filename: wcrGraphicsPipe.cxx
-// Created by: skyler, based on wgl* file.
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license. You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-#include "wcrGraphicsPipe.h"
-#include "config_wcrdisplay.h"
-
-////////////////////////////////////////////////////////////////////
-// Static variables
-////////////////////////////////////////////////////////////////////
-TypeHandle wcrGraphicsPipe::_type_handle;
-
-wcrGraphicsPipe::wcrGraphicsPipe(const PipeSpecifier& spec)
- : InteractiveGraphicsPipe(spec)
-{}
-
-////////////////////////////////////////////////////////////////////
-// Function: wcrGraphicsPipe::get_window_type
-// Access: Published, Virtual
-// Description: Returns the TypeHandle of the kind of window
-// preferred by this kind of pipe.
-////////////////////////////////////////////////////////////////////
-TypeHandle wcrGraphicsPipe::
-get_window_type() const {
- return wcrGraphicsWindow::get_class_type();
-}
-
-GraphicsPipe *wcrGraphicsPipe::
-make_wcrGraphicsPipe(const FactoryParams ¶ms) {
- GraphicsPipe::PipeSpec *pipe_param;
- if (!get_param_into(pipe_param, params)) {
- return new wcrGraphicsPipe(PipeSpecifier());
- } else {
- return new wcrGraphicsPipe(pipe_param->get_specifier());
- }
-}
-
-
-TypeHandle wcrGraphicsPipe::get_class_type() {
- return _type_handle;
-}
-
-const char *pipe_type_name="wcrGraphicsPipe";
-
-void wcrGraphicsPipe::init_type() {
- InteractiveGraphicsPipe::init_type();
- register_type(_type_handle, pipe_type_name,
- InteractiveGraphicsPipe::get_class_type());
-}
-
-TypeHandle wcrGraphicsPipe::get_type() const {
- return get_class_type();
-}
-
-wcrGraphicsPipe::wcrGraphicsPipe() {
- wcrdisplay_cat.error()
- << pipe_type_name <<"s should not be created with the default constructor" << endl;
-}
-
-wcrGraphicsPipe::wcrGraphicsPipe(const wcrGraphicsPipe&) {
- wcrdisplay_cat.error()
- << pipe_type_name << "s should not be copied" << endl;
-}
-
-wcrGraphicsPipe& wcrGraphicsPipe::operator=(const wcrGraphicsPipe&) {
- wcrdisplay_cat.error()
- << pipe_type_name << "s should not be assigned" << endl;
- return *this;
-}
diff --git a/panda/src/wcrdisplay/wcrGraphicsPipe.h b/panda/src/wcrdisplay/wcrGraphicsPipe.h
deleted file mode 100644
index ca096543e9..0000000000
--- a/panda/src/wcrdisplay/wcrGraphicsPipe.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Filename: wcrGraphicsPipe.h
-// Created by: skyler, based on wgl* file.
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license. You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-#ifndef WCRGRAPHICSPIPE_H
-#define WCRGRAPHICSPIPE_H
-//
-////////////////////////////////////////////////////////////////////
-// Includes
-////////////////////////////////////////////////////////////////////
-#include "pandabase.h"
-
-#include
-#include "interactiveGraphicsPipe.h"
-//#include "wcrGraphicsWindow.h"
-#define WINDOWS_LEAN_AND_MEAN
-#include
-#undef WINDOWS_LEAN_AND_MEAN
-
-////////////////////////////////////////////////////////////////////
-// Class : wcrGraphicsPipe
-// Description :
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDACR wcrGraphicsPipe : public InteractiveGraphicsPipe {
-PUBLISHED:
- wcrGraphicsPipe(const PipeSpecifier&);
-
- virtual TypeHandle get_window_type() const;
-
-public:
-
- static GraphicsPipe* make_wcrGraphicsPipe(const FactoryParams ¶ms);
-
- static TypeHandle get_class_type();
- static void init_type();
- virtual TypeHandle get_type() const;
- virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-
-private:
-
- static TypeHandle _type_handle;
-
-protected:
-
- wcrGraphicsPipe();
- wcrGraphicsPipe(const wcrGraphicsPipe&);
- wcrGraphicsPipe& operator=(const wcrGraphicsPipe&);
-};
-
-#endif
diff --git a/panda/src/wcrdisplay/wcrGraphicsWindow.cxx b/panda/src/wcrdisplay/wcrGraphicsWindow.cxx
deleted file mode 100644
index b52f65917e..0000000000
--- a/panda/src/wcrdisplay/wcrGraphicsWindow.cxx
+++ /dev/null
@@ -1,1887 +0,0 @@
-// Filename: wcrGraphicsWindow.cxx
-// Created by: skyler, based on wgl* file.
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license. You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-#include "wcrGraphicsWindow.h"
-#include "wcrGraphicsPipe.h"
-#include "config_wcrdisplay.h"
-#include "keyboardButton.h"
-#include "mouseButton.h"
-#include "crGraphicsStateGuardian.h"
-#include
-#include
-#include
-#include
-#include