[Greater-commits] r193 - in trunk/Administration: . cmake
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jun 10 11:47:31 CEST 2011
Author: aheinecke
Date: 2011-06-10 11:47:30 +0200 (Fri, 10 Jun 2011)
New Revision: 193
Modified:
trunk/Administration/Administration.rc
trunk/Administration/AuthenticateDialog.cpp
trunk/Administration/BackgrdDialog.cpp
trunk/Administration/BinobjDialog.cpp
trunk/Administration/CatchmentDialog.cpp
trunk/Administration/DownloadDialog.cpp
trunk/Administration/EnvironmentDialog.cpp
trunk/Administration/EnvtreeDialog.cpp
trunk/Administration/ExportDialog.cpp
trunk/Administration/ExportDialog.h
trunk/Administration/GroupDialog.cpp
trunk/Administration/ImportDialog.cpp
trunk/Administration/ImportDialog.h
trunk/Administration/MainWindow.cpp
trunk/Administration/MessageDialog.cpp
trunk/Administration/PanelEnvironment.cpp
trunk/Administration/PanelUser.cpp
trunk/Administration/ParatreeDialog.cpp
trunk/Administration/PhraseDialog.cpp
trunk/Administration/PwdDialog.cpp
trunk/Administration/SessionDialog.cpp
trunk/Administration/SubstanceDialog.cpp
trunk/Administration/SubsttreeDialog.cpp
trunk/Administration/UserDialog.cpp
trunk/Administration/cmake/FindXercesC.cmake
trunk/Administration/wxcommon.h
Log:
Port to compile with MSVC 2008 and wxwidgets 2.8.3
Modified: trunk/Administration/Administration.rc
===================================================================
--- trunk/Administration/Administration.rc 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/Administration.rc 2011-06-10 09:47:30 UTC (rev 193)
@@ -51,14 +51,14 @@
WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur"
WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur"
WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur"
-WXCURSOR_NO_ENTRY CURSOR DISCARDABLE "wx/msw/noentry.cur"
-WXCURSOR_SIZING CURSOR DISCARDABLE "wx/msw/size.cur"
+//WXCURSOR_NO_ENTRY CURSOR DISCARDABLE "wx/msw/noentry.cur"
+//WXCURSOR_SIZING CURSOR DISCARDABLE "wx/msw/size.cur"
WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur"
-WXCURSOR_WATCH CURSOR DISCARDABLE "wx/msw/watch1.cur"
+//WXCURSOR_WATCH CURSOR DISCARDABLE "wx/msw/watch1.cur"
WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur"
WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur"
WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur"
-WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur"
+//WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur"
WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur"
WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur"
@@ -84,7 +84,7 @@
// Bitmap
//
-WXDISABLE_BUTTON_BITMAP BITMAP MOVEABLE PURE "wx/msw/disable.bmp"
+//WXDISABLE_BUTTON_BITMAP BITMAP MOVEABLE PURE "wx/msw/disable.bmp"
CSQUERY BITMAP MOVEABLE PURE "wx/msw/csquery.bmp"
WXBITMAP_STD_COLOURS BITMAP MOVEABLE PURE "wx/msw/colours.bmp"
FILE_OPEN BITMAP DISCARDABLE "load.bmp"
Modified: trunk/Administration/AuthenticateDialog.cpp
===================================================================
--- trunk/Administration/AuthenticateDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/AuthenticateDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -83,7 +83,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/BackgrdDialog.cpp
===================================================================
--- trunk/Administration/BackgrdDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/BackgrdDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -121,7 +121,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/BinobjDialog.cpp
===================================================================
--- trunk/Administration/BinobjDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/BinobjDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -199,9 +199,9 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
- wxFlexGridSizer* sizer_level_5_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_5_fg = new wxFlexGridSizer(3, wxSize(0,0));
//Compose layout
//The indentation reflects the nesting level of the sizers
@@ -383,12 +383,11 @@
const char* p_r_const;
const char* p_h_const;
const char* p_e_const;
- char* get_file_obj;
+ char get_file_obj = 'Y';
char filepath[1000];
char filename[50];
int pos;
- *get_file_obj = 'Y';
//Read input values from text controls
objectId = textobjectId->GetValue();
name = textName->GetValue();
@@ -495,7 +494,7 @@
//Call API function for insert of data
//filename is only required to locate the file; the file name is set
//according to p_binobjData.name !!!
- if (!da_load_bin_obj (&p_binobjData, *get_file_obj, filepath, filename, &errinfo))
+ if (!da_load_bin_obj (&p_binobjData, get_file_obj, filepath, filename, &errinfo))
{
//Show error
((MainWindow*) GetParent()->GetGrandParent())->OnError("Create failed", &errinfo);
@@ -764,9 +763,9 @@
wxString filepath;
wxString label;
- filepath = wxFileSelector("Please select file path", "c:\temp",
- "", "", "*.*", wxOPEN, this);
- if (filepath)
+ filepath = wxFileSelector("Please select file path", "c:\\temp",
+ "", "", "*.*", wxFD_OPEN, this);
+ if (!filepath.empty())
{
//Set selected file path into text control
textFilePath->SetValue(filepath);
Modified: trunk/Administration/CatchmentDialog.cpp
===================================================================
--- trunk/Administration/CatchmentDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/CatchmentDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -138,7 +138,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/DownloadDialog.cpp
===================================================================
--- trunk/Administration/DownloadDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/DownloadDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -132,9 +132,9 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
- wxFlexGridSizer* sizer_level_5_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_5_fg = new wxFlexGridSizer(3, wxSize(0,0));
//Compose layout
//The indentation reflects the nesting level of the sizers
@@ -371,11 +371,11 @@
filename = name + "." + filetype;
}
- filepath = wxFileSelector("Save file to path", "c:\temp",
- filename, "", "*.*", wxSAVE | wxOVERWRITE_PROMPT, this);
+ filepath = wxFileSelector("Save file to path", "c:\\temp",
+ filename, "", "*.*", wxFD_SAVE | wxFD_OVERWRITE_PROMPT, this);
- if (filepath)
+ if (!filepath.empty())
{
//Set selected file path into text control
textFilePath->SetValue(filepath);
Modified: trunk/Administration/EnvironmentDialog.cpp
===================================================================
--- trunk/Administration/EnvironmentDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/EnvironmentDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -150,7 +150,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/EnvtreeDialog.cpp
===================================================================
--- trunk/Administration/EnvtreeDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/EnvtreeDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -211,7 +211,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/ExportDialog.cpp
===================================================================
--- trunk/Administration/ExportDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/ExportDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -106,7 +106,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
@@ -222,10 +222,10 @@
filename = name;
- filepath = wxFileSelector("Save file to path", "c:\temp",
- filename, "", "*.xml", wxSAVE | wxOVERWRITE_PROMPT, this);
+ filepath = wxFileSelector("Save file to path", "c:\\temp",
+ filename, "", "*.xml", wxFD_SAVE | wxFD_OVERWRITE_PROMPT, this);
- if (filepath)
+ if (!filepath.empty())
{
//Set selected file path into text control
textFilePath->SetValue(filepath);
@@ -253,14 +253,14 @@
DA_T_sess* v_curr_elem_ptr;
DA_T_errinfo errinfo;
long sessid = -1;
- char* isTempl;
+ char isTempl;
wxString sessId;
wxString sessName;
wxString sessText;
- *isTempl = '%';
+ isTempl = '%';
// get session data from database
- if (!da_get_sess(sessid, *isTempl, &p_sess, &errinfo))
+ if (!da_get_sess(sessid, isTempl, &p_sess, &errinfo))
{
//Show error
((MainWindow*) GetParent())->OnError("Initialise session values failed",
@@ -507,13 +507,12 @@
int ExportDialog::ExportSessionData(long sessid)
{
DA_T_errinfo errinfo;
- char* isTempl;
+ char isTempl = 'N';
char object_type_res[31] = {"RESULT"};
char object_type_catch[31] = {"CATCHMENT"};
char get_file_obj = 'Y';
int retval = DA_FAIL;
- *isTempl = 'N';
//Initialise data pointers
p_sess=NULL;
p_subst=NULL;
@@ -540,7 +539,7 @@
//Get session data to export from database
//
*/
- if (!da_get_sess(sessid, *isTempl, &p_sess, &errinfo))
+ if (!da_get_sess(sessid, isTempl, &p_sess, &errinfo))
{
//Show error
((MainWindow*) GetParent())->OnError("Session to export could not be loaded.\nExport was stopped.",
@@ -565,7 +564,7 @@
*/
if (p_sess->subst_id != -1)
{
- if (!da_get_subst(p_sess->subst_id, *isTempl, &p_subst, &errinfo))
+ if (!da_get_subst(p_sess->subst_id, isTempl, &p_subst, &errinfo))
{
//Show error
((MainWindow*) GetParent())->OnError("Substance to export could not be loaded.\nExport was stopped.",
@@ -613,7 +612,7 @@
*/
if (p_sess->env_id != -1)
{
- if (!da_get_env(p_sess->env_id, *isTempl, &p_env, &errinfo))
+ if (!da_get_env(p_sess->env_id, isTempl, &p_env, &errinfo))
{
//Show error
((MainWindow*) GetParent())->OnError("Environment data to export could not be loaded.\nExport was stopped.",
@@ -988,12 +987,12 @@
*/
DOMImplementation* impl = DOMImplementationRegistry::getDOMImplementation(XMLConv("Core"));
- DOMDocumentType* doctype = impl->createDocumentType(XMLConv("greater"),
+ xercesc::DOMDocumentType* doctype = impl->createDocumentType(XMLConv("greater"),
0,
XMLConv(p_DTD_file));
- DOMDocument* doc = impl->createDocument(0, //root element namespace URI.
+ xercesc::DOMDocument* doc = impl->createDocument(0, //root element namespace URI.
XMLConv("GREATER"), //root element name
doctype); //document type object (DTD).
@@ -1157,7 +1156,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteCatchment(DOMDocument* doc)
+int ExportDialog::WriteCatchment(xercesc::DOMDocument* doc)
{
DA_T_stretch* current_stretch;
@@ -1456,7 +1455,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteCatchmentBinary(DOMDocument* doc)
+int ExportDialog::WriteCatchmentBinary(xercesc::DOMDocument* doc)
{
DA_T_bin_obj* current_bin_obj_catch;
wxFile file;
@@ -1628,7 +1627,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteSubstance(DOMDocument* doc)
+int ExportDialog::WriteSubstance(xercesc::DOMDocument* doc)
{
DA_T_subst_det* current_subst_det;
@@ -1797,7 +1796,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteEnvironment(DOMDocument* doc)
+int ExportDialog::WriteEnvironment(xercesc::DOMDocument* doc)
{
DA_T_env_det* current_env_det;
@@ -1966,7 +1965,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteModel(DOMDocument* doc)
+int ExportDialog::WriteModel(xercesc::DOMDocument* doc)
{
DA_T_mod_det* current_mod_det;
@@ -2131,7 +2130,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteMarket(DOMDocument* doc)
+int ExportDialog::WriteMarket(xercesc::DOMDocument* doc)
{
DA_T_market* current_market;
@@ -2267,7 +2266,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteResult(DOMDocument* doc)
+int ExportDialog::WriteResult(xercesc::DOMDocument* doc)
{
char res_id[20];
@@ -2364,7 +2363,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteResultBinary(DOMDocument* doc)
+int ExportDialog::WriteResultBinary(xercesc::DOMDocument* doc)
{
DA_T_bin_obj* current_bin_obj_res;
wxFile file;
@@ -2537,7 +2536,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteSessionDischarge(DOMDocument* doc)
+int ExportDialog::WriteSessionDischarge(xercesc::DOMDocument* doc)
{
DA_T_sess_disch* current_sess_disch;
@@ -2708,7 +2707,7 @@
*
* Changes :
*********************************************************************/
-int ExportDialog::WriteSession(DOMDocument* doc)
+int ExportDialog::WriteSession(xercesc::DOMDocument* doc)
{
char sess_id[20];
Modified: trunk/Administration/ExportDialog.h
===================================================================
--- trunk/Administration/ExportDialog.h 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/ExportDialog.h 2011-06-10 09:47:30 UTC (rev 193)
@@ -67,7 +67,6 @@
XERCES_CPP_NAMESPACE_USE
-
class ExportDialog : public wxDialog
{
public:
@@ -86,16 +85,16 @@
ID_ButtonOpen
};
private:
- int WriteCatchment(DOMDocument* doc);
- int WriteCatchmentBinary(DOMDocument* doc);
- int WriteSubstance(DOMDocument* doc);
- int WriteEnvironment(DOMDocument* doc);
- int WriteMarket(DOMDocument* doc);
- int WriteModel(DOMDocument* doc);
- int WriteResult(DOMDocument* doc);
- int WriteResultBinary(DOMDocument* doc);
- int WriteSessionDischarge(DOMDocument* doc);
- int WriteSession(DOMDocument* doc);
+ int WriteCatchment(xercesc::DOMDocument* doc);
+ int WriteCatchmentBinary(xercesc::DOMDocument* doc);
+ int WriteSubstance(xercesc::DOMDocument* doc);
+ int WriteEnvironment(xercesc::DOMDocument* doc);
+ int WriteMarket(xercesc::DOMDocument* doc);
+ int WriteModel(xercesc::DOMDocument* doc);
+ int WriteResult(xercesc::DOMDocument* doc);
+ int WriteResultBinary(xercesc::DOMDocument* doc);
+ int WriteSessionDischarge(xercesc::DOMDocument* doc);
+ int WriteSession(xercesc::DOMDocument* doc);
int ExportSessionData(long sessid);
int WriteXMLExportFile();
XMLCh* XMLConvStr(const char* toTranscode);
Modified: trunk/Administration/GroupDialog.cpp
===================================================================
--- trunk/Administration/GroupDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/GroupDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -153,7 +153,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/ImportDialog.cpp
===================================================================
--- trunk/Administration/ImportDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/ImportDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -104,7 +104,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
@@ -208,8 +208,8 @@
wxString filepath;
filepath = wxFileSelector("Please select file path", "c:\temp",
- "", "", "*.xml", wxOPEN, this);
- if (filepath)
+ "", "", "*.xml", wxFD_OPEN, this);
+ if (!filepath.empty())
{
//Set selected file path into text control
textFilePath->SetValue(filepath);
@@ -517,7 +517,7 @@
//Create import DOM Tree
//
*/
- DOMDocument* doc = parser->getDocument();
+ xercesc::DOMDocument* doc = parser->getDocument();
//Show progress in status bar
@@ -656,7 +656,7 @@
*
* Changes :
*********************************************************************/
-int ImportDialog::ReadXMLImportFile(DOMDocument* doc)
+int ImportDialog::ReadXMLImportFile(xercesc::DOMDocument* doc)
{
int retval = DA_FAIL;
DOMNodeList* catchlist = NULL;
@@ -1773,7 +1773,7 @@
{
DA_T_bin_obj* p_curr_bin_obj;
DA_T_errinfo errinfo;
- char* get_file_obj;
+ char get_file_obj = 'Y';
wxString filePath;
wxString fileName;
wxString XMLfileName;
@@ -1783,7 +1783,6 @@
char filename[50];
int pos;
- *get_file_obj = 'Y';
/*
//
//Insert BIN_OBJ_TAB data
@@ -1833,7 +1832,7 @@
//filename is only required to locate the file; the file name is set
//according to p_curr_bin_obj->name !!!
- if (!da_load_bin_obj (p_curr_bin_obj, *get_file_obj, filepath, filename, &errinfo))
+ if (!da_load_bin_obj (p_curr_bin_obj, get_file_obj, filepath, filename, &errinfo))
{
//Show error
message = message.Format("Insert into BIN_OBJ_TAB failed for %ld.\nImport was stopped.",
Modified: trunk/Administration/ImportDialog.h
===================================================================
--- trunk/Administration/ImportDialog.h 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/ImportDialog.h 2011-06-10 09:47:30 UTC (rev 193)
@@ -121,7 +121,7 @@
int ReadSessDisch(DOMNodeList* sessdischlist);
int ReadSess(DOMNodeList* sesslist);
int ImportSessionData();
- int ReadXMLImportFile(DOMDocument* doc);
+ int ReadXMLImportFile(xercesc::DOMDocument* doc);
int InsertXMLData();
int InsertCatchment();
int InsertSubstance();
Modified: trunk/Administration/MainWindow.cpp
===================================================================
--- trunk/Administration/MainWindow.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/MainWindow.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -853,7 +853,7 @@
{
#ifdef WIN32
// display help-file: Windows-specific!
- ShellExecute(0, "open", "administration.pdf", 0, 0, SW_SHOWNORMAL);
+ ShellExecute(0, _T("open"), _T("administration.pdf"), 0, 0, SW_SHOWNORMAL);
#endif
}
Modified: trunk/Administration/MessageDialog.cpp
===================================================================
--- trunk/Administration/MessageDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/MessageDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -120,7 +120,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/PanelEnvironment.cpp
===================================================================
--- trunk/Administration/PanelEnvironment.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/PanelEnvironment.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -310,12 +310,11 @@
// Strings must be passed as C-string to API
long envid = -1;
- char* isTempl;
- *isTempl = '%';
+ char isTempl = '%';
ClearEnvironmentGrid();
// get environment data from database
- if (!da_get_env(envid, *isTempl, &p_env, &errinfo))
+ if (!da_get_env(envid, isTempl, &p_env, &errinfo))
{
//Show error
((MainWindow*) GetGrandParent())->OnError("Reload failed", &errinfo);
Modified: trunk/Administration/PanelUser.cpp
===================================================================
--- trunk/Administration/PanelUser.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/PanelUser.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -298,7 +298,7 @@
p_u_const = activeUser.c_str();
//Check, that the user to be deleted is not the active logged in user
- if (userName.CompareTo(p_u_const) == 0)
+ if (strcmp(userName.mb_str(), p_u_const) == 0)
{
//Inform user, that this is not allowed
wxMessageBox("It is not possible to delete the current user", "Info",
Modified: trunk/Administration/ParatreeDialog.cpp
===================================================================
--- trunk/Administration/ParatreeDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/ParatreeDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -208,7 +208,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/PhraseDialog.cpp
===================================================================
--- trunk/Administration/PhraseDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/PhraseDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -157,7 +157,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/PwdDialog.cpp
===================================================================
--- trunk/Administration/PwdDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/PwdDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -98,7 +98,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/SessionDialog.cpp
===================================================================
--- trunk/Administration/SessionDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/SessionDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -151,7 +151,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/SubstanceDialog.cpp
===================================================================
--- trunk/Administration/SubstanceDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/SubstanceDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -151,7 +151,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/SubsttreeDialog.cpp
===================================================================
--- trunk/Administration/SubsttreeDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/SubsttreeDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -208,7 +208,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
Modified: trunk/Administration/UserDialog.cpp
===================================================================
--- trunk/Administration/UserDialog.cpp 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/UserDialog.cpp 2011-06-10 09:47:30 UTC (rev 193)
@@ -148,7 +148,7 @@
wxBoxSizer* sizer_level_1_v = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* sizer_level_2_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_level_3_v = new wxBoxSizer(wxVERTICAL);
- wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, 0);
+ wxFlexGridSizer* sizer_level_4_fg = new wxFlexGridSizer(3, wxSize(0,0));
wxBoxSizer* sizer_level_4_h = new wxBoxSizer(wxHORIZONTAL);
//Compose layout
@@ -504,4 +504,4 @@
//Display error message box
wxMessageBox(errMessage,
"Error", wxOK | wxICON_ERROR);
-}
\ No newline at end of file
+}
Modified: trunk/Administration/cmake/FindXercesC.cmake
===================================================================
--- trunk/Administration/cmake/FindXercesC.cmake 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/cmake/FindXercesC.cmake 2011-06-10 09:47:30 UTC (rev 193)
@@ -11,7 +11,7 @@
SET(XERCESC_FIND_QUIETLY TRUE)
ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
-OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
+OPTION(XERCESC_STATIC "Set to ON to link your project with static library (instead of DLL)." OFF)
IF (NOT ${XERCESC_WAS_STATIC} STREQUAL ${XERCESC_STATIC})
UNSET(XERCESC_LIBRARY CACHE)
Modified: trunk/Administration/wxcommon.h
===================================================================
--- trunk/Administration/wxcommon.h 2011-06-10 09:46:23 UTC (rev 192)
+++ trunk/Administration/wxcommon.h 2011-06-10 09:47:30 UTC (rev 193)
@@ -27,8 +27,6 @@
#include <wx/dialog.h>
#include <wx/stattext.h>
-#ifndef _MSC_VER
#include "wx/wx.h"
-#endif
#endif // __WXCOMMON_H__
More information about the Greater-commits
mailing list