From 1a504ff0315cf079b7fec93ab5c1ad250a68e0c1 Mon Sep 17 00:00:00 2001
From: Sonicadvance1 <sonicadvance1@gmail.com>
Date: Mon, 4 Aug 2008 22:42:04 +0000
Subject: [PATCH] Fix compile bugs in Windows

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@131 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp   | 13 ++++++++-----
 Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h  |  7 ++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
index cc5b64a8f4..20df860e0f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
@@ -25,6 +25,7 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
 	EVT_BUTTON(ID_CLOSE,ConfigDialog::OKClick)
 	EVT_BUTTON(ID_APPLY,ConfigDialog::OKClick)
 	EVT_BUTTON(ID_OK,ConfigDialog::OKClick)
+	EVT_BUTTON(ID_BROWSE,ConfigDialog::BrowseClick)
 END_EVENT_TABLE()
 
 
@@ -94,6 +95,10 @@ void ConfigDialog::CreateGUIControls()
 
 	m_DumpTextures = new wxCheckBox(m_PageAdvanced, ID_DUMPTEXTURES, wxT("Dump texture to:"), wxPoint(12,88), wxSize(233,25), 0, wxDefaultValidator, wxT("DumpTextures"));
 	m_DumpTextures->SetValue(g_Config.bDumpTextures);
+	m_TexturePath = new wxTextCtrl(m_PageAdvanced, ID_TEXTUREPATH, wxT("TexturePath"), wxPoint(20,136), wxSize(129,25), 0, wxDefaultValidator, wxT("TexturePath"));
+	m_TexturePath->SetValue(wxString::FromAscii(g_Config.texDumpPath));
+	m_TexturePath->Enable(false);
+
 
 	m_Statistics = new wxCheckBox(m_PageAdvanced, ID_STATISTICS, wxT("Overlay some statistics"), wxPoint(12,40), wxSize(233,25), 0, wxDefaultValidator, wxT("Statistics"));
 	m_Statistics->SetValue(g_Config.bOverlayStats);
@@ -102,8 +107,7 @@ void ConfigDialog::CreateGUIControls()
 	m_ShaderErrors = new wxCheckBox(m_PageAdvanced, ID_SHADERERRORS, wxT("Show shader compilation issues"), wxPoint(12,64), wxSize(233,25), 0, wxDefaultValidator, wxT("ShaderErrors"));
 	m_ShaderErrors->Enable(false);
 	
-	m_Browse = new wxDirPickerCtrl( m_PageAdvanced, wxID_ANY, wxT("path"), wxT("Select a folder"), wxPoint(12,136), wxSize(233,25), wxDIRP_DEFAULT_STYLE );
-	//m_Browse->SetPath(wxString::FromAscii(g_Config.texDumpPath));
+	m_Browse = new wxButton(m_PageAdvanced, ID_BROWSE, wxT("Browse"), wxPoint(156,136), wxSize(65,25), 0, wxDefaultValidator, wxT("Browse"));
 	m_Browse->Enable(false);
 
 	SetTitle(wxT("Opengl Plugin Configuration"));
@@ -115,7 +119,6 @@ void ConfigDialog::CreateGUIControls()
 	m_Statistics->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDialog::OverlayCheck ), NULL, this );
 	m_FullscreenCB->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( ConfigDialog::FSCB ), NULL, this );
 	m_WindowResolutionCB->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( ConfigDialog::WMCB ), NULL, this );
-	m_Browse->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( ConfigDialog::BrowseChange ), NULL, this );
 }
 
 void ConfigDialog::OnClose(wxCloseEvent& /*event*/)
@@ -129,9 +132,9 @@ void ConfigDialog::ConfigDialogActivate(wxActivateEvent& event)
 	// init dialog elements from config
 }
 
-void ConfigDialog::BrowseChange( wxFileDirPickerEvent& event )
+void ConfigDialog::BrowseClick(wxCommandEvent& event)
 {
-	// Doesn't trigger an Event...Oh well //
+	// Changed Back //
 }
 
 void ConfigDialog::OKClick(wxCommandEvent& event)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
index 03ced16cee..bdb85968c0 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
@@ -27,9 +27,6 @@
 #include <wx/checkbox.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
-#include <wx/dirctrl.h>
-#include <wx/filepicker.h>
-#include <wx/gdicmn.h>
 
 
 #undef ConfigDialog_STYLE
@@ -45,7 +42,7 @@ class ConfigDialog : public wxDialog
 		ConfigDialog(wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("Opengl Plugin Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = ConfigDialog_STYLE);
 		virtual ~ConfigDialog();
 		void ConfigDialogActivate(wxActivateEvent& event);
-		void BrowseChange( wxFileDirPickerEvent& event );
+		void BrowseClick(wxCommandEvent& event);
 		void OKClick(wxCommandEvent& event);
 		void AddFSReso(char *reso);
 		void AddWindowReso(char *reso);
@@ -61,7 +58,7 @@ class ConfigDialog : public wxDialog
 		wxButton *m_Apply;
 		wxButton *m_OK;
 		wxTextCtrl *m_TexturePath;
-		wxDirPickerCtrl *m_Browse;
+		wxButton *m_Browse;
 		wxCheckBox *m_ShaderErrors;
 		wxCheckBox *m_Statistics;
 		wxCheckBox *m_DumpTextures;