From: guigues <guigues>
Date: Mon, 11 May 2009 08:20:28 +0000 (+0000)
Subject: Compil Linux
X-Git-Tag: EED.02Oct2009~68
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0aa00616066c059f5b11bf6355c22c90c22f95f0;hp=152f8d6556de5c935404953ad95e392ae148374d;p=creaImageIO.git

Compil Linux
---

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 3bae7d8..1a423eb 100644
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -673,16 +673,16 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::OnSettings(wxCommandEvent& event)
   {
-	  wxDialog* dial= new wxDialog (this,-1,"System Settings",wxDefaultPosition, wxSize(450,600));
-	  wxBoxSizer	*siz = new wxBoxSizer(wxVERTICAL);
-	  // Notebook
-      wxNotebook* nb= new wxNotebook(dial,
-			       -1,wxDefaultPosition, wxDefaultSize, 0);
-
-	  siz->Add( nb,1,wxGROW  ,0);  
-	  CreateSettingsDialog(nb);
-	  dial->SetSizer(siz);
-	  dial->ShowModal();
+    wxDialog* dial= new wxDialog (this,-1,_T("System Settings"),wxDefaultPosition, wxSize(450,600));
+    wxBoxSizer	*siz = new wxBoxSizer(wxVERTICAL);
+    // Notebook
+    wxNotebook* nb= new wxNotebook(dial,
+				   -1,wxDefaultPosition, wxDefaultSize, 0);
+    
+    siz->Add( nb,1,wxGROW  ,0);  
+    CreateSettingsDialog(nb);
+    dial->SetSizer(siz);
+    dial->ShowModal();
   }
   //=================================================
 
@@ -690,7 +690,7 @@ namespace creaImageIO
   //AndresDonadio
   void WxGimmickView::OnTools(wxCommandEvent& event)
   {
-		wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxDefaultSize);
+    wxDialog* dial= new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxDefaultSize);
 		wxBoxSizer	*siz = new wxBoxSizer(wxVERTICAL);
 		
 		wxButton *inBtn = new wxButton(dial,-1,_T("Input Directory"), wxDefaultPosition, wxSize(200,30) );
diff --git a/src2/icons/settings.xpm b/src2/icons/settings.xpm
index a26cfed..f98fffd 100644
--- a/src2/icons/settings.xpm
+++ b/src2/icons/settings.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *settings_xpm[] = {
+static const char *settings_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "40 40 69 1",
 "  c #474A4A",
diff --git a/src2/icons/tools.xpm b/src2/icons/tools.xpm
index e8e8627..045fb53 100644
--- a/src2/icons/tools.xpm
+++ b/src2/icons/tools.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tools_xpm[] = {
+static const char *tools_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 254 2",
 "   c #435C69",