Corrections pour linux

CosMoS/bdd.cpp

@@ -49,7 +49,11 @@ void class_bdd::importer(const wxString& filename)
 	
 	wxFFile* importfile = new wxFFile();
 	importfile->Open(filename);
-	importfile->ReadAll(&fichier, wxConvAuto(wxFONTENCODING_SYSTEM));
+	#ifdef __WXMSW__
+		importfile->ReadAll(&fichier, wxConvAuto(wxFONTENCODING_SYSTEM));
+	#elif defined(__WXGTK__)
+		importfile->ReadAll(&fichier);
+	#endif
 	size = fichier.length() + 1;
 		
 	sqlite3_exec(db, "SAVEPOINT before_import;", NULL, NULL, NULL);

CosMoS/misc.h

@@ -6,7 +6,7 @@
 
 #ifdef __WXGTK__
 	#define slash "/"
-	#define _C(string) string.fn_str() // wxString -> char*
+	#define _C(string) (const char*) string.c_str() // wxString -> char*
 	#define _W(string) string // char* -> wxString
 #elif defined( __WXMSW__ )
 	#define slash "\\"

CosMoS/recherche.cpp

@@ -1,5 +1,7 @@
 #include "recherche.h"
 
+#pragma GCC diagnostic ignored "-Wunused-function"
+
 class_recherche::class_recherche(config* configuration, class_bdd* bdd, wxGrid* grid)
 {
 	this->configuration = configuration;

Sante_Pub.workspace

@@ -8,6 +8,11 @@
     <![CDATA[
   
   
+  
+  
+  
+  
+  
   ]]>
   </Environment>
   <BuildMatrix>
@@ -18,7 +23,7 @@
       <Project Name="testcurl" ConfigName="Debug"/>
       <Project Name="testsqlite" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="no">
+    <WorkspaceConfiguration Name="Release" Selected="yes">
       <Project Name="COSMOS" ConfigName="Release"/>
       <Project Name="CosMoS" ConfigName="Release"/>
       <Project Name="grid" ConfigName="Release"/>
@@ -31,7 +36,7 @@
       <Project Name="testcurl" ConfigName="Debug_WIN"/>
       <Project Name="testsqlite" ConfigName="Debug_WIN"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release_WIN" Selected="yes">
+    <WorkspaceConfiguration Name="Release_WIN" Selected="no">
       <Project Name="CosMoS" ConfigName="Release_WIN"/>
       <Project Name="grid" ConfigName="Release_WIN"/>
       <Project Name="testcurl" ConfigName="Release_WIN"/>

Sante_Pub.workspace.session

@@ -1,60 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Session Name="C:\Projets\Sante_Pub.workspace">
-  <int Value="8" Name="m_selectedTab"/>
-  <wxString Value="C:\Projets\Sante_Pub.workspace" Name="m_workspaceName"/>
+<?xml version="1.0" encoding="utf-8"?>
+<Session Name="/home/satamaxx/Programmes/Sante_Pub/Sante_Pub.workspace">
+  <int Value="3" Name="m_selectedTab"/>
+  <wxString Value="/home/satamaxx/Programmes/Sante_Pub/Sante_Pub.workspace" Name="m_workspaceName"/>
   <TabInfoArray Name="TabInfoArray">
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\misc.h" Name="FileName"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
       <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\cosmos.h" Name="FileName"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/config.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
       <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\cosmos.cpp" Name="FileName"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
       <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\config.h" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="0" Name="CurrentLine"/>
-      <wxArrayString Name="Bookmarks"/>
-    </TabInfo>
-    <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\config.cpp" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="0" Name="CurrentLine"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.cpp" Name="FileName"/>
+      <int Value="50" Name="FirstVisibleLine"/>
+      <int Value="50" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\bdd.h" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="0" Name="CurrentLine"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/config.cpp" Name="FileName"/>
+      <int Value="98" Name="FirstVisibleLine"/>
+      <int Value="98" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\bdd.cpp" Name="FileName"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.cpp" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
       <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\recherche.h" Name="FileName"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/recherche.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
       <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="C:\Projets\CosMoS\recherche.cpp" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="18" Name="CurrentLine"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/recherche.cpp" Name="FileName"/>
+      <int Value="25" Name="FirstVisibleLine"/>
+      <int Value="61" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
   </TabInfoArray>

testcurl/testcurl.cpp

@@ -1,5 +1,7 @@
 #include "testcurl.h"
 
+#pragma GCC diagnostic ignored "-Wunused-function"
+
 testcurl::testcurl( wxWindow* parent )
 :
 testcurlGUI( parent )
@@ -46,7 +48,7 @@ void testcurl::OnGo( wxCommandEvent& event )
 		
 		printf ("Content = %s", curldata.content);
 		
-		wxString content = wxString::FromAscii(curldata.content);
+		wxString content = wxString::From8BitData(curldata.content);
 		texte_Resultat->SetValue(content);
 		wxMessageBox("Fini !", "Fini !", wxOK);
 		
@@ -55,7 +57,6 @@ void testcurl::OnGo( wxCommandEvent& event )
 	}
 }
 
-
 static size_t WriteDataCallback(void *contents, size_t size, size_t nmemb, void *userp)
 {
   size_t realsize = size * nmemb;

testcurl/testcurl.h

@@ -14,7 +14,7 @@ Subclass of testcurlGUI, which is generated by wxFormBuilder.
 
 #ifdef __WXGTK__
 	#define slash "/"
-	#define _C(string) string.fn_str()
+	#define _C(string) (const char*) string.c_str()
 #elif defined( __WXMSW__ )
 	#define slash "\\"
 	#define _C(string) (const char*) string.c_str()
@@ -35,6 +35,7 @@ class testcurl : public testcurlGUI
 		void OnGo( wxCommandEvent& event );
 		CURL* curlhandle;
 		CurlData curldata;
+		
 	public:
 		/** Constructor */
 		testcurl( wxWindow* parent );