diff options
| author | flacs <tilkax@gmail.com> | 2015-08-09 07:55:37 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-08-09 07:55:37 +0200 |
| commit | 6f2400ebc08a1e300881ea48e5cac5abf2f3c08c (patch) | |
| tree | 6ef9135546335414b607f38520edca1948ae1b39 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | a488ab7a7090f8e2669a42319519ea482f52accb (diff) | |
| parent | d51267d13cd7ed6248bec3668e9220ba4c916a8b (diff) | |
Merge pull request #2807 from aserna3/master
Removed audio shortcut from toolbar
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index eab7d50328..736ea19aae 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -552,7 +552,6 @@ void CFrame::PopulateToolbar(wxToolBar* ToolBar) ToolBar->AddSeparator(); WxUtils::AddToolbarButton(ToolBar, wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_ConfigMain], _("Configure...")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_GFX_BACKEND, _("Graphics"), m_Bitmaps[Toolbar_ConfigGFX], _("Graphics settings")); - WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_AUDIO, _("Audio"), m_Bitmaps[Toolbar_ConfigAudio], _("Audio settings")); WxUtils::AddToolbarButton(ToolBar, IDM_CONFIG_CONTROLLERS, _("Controllers"), m_Bitmaps[Toolbar_Controller], _("Controller settings")); } @@ -596,7 +595,6 @@ void CFrame::InitBitmaps() m_Bitmaps[Toolbar_Pause ].LoadFile(dir + "pause.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_ConfigMain ].LoadFile(dir + "config.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_ConfigGFX ].LoadFile(dir + "graphics.png", wxBITMAP_TYPE_PNG); - m_Bitmaps[Toolbar_ConfigAudio].LoadFile(dir + "audio.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Controller ].LoadFile(dir + "classic.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_Screenshot ].LoadFile(dir + "screenshot.png", wxBITMAP_TYPE_PNG); m_Bitmaps[Toolbar_FullScreen ].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG); |