Update of /cvsroot/hugin/hugin/src/nona_gui
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12565/nona_gui
Modified Files:
nona_gui.cpp
Log Message:
made nona_gui.cpp compile on OSX with -DDEBUG flag
Index: nona_gui.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/nona_gui/nona_gui.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- nona_gui.cpp 17 Aug 2006 23:26:21 -0000 1.24
+++ nona_gui.cpp 19 Aug 2006 07:51:41 -0000 1.25
@@ -24,21 +24,26 @@
*
*/
-#include "config.h"
+#include <config.h>
#include "panoinc_WX.h"
-#include <wx/cmdline.h>
+#include "panoinc.h"
+
#include <fstream>
#include <sstream>
-
#include <vigra/error.hxx>
-
#include "PT/Stitcher.h"
-
#include "hugin/MyProgressDialog.h"
#include <tiffio.h>
+// somewhere SetDesc gets defined.. this breaks wx/cmdline.h on OSX
+#ifdef SetDesc
+#undef SetDesc
+#endif
+
+#include <wx/cmdline.h>
+
using namespace vigra;
using namespace PT;
using namespace std;
@@ -105,6 +110,8 @@
m_locale.AddCatalogLookupPathPrefix(exePath + wxT("/locale"));
#if defined __WXMSW__
m_locale.AddCatalogLookupPathPrefix(wxT("./locale"));
+#elif defined __WXMAC__
+ // TODO: add localisation init
#else
DEBUG_INFO("add locale path: " << INSTALL_LOCALE_DIR);
m_locale.AddCatalogLookupPathPrefix(wxT(INSTALL_LOCALE_DIR));
|