From c7f9e6b6ee14ffa0583541f84d3133d5a3efcd73 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Thu, 4 Jun 2009 08:42:20 +0200
Subject: [PATCH] Upstream tarball 9636

---
 .svn-revision                      |  2 +-
 src/webserver/src/WebInterface.cpp | 25 +++++++++++++++----------
 src/webserver/src/WebInterface.h   | 16 ++++++++++++----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 03feab95..89aeab77 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9635
+9636
diff --git a/src/webserver/src/WebInterface.cpp b/src/webserver/src/WebInterface.cpp
index a2f431cd..407b5af7 100644
--- a/src/webserver/src/WebInterface.cpp
+++ b/src/webserver/src/WebInterface.cpp
@@ -55,7 +55,7 @@
 #	include <libintl.h>
 #endif
 
-
+#ifdef AMULEWEB28
 /*
  * Socket handling in wxBase (same as amuled)
  * 
@@ -352,15 +352,6 @@ void CWebserverAppTraits::DeletePending()
 }
 
 
-//-------------------------------------------------------------------
-IMPLEMENT_APP(CamulewebApp)
-//-------------------------------------------------------------------
-
-
-BEGIN_EVENT_TABLE(CamulewebApp, CaMuleExternalConnector)
-END_EVENT_TABLE()
-
-
 CamulewebApp::CamulewebApp() : m_table(new CWebserverGSocketFuncTable)
 {
 	wxPendingEventsLocker = new wxCriticalSection;
@@ -372,6 +363,16 @@ wxAppTraits *CamulewebApp::CreateTraits()
 	return new CWebserverAppTraits(m_table);
 }
 
+#endif
+
+//-------------------------------------------------------------------
+IMPLEMENT_APP(CamulewebApp)
+//-------------------------------------------------------------------
+
+
+BEGIN_EVENT_TABLE(CamulewebApp, CaMuleExternalConnector)
+END_EVENT_TABLE()
+
 void CamulewebApp::Post_Shell()
 {
 	m_webserver->StopServer();
@@ -680,11 +681,15 @@ void CamulewebApp::Pre_Shell()
 
 void CamulewebApp::TextShell(const wxString &)
 {
+#ifdef AMULEWEB28
 	while (true) {
 		m_table->RunSelect();
 		ProcessPendingEvents();
 		((CWebserverAppTraits *)GetTraits())->DeletePending();
 	}
+#else
+	wxApp::OnRun();
+#endif
 }
 
 
diff --git a/src/webserver/src/WebInterface.h b/src/webserver/src/WebInterface.h
index d6fd35ad..e165a0c3 100644
--- a/src/webserver/src/WebInterface.h
+++ b/src/webserver/src/WebInterface.h
@@ -29,16 +29,26 @@
 
 #include "ExternalConnector.h"
 
+
+#if !wxCHECK_VERSION(2, 9, 0)
+		#define AMULEWEB28
+#endif
+
+
 class CamulewebApp
 :
 public CaMuleExternalConnector
 {
-    class CWebserverGSocketFuncTable *m_table;
 	class CWebServerBase *m_webserver;
 
+#ifdef AMULEWEB28
+	class CWebserverGSocketFuncTable *m_table;
 public:
+	wxAppTraits *CreateTraits();
 	CamulewebApp();
-	
+#endif
+
+public:
 	const wxString GetGreetingTitle();
 	void Pre_Shell();
 	void LoadConfigFile();
@@ -69,8 +79,6 @@ public:
 public:
 	virtual void Post_Shell();
 
-	wxAppTraits *CreateTraits();
-
 	void TextShell(const wxString &prompt);
 
 	virtual wxString SetLocale(const wxString& language);
-- 
2.11.4.GIT