From 144d049898b6ddea88cd82ed0ea1d4a13d66ddf3 Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Wed, 3 Feb 2010 14:19:10 +0000
Subject: [PATCH] First batch to have wx stuff compiling

This is mostyle missing includes, includes with the wrong
case and wrong path, also there is that PanicAlert
function that is not defined.
---
 desmume/src/wx/IniFile.cpp                 | 1 +
 desmume/src/wx/InputCommon/EventHandler.h  | 2 +-
 desmume/src/wx/InputCommon/SDL.cpp         | 2 +-
 desmume/src/wx/InputCommon/SDL.h           | 2 +-
 desmume/src/wx/InputCommon/X11InputBase.h  | 4 +++-
 desmume/src/wx/PadSimple/GUI/ConfigDlg.h   | 2 +-
 desmume/src/wx/PadSimple/PadSimple.cpp     | 2 +-
 desmume/src/wx/PadSimple/PadSimple.h       | 1 +
 desmume/src/wx/PadSimple/pluginspecs_pad.h | 2 ++
 desmume/src/wx/StringUtil.cpp              | 1 +
 desmume/src/wx/StringUtil.h                | 2 +-
 11 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/desmume/src/wx/IniFile.cpp b/desmume/src/wx/IniFile.cpp
index 62ccaaa3e..0a6e54f9e 100644
--- a/desmume/src/wx/IniFile.cpp
+++ b/desmume/src/wx/IniFile.cpp
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <strings.h>
 
 #include <string>
 #include <vector>
diff --git a/desmume/src/wx/InputCommon/EventHandler.h b/desmume/src/wx/InputCommon/EventHandler.h
index ff5421939..1529a58b5 100644
--- a/desmume/src/wx/InputCommon/EventHandler.h
+++ b/desmume/src/wx/InputCommon/EventHandler.h
@@ -1,6 +1,6 @@
 #ifndef EVENTHANDER_H
 #define EVENTHANDER_H 1
-#include "Common.h"
+#include "common.h"
 #include <queue>
 #include "Event.hpp"
 
diff --git a/desmume/src/wx/InputCommon/SDL.cpp b/desmume/src/wx/InputCommon/SDL.cpp
index cc905e9cb..ec503a43e 100644
--- a/desmume/src/wx/InputCommon/SDL.cpp
+++ b/desmume/src/wx/InputCommon/SDL.cpp
@@ -67,7 +67,7 @@ bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_
 		if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
 #endif
 		{
-			PanicAlert("Could not initialize SDL: %s", SDL_GetError());
+			//PanicAlert("Could not initialize SDL: %s", SDL_GetError());
 			return false;
 		}
 
diff --git a/desmume/src/wx/InputCommon/SDL.h b/desmume/src/wx/InputCommon/SDL.h
index 18855c2dd..79443b306 100644
--- a/desmume/src/wx/InputCommon/SDL.h
+++ b/desmume/src/wx/InputCommon/SDL.h
@@ -52,7 +52,7 @@
 #endif
 #endif
 
-#include "Common.h" // Common
+#include "common.h" // Common
 
 
 
diff --git a/desmume/src/wx/InputCommon/X11InputBase.h b/desmume/src/wx/InputCommon/X11InputBase.h
index a17fbe356..238ab27c4 100644
--- a/desmume/src/wx/InputCommon/X11InputBase.h
+++ b/desmume/src/wx/InputCommon/X11InputBase.h
@@ -20,7 +20,9 @@
 
 #include <X11/X.h>
 #include <X11/keysym.h>
-#include "Config.h"
+#if 0
+#include "config.h"
+#endif
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
 #endif
diff --git a/desmume/src/wx/PadSimple/GUI/ConfigDlg.h b/desmume/src/wx/PadSimple/GUI/ConfigDlg.h
index d7fb70808..851e4f45e 100644
--- a/desmume/src/wx/PadSimple/GUI/ConfigDlg.h
+++ b/desmume/src/wx/PadSimple/GUI/ConfigDlg.h
@@ -30,7 +30,7 @@
 #include <wx/gbsizer.h>
 
 #if defined(HAVE_X11) && HAVE_X11
-#include "X11InputBase.h"
+#include "InputCommon/X11InputBase.h"
 #endif
 
 class PADConfigDialogSimple : public wxDialog
diff --git a/desmume/src/wx/PadSimple/PadSimple.cpp b/desmume/src/wx/PadSimple/PadSimple.cpp
index 705f6f2cc..16ac781ab 100644
--- a/desmume/src/wx/PadSimple/PadSimple.cpp
+++ b/desmume/src/wx/PadSimple/PadSimple.cpp
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "Common.h"
+#include "common.h"
 //#include "LogManager.h"
 #include "pluginspecs_pad.h"
 #include "PadSimple.h"
diff --git a/desmume/src/wx/PadSimple/PadSimple.h b/desmume/src/wx/PadSimple/PadSimple.h
index 4eb8a7299..34874702d 100644
--- a/desmume/src/wx/PadSimple/PadSimple.h
+++ b/desmume/src/wx/PadSimple/PadSimple.h
@@ -19,6 +19,7 @@
 #define __PADSIMPLE_H__  
 
 //#include "Setup.h" // Common
+#include "types.h"
 
 // Constants for full-press sticks and triggers
 const int BUTTON_FULL = 255;
diff --git a/desmume/src/wx/PadSimple/pluginspecs_pad.h b/desmume/src/wx/PadSimple/pluginspecs_pad.h
index 6ed8a8450..05793c748 100644
--- a/desmume/src/wx/PadSimple/pluginspecs_pad.h
+++ b/desmume/src/wx/PadSimple/pluginspecs_pad.h
@@ -5,6 +5,8 @@
 #ifndef _PAD_H_INCLUDED__
 #define _PAD_H_INCLUDED__
 
+#include <wx/isql.h>
+#include "types.h"
 //#include "PluginSpecs.h"
 
 //#include "ExportProlog.h"
diff --git a/desmume/src/wx/StringUtil.cpp b/desmume/src/wx/StringUtil.cpp
index da4b77ca6..e20192c86 100644
--- a/desmume/src/wx/StringUtil.cpp
+++ b/desmume/src/wx/StringUtil.cpp
@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "StringUtil.h"
 
diff --git a/desmume/src/wx/StringUtil.h b/desmume/src/wx/StringUtil.h
index 3911455ee..8901aa7de 100644
--- a/desmume/src/wx/StringUtil.h
+++ b/desmume/src/wx/StringUtil.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <string>
 
-#include "Common.h"
+#include "common.h"
 
 std::string StringFromFormat(const char* format, ...);
 void ToStringFromFormat(std::string* out, const char* format, ...);