Win32-only:

- Merge the EmuWindow class to VideoCommon.
- Implement free look in the D3D plugins. Seems like it had broken before though; only rotating the view works..


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6616 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -57,7 +57,7 @@ Make AA apply instantly during gameplay if possible
 #include <cstdarg>
 
 #ifdef _WIN32
-#include "OS/Win32.h"
+#include "EmuWindow.h"
 #endif
 
 #if defined(HAVE_WX) && HAVE_WX
@@ -97,18 +97,53 @@ Make AA apply instantly during gameplay if possible
 // Logging
 int GLScissorX, GLScissorY, GLScissorW, GLScissorH;
 
+#ifdef _WIN32
+HINSTANCE g_hInstance;
+
+#if defined(HAVE_WX) && HAVE_WX
+class wxDLLApp : public wxApp
+{
+        bool OnInit()
+        {
+                return true;
+        }
+};
+IMPLEMENT_APP_NO_MAIN(wxDLLApp) 
+WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
+#endif
+// ------------------
+
+BOOL APIENTRY DllMain(HINSTANCE hinstDLL,       // DLL module handle
+                                          DWORD dwReason,               // reason called
+                                          LPVOID lpvReserved)   // reserved
+{
+        switch (dwReason)
+        {
+        case DLL_PROCESS_ATTACH:
+                {
+#if defined(HAVE_WX) && HAVE_WX
+                        wxSetInstance((HINSTANCE)hinstDLL);
+                        wxInitialize();
+#endif
+                }
+                break; 
+
+        case DLL_PROCESS_DETACH:
+#if defined(HAVE_WX) && HAVE_WX
+                wxUninitialize();
+#endif
+                break;
+        }
+
+        g_hInstance = hinstDLL;
+        return TRUE;
+}
+#endif // _WIN32
+
 #if defined(HAVE_X11) && HAVE_X11
 static volatile u32 s_doStateRequested = FALSE;
 #endif
 
-// This is used for the functions right below here which use wxwidgets
-#if defined(HAVE_WX) && HAVE_WX
-#ifdef _WIN32
-	WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
-	extern HINSTANCE g_hInstance;
-#endif
-#endif
-
 void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 {
 	_PluginInfo->Version = 0x0100;