wxgl fixes

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

Source/Core/DolphinWX/Src/Frame.h

@@ -10,12 +10,18 @@ class CFrame : public wxFrame
 
 		CFrame(wxFrame* parent,
 			wxWindowID id = wxID_ANY,
-			const wxString& title = _T("Dolphin"),
+			const wxString& title = wxT("Dolphin"),
 		const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize,
 		long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
 
-		void* GetRenderHandle() {return(m_Panel->GetHandle());}
+		void* GetRenderHandle() {
+#ifdef _WIN32
+                    return(m_Panel->GetHandle());
+#else
+                    return this;
+#endif
+                }
 
 		wxStatusBar* m_pStatusBar;
 

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp

@@ -212,10 +212,11 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
     wxSize size(_iwidth, _iheight);
     if (!g_Config.renderToMainframe || 
         g_VideoInitialize.pWindowHandle == NULL) {
-        GLWin.frame = new wxFrame((wxFrame *)g_VideoInitialize.pWindowHandle, 
+        GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle, 
                                   -1, _("Dolphin"), wxPoint(0,0), size);
     } else {
-        GLWin.frame = (wxFrame *)g_VideoInitialize.pWindowHandle;
+        GLWin.frame = new wxFrame((wxWindow *)NULL, 
+                                  -1, _("Dolphin"), wxPoint(0,0), size);
     }
     GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, NULL,
                                     wxPoint(0,0), size, wxSUNKEN_BORDER);

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -153,7 +153,12 @@ void DllConfig(HWND _hParent)
 	//frame.ShowModal();
 	frame->ShowModal();
 	//win.SetHWND(0);
+#elif defined(USE_WX) && USE_WX
 
+	ConfigDialog frame(NULL);
+        g_Config.Load();
+        frame.ShowModal()
+;
 #elif defined(HAVE_X11) && HAVE_X11
 #if defined(HAVE_XXF86VM) && HAVE_XXF86VM
 	ConfigDialog frame(NULL);