diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp index c6874bde89..43eb23831e 100644 --- a/Source/Core/Core/Src/PluginManager.cpp +++ b/Source/Core/Core/Src/PluginManager.cpp @@ -317,7 +317,7 @@ void *CPluginManager::LoadPlugin(const char *_rFilename) return NULL; } - // Check that the plugin has both all the common and all the type specific functions + // Check that the plugin has all the common and all the type specific functions if (!plugin->IsValid()) { PanicAlert("Can't open %s, it has a missing function", _rFilename); diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 61c3ff5cb4..86ab39fd31 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -23,7 +23,7 @@ BEGIN_EVENT_TABLE(AboutDolphin, wxDialog) EVT_CLOSE(AboutDolphin::OnClose) - EVT_BUTTON(ID_CLOSE, AboutDolphin::CloseClick) + EVT_BUTTON(wxID_CLOSE, AboutDolphin::CloseClick) END_EVENT_TABLE() AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) @@ -38,7 +38,7 @@ AboutDolphin::~AboutDolphin() void AboutDolphin::CreateGUIControls() { - m_Close = new wxButton(this, ID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); //miloszwl@miloszwl.com (miloszwl.deviantart.com) wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png); @@ -79,8 +79,8 @@ void AboutDolphin::CreateGUIControls() this->SetSizer(sMain); sMain->Layout(); - CenterOnParent(); Fit(); + CenterOnParent(); } void AboutDolphin::OnClose(wxCloseEvent& WXUNUSED (event)) diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.h b/Source/Core/DolphinWX/Src/AboutDolphin.h index 9b700922b4..813eb57e12 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.h +++ b/Source/Core/DolphinWX/Src/AboutDolphin.h @@ -29,7 +29,7 @@ class AboutDolphin : public wxDialog { public: AboutDolphin(wxWindow *parent, - wxWindowID id = 1, + wxWindowID id = wxID_ANY, const wxString &title = wxT("About Dolphin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -52,8 +52,7 @@ class AboutDolphin : public wxDialog enum { - ID_CLOSE = 1000, - ID_LOGO, + ID_LOGO = 1000, ID_MESSAGE }; diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 386a939221..f038f0926b 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -327,7 +327,7 @@ CFrame::CFrame(wxFrame* parent, , m_pStatusBar(NULL), m_GameListCtrl(NULL), m_Panel(NULL) , m_LogWindow(NULL) , UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false) - , m_bModalDialogOpen(false), m_bControlsCreated(false), m_StopDlg(NULL) + , m_bControlsCreated(false), m_StopDlg(NULL) #if wxUSE_TIMER #ifdef _WIN32 , m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0) @@ -610,10 +610,15 @@ WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { case SC_SCREENSAVE: case SC_MONITORPOWER: - return 0; + break; + default: + return wxFrame::MSWWindowProc(nMsg, wParam, lParam); } + break; + default: + return wxFrame::MSWWindowProc(nMsg, wParam, lParam); } - return wxFrame::MSWWindowProc(nMsg, wParam, lParam); + return 0; } #endif @@ -928,13 +933,13 @@ void X11_ShowFullScreen(bool bF) void CFrame::DoFullscreen(bool bF) { #if defined HAVE_X11 && HAVE_X11 - if ((Core::GetState() == Core::CORE_RUN) && !m_bModalDialogOpen) + if ((Core::GetState() == Core::CORE_RUN)) X11_ShowFullScreen(bF); #endif // Only switch this to fullscreen if we're rendering to main AND if we're running a game // plus if a modal dialog is open, this will still process the keyboard events, and may cause // the main window to become unresponsive, so we have to avoid that. - if ((bRenderToMain && Core::GetState() == Core::CORE_RUN) && !m_bModalDialogOpen) + if ((bRenderToMain && Core::GetState() == Core::CORE_RUN)) { ShowFullScreen(bF); @@ -1055,4 +1060,4 @@ void CFrame::ListTopWindows() j++; } NOTICE_LOG(CONSOLE, "\n"); -} +} \ No newline at end of file diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 0384c9bc6a..6d228a8618 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -199,7 +199,6 @@ class CFrame : public wxFrame bool m_bEdit; bool m_bTabSplit; bool m_bNoDocking; - bool m_bModalDialogOpen; bool m_bControlsCreated; char newDiscpath[2048]; wxMessageDialog *m_StopDlg; diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index a5aedc5ef8..f8634c57c7 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -282,6 +282,7 @@ void CMemcardManager::CreateGUIControls() this->SetSizer(sMain); sMain->SetSizeHints(this); Fit(); + Center(); for (int i = SLOT_A; i < SLOT_B + 1; i++) { diff --git a/Source/Core/DolphinWX/Src/MemcardManager.h b/Source/Core/DolphinWX/Src/MemcardManager.h index 7cc0c2b573..cb001870d0 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.h +++ b/Source/Core/DolphinWX/Src/MemcardManager.h @@ -47,12 +47,11 @@ #endif -class CMemcardManager - : public wxDialog +class CMemcardManager : public wxDialog { public: - CMemcardManager(wxWindow *parent, wxWindowID id = 1, const wxString& title = wxT(MEMCARDMAN_TITLE), + CMemcardManager(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString& title = wxT(MEMCARDMAN_TITLE), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = MEMCARD_MANAGER_STYLE); virtual ~CMemcardManager(); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp index aff2a5e919..ce6ef2025d 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp @@ -25,16 +25,13 @@ BEGIN_EVENT_TABLE(DSPConfigDialogHLE, wxDialog) EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, DSPConfigDialogHLE::SettingsChanged) EVT_CHECKBOX(ID_ENABLE_THROTTLE, DSPConfigDialogHLE::SettingsChanged) EVT_CHECKBOX(ID_ENABLE_RE0_FIX, DSPConfigDialogHLE::SettingsChanged) - EVT_CHOICE(wxID_ANY, DSPConfigDialogHLE::BackendChanged) + EVT_CHOICE(ID_BACKEND, DSPConfigDialogHLE::BackendChanged) EVT_COMMAND_SCROLL(ID_VOLUME, DSPConfigDialogHLE::VolumeChanged) END_EVENT_TABLE() DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) : wxDialog(parent, id, title, position, size, style) { - // Center window - CenterOnParent(); - m_OK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxStaticBoxSizer *sbSettings = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Sound Settings")); @@ -94,6 +91,9 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wx sButtons->Add(m_OK, 0, wxALL, 1); sMain->Add(sButtons, 0, wxALL|wxEXPAND, 4); SetSizerAndFit(sMain); + + // Center window + CenterOnParent(); } // Add audio output options diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h index d724e118e9..9ebcfa9724 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h @@ -28,7 +28,7 @@ class DSPConfigDialogHLE : public wxDialog { public: DSPConfigDialogHLE(wxWindow *parent, - wxWindowID id = 1, + wxWindowID id = wxID_ANY, const wxString &title = wxT("Dolphin DSP-HLE Plugin Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -52,7 +52,6 @@ private: enum { - wxID_OK, ID_ENABLE_HLE_AUDIO, ID_ENABLE_DTK_MUSIC, ID_ENABLE_THROTTLE, diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp index de8835967a..62278dab30 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp @@ -99,8 +99,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -147,12 +145,12 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo) _PluginInfo->Version = 0x0100; _PluginInfo->Type = PLUGIN_TYPE_DSP; #ifdef DEBUGFAST - sprintf(_PluginInfo->Name, "Dolphin DSP-HLE Plugin (DebugFast) "); + sprintf_s(_PluginInfo->Name, 100, "Dolphin DSP-HLE Plugin (DebugFast) "); #else #ifndef _DEBUG - sprintf(_PluginInfo->Name, "Dolphin DSP-HLE Plugin "); + sprintf_s(_PluginInfo->Name, 100, "Dolphin DSP-HLE Plugin "); #else - sprintf(_PluginInfo ->Name, "Dolphin DSP-HLE Plugin (Debug) "); + sprintf_s(_PluginInfo->Name, 100, "Dolphin DSP-HLE Plugin (Debug) "); #endif #endif } @@ -171,28 +169,29 @@ void DllConfig(HWND _hParent) g_Config.Load(); g_Config.GameIniLoad(globals->game_ini); - if (!m_ConfigFrame) + wxWindow *frame = GetParentedWxWindow(_hParent); + m_ConfigFrame = new DSPConfigDialogHLE(frame); + + // add backends + std::vector backends = AudioCommon::GetSoundBackends(); + + for (std::vector::const_iterator iter = backends.begin(); + iter != backends.end(); ++iter) { - wxWindow *frame = GetParentedWxWindow(_hParent); - m_ConfigFrame = new DSPConfigDialogHLE(frame); + m_ConfigFrame->AddBackend((*iter).c_str()); + } - // add backends - std::vector backends = AudioCommon::GetSoundBackends(); + // Only allow one open at a time + frame->Disable(); + m_ConfigFrame->ShowModal(); + frame->Enable(); - for (std::vector::const_iterator iter = backends.begin(); - iter != backends.end(); ++iter) - { - m_ConfigFrame->AddBackend((*iter).c_str()); - } - - // Only allow one open at a time - m_ConfigFrame->ShowModal(); - m_ConfigFrame->Destroy(); - m_ConfigFrame = NULL; + m_ConfigFrame->Destroy(); + m_ConfigFrame = NULL; #ifdef _WIN32 - frame->SetHWND(NULL); + frame->SetHWND(NULL); #endif - delete frame; + frame->Destroy(); } #endif } diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp index 8b9629e807..d2bf2ed678 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp @@ -23,7 +23,7 @@ BEGIN_EVENT_TABLE(DSPConfigDialogLLE, wxDialog) EVT_BUTTON(wxID_OK, DSPConfigDialogLLE::SettingsChanged) EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, DSPConfigDialogLLE::SettingsChanged) EVT_CHECKBOX(ID_ENABLE_THROTTLE, DSPConfigDialogLLE::SettingsChanged) - EVT_CHOICE(wxID_ANY, DSPConfigDialogLLE::BackendChanged) + EVT_CHOICE(ID_BACKEND, DSPConfigDialogLLE::BackendChanged) EVT_COMMAND_SCROLL(ID_VOLUME, DSPConfigDialogLLE::VolumeChanged) END_EVENT_TABLE() @@ -33,9 +33,6 @@ DSPConfigDialogLLE::DSPConfigDialogLLE(wxWindow *parent, wxWindowID id, const wx // Load config settings g_Config.Load(); - // Center window - CenterOnParent(); - m_OK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxStaticBoxSizer *sbSettings = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Sound Settings")); @@ -89,6 +86,8 @@ DSPConfigDialogLLE::DSPConfigDialogLLE(wxWindow *parent, wxWindowID id, const wx sMain->Add(sButtons, 0, wxALL|wxEXPAND, 4); SetSizerAndFit(sMain); + // Center window + CenterOnParent(); } // Add audio output options diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.h b/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.h index b58486f114..1e01df6e9a 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.h +++ b/Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.h @@ -28,7 +28,7 @@ class DSPConfigDialogLLE : public wxDialog { public: DSPConfigDialogLLE(wxWindow *parent, - wxWindowID id = 1, + wxWindowID id = wxID_ANY, const wxString &title = wxT("Dolphin DSP-LLE Plugin Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -50,7 +50,6 @@ private: enum { - wxID_OK, ID_ENABLE_DTK_MUSIC, ID_ENABLE_THROTTLE, ID_BACKEND, diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp index b693b4ff49..06c0e6f372 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp @@ -86,8 +86,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -117,12 +115,12 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo) _PluginInfo->Type = PLUGIN_TYPE_DSP; #ifdef DEBUGFAST - sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin (DebugFast)"); + sprintf_s(_PluginInfo->Name, "Dolphin DSP-LLE Plugin (DebugFast)"); #else #ifndef _DEBUG - sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin"); + sprintf_s(_PluginInfo->Name, "Dolphin DSP-LLE Plugin"); #else - sprintf(_PluginInfo->Name, "Dolphin DSP-LLE Plugin (Debug)"); + sprintf_s(_PluginInfo->Name, "Dolphin DSP-LLE Plugin (Debug)"); #endif #endif } @@ -136,29 +134,29 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) void DllConfig(HWND _hParent) { #if defined(HAVE_WX) && HAVE_WX - if (!m_ConfigFrame) + wxWindow *frame = GetParentedWxWindow(_hParent); + m_ConfigFrame = new DSPConfigDialogLLE(frame); + + // add backends + std::vector backends = AudioCommon::GetSoundBackends(); + + for (std::vector::const_iterator iter = backends.begin(); + iter != backends.end(); ++iter) { - wxWindow *frame = GetParentedWxWindow(_hParent); - m_ConfigFrame = new DSPConfigDialogLLE(frame); - - // add backends - std::vector backends = AudioCommon::GetSoundBackends(); - - for (std::vector::const_iterator iter = backends.begin(); - iter != backends.end(); ++iter) - { - m_ConfigFrame->AddBackend((*iter).c_str()); - } - - // Only allow one open at a time - m_ConfigFrame->ShowModal(); - m_ConfigFrame->Destroy(); - m_ConfigFrame = NULL; -#ifdef _WIN32 - frame->SetHWND(NULL); -#endif - delete frame; + m_ConfigFrame->AddBackend((*iter).c_str()); } + + // Only allow one open at a time + frame->Disable(); + m_ConfigFrame->ShowModal(); + frame->Enable(); + + m_ConfigFrame->Destroy(); + m_ConfigFrame = NULL; +#ifdef _WIN32 + frame->SetHWND(NULL); +#endif + frame->Destroy(); #endif } diff --git a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp index fefd1b4b0f..77bdbdb755 100644 --- a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp @@ -42,8 +42,8 @@ // The wxWidgets class BEGIN_EVENT_TABLE(GCPadConfigDialog,wxDialog) EVT_CLOSE(GCPadConfigDialog::OnClose) - EVT_BUTTON(ID_OK, GCPadConfigDialog::OnCloseClick) - EVT_BUTTON(ID_CANCEL, GCPadConfigDialog::OnCloseClick) + EVT_BUTTON(wxID_OK, GCPadConfigDialog::OnCloseClick) + EVT_BUTTON(wxID_CANCEL, GCPadConfigDialog::OnCloseClick) EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, GCPadConfigDialog::NotebookPageChanged) EVT_CHOICE(IDC_JOYNAME, GCPadConfigDialog::ChangeSettings) @@ -178,11 +178,11 @@ void GCPadConfigDialog::OnCloseClick(wxCommandEvent& event) { switch (event.GetId()) { - case ID_OK: + case wxID_OK: g_Config.Save(); Close(); // Call OnClose() break; - case ID_CANCEL: + case wxID_CANCEL: g_Config.Load(); Close(); // Call OnClose() break; @@ -736,9 +736,9 @@ void GCPadConfigDialog::CreateGUIControls() m_Controller[i]->SetSizer(m_sMain[i]); } - m_OK = new wxButton(this, ID_OK, wxT("OK")); + m_OK = new wxButton(this, wxID_OK, wxT("OK")); m_OK->SetToolTip(wxT("Save changes and close")); - m_Cancel = new wxButton(this, ID_CANCEL, wxT("Cancel")); + m_Cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel")); m_Cancel->SetToolTip(wxT("Discard changes and close")); wxBoxSizer* m_DlgButton = new wxBoxSizer(wxHORIZONTAL); m_DlgButton->AddStretchSpacer(); diff --git a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.h b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.h index 096c6e75d4..2ac4e5ad98 100644 --- a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.h +++ b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.h @@ -45,7 +45,7 @@ class GCPadConfigDialog : public wxDialog { public: - GCPadConfigDialog(wxWindow *parent, wxWindowID id = 1, + GCPadConfigDialog(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = wxT("Gamecube Pad Plugin Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE); @@ -92,9 +92,7 @@ class GCPadConfigDialog : public wxDialog IDB_TRIGGER_L, IDB_TRIGGER_R, // Dialog controls - ID_OK = 1000, - ID_CANCEL, - ID_NOTEBOOK, + ID_NOTEBOOK = 1000, ID_CONTROLLERPAGE1, ID_CONTROLLERPAGE2, ID_CONTROLLERPAGE3, diff --git a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp index d855880905..91cd6c0a47 100644 --- a/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/GCPad.cpp @@ -96,8 +96,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -163,17 +161,19 @@ void DllConfig(HWND _hParent) } #if defined(HAVE_WX) && HAVE_WX - if (!m_ConfigFrame) - { - wxWindow *frame = GetParentedWxWindow(_hParent); - m_ConfigFrame = new GCPadConfigDialog(frame); - m_ConfigFrame->ShowModal(); - m_ConfigFrame->Destroy(); - m_ConfigFrame = NULL; + wxWindow *frame = GetParentedWxWindow(_hParent); + m_ConfigFrame = new GCPadConfigDialog(frame); + + frame->Disable(); + m_ConfigFrame->ShowModal(); + frame->Enable(); + + m_ConfigFrame->Destroy(); + m_ConfigFrame = NULL; #ifdef _WIN32 - frame->SetHWND(NULL); + frame->SetHWND(NULL); #endif - delete frame; + frame->Destroy(); } #endif } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp index c5dbfdd0c9..1b9285bd56 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp @@ -109,9 +109,6 @@ struct TabDirect3D : public W32Util::Tab case IDC_WIDESCREEN_HACK: g_Config.bWidescreenHack = Button_GetCheck(GetDlgItem(hDlg, IDC_WIDESCREEN_HACK)) ? true : false; break; - case IDC_WIREFRAME: - g_Config.bWireFrame = Button_GetCheck(GetDlgItem(hDlg,IDC_WIREFRAME)) ? true : false; - break; case IDC_SAFE_TEXTURE_CACHE: g_Config.bSafeTextureCache = Button_GetCheck(GetDlgItem(hDlg, IDC_SAFE_TEXTURE_CACHE)) == 0 ? false : true; break; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index 897ea27f48..c4008331ff 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -302,7 +302,7 @@ void PixelShaderCache::Init() File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX)); char cache_filename[MAX_PATH]; - sprintf(cache_filename, "%s%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX), globals->unique_id); + sprintf(cache_filename, "%s%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX), globals->unique_id); PixelShaderCacheInserter inserter; int read_items = g_ps_disk_cache.OpenAndRead(cache_filename, &inserter); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp index 447aa33ceb..9c7708c9b1 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp @@ -129,10 +129,10 @@ static const D3DBLEND d3dDestFactors[8] = static const D3DBLENDOP d3dLogincOPop[16] = { D3DBLENDOP_ADD,//0 - D3DBLENDOP_ADD,//1 - D3DBLENDOP_SUBTRACT,//2 - D3DBLENDOP_ADD,//3 - D3DBLENDOP_REVSUBTRACT,//4 + D3DBLENDOP_ADD,//1 + D3DBLENDOP_SUBTRACT,//2 + D3DBLENDOP_ADD,//3 + D3DBLENDOP_REVSUBTRACT,//4 D3DBLENDOP_ADD,//5 D3DBLENDOP_MAX,//6 D3DBLENDOP_ADD,//7 @@ -284,7 +284,7 @@ bool Renderer::Init() // TODO: Grab target width from configured resolution? s_target_width = s_backbuffer_width; - s_target_height = s_backbuffer_height * ((float)EFB_HEIGHT / 480.0f); + s_target_height = s_backbuffer_height * ((float)EFB_HEIGHT / 480.0f); s_LastAA = (g_ActiveConfig.iMultisampleMode > 3)?0:g_ActiveConfig.iMultisampleMode; switch (s_LastAA) @@ -308,7 +308,7 @@ bool Renderer::Init() xScale = (float)s_target_width / (float)EFB_WIDTH; yScale = (float)s_target_height / (float)EFB_HEIGHT; s_Fulltarget_width = s_target_width; - s_Fulltarget_height = s_target_height; + s_Fulltarget_height = s_target_height; s_LastFrameDumped = false; s_AVIDumping = false; @@ -345,19 +345,17 @@ bool Renderer::Init() D3D::dev->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x0, 1.0f, 0); D3D::BeginFrame(); D3D::SetRenderState(D3DRS_SCISSORTESTENABLE, true); - D3D::dev->CreateOffscreenPlainSurface(s_backbuffer_width,s_backbuffer_height, FBManager::GetEFBColorRTSurfaceFormat(), D3DPOOL_SYSTEMMEM, &ScreenShootMEMSurface, NULL ); + D3D::dev->CreateOffscreenPlainSurface(s_backbuffer_width,s_backbuffer_height, FBManager::GetEFBColorRTSurfaceFormat(), D3DPOOL_SYSTEMMEM, &ScreenShootMEMSurface, NULL ); return true; } void Renderer::Shutdown() { - - TeardownDeviceObjects(); D3D::EndFrame(); D3D::Present(); D3D::Close(); - + if (s_AVIDumping) { AVIDump::Stop(); @@ -415,7 +413,7 @@ void Renderer::DrawDebugText() break; } std::string OSDM22 = - g_ActiveConfig.bCrop ? " (crop)" : ""; + g_ActiveConfig.bCrop ? " (crop)" : ""; std::string OSDM3 = g_ActiveConfig.bEFBCopyDisable ? "Disabled" : g_ActiveConfig.bCopyEFBToTexture ? "To Texture" : "To RAM"; @@ -435,14 +433,14 @@ void Renderer::DrawDebugText() T1 += (OSDChoice == -2) ? T0.at(1) : "\n"; T1 += (OSDChoice == -3) ? T0.at(2) : "\n"; T1 += (OSDChoice == -4) ? T0.at(3) : "\n"; - T1 += (OSDChoice == -5) ? T0.at(4) : "\n"; + T1 += (OSDChoice == -5) ? T0.at(4) : "\n"; // The other settings in cyan T2 += (OSDChoice != -1) ? T0.at(0) : "\n"; T2 += (OSDChoice != -2) ? T0.at(1) : "\n"; T2 += (OSDChoice != -3) ? T0.at(2) : "\n"; T2 += (OSDChoice != -4) ? T0.at(3) : "\n"; - T2 += (OSDChoice != -5) ? T0.at(4) : "\n"; + T2 += (OSDChoice != -5) ? T0.at(4) : "\n"; // Render a shadow, and then the text Renderer::RenderText(T1.c_str(), 21, 21, 0xDD000000); @@ -570,7 +568,7 @@ static void EFBTextureToD3DBackBuffer(const EFBRectangle& sourceRc) D3D::dev->SetViewport(&vp); - EFBRectangle efbRect; + EFBRectangle efbRect; LPDIRECT3DTEXTURE9 read_texture = FBManager::GetEFBColorTexture(efbRect); RECT destinationrect; @@ -584,13 +582,13 @@ static void EFBTextureToD3DBackBuffer(const EFBRectangle& sourceRc) sourcerect.right = src_rect.right; sourcerect.top = src_rect.top; - D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); + D3D::ChangeSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); D3D::ChangeSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); int SSAAMode = ( g_ActiveConfig.iMultisampleMode > 3 )? 0 : g_ActiveConfig.iMultisampleMode; - D3D::drawShadedTexQuad(read_texture,&sourcerect,Renderer::GetFullTargetWidth(),Renderer::GetFullTargetHeight(),PixelShaderCache::GetColorCopyProgram(SSAAMode),(SSAAMode != 0)?VertexShaderCache::GetFSAAVertexShader():VertexShaderCache::GetSimpleVertexShader()); + D3D::drawShadedTexQuad(read_texture,&sourcerect,Renderer::GetFullTargetWidth(),Renderer::GetFullTargetHeight(),PixelShaderCache::GetColorCopyProgram(SSAAMode),(SSAAMode != 0)?VertexShaderCache::GetFSAAVertexShader():VertexShaderCache::GetSimpleVertexShader()); - D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER); + D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER); D3D::RefreshSamplerState(0, D3DSAMP_MAGFILTER); vp.X = 0; @@ -638,7 +636,7 @@ static void EFBTextureToD3DBackBuffer(const EFBRectangle& sourceRc) ScreenShootMEMSurface->UnlockRect(); } } - s_LastFrameDumped = true; + s_LastFrameDumped = true; } else { @@ -674,8 +672,6 @@ static void EFBTextureToD3DBackBuffer(const EFBRectangle& sourceRc) OSD::DrawMessages(); } - - void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc) { if (g_bSkipCurrentFrame) @@ -688,7 +684,7 @@ void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRect Renderer::ResetAPIState(); // Set the backbuffer as the rendering target D3D::dev->SetDepthStencilSurface(NULL); - D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); + D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface()); EFBTextureToD3DBackBuffer(sourceRc); @@ -704,13 +700,13 @@ void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRect ); Swap(0,FIELD_PROGRESSIVE,0,0); // we used to swap the buffer here, now we will wait - // until the XFB pointer is updated by VI + // until the XFB pointer is updated by VI D3D::BeginFrame(); Renderer::RestoreAPIState(); D3D::dev->SetRenderTarget(0, FBManager::GetEFBColorRTSurface()); - D3D::dev->SetDepthStencilSurface(FBManager::GetEFBDepthRTSurface()); - UpdateViewport(); - VertexShaderManager::SetViewportChanged(); + D3D::dev->SetDepthStencilSurface(FBManager::GetEFBDepthRTSurface()); + UpdateViewport(); + VertexShaderManager::SetViewportChanged(); } bool Renderer::SetScissorRect() @@ -734,7 +730,7 @@ bool Renderer::SetScissorRect() if (rc.left < 0) rc.left = 0; if (rc.right < 0) rc.right = 0; if (rc.left > s_target_width) rc.left = s_target_width; - if (rc.right > s_target_width) rc.right = s_target_width; + if (rc.right > s_target_width) rc.right = s_target_width; if (rc.top < 0) rc.top = 0; if (rc.bottom < 0) rc.bottom = 0; if (rc.top > s_target_height) rc.top = s_target_height; @@ -886,7 +882,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y) Renderer::GetFullTargetWidth() , Renderer::GetFullTargetHeight(), (BufferFormat == FOURCC_RAWZ)?PixelShaderCache::GetColorMatrixProgram(0):PixelShaderCache::GetDepthMatrixProgram(0), - VertexShaderCache::GetSimpleVertexShader()); + VertexShaderCache::GetSimpleVertexShader()); D3D::RefreshSamplerState(0, D3DSAMP_MINFILTER); @@ -928,7 +924,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y) if ((hr = pOffScreenBuffer->LockRect(&drect, &RectToLock, D3DLOCK_READONLY)) != D3D_OK) { PanicAlert("ERROR: %s", hr == D3DERR_WASSTILLDRAWING ? "Still drawing" : - hr == D3DERR_INVALIDCALL ? "Invalid call" : "w00t"); + hr == D3DERR_INVALIDCALL ? "Invalid call" : "w00t"); return 0; } @@ -938,7 +934,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y) switch (ReadBufferFormat) { case D3DFMT_R32F: - val = ((float *)drect.pBits)[6]; + val = ((float *)drect.pBits)[6]; break; default: float ffrac = 1.0f/255.0f; @@ -947,12 +943,12 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y) ffrac*= 1 / 255.0f; val += ((float)((z>>8) & 0xFF)) * ffrac; ffrac*= 1 / 255.0f; - val += ((float)(z & 0xFF)) * ffrac; + val += ((float)(z & 0xFF)) * ffrac; break; }; z = ((u32)(val * 0xffffff)); } - break; + break; case POKE_Z: // TODO: Get that Z value to poke from somewhere //((float *)drect.pBits)[0] = val; @@ -980,12 +976,12 @@ u32 Renderer::AccessEFB(EFBAccessType type, int x, int y) void UpdateViewport() { // reversed gxsetviewport(xorig, yorig, width, height, nearz, farz) - // [0] = width/2 - // [1] = height/2 - // [2] = 16777215 * (farz - nearz) - // [3] = xorig + width/2 + 342 - // [4] = yorig + height/2 + 342 - // [5] = 16777215 * farz + // [0] = width/2 + // [1] = height/2 + // [2] = 16777215 * (farz - nearz) + // [3] = xorig + width/2 + 342 + // [4] = yorig + height/2 + 342 + // [5] = 16777215 * farz int scissorXOff = bpmem.scissorOffset.x * 2; int scissorYOff = bpmem.scissorOffset.y * 2; @@ -998,19 +994,19 @@ void UpdateViewport() D3DVIEWPORT9 vp; // Stretch picture with increased internal resolution - int X = (int)(ceil(xfregs.rawViewport[3] - xfregs.rawViewport[0] - (scissorXOff)) * MValueX) + Xstride; + int X = (int)(ceil(xfregs.rawViewport[3] - xfregs.rawViewport[0] - (scissorXOff)) * MValueX) + Xstride; int Y = (int)(ceil(xfregs.rawViewport[4] + xfregs.rawViewport[1] - (scissorYOff)) * MValueY) + Ystride; int Width = (int)ceil((int)(2 * xfregs.rawViewport[0]) * MValueX); int Height = (int)ceil((int)(-2 * xfregs.rawViewport[1]) * MValueY); if (Width < 0) { X += Width; - Width*=-1; + Width*=-1; } if (Height < 0) { Y += Height; - Height *= -1; + Height *= -1; } bool sizeChanged = false; if(X < 0) @@ -1062,7 +1058,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE { // Update the view port for clearing the picture - D3DVIEWPORT9 vp; + D3DVIEWPORT9 vp; vp.X = 0; vp.Y = 0; vp.Width = Renderer::GetFullTargetWidth(); @@ -1079,13 +1075,13 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE sirc.top = targetRc.top; sirc.right = targetRc.right; sirc.bottom = targetRc.bottom; - D3D::dev->SetScissorRect(&sirc); + D3D::dev->SetScissorRect(&sirc); if (zEnable) D3D::ChangeRenderState(D3DRS_ZFUNC, D3DCMP_ALWAYS); - D3D::drawClearQuad(color ,(z & 0xFFFFFF) / float(0xFFFFFF),PixelShaderCache::GetClearProgram(),VertexShaderCache::GetClearVertexShader()); + D3D::drawClearQuad(color ,(z & 0xFFFFFF) / float(0xFFFFFF),PixelShaderCache::GetClearProgram(),VertexShaderCache::GetClearVertexShader()); if (zEnable) D3D::RefreshRenderState(D3DRS_ZFUNC); - //D3D::dev->Clear(0, NULL, (colorEnable ? D3DCLEAR_TARGET : 0)| ( zEnable ? D3DCLEAR_ZBUFFER : 0), color | ((alphaEnable)?0:0xFF000000),(z & 0xFFFFFF) / float(0xFFFFFF), 0); + //D3D::dev->Clear(0, NULL, (colorEnable ? D3DCLEAR_TARGET : 0)| ( zEnable ? D3DCLEAR_ZBUFFER : 0), color | ((alphaEnable)?0:0xFF000000),(z & 0xFFFFFF) / float(0xFFFFFF), 0); UpdateViewport(); SetScissorRect(); } @@ -1101,9 +1097,9 @@ void Renderer::SetBlendMode(bool forceUpdate) return; u32 newval = bpmem.blendmode.subtract << 2; - if (bpmem.blendmode.subtract) { - newval |= 0x0049; // enable blending src 1 dst 1 - } else if (bpmem.blendmode.blendenable) { + if (bpmem.blendmode.subtract) { + newval |= 0x0049; // enable blending src 1 dst 1 + } else if (bpmem.blendmode.blendenable) { newval |= 1; // enable blending newval |= bpmem.blendmode.srcfactor << 3; newval |= bpmem.blendmode.dstfactor << 6; @@ -1112,12 +1108,12 @@ void Renderer::SetBlendMode(bool forceUpdate) u32 changes = forceUpdate ? 0xFFFFFFFF : newval ^ s_blendMode; if (changes & 1) { - // blend enable change + // blend enable change D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, (newval & 1)); } - if (changes & 4) { + if (changes & 4) { // subtract enable change D3D::SetRenderState(D3DRS_BLENDOP, newval & 4 ? D3DBLENDOP_REVSUBTRACT : D3DBLENDOP_ADD); } @@ -1125,7 +1121,7 @@ void Renderer::SetBlendMode(bool forceUpdate) if (changes & 0x1F8) { // blend RGB change D3D::SetRenderState(D3DRS_SRCBLEND, d3dSrcFactors[(newval >> 3) & 7]); - D3D::SetRenderState(D3DRS_DESTBLEND, d3dDestFactors[(newval >> 6) & 7]); + D3D::SetRenderState(D3DRS_DESTBLEND, d3dDestFactors[(newval >> 6) & 7]); } s_blendMode = newval; @@ -1155,7 +1151,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight) if(newAA != s_LastAA) { s_target_width = s_backbuffer_width; - s_target_height = s_backbuffer_height * ((float)EFB_HEIGHT / 480.0f); + s_target_height = s_backbuffer_height * ((float)EFB_HEIGHT / 480.0f); s_LastAA = newAA; switch (s_LastAA) { @@ -1190,14 +1186,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight) // Count FPS. // ------------- static int fpscount = 0; - static unsigned long lasttime; - ++fpscount; + static unsigned long lasttime; + ++fpscount; if (Common::Timer::GetTimeMs() - lasttime > 1000) - { - lasttime = Common::Timer::GetTimeMs(); - s_fps = fpscount - 1; - fpscount = 0; - } + { + lasttime = Common::Timer::GetTimeMs(); + s_fps = fpscount - 1; + fpscount = 0; + } // Begin new frame // Set default viewport and scissor, for the clear to work correctly @@ -1210,11 +1206,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight) void Renderer::ResetAPIState() { D3D::SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); - D3D::SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); - D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE); - D3D::SetRenderState(D3DRS_ZENABLE, FALSE); + D3D::SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); + D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE); + D3D::SetRenderState(D3DRS_ZENABLE, FALSE); D3D::SetRenderState(D3DRS_ZWRITEENABLE, FALSE); - DWORD color_mask = D3DCOLORWRITEENABLE_ALPHA| D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE; + DWORD color_mask = D3DCOLORWRITEENABLE_ALPHA| D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE; D3D::SetRenderState(D3DRS_COLORWRITEENABLE, color_mask); } @@ -1225,14 +1221,14 @@ void Renderer::RestoreAPIState() UpdateViewport(); SetScissorRect(); if (bpmem.zmode.testenable) D3D::SetRenderState(D3DRS_ZENABLE, TRUE); - if (bpmem.zmode.updateenable) D3D::SetRenderState(D3DRS_ZWRITEENABLE, TRUE); - SetColorMask(); + if (bpmem.zmode.updateenable) D3D::SetRenderState(D3DRS_ZWRITEENABLE, TRUE); + SetColorMask(); SetLogicOpMode(); } void Renderer::SetGenerationMode() { - D3D::SetRenderState(D3DRS_CULLMODE, d3dCullModes[bpmem.genMode.cullmode]); + D3D::SetRenderState(D3DRS_CULLMODE, d3dCullModes[bpmem.genMode.cullmode]); } void Renderer::SetDepthMode() @@ -1241,13 +1237,13 @@ void Renderer::SetDepthMode() { D3D::SetRenderState(D3DRS_ZENABLE, TRUE); D3D::SetRenderState(D3DRS_ZWRITEENABLE, bpmem.zmode.updateenable); - D3D::SetRenderState(D3DRS_ZFUNC, d3dCmpFuncs[bpmem.zmode.func]); + D3D::SetRenderState(D3DRS_ZFUNC, d3dCmpFuncs[bpmem.zmode.func]); } else { D3D::SetRenderState(D3DRS_ZENABLE, FALSE); - D3D::SetRenderState(D3DRS_ZWRITEENABLE, FALSE); // ?? - } + D3D::SetRenderState(D3DRS_ZWRITEENABLE, FALSE); // ?? + } } void Renderer::SetLogicOpMode() @@ -1255,7 +1251,7 @@ void Renderer::SetLogicOpMode() if (bpmem.blendmode.logicopenable && bpmem.blendmode.logicmode != 3) { s_blendMode = 0; - D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, 1); + D3D::SetRenderState(D3DRS_ALPHABLENDENABLE, 1); D3D::SetRenderState(D3DRS_BLENDOP, d3dLogincOPop[bpmem.blendmode.logicmode]); D3D::SetRenderState(D3DRS_SRCBLEND, d3dLogicOpSrcFactors[bpmem.blendmode.logicmode]); D3D::SetRenderState(D3DRS_DESTBLEND, d3dLogicOpDestFactors[bpmem.blendmode.logicmode]); @@ -1268,7 +1264,7 @@ void Renderer::SetLogicOpMode() void Renderer::SetDitherMode() { - D3D::SetRenderState(D3DRS_DITHERENABLE,bpmem.blendmode.dither); + D3D::SetRenderState(D3DRS_DITHERENABLE,bpmem.blendmode.dither); } void Renderer::SetLineWidth() diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 7b970843fa..9ffec68553 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -150,8 +150,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -201,7 +199,7 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) { void DllAbout(HWND _hParent) { - DialogBoxA(g_hInstance,(LPCSTR)IDD_ABOUT,_hParent,(DLGPROC)AboutProc); + DialogBox(g_hInstance,(LPCTSTR)IDD_ABOUT,_hParent,(DLGPROC)AboutProc); } void DllConfig(HWND _hParent) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index eda0516b0a..3cab99ffd4 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -34,8 +34,8 @@ BEGIN_EVENT_TABLE(GFXConfigDialogOGL,wxDialog) EVT_CLOSE(GFXConfigDialogOGL::OnClose) - EVT_BUTTON(ID_CLOSE, GFXConfigDialogOGL::CloseClick) - EVT_BUTTON(ID_ABOUTOGL, GFXConfigDialogOGL::AboutClick) + EVT_BUTTON(wxID_CLOSE, GFXConfigDialogOGL::CloseClick) + EVT_BUTTON(wxID_ABOUT, GFXConfigDialogOGL::AboutClick) EVT_CHECKBOX(ID_FULLSCREEN, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_VSYNC, GFXConfigDialogOGL::GeneralSettingsChanged) EVT_CHECKBOX(ID_RENDERTOMAINWINDOW, GFXConfigDialogOGL::GeneralSettingsChanged) @@ -65,7 +65,7 @@ BEGIN_EVENT_TABLE(GFXConfigDialogOGL,wxDialog) EVT_CHECKBOX(ID_DUMPTEXTURES, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_HIRESTEXTURES, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_DUMPEFBTARGET, GFXConfigDialogOGL::AdvancedSettingsChanged) - EVT_CHECKBOX(ID_DUMPFRAMES, GFXConfigDialogOGL::AdvancedSettingsChanged) + EVT_CHECKBOX(ID_DUMPFRAMES, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_FREELOOK, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_DISABLELIGHTING, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_DISABLETEXTURING, GFXConfigDialogOGL::AdvancedSettingsChanged) @@ -73,7 +73,7 @@ BEGIN_EVENT_TABLE(GFXConfigDialogOGL,wxDialog) EVT_CHECKBOX(ID_OSDHOTKEY, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_HACK, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_SAFETEXTURECACHE,GFXConfigDialogOGL::AdvancedSettingsChanged) - EVT_CHECKBOX(ID_DSTALPHAPASS,GFXConfigDialogOGL::AdvancedSettingsChanged) + EVT_CHECKBOX(ID_DSTALPHAPASS,GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_CHECKBOX(ID_CHECKBOX_DISABLECOPYEFB, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_RADIOBUTTON(ID_RADIO_COPYEFBTORAM, GFXConfigDialogOGL::AdvancedSettingsChanged) EVT_RADIOBUTTON(ID_RADIO_COPYEFBTOGL, GFXConfigDialogOGL::AdvancedSettingsChanged) @@ -86,6 +86,7 @@ END_EVENT_TABLE() GFXConfigDialogOGL::GFXConfigDialogOGL(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) : wxDialog(parent, id, title, position, size, style) { + CreateGUIControls(); } @@ -95,6 +96,7 @@ GFXConfigDialogOGL::~GFXConfigDialogOGL() { INFO_LOG(CONSOLE, "GFXConfigDialogOGL Closed"); } + void GFXConfigDialogOGL::OnClose(wxCloseEvent& event) { //INFO_LOG(CONSOLE, "OnClose"); @@ -161,6 +163,7 @@ void GFXConfigDialogOGL::LoadShaders() File::CreateDir(File::GetUserPath(D_SHADERS_IDX)); } } + void GFXConfigDialogOGL::InitializeGUILists() { // Resolutions @@ -206,6 +209,7 @@ void GFXConfigDialogOGL::InitializeGUILists() arrayStringFor_PhackvalueCB.Add(wxT("Baten Kaitos Origin")); arrayStringFor_PhackvalueCB.Add(wxT("Skies of Arcadia")); } + void GFXConfigDialogOGL::InitializeGUIValues() { // General Display Settings @@ -257,8 +261,8 @@ void GFXConfigDialogOGL::InitializeGUIValues() m_Wireframe->SetValue(g_Config.bWireFrame); m_DisableLighting->SetValue(g_Config.bDisableLighting); m_DisableTexturing->SetValue(g_Config.bDisableTexturing); - m_DstAlphaPass->SetValue(g_Config.bDstAlphaPass); - m_DisableFog->SetValue(g_Config.bDisableFog); + m_DstAlphaPass->SetValue(g_Config.bDstAlphaPass); + m_DisableFog->SetValue(g_Config.bDisableFog); m_CheckBox_DisableCopyEFB->SetValue(g_Config.bEFBCopyDisable); g_Config.bCopyEFBToTexture ? m_Radio_CopyEFBToGL->SetValue(true) : m_Radio_CopyEFBToRAM->SetValue(true); @@ -274,6 +278,7 @@ void GFXConfigDialogOGL::InitializeGUIValues() m_PhackvalueCB->SetSelection(g_Config.iPhackvalue); m_SafeTextureCache->SetValue(g_Config.bSafeTextureCache); } + void GFXConfigDialogOGL::InitializeGUITooltips() { // Tool tips @@ -343,6 +348,7 @@ void GFXConfigDialogOGL::InitializeGUITooltips() wxT("\n[This option will apply immediately and does not require a restart. However it may not") wxT(" be entirely safe to change it midgames.]")); } + void GFXConfigDialogOGL::CreateGUIControls() { InitializeGUILists(); @@ -355,8 +361,8 @@ void GFXConfigDialogOGL::CreateGUIControls() m_Notebook->AddPage(m_PageAdvanced, wxT("Advanced")); // Buttons - m_About = new wxButton(this, ID_ABOUTOGL, wxT("About"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - m_Close = new wxButton(this, ID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + m_About = new wxButton(this, wxID_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Put notebook and buttons in sizers wxBoxSizer* sButtons; @@ -418,7 +424,7 @@ void GFXConfigDialogOGL::CreateGUIControls() // Sizers sGeneral = new wxBoxSizer(wxVERTICAL); - sBasic = new wxGridBagSizer(0, 0); + sBasic = new wxGridBagSizer(0, 0); sBasic->Add(IRText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5); sBasic->Add(m_NativeResolution, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5); @@ -428,7 +434,7 @@ void GFXConfigDialogOGL::CreateGUIControls() sBasic->Add(WMText, wxGBPosition(1, 1), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5); sBasic->Add(m_WindowResolutionCB, wxGBPosition(2, 1), wxGBSpan(1, 1), wxALL, 5); sBasic->Add(m_Fullscreen, wxGBPosition(1, 2), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5); - sBasic->Add(m_WindowFSResolutionCB, wxGBPosition(2, 2), wxGBSpan(1, 1), wxALL, 5); + sBasic->Add(m_WindowFSResolutionCB, wxGBPosition(2, 2), wxGBSpan(1, 1), wxALL, 5); sBasic->Add(KeepARText, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 5); sBasic->Add(m_KeepAR, wxGBPosition(3, 1), wxGBSpan(1, 1), wxALL, 5); @@ -485,8 +491,8 @@ void GFXConfigDialogOGL::CreateGUIControls() m_Wireframe = new wxCheckBox(m_PageAdvanced, ID_WIREFRAME, wxT("Enable Wireframe"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_DisableLighting = new wxCheckBox(m_PageAdvanced, ID_DISABLELIGHTING, wxT("Disable Material Lighting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_DisableTexturing = new wxCheckBox(m_PageAdvanced, ID_DISABLETEXTURING, wxT("Disable Texturing"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - m_DstAlphaPass = new wxCheckBox(m_PageAdvanced, ID_DSTALPHAPASS, wxT("Disable Destination Alpha Pass"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - m_DisableFog = new wxCheckBox(m_PageAdvanced, ID_DISABLEFOG, wxT("Disable Fog"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + m_DstAlphaPass = new wxCheckBox(m_PageAdvanced, ID_DSTALPHAPASS, wxT("Disable Destination Alpha Pass"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + m_DisableFog = new wxCheckBox(m_PageAdvanced, ID_DISABLEFOG, wxT("Disable Fog"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_StaticBox_EFB = new wxStaticBox(m_PageAdvanced, ID_STATICBOX_EFB, wxT("EFB Copy")); m_CheckBox_DisableCopyEFB = new wxCheckBox(m_PageAdvanced, ID_CHECKBOX_DISABLECOPYEFB, wxT("Disable")); @@ -506,7 +512,6 @@ void GFXConfigDialogOGL::CreateGUIControls() m_SafeTextureCache = new wxCheckBox(m_PageAdvanced, ID_SAFETEXTURECACHE, wxT("Use Safe texture cache"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_PhackvalueCB = new wxChoice(m_PageAdvanced, ID_PHACKVALUE, wxDefaultPosition, wxDefaultSize, arrayStringFor_PhackvalueCB, 0, wxDefaultValidator); - // Sizers sHacks = new wxGridBagSizer(0, 0); sHacks->Add(m_SafeTextureCache, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL, 5); @@ -530,7 +535,7 @@ void GFXConfigDialogOGL::CreateGUIControls() sRendering->Add(m_Wireframe, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALL, 4); sRendering->Add(m_DisableLighting, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL, 4); sRendering->Add(m_DisableTexturing, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALL, 4); - sRendering->Add(m_DstAlphaPass, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 4); + sRendering->Add(m_DstAlphaPass, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 4); sRendering->Add(m_DisableFog, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 4); sRenderBoxRow1->Add(sRendering, 0, wxALL|wxEXPAND, 1); wxStaticBoxSizer *sSBox = new wxStaticBoxSizer(m_StaticBox_EFB, wxVERTICAL); @@ -542,12 +547,12 @@ void GFXConfigDialogOGL::CreateGUIControls() sRenderBoxRow1->Add(sSBox, 0, wxALL|wxEXPAND, 5); sbRendering->Add(sRenderBoxRow1); - sUtilities = new wxGridBagSizer(0, 0); + sUtilities = new wxGridBagSizer(0, 0); sUtilities->Add(m_DumpTextures, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sUtilities->Add(m_HiresTextures, wxGBPosition(0, 1), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sUtilities->Add(m_DumpEFBTarget, wxGBPosition(0, 2), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sUtilities->Add(m_DumpFrames, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); - sUtilities->Add(m_FreeLook, wxGBPosition(1, 1), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); + sUtilities->Add(m_FreeLook, wxGBPosition(1, 1), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sbUtilities->Add(sUtilities, 1, wxEXPAND); // Sizers @@ -567,7 +572,6 @@ void GFXConfigDialogOGL::CreateGUIControls() UpdateGUI(); } - void GFXConfigDialogOGL::AboutClick(wxCommandEvent& WXUNUSED (event)) { wxMessageBox(wxT("Dolphin OpenGL Plugin\nBy zerofrog(@gmail.com)\n\n") @@ -645,10 +649,10 @@ void GFXConfigDialogOGL::GeneralSettingsChanged(wxCommandEvent& event) g_Config.bWidescreenHack = m_WidescreenHack->IsChecked(); break; case ID_CROP: - g_Config.bCrop = m_Crop->IsChecked(); + g_Config.bCrop = m_Crop->IsChecked(); break; case ID_FORCEFILTERING: - g_Config.bForceFiltering = m_ForceFiltering->IsChecked(); + g_Config.bForceFiltering = m_ForceFiltering->IsChecked(); break; #ifndef _WIN32 case ID_HIDECURSOR: @@ -684,7 +688,6 @@ void GFXConfigDialogOGL::GeneralSettingsChanged(wxCommandEvent& event) UpdateGUI(); } - void GFXConfigDialogOGL::AdvancedSettingsChanged(wxCommandEvent& event) { switch (event.GetId()) @@ -721,8 +724,8 @@ void GFXConfigDialogOGL::AdvancedSettingsChanged(wxCommandEvent& event) break; case ID_DISABLEFOG: g_Config.bDisableFog = m_DisableFog->IsChecked(); - break; - case ID_DSTALPHAPASS: + break; + case ID_DSTALPHAPASS: g_Config.bDstAlphaPass = m_DstAlphaPass->IsChecked(); break; case ID_DUMPTEXTURES: @@ -737,7 +740,7 @@ void GFXConfigDialogOGL::AdvancedSettingsChanged(wxCommandEvent& event) case ID_DUMPFRAMES: g_Config.bDumpFrames = m_DumpFrames->IsChecked(); break; - case ID_FREELOOK: + case ID_FREELOOK: g_Config.bFreeLook = m_FreeLook->IsChecked(); break; case ID_TEXTUREPATH: @@ -809,8 +812,6 @@ void GFXConfigDialogOGL::UpdateGUI() // Disable the Copy to options when EFBCopy is disabled m_Radio_CopyEFBToRAM->Enable(!(g_Config.bEFBCopyDisable)); - m_Radio_CopyEFBToGL->Enable(!(g_Config.bEFBCopyDisable)); + m_Radio_CopyEFBToGL->Enable(!(g_Config.bEFBCopyDisable)); } - - diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h index 22c502f089..7b3124fe80 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h @@ -48,7 +48,7 @@ enum class GFXConfigDialogOGL : public wxDialog { public: - GFXConfigDialogOGL(wxWindow *parent, wxWindowID id = 1, + GFXConfigDialogOGL(wxWindow *parent, wxWindowID id = wxID_ANY, #ifdef DEBUGFAST const wxString &title = wxT("OpenGL (DEBUGFAST) Plugin Configuration"), #else @@ -123,12 +123,12 @@ class GFXConfigDialogOGL : public wxDialog wxCheckBox *m_DisableLighting; wxCheckBox *m_DisableTexturing; wxCheckBox *m_DisableFog; - wxCheckBox *m_DstAlphaPass; + wxCheckBox *m_DstAlphaPass; wxCheckBox *m_DumpTextures; wxCheckBox *m_HiresTextures; wxCheckBox *m_DumpEFBTarget; wxCheckBox *m_DumpFrames; - wxCheckBox *m_FreeLook; + wxCheckBox *m_FreeLook; wxStaticBox * m_StaticBox_EFB; wxCheckBox *m_CheckBox_DisableCopyEFB; wxRadioButton *m_Radio_CopyEFBToRAM, *m_Radio_CopyEFBToGL; @@ -150,10 +150,7 @@ class GFXConfigDialogOGL : public wxDialog enum { - ID_CLOSE = 1000, - ID_ABOUTOGL, - - ID_NOTEBOOK, + ID_NOTEBOOK = 1000, ID_PAGEGENERAL, ID_PAGEADVANCED, @@ -204,13 +201,13 @@ class GFXConfigDialogOGL : public wxDialog ID_HIRESTEXTURES, ID_DUMPEFBTARGET, ID_DUMPFRAMES, - ID_FREELOOK, + ID_FREELOOK, ID_TEXTUREPATH, ID_CHECKBOX_DISABLECOPYEFB, ID_OSDHOTKEY, //ID_PROJECTIONHACK1, - ID_DSTALPHAPASS, + ID_DSTALPHAPASS, ID_RADIO_COPYEFBTORAM, ID_RADIO_COPYEFBTOGL, ID_POSTSHADER, diff --git a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp index 3ad0ee1a1d..a54420ca2d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp @@ -69,8 +69,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -125,7 +123,7 @@ void OSDMenu(WPARAM wParam) case '7': OSDChoice = 5; g_Config.bDisableLighting = !g_Config.bDisableLighting; - break; + break; } } // --------------------------------------------------------------------- @@ -166,14 +164,14 @@ HWND GetWnd() } HWND GetParentWnd() { - return m_hParent; + return m_hParent; } void FreeLookInput( UINT iMsg, WPARAM wParam ) { - static float debugSpeed = 1.0f; - static bool mouseLookEnabled = false; - static float lastMouse[2]; + static float debugSpeed = 1.0f; + static bool mouseLookEnabled = false; + static float lastMouse[2]; switch( iMsg ) { @@ -181,51 +179,51 @@ void FreeLookInput( UINT iMsg, WPARAM wParam ) case WM_KEYDOWN: switch( LOWORD( wParam )) { - case '9': - debugSpeed /= 2.0f; - break; - case '0': - debugSpeed *= 2.0f; - break; - case 'W': - VertexShaderManager::TranslateView(0.0f, debugSpeed); - break; - case 'S': - VertexShaderManager::TranslateView(0.0f, -debugSpeed); - break; - case 'A': - VertexShaderManager::TranslateView(debugSpeed, 0.0f); - break; - case 'D': - VertexShaderManager::TranslateView(-debugSpeed, 0.0f); - break; - case 'R': - VertexShaderManager::ResetView(); - break; + case '9': + debugSpeed /= 2.0f; + break; + case '0': + debugSpeed *= 2.0f; + break; + case 'W': + VertexShaderManager::TranslateView(0.0f, debugSpeed); + break; + case 'S': + VertexShaderManager::TranslateView(0.0f, -debugSpeed); + break; + case 'A': + VertexShaderManager::TranslateView(debugSpeed, 0.0f); + break; + case 'D': + VertexShaderManager::TranslateView(-debugSpeed, 0.0f); + break; + case 'R': + VertexShaderManager::ResetView(); + break; } break; case WM_MOUSEMOVE: - if (mouseLookEnabled) { - POINT point; - GetCursorPos(&point); - VertexShaderManager::RotateView((point.x - lastMouse[0]) / 200.0f, (point.y - lastMouse[1]) / 200.0f); - lastMouse[0] = point.x; - lastMouse[1] = point.y; - } + if (mouseLookEnabled) { + POINT point; + GetCursorPos(&point); + VertexShaderManager::RotateView((point.x - lastMouse[0]) / 200.0f, (point.y - lastMouse[1]) / 200.0f); + lastMouse[0] = point.x; + lastMouse[1] = point.y; + } break; - case WM_RBUTTONDOWN: - POINT point; - GetCursorPos(&point); - lastMouse[0] = point.x; - lastMouse[1] = point.y; - mouseLookEnabled= true; - break; + case WM_RBUTTONDOWN: + POINT point; + GetCursorPos(&point); + lastMouse[0] = point.x; + lastMouse[1] = point.y; + mouseLookEnabled= true; + break; case WM_RBUTTONUP: - mouseLookEnabled = false; - break; - } + mouseLookEnabled = false; + break; + } } // --------------------------------------------------------------------- @@ -277,7 +275,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) hdc = BeginPaint(hWnd, &ps); EndPaint(hWnd, &ps); } - return 0; + break; case WM_SYSKEYDOWN: switch (LOWORD(wParam)) @@ -287,12 +285,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) if (m_hParent == NULL && !g_Config.RenderToMainframe) { ToggleFullscreen(hWnd); - return 0; } break; case VK_F5: case VK_F6: case VK_F7: case VK_F8: PostMessage(m_hMain, WM_SYSKEYDOWN, wParam, lParam); - return 0; + break; + default: + return DefWindowProc(hWnd, iMsg, wParam, lParam); } break; @@ -300,6 +299,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) // Don't process this as a child window to avoid double events if (!g_Config.RenderToMainframe) OnKeyDown(wParam); + + if (g_Config.bFreeLook) + FreeLookInput( iMsg, wParam ); break; /* Post these mouse events to the main window, it's nessesary becase in difference to the @@ -328,8 +330,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) break; /* To support the separate window rendering we get the message back here. So we basically - only let it pass through Dolphin > Frame.cpp to determine if it should be on or off - and coordinate it with the other settings if nessesary */ + only let it pass through Dolphin > Frame.cpp to determine if it should be on or off + and coordinate it with the other settings if nessesary */ case WM_USER: if (wParam == WM_USER_STOP) SetCursor((lParam) ? hCursor : hCursorBlank); @@ -340,7 +342,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) } else if (wParam == TOGGLE_FULLSCREEN) { - if(!g_Config.RenderToMainframe) + if(!g_Config.RenderToMainframe) ToggleFullscreen(m_hWnd); } else if (wParam == WIIMOTE_DISCONNECT) @@ -357,8 +359,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) if( g_Config.bFullscreen ) ToggleFullscreen(m_hParent); PostMessage(m_hMain, WM_USER, WM_USER_STOP, 0); - return 0; } + break; case WM_DESTROY: Shutdown(); @@ -370,16 +372,16 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { case SC_SCREENSAVE: case SC_MONITORPOWER: - return 0; + break; + default: + return DefWindowProc(hWnd, iMsg, wParam, lParam); } break; + default: + return DefWindowProc(hWnd, iMsg, wParam, lParam); } - - if (g_Config.bFreeLook) { - FreeLookInput( iMsg, wParam ); - } - - return DefWindowProc(hWnd, iMsg, wParam, lParam); + return 0; + } @@ -407,35 +409,35 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T CreateCursors(m_hInstance); // Create child window - if (g_Config.RenderToMainframe) - { + if (g_Config.RenderToMainframe) + { m_hParent = m_hMain = parent; m_hWnd = CreateWindow(m_szClassName, title, WS_CHILD, - 0, 0, width, height, parent, NULL, hInstance, NULL); - } + 0, 0, width, height, parent, NULL, hInstance, NULL); + } // Create new separate window - else - { + else + { // Don't forget to make it NULL, or a broken window will be created in case we // render to main, stop, then render to separate window, as the GUI will still - // think we're rendering to main because m_hParent will still contain the old HWND... + // think we're rendering to main because m_hParent will still contain the old HWND m_hParent = NULL; m_hMain = parent; DWORD style = g_Config.bFullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW; - RECT rc = {0, 0, width, height}; - AdjustWindowRect(&rc, style, false); + RECT rc = {0, 0, width, height}; + AdjustWindowRect(&rc, style, false); RECT rcdesktop; GetWindowRect(GetDesktopWindow(), &rcdesktop); int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2; int Y = (rcdesktop.bottom-rcdesktop.top)/2 - (rc.bottom-rc.top)/2; - m_hWnd = CreateWindow(m_szClassName, title, style, + m_hWnd = CreateWindow(m_szClassName, title, style, X, Y, rc.right-rc.left, rc.bottom-rc.top, - NULL, NULL, hInstance, NULL); - } + NULL, NULL, hInstance, NULL); + } return m_hWnd; } @@ -485,7 +487,7 @@ void ToggleFullscreen(HWND hParent, bool bForceFull) RECT rc = {0, 0, w_fs, h_fs}; AdjustWindowRect(&rc, style, false); RECT rcdesktop; - GetWindowRect(GetDesktopWindow(), &rcdesktop); + GetWindowRect(GetDesktopWindow(), &rcdesktop); // SetWindowPos to the center of the screen int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index dd0d1bc108..390b047908 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -98,8 +98,6 @@ GFXDebuggerOGL *m_DebuggerFrame = NULL; SVideoInitialize g_VideoInitialize; PLUGIN_GLOBALS* globals = NULL; -bool allowConfigShow = true; - // Logging int GLScissorX, GLScissorY, GLScissorW, GLScissorH; @@ -117,14 +115,14 @@ bool IsD3D() void GetDllInfo (PLUGIN_INFO* _PluginInfo) { - _PluginInfo->Version = 0x0100; - _PluginInfo->Type = PLUGIN_TYPE_VIDEO; + _PluginInfo->Version = 0x0100; + _PluginInfo->Type = PLUGIN_TYPE_VIDEO; #ifdef DEBUGFAST - sprintf(_PluginInfo->Name, "Dolphin OpenGL (DebugFast)"); + sprintf_s(_PluginInfo->Name, "Dolphin OpenGL (DebugFast)"); #elif defined _DEBUG - sprintf(_PluginInfo->Name, "Dolphin OpenGL (Debug)"); + sprintf_s(_PluginInfo->Name, "Dolphin OpenGL (Debug)"); #else - sprintf(_PluginInfo->Name, "Dolphin OpenGL"); + sprintf_s(_PluginInfo->Name, "Dolphin OpenGL"); #endif } @@ -169,7 +167,8 @@ void DllDebugger(HWND _hParent, bool Show) } #ifdef _WIN32 -void Win32AddResolutions() { +void Win32AddResolutions() +{ // Search for avaliable resolutions DWORD iModeNum = 0; @@ -204,7 +203,7 @@ void Win32AddResolutions() { m_ConfigFrame->AddFSReso(szBuffer); m_ConfigFrame->AddWindowReso(szBuffer); } - ZeroMemory(&dmi, sizeof(dmi)); + ZeroMemory(&dmi, sizeof(dmi)); } } #elif defined(HAVE_X11) && HAVE_X11 && defined(HAVE_XRANDR) && HAVE_XRANDR @@ -226,10 +225,10 @@ void X11AddResolutions() { m_ConfigFrame->AddFSReso(temp); //Add same to window resolutions, since //they should be nearly all that's needed - m_ConfigFrame->AddWindowReso(temp); + m_ConfigFrame->AddWindowReso(temp); #endif } - } + } } #elif defined(HAVE_COCOA) && HAVE_COCOA void CocoaAddResolutions() { @@ -245,7 +244,6 @@ void CocoaAddResolutions() { int modeIndex; int px = 0, py = 0; - modes = CGDisplayAvailableModes(CGMainDisplayID()); range.location = 0; @@ -281,42 +279,40 @@ void DllConfig(HWND _hParent) g_Config.UpdateProjectionHack(); UpdateActiveConfig(); #if defined(HAVE_WX) && HAVE_WX - // Prevent user to show more than 1 config window at same time - if (allowConfigShow) - { - wxWindow *frame = GetParentedWxWindow(_hParent); - m_ConfigFrame = new GFXConfigDialogOGL(frame); + wxWindow *frame = GetParentedWxWindow(_hParent); + m_ConfigFrame = new GFXConfigDialogOGL(frame); #if defined(_WIN32) - Win32AddResolutions(); + Win32AddResolutions(); #elif defined(HAVE_X11) && HAVE_X11 && defined(HAVE_XRANDR) && HAVE_XRANDR - X11AddResolutions(); + X11AddResolutions(); #elif defined(HAVE_COCOA) && HAVE_COCOA - CocoaAddResolutions(); + CocoaAddResolutions(); #endif - allowConfigShow = false; - m_ConfigFrame->CreateGUIControls(); - allowConfigShow = m_ConfigFrame->ShowModal() == 1 ? true : false; - m_ConfigFrame->Destroy(); - m_ConfigFrame = NULL; + // Prevent user to show more than 1 config window at same time + frame->Disable(); + m_ConfigFrame->ShowModal(); + frame->Enable(); + + m_ConfigFrame->Destroy(); + m_ConfigFrame = NULL; #ifdef _WIN32 - frame->SetHWND(NULL); + frame->SetHWND(NULL); #endif - delete frame; - } + frame->Destroy(); #endif } void Initialize(void *init) { - frameCount = 0; - SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init; + frameCount = 0; + SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init; // Create a shortcut to _pVideoInitialize that can also update it - g_VideoInitialize = *(_pVideoInitialize); + g_VideoInitialize = *(_pVideoInitialize); InitXFBConvTables(); - g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_opengl.ini").c_str()); + g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_opengl.ini").c_str()); g_Config.GameIniLoad(globals->game_ini); g_Config.UpdateProjectionHack(); @@ -326,19 +322,19 @@ void Initialize(void *init) #endif UpdateActiveConfig(); - if (!OpenGL_Create(g_VideoInitialize, 640, 480)) + if (!OpenGL_Create(g_VideoInitialize, 640, 480)) { - g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE); - return; - } + g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE); + return; + } _pVideoInitialize->pPeekMessages = g_VideoInitialize.pPeekMessages; - _pVideoInitialize->pUpdateFPSDisplay = g_VideoInitialize.pUpdateFPSDisplay; + _pVideoInitialize->pUpdateFPSDisplay = g_VideoInitialize.pUpdateFPSDisplay; // Now the window handle is written - _pVideoInitialize->pWindowHandle = g_VideoInitialize.pWindowHandle; + _pVideoInitialize->pWindowHandle = g_VideoInitialize.pWindowHandle; #if defined(HAVE_X11) && HAVE_X11 - _pVideoInitialize->pXWindow = g_VideoInitialize.pXWindow; + _pVideoInitialize->pXWindow = g_VideoInitialize.pXWindow; #endif OSD::AddMessage("Dolphin OpenGL Video Plugin" ,5000); @@ -349,17 +345,17 @@ void DoState(unsigned char **ptr, int mode) { // WHY is this here?? OpenGL_MakeCurrent(); #endif - // Clear all caches that touch RAM - TextureMngr::Invalidate(false); - VertexLoaderManager::MarkAllDirty(); - - PointerWrap p(ptr, mode); - VideoCommon_DoState(p); - - // Refresh state. + // Clear all caches that touch RAM + TextureMngr::Invalidate(false); + VertexLoaderManager::MarkAllDirty(); + + PointerWrap p(ptr, mode); + VideoCommon_DoState(p); + + // Refresh state. if (mode == PointerWrap::MODE_READ) { - BPReload(); + BPReload(); RecomputeCachedArraybases(); } } @@ -372,34 +368,34 @@ void EmuStateChange(PLUGIN_EMUSTATE newState) // This is called after Video_Initialize() from the Core void Video_Prepare(void) { - OpenGL_MakeCurrent(); - if (!Renderer::Init()) { - g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE); - PanicAlert("Can't create opengl renderer. You might be missing some required opengl extensions, check the logs for more info"); - exit(1); - } + OpenGL_MakeCurrent(); + if (!Renderer::Init()) { + g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE); + PanicAlert("Can't create opengl renderer. You might be missing some required opengl extensions, check the logs for more info"); + exit(1); + } s_swapRequested = FALSE; s_efbAccessRequested = FALSE; s_FifoShuttingDown = FALSE; - CommandProcessor::Init(); - PixelEngine::Init(); + CommandProcessor::Init(); + PixelEngine::Init(); - TextureMngr::Init(); + TextureMngr::Init(); - BPInit(); - VertexManager::Init(); - Fifo_Init(); // must be done before OpcodeDecoder_Init() - OpcodeDecoder_Init(); - VertexShaderCache::Init(); - VertexShaderManager::Init(); - PixelShaderCache::Init(); - PixelShaderManager::Init(); + BPInit(); + VertexManager::Init(); + Fifo_Init(); // must be done before OpcodeDecoder_Init() + OpcodeDecoder_Init(); + VertexShaderCache::Init(); + VertexShaderManager::Init(); + PixelShaderCache::Init(); + PixelShaderManager::Init(); PostProcessing::Init(); - GL_REPORT_ERRORD(); - VertexLoaderManager::Init(); - TextureConverter::Init(); + GL_REPORT_ERRORD(); + VertexLoaderManager::Init(); + TextureConverter::Init(); DLCache::Init(); s_PluginInitialized = true; @@ -584,37 +580,36 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y) void Video_CommandProcessorRead16(u16& _rReturnValue, const u32 _Address) { - CommandProcessor::Read16(_rReturnValue, _Address); + CommandProcessor::Read16(_rReturnValue, _Address); } void Video_CommandProcessorWrite16(const u16 _Data, const u32 _Address) { - CommandProcessor::Write16(_Data, _Address); + CommandProcessor::Write16(_Data, _Address); } void Video_PixelEngineRead16(u16& _rReturnValue, const u32 _Address) { - PixelEngine::Read16(_rReturnValue, _Address); + PixelEngine::Read16(_rReturnValue, _Address); } void Video_PixelEngineWrite16(const u16 _Data, const u32 _Address) { - PixelEngine::Write16(_Data, _Address); + PixelEngine::Write16(_Data, _Address); } void Video_PixelEngineWrite32(const u32 _Data, const u32 _Address) { - PixelEngine::Write32(_Data, _Address); + PixelEngine::Write32(_Data, _Address); } void Video_GatherPipeBursted(void) { - CommandProcessor::GatherPipeBursted(); + CommandProcessor::GatherPipeBursted(); } void Video_WaitForFrameFinish(void) { - CommandProcessor::WaitForFrameFinish(); + CommandProcessor::WaitForFrameFinish(); } - diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp index eccb437aeb..133465fe6a 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp @@ -65,8 +65,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -109,29 +107,29 @@ HWND GetWnd() HWND GetParentWnd() { - return m_hParent; + return m_hParent; } HWND GetChildParentWnd() { - return m_hMain; + return m_hMain; } LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) { - HDC hdc; + HDC hdc; PAINTSTRUCT ps; switch( iMsg ) { case WM_CREATE: PostMessage(m_hMain, WM_USER, WM_USER_CREATE, (int)m_hParent); break; - + case WM_PAINT: hdc = BeginPaint( hWnd, &ps ); EndPaint( hWnd, &ps ); break; - + case WM_SYSKEYDOWN: switch( LOWORD( wParam )) { @@ -140,11 +138,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) if (m_hParent == NULL && !g_Config.renderToMainframe) { ToggleFullscreen(hWnd); - } + } break; case VK_F5: case VK_F6: case VK_F7: case VK_F8: PostMessage(m_hMain, WM_SYSKEYDOWN, wParam, lParam); break; + default: + return DefWindowProc(hWnd, iMsg, wParam, lParam); } break; @@ -160,7 +160,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) // And pause the emulation when already in Windowed mode PostMessage(m_hMain, WM_USER, WM_USER_PAUSE, 0); break; - } + } g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0); break; @@ -174,14 +174,14 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) it's nessesary for both the chil dwindow and separate rendering window because moves over the rendering window do not reach the main program then. */ if (GetParentWnd() == NULL) // Separate rendering window - PostMessage(m_hMain, iMsg, wParam, -1); + PostMessage(m_hMain, iMsg, wParam, -1); else PostMessage(GetParentWnd(), iMsg, wParam, lParam); break; /* To support the separate window rendering we get the message back here. So we basically - only let it pass through Dolphin > Frame.cpp to determine if it should be on or off - and coordinate it with the other settings if nessesary */ + only let it pass through Dolphin > Frame.cpp to determine if it should be on or off + and coordinate it with the other settings if necessary */ case WM_USER: if (wParam == WM_USER_STOP) SetCursor((lParam) ? hCursor : hCursorBlank); @@ -189,7 +189,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) PostMessage(m_hMain, WM_USER, wParam, lParam); break; - /* Post thes mouse events to the main window, it's nessesary becase in difference to the + /* Post these mouse events to the main window, it's nessesary becase in difference to the keyboard inputs these events only appear here, not in the main WndProc() */ case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -218,11 +218,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) case SC_SCREENSAVE: case SC_MONITORPOWER: break; + default: + return DefWindowProc(hWnd, iMsg, wParam, lParam); } break; default: return DefWindowProc(hWnd, iMsg, wParam, lParam); - } + } return 0; } @@ -251,45 +253,45 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T CreateCursors(m_hInstance); // Create child window - if (parent) - { + if (parent) + { m_hParent = m_hMain = parent; - m_hWnd = CreateWindow(m_szClassName, title, - WS_CHILD, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - parent, NULL, hInstance, NULL); + m_hWnd = CreateWindow(m_szClassName, title, + WS_CHILD, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, hInstance, NULL); - ShowWindow(m_hWnd, SW_SHOWMAXIMIZED); - } + ShowWindow(m_hWnd, SW_SHOWMAXIMIZED); + } // Create new separate window - else - { + else + { DWORD style = g_Config.bFullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW; - RECT rc = {0, 0, width, height}; - AdjustWindowRect(&rc, style, false); + RECT rc = {0, 0, width, height}; + AdjustWindowRect(&rc, style, false); - int w = rc.right - rc.left; - int h = rc.bottom - rc.top; + int w = rc.right - rc.left; + int h = rc.bottom - rc.top; - rc.left = (1280 - w)/2; - rc.right = rc.left + w; - rc.top = (1024 - h)/2; - rc.bottom = rc.top + h; + rc.left = (1280 - w)/2; + rc.right = rc.left + w; + rc.top = (1024 - h)/2; + rc.bottom = rc.top + h; // I save this to m_hMain instead of m_hParent because it casused problems otherwise m_hMain = (HWND)g_VideoInitialize.pWindowHandle; - m_hWnd = CreateWindow(m_szClassName, title, - style, - rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, - parent, NULL, hInstance, NULL ); + m_hWnd = CreateWindow(m_szClassName, title, + style, + rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, + parent, NULL, hInstance, NULL ); - g_winstyle = GetWindowLong( m_hWnd, GWL_STYLE ); - g_winstyle &= ~WS_MAXIMIZE & ~WS_MINIMIZE; // remove minimize/maximize style - } + g_winstyle = GetWindowLong( m_hWnd, GWL_STYLE ); + g_winstyle &= ~WS_MAXIMIZE & ~WS_MINIMIZE; // remove minimize/maximize style + } return m_hWnd; } diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp index 7abf3c39d4..3291f76d3b 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp @@ -29,8 +29,8 @@ BEGIN_EVENT_TABLE(WiimoteBasicConfigDialog,wxDialog) EVT_CLOSE(WiimoteBasicConfigDialog::OnClose) - EVT_BUTTON(ID_OK, WiimoteBasicConfigDialog::ButtonClick) - EVT_BUTTON(ID_CANCEL, WiimoteBasicConfigDialog::ButtonClick) + EVT_BUTTON(wxID_OK, WiimoteBasicConfigDialog::ButtonClick) + EVT_BUTTON(wxID_CANCEL, WiimoteBasicConfigDialog::ButtonClick) EVT_BUTTON(ID_BUTTONMAPPING, WiimoteBasicConfigDialog::ButtonClick) EVT_BUTTON(ID_BUTTONRECORDING, WiimoteBasicConfigDialog::ButtonClick) EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, WiimoteBasicConfigDialog::NotebookPageChanged) @@ -81,12 +81,12 @@ void WiimoteBasicConfigDialog::ButtonClick(wxCommandEvent& event) { switch(event.GetId()) { - case ID_OK: + case wxID_OK: WiiMoteReal::Allocate(); g_Config.Save(); Close(); break; - case ID_CANCEL: + case wxID_CANCEL: g_Config.Load(); Close(); break; @@ -256,9 +256,9 @@ void WiimoteBasicConfigDialog::CreateGUIControls() m_ButtonMapping = new wxButton(this, ID_BUTTONMAPPING, wxT("Button Mapping")); m_Recording = new wxButton(this, ID_BUTTONRECORDING, wxT("Recording")); - m_OK = new wxButton(this, ID_OK, wxT("OK")); + m_OK = new wxButton(this, wxID_OK, wxT("OK")); m_OK->SetToolTip(wxT("Save changes and close")); - m_Cancel = new wxButton(this, ID_CANCEL, wxT("Cancel")); + m_Cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel")); m_Cancel->SetToolTip(wxT("Discard changes and close")); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.h b/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.h index 433b091990..506bab84c8 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.h +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.h @@ -36,7 +36,7 @@ class WiimoteBasicConfigDialog : public wxDialog { public: WiimoteBasicConfigDialog(wxWindow *parent, - wxWindowID id = 1, + wxWindowID id = wxID_ANY, const wxString &title = wxT("Wii Remote Plugin Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -107,8 +107,6 @@ class WiimoteBasicConfigDialog : public wxDialog enum { - ID_OK = 1000, - ID_CANCEL, ID_BUTTONMAPPING, ID_BUTTONRECORDING, IDTM_SHUTDOWN, diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp index 6c12e2ac87..417ded3b5e 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp @@ -26,8 +26,8 @@ BEGIN_EVENT_TABLE(WiimotePadConfigDialog,wxDialog) EVT_CLOSE(WiimotePadConfigDialog::OnClose) - EVT_BUTTON(ID_CLOSE, WiimotePadConfigDialog::CloseClick) -// EVT_BUTTON(ID_APPLY, WiimotePadConfigDialog::CloseClick) + EVT_BUTTON(wxID_CLOSE, WiimotePadConfigDialog::CloseClick) +// EVT_BUTTON(wxID_APPLY, WiimotePadConfigDialog::CloseClick) EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, WiimotePadConfigDialog::NotebookPageChanged) EVT_TIMER(IDTM_BUTTON, WiimotePadConfigDialog::OnButtonTimer) @@ -182,10 +182,10 @@ void WiimotePadConfigDialog::CloseClick(wxCommandEvent& event) { switch(event.GetId()) { - case ID_CLOSE: + case wxID_CLOSE: Close(); break; - case ID_APPLY: + case wxID_APPLY: break; } } @@ -922,8 +922,8 @@ void WiimotePadConfigDialog::CreatePadGUIControls() m_Controller[i]->SetSizer(m_sMain[i]); } -// m_Apply = new wxButton(this, ID_APPLY, wxT("Apply")); - m_Close = new wxButton(this, ID_CLOSE, wxT("Close")); +// m_Apply = new wxButton(this, wxID_APPLY, wxT("Apply")); + m_Close = new wxButton(this, wxID_CLOSE, wxT("Close")); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); sButtons->AddStretchSpacer(); diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.h b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.h index 4d7e0c9ff4..aecdce9874 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.h +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.h @@ -45,7 +45,7 @@ class WiimotePadConfigDialog : public wxDialog { public: WiimotePadConfigDialog(wxWindow *parent, - wxWindowID id = 1, + wxWindowID id = wxID_ANY, const wxString &title = wxT("Wii Remote Plugin Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -120,9 +120,7 @@ class WiimotePadConfigDialog : public wxDialog IDB_ANALOG_RIGHT_X, IDB_ANALOG_RIGHT_Y, IDB_TRIGGER_L, IDB_TRIGGER_R, - ID_CLOSE = 1000, - ID_APPLY, - IDTM_BUTTON, // Timer + IDTM_BUTTON = 1000, // Timer IDTM_UPDATE_PAD, // Timer ID_NOTEBOOK, diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp index b61bc3ec8d..3b07569ac6 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp @@ -339,8 +339,8 @@ void WiimoteRecordingConfigDialog::CreateGUIControlsRecording() m_PageRecording->SetSizer(m_sRecordingMain); - m_Apply = new wxButton(this, ID_APPLY, wxT("Apply")); - m_Close = new wxButton(this, ID_CLOSE, wxT("Close")); + m_Apply = new wxButton(this, wxID_APPLY, wxT("Apply")); + m_Close = new wxButton(this, wxID_CLOSE, wxT("Close")); m_Close->SetToolTip(wxT("Apply and Close")); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.cpp index 12dbdcbee1..4d87ead5dd 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.cpp @@ -26,8 +26,8 @@ BEGIN_EVENT_TABLE(WiimoteRecordingConfigDialog,wxDialog) EVT_CLOSE(WiimoteRecordingConfigDialog::OnClose) - EVT_BUTTON(ID_CLOSE, WiimoteRecordingConfigDialog::CloseClick) - EVT_BUTTON(ID_APPLY, WiimoteRecordingConfigDialog::CloseClick) + EVT_BUTTON(wxID_CLOSE, WiimoteRecordingConfigDialog::CloseClick) + EVT_BUTTON(wxID_APPLY, WiimoteRecordingConfigDialog::CloseClick) EVT_CHOICE(IDC_RECORD + 1, WiimoteRecordingConfigDialog::RecordingChanged) EVT_CHOICE(IDC_RECORD + 2, WiimoteRecordingConfigDialog::RecordingChanged) @@ -65,8 +65,7 @@ END_EVENT_TABLE() WiimoteRecordingConfigDialog::WiimoteRecordingConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) -: wxDialog -(parent, id, title, position, size, style) +: wxDialog(parent, id, title, position, size, style) { #if wxUSE_TIMER m_TimeoutTimer = new wxTimer(this, IDTM_UPDATE); @@ -96,13 +95,13 @@ void WiimoteRecordingConfigDialog::CloseClick(wxCommandEvent& event) { switch(event.GetId()) { - case ID_CLOSE: + case wxID_CLOSE: #if HAVE_WIIUSE if (!WiiMoteReal::SafeClose()) #endif Close(); break; - case ID_APPLY: + case wxID_APPLY: SaveFile(); WiiMoteEmu::LoadRecordedMovements(); break; diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.h b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.h index 6b83b31476..321c6e012b 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.h +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecordingDlg.h @@ -34,7 +34,7 @@ class WiimoteRecordingConfigDialog : public wxDialog { public: WiimoteRecordingConfigDialog(wxWindow *parent, - wxWindowID id = 1, + wxWindowID id = wxID_ANY, const wxString &title = wxT("Wii Remote Plugin Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -103,9 +103,7 @@ class WiimoteRecordingConfigDialog : public wxDialog enum { - ID_CLOSE = 1000, - ID_APPLY, - ID_RECORDINGPAGE, + ID_RECORDINGPAGE = 1000, IDTM_UPDATE, // Real diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index b09ede8cc0..8cce81195b 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -108,8 +108,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle wxUninitialize(); #endif break; - default: - break; } g_hInstance = hinstDLL; @@ -138,12 +136,12 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo) _PluginInfo->Version = 0x0100; _PluginInfo->Type = PLUGIN_TYPE_WIIMOTE; #ifdef DEBUGFAST - sprintf(_PluginInfo->Name, "Dolphin Wiimote Plugin (DebugFast)"); + sprintf_s(_PluginInfo->Name, "Dolphin Wiimote Plugin (DebugFast)"); #else #ifndef _DEBUG - sprintf(_PluginInfo->Name, "Dolphin Wiimote Plugin"); + sprintf_s(_PluginInfo->Name, "Dolphin Wiimote Plugin"); #else - sprintf(_PluginInfo->Name, "Dolphin Wiimote Plugin (Debug)"); + sprintf_s(_PluginInfo->Name, "Dolphin Wiimote Plugin (Debug)"); #endif #endif } @@ -168,18 +166,19 @@ void DllConfig(HWND _hParent) } #if defined(HAVE_WX) && HAVE_WX - if (!m_BasicConfigFrame) - { - wxWindow *frame = GetParentedWxWindow(_hParent); - m_BasicConfigFrame = new WiimoteBasicConfigDialog(frame); - m_BasicConfigFrame->ShowModal(); - m_BasicConfigFrame->Destroy(); - m_BasicConfigFrame = NULL; + wxWindow *frame = GetParentedWxWindow(_hParent); + m_BasicConfigFrame = new WiimoteBasicConfigDialog(frame); + + frame->Disable(); + m_BasicConfigFrame->ShowModal(); + frame->Enable(); + + m_BasicConfigFrame->Destroy(); + m_BasicConfigFrame = NULL; #ifdef _WIN32 - frame->SetHWND(NULL); + frame->SetHWND(NULL); #endif - delete frame; - } + frame->Destroy(); #endif } @@ -189,18 +188,11 @@ void Initialize(void *init) g_EmulatorRunning = true; g_WiimoteInitialize = *(SWiimoteInitialize *)init; - // Update the GUI if the configuration window is already open #if defined(HAVE_WX) && HAVE_WX - if (m_BasicConfigFrame) - { - // Save the settings - g_Config.Save(); - // Load the ISO Id - g_ISOId = g_WiimoteInitialize.ISOId; - // Load the settings - g_Config.Load(); - m_BasicConfigFrame->UpdateGUI(); - } + // Load the ISO Id + g_ISOId = g_WiimoteInitialize.ISOId; + // Load the settings + g_Config.Load(); #endif #if defined(HAVE_X11) && HAVE_X11 WMdisplay = (Display*)g_WiimoteInitialize.hWnd;