mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-10 01:14:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wxgl fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1524 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-13 22:40:10 +00:00
parent f225f92f4d
commit 2c66b9d36f
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Src/Frame.h
View File

@ -10,12 +10,18 @@ class CFrame : public wxFrame
CFrame(wxFrame* parent, CFrame(wxFrame* parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& title = _T("Dolphin"), const wxString& title = wxT("Dolphin"),
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE); 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; wxStatusBar* m_pStatusBar;

5
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

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

5
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

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