From ed598d3c671308e49324f145f9cfb3c30dfa22e7 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 22 Apr 2009 17:15:51 +0000 Subject: [PATCH] aaaand the always-fun linux build fix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3043 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/SConscript | 1 - Source/Core/DolphinWX/Src/SDCardWindow.cpp | 64 ---------------------- Source/Core/DolphinWX/Src/SDCardWindow.h | 46 ---------------- 3 files changed, 111 deletions(-) delete mode 100644 Source/Core/DolphinWX/Src/SDCardWindow.cpp delete mode 100644 Source/Core/DolphinWX/Src/SDCardWindow.h diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 61e83d5f21..94bedc4e97 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -33,7 +33,6 @@ if wxenv['HAVE_WX']: 'CheatsWindow.cpp', 'stdafx.cpp', 'FrameWiimote.cpp', - 'SDCardWindow.cpp', 'WxUtils.cpp', ] diff --git a/Source/Core/DolphinWX/Src/SDCardWindow.cpp b/Source/Core/DolphinWX/Src/SDCardWindow.cpp deleted file mode 100644 index da71d3546b..0000000000 --- a/Source/Core/DolphinWX/Src/SDCardWindow.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2003-2008 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "SDCardWindow.h" -#include "Globals.h" -#include "IPC_HLE/HW/SDInterface.h" - -BEGIN_EVENT_TABLE(wxSDCardWindow, wxWindow) - EVT_CLOSE( wxSDCardWindow::OnEvent_Window_Close) - EVT_BUTTON(ID_BUTTON_CLOSE, wxSDCardWindow::OnEvent_ButtonClose_Press) -END_EVENT_TABLE() - -wxSDCardWindow::wxSDCardWindow(wxWindow* parent) : - wxDialog(parent, wxID_ANY, _T("SDCard Mounter"), wxDefaultPosition, wxSize(400, 400), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) -{ - Init_ChildControls(); - Layout(); - Show(); -} - -wxSDCardWindow::~wxSDCardWindow() -{ - // On Disposal -} - -void wxSDCardWindow::Init_ChildControls() -{ - // Button Strip - m_Button_Close = new wxButton(this, ID_BUTTON_CLOSE, _T("Close"), wxDefaultPosition, wxDefaultSize); - wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); - sButtons->Add(m_Button_Close, 0, wxALL, 5); - - wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL); - sMain->Add(sButtons, 0, wxALL, 5); - SetSizer(sMain); - Layout(); - - Fit(); -} - -void wxSDCardWindow::OnEvent_Window_Close(wxCloseEvent& WXUNUSED(event)) -{ - EndModal(0); -} - -void wxSDCardWindow::OnEvent_ButtonClose_Press(wxCommandEvent& WXUNUSED(event)) -{ - EndModal(0); -} - diff --git a/Source/Core/DolphinWX/Src/SDCardWindow.h b/Source/Core/DolphinWX/Src/SDCardWindow.h deleted file mode 100644 index 3088657067..0000000000 --- a/Source/Core/DolphinWX/Src/SDCardWindow.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2003-2008 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#ifndef __SDCARD_WINDOW_h__ -#define __SDCARD_WINDOW_h__ - -#include - -class wxSDCardWindow : public wxDialog -{ -public: - wxSDCardWindow(wxWindow* parent); - virtual ~wxSDCardWindow(); - -protected: - DECLARE_EVENT_TABLE(); - - wxButton *m_Button_Close; - - enum - { - ID_BUTTON_CLOSE, - }; - - void Init_ChildControls(); - void OnEvent_Window_Close(wxCloseEvent& event); - void OnEvent_ButtonClose_Press(wxCommandEvent& event); -}; - - -#endif -