From 87b146f9d6c9cf45d5ae9d7c9127fce0ebd9a73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= <ipkiss@gmail.com>
Date: Wed, 20 Apr 2005 19:48:59 +0000
Subject: [PATCH] A few (cross-)compilation fixes

---
 wxwin/confdimdlg.cc | 6 +++---
 wxwin/confsearch.cc | 4 ++--
 wxwin/ewx.h         | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wxwin/confdimdlg.cc b/wxwin/confdimdlg.cc
index b23b976..2055835 100644
--- a/wxwin/confdimdlg.cc
+++ b/wxwin/confdimdlg.cc
@@ -16,7 +16,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* $Id: confdimdlg.cc,v 1.3 2005/02/05 11:14:56 ipkiss Exp $ */
+/* $Id: confdimdlg.cc,v 1.4 2005/04/20 19:48:59 ipkiss Exp $ */
 
 #include "wx/printdlg.h"
 
@@ -60,7 +60,7 @@ max(int i,int j)
 
 
 ConfDimDlg::ConfDimDlg(wxWindow* parent, wxPrintData pd, wxPageSetupData psd)
-  : wxDialog(parent,-1,wxT("Eliot : Impression"))
+  : wxDialog(parent, -1, wxString(wxT("Eliot : Impression")))
 {
   int i;
   wxString choices[3];
@@ -74,7 +74,7 @@ ConfDimDlg::ConfDimDlg(wxWindow* parent, wxPrintData pd, wxPageSetupData psd)
   wxRect        Hspacesrect[5];
   wxStaticText* Tcomment[5];
   wxRect        Tcommentrect[5];
-  wxRect 	Tdimrect[5];
+  wxRect        Tdimrect[5];
   wxStaticText* Tunit[5];
   wxRect        Tjustrect[5];
   wxRect        Tspacesrect[5];
diff --git a/wxwin/confsearch.cc b/wxwin/confsearch.cc
index f7a657b..d4f148e 100644
--- a/wxwin/confsearch.cc
+++ b/wxwin/confsearch.cc
@@ -16,7 +16,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* $Id: confsearch.cc,v 1.4 2005/03/29 08:05:18 afrab Exp $ */
+/* $Id: confsearch.cc,v 1.5 2005/04/20 19:48:59 ipkiss Exp $ */
 
 #include "ewx.h"
 #include "wx/sizer.h"
@@ -37,7 +37,7 @@ END_EVENT_TABLE()
 
 
 ConfSearchDlg::ConfSearchDlg(wxWindow* parent)
-   	: wxDialog(parent,-1,wxT("Configuration recherche"))
+   	: wxDialog(parent, -1, wxString(wxT("Configuration recherche")))
 {
 
   joker_searching = new wxCheckBox(this,CheckBox_Joker,wxT("Recherche sur joker dans 7+1"));
diff --git a/wxwin/ewx.h b/wxwin/ewx.h
index 5aa2a12..30cdf54 100644
--- a/wxwin/ewx.h
+++ b/wxwin/ewx.h
@@ -16,7 +16,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* $Id: ewx.h,v 1.5 2005/04/03 21:12:03 ipkiss Exp $ */
+/* $Id: ewx.h,v 1.6 2005/04/20 19:48:59 ipkiss Exp $ */
 
 #ifndef __EWX__
 #define __EWX__
@@ -47,7 +47,6 @@
 
 #include "config.h"
 #define APPNAME "Eliot"
-#define DATE "$Date: 2005/04/03 21:12:03 $"
 
 // wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t)
 #if defined( ENABLE_NLS ) && defined( ENABLE_UTF8 )