projects / users / quan74 / pgadmin-import.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ffac98f)
bug fix & patch for gcc
authorU-E8400\Quan Zongliang <Quan Zongliang@e8400.(none)>
Sun, 3 Jan 2010 01:58:35 +0000 (09:58 +0800)
committerU-E8400\Quan Zongliang <Quan Zongliang@e8400.(none)>
Sun, 3 Jan 2010 01:58:35 +0000 (09:58 +0800)
pgadmin/ctl/module.mk patch | blob | blame | history
pgadmin/frm/frmImport.cpp patch | blob | blame | history
pgadmin/frm/module.mk patch | blob | blame | history
pgadmin/include/ctl/module.mk patch | blob | blame | history
pgadmin/include/frm/frmImport.h patch | blob | blame | history
pgadmin/include/frm/module.mk patch | blob | blame | history
pgadmin/include/utils/module.mk patch | blob | blame | history
pgadmin/include/utils/pgodbc.h patch | blob | blame | history
pgadmin/ui/frmImport.xrc [new file with mode: 0755] patch | blob
pgadmin/utils/module.mk patch | blob | blame | history
pgadmin/utils/pgodbc.cpp patch | blob | blame | history

diff --git a/pgadmin/ctl/module.mk b/pgadmin/ctl/module.mk
index d64fe9a6a473a11656dab48742d995c52a8245bb..ab20d70cac62b95314f3d036d66f51973dac52eb 100644 (file)
--- a/pgadmin/ctl/module.mk
+++ b/pgadmin/ctl/module.mk
@@ -13,6 +13,7 @@ pgadmin3_SOURCES += \
        $(srcdir)/ctl/calbox.cpp \
         $(srcdir)/ctl/ctlCheckTreeView.cpp \
         $(srcdir)/ctl/ctlComboBox.cpp \
+        $(srcdir)/ctl/ctlGrid.cpp \
         $(srcdir)/ctl/ctlListView.cpp \
         $(srcdir)/ctl/ctlMenuToolbar.cpp \
         $(srcdir)/ctl/ctlSQLBox.cpp \
diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index d03a61eb0951c9a1ab36973f3894540b736a3235..3aa9094121036df5b5062d082e833304ad202e85 100755 (executable)
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -14,7 +14,7 @@
 #define wzdSrcTypePage        CTRL_WIZARDPAGE("wzdSrcTypePage")\r
 #define wzdTextFilePage       CTRL_WIZARDPAGE("wzdTextFilePage")\r
 #define wzdArchFilePage       CTRL_WIZARDPAGE("wzdArchFilePage")\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 #define wzdSrcODBCPage        CTRL_WIZARDPAGE("wzdSrcODBCPage")\r
 #endif\r
 #define wzdSrcPgSQLPage       CTRL_WIZARDPAGE("wzdSrcPgSQLPage")\r
@@ -45,7 +45,7 @@
 #define btnArchFilePreviewMore     CTRL_BUTTON("btnArchFilePreviewMore")\r
 #define txtArchFileCont            CTRL_TEXT("txtArchFileCont")\r
 //wzdODBCPage\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 #define cbODBCDSNNames           CTRL_COMBOBOX("cbODBCDSNNames")\r
 #define btnODBCReset             CTRL_BUTTON("btnODBCReset")\r
 #define txtODBCUsername          CTRL_TEXT("txtODBCUsername")\r
@@ -143,7 +143,7 @@ BEGIN_EVENT_TABLE(frmImport, wxWizard)
     EVT_CHOICE(XRCID("chcArchEntryEncoding"),           frmImport::OnArchEntryEncoding)\r
     EVT_BUTTON(XRCID("btnArchFilePreviewMore"),         frmImport::OnArchFilePreviewMore)\r
     // ODBC page\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     //EVT_COMBOBOX(XRCID("cbODBCDSNNames"),               frmImport::OnODBCDSNNames)\r
     EVT_COMBOBOX(XRCID("cbODBCTableNames"),             frmImport::OnODBCTableNames)\r
     EVT_BUTTON(XRCID("btnODBCReset"),                   frmImport::OnODBCReset)\r
@@ -297,7 +297,7 @@ const wxString frmImport::IMPBOOLTRUEDISP = wxT("true"), frmImport::IMPBOOLFALSE
 const wxString frmImport::TRIMNONEDISP = _("None"), frmImport::TRIMALLDISP = _("All"), frmImport::TRIMLEFTDISP = _("Left"), frmImport::TRIMRIGHTDISP = _("Right");\r
 const wxString frmImport::ANSICTIMETZFMT = wxT("%H:%M:%S %Z"), frmImport::ANSICTIMESTAMPFMT = wxT("%Y-%m-%d %H:%M:%S"), frmImport::ANSICTIMESTAMPTZFMT = wxT("%Y-%m-%d %H:%M:%S %Z");\r
 const wxColour frmImport::YELLOW_COLOR = wxColour(255, 255, 0);\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 const wxString frmImport::BINDATADISP = _("<<Binary data>>"), frmImport::UNKNOWNTYPEDISP = _("<<Unknown type>>");\r
 const wxString frmImport::UNSUPTYPEDISP = _("<<Unsupported type>>"), frmImport::MOREDATADISP = _("...<<more>>");\r
 #endif\r
@@ -341,7 +341,7 @@ frmImport::~frmImport()
     if (m_boolfalsevals)\r
         delete m_boolfalsevals;\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     if (m_srcodbc)\r
         delete m_srcodbc;\r
 \r
@@ -425,7 +425,7 @@ void frmImport::Init()
     wzdTextFilePage->SetNext(wzdFileSettingPage);\r
     wzdArchFilePage->SetPrev(wzdSrcTypePage);\r
     wzdArchFilePage->SetNext(wzdFileSettingPage);\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     wzdSrcODBCPage->SetPrev(wzdSrcTypePage);\r
     wzdSrcODBCPage->SetNext(wzdColsSettingPage);\r
     m_srcodbc = NULL;\r
@@ -499,25 +499,13 @@ void frmImport::OnPageChanging(wxWizardEvent& ev)
 {\r
     bool isforward = ev.GetDirection();\r
 \r
-    if (m_procstatus!=IMPPREPARED)\r
-    {\r
-        wxButton* wzdctrlbtn = (wxButton*)FindWindowById(wxID_FORWARD);\r
-\r
-        if (isforward && m_curpagenr==DESTLOGPAGE)\r
-            wzdctrlbtn->Disable();\r
-        else\r
-            wzdctrlbtn->Enable();\r
-\r
-        return;\r
-    }\r
-\r
     if (isforward && !CheckWizardPage())\r
     {\r
         ev.Veto();\r
         return;\r
     }\r
 \r
-    wxButton* btnnxtpg;\r
+    wxButton* wzdctrlbtn;\r
     switch(m_curpagenr)\r
     {\r
     case TARGETPAGE:\r
@@ -538,7 +526,7 @@ void frmImport::OnPageChanging(wxWizardEvent& ev)
             m_datasrctype = ARCHFILEPAGE;\r
             m_curpagenr = ARCHFILEPAGE;\r
         }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (rdbSrcODBC->GetValue())\r
         {\r
             m_datasrctype = SRCODBCPAGE;\r
@@ -582,7 +570,7 @@ void frmImport::OnPageChanging(wxWizardEvent& ev)
                     m_srcfile = new pgCSVFile;\r
             }\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
             if (m_datasrctype!=SRCODBCPAGE && m_srcodbc)\r
             {\r
                 delete m_srcodbc;\r
@@ -697,7 +685,12 @@ void frmImport::OnPageChanging(wxWizardEvent& ev)
         if (isforward)\r
         {\r
             m_curpagenr = PROCESSPAGE;\r
-            InitWizardPage(PROCESSPAGE);\r
+\r
+            wzdctrlbtn = (wxButton*)FindWindowById(wxID_FORWARD);\r
+            if (m_procstatus==IMPSTOPED || m_procstatus==IMPFINISHED)\r
+                wzdctrlbtn->Enable();\r
+            else\r
+                wzdctrlbtn->Disable();\r
         }\r
         else\r
             m_curpagenr = COLSETTINGPAGE;\r
@@ -710,8 +703,8 @@ void frmImport::OnPageChanging(wxWizardEvent& ev)
         {\r
             m_curpagenr = DESTLOGPAGE;\r
 \r
-            btnnxtpg = (wxButton*)FindWindowById(wxID_FORWARD);\r
-            btnnxtpg->Enable();\r
+            wzdctrlbtn = (wxButton*)FindWindowById(wxID_FORWARD);\r
+            wzdctrlbtn->Enable();\r
         }\r
 \r
         break;\r
@@ -754,7 +747,7 @@ void frmImport::OnSourceType(wxCommandEvent &ev)
         wzdFileSettingPage->SetPrev(wzdArchFilePage);\r
         wzdColsSettingPage->SetPrev(wzdFileOptsPage);\r
     }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (rdbSrcODBC->GetValue())\r
     {\r
         wzdSrcTypePage->SetNext(wzdSrcODBCPage);\r
@@ -1033,7 +1026,7 @@ void frmImport::OnFilePreviewRows(wxSpinEvent &ev)
     GenCSVPreview();\r
 }\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 \r
 void frmImport::OnODBCReset(wxCommandEvent &ev)\r
 {\r
@@ -1441,6 +1434,8 @@ void frmImport::OnProcImpStop(wxCommandEvent &ev)
             else\r
                 m_procstatus = IMPSTOPING;\r
         }\r
+        else if (ev.GetEventType()==wxEVT_WIZARD_CANCEL)\r
+            ((wxWizardEvent*)&ev)->Veto();\r
     }\r
 }\r
 \r
@@ -1550,7 +1545,7 @@ void frmImport::ImportData()
                 return;\r
             }\r
         }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
         {\r
             if (m_srcodbc->ReexecPrevQuery())\r
@@ -1706,7 +1701,7 @@ void frmImport::ImportData()
         wzdSrcTypePage->Disable();\r
         wzdTextFilePage->Disable();\r
         wzdArchFilePage->Disable();\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         wzdSrcODBCPage->Disable();\r
 #endif\r
         wzdSrcPgSQLPage->Disable();\r
@@ -1815,7 +1810,7 @@ void frmImport::ImportData()
     int commitevery = spinCommitEvery->GetValue();\r
     int stoponerror = spinStopOnError->GetValue();\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     SQLSMALLINT stmtcolsnum;\r
     SQLSMALLINT *odbccoltypes;\r
 \r
@@ -1953,7 +1948,7 @@ void frmImport::ImportData()
                 continue;\r
             }\r
         }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
         {\r
             odbcsqlrc = m_srcodbc->NextResultRow();\r
@@ -2092,7 +2087,7 @@ void frmImport::ImportData()
 \r
         if (m_datasrctype==TEXTFILEPAGE || m_datasrctype==ARCHFILEPAGE)\r
             rowdataok = GenCSVSQLData(impdatalist, rowlog, linevals, valsnum, clienttime, impmode, fmtstyle);\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
             rowdataok = GenODBCSQLData(impdatalist, rowlog, odbcrowdata, clienttime, impmode);\r
 #endif\r
@@ -2225,7 +2220,9 @@ void frmImport::ImportData()
                 else if (impdest!=IMPDESTFILE && m_improwsnum)\r
                 {\r
                     insstmt.Empty();\r
-                    _itow(m_improwsnum-1, imptranssn, 10);\r
+                    //_itow(m_improwsnum-1, imptranssn, 10);\r
+                    swprintf(imptranssn, 32, wxT("%d"), m_improwsnum-1);\r
+\r
                     if (m_impconn->GetAsyncResult())\r
                     {\r
                         if (loginfo)\r
@@ -2351,7 +2348,8 @@ void frmImport::ImportData()
                 }\r
                 else\r
                 {\r
-                    _itow(m_improwsnum, imptranssn, 10);\r
+                    //_itow(m_improwsnum, imptranssn, 10);\r
+                    swprintf(imptranssn, 32, wxT("%d"), m_improwsnum);\r
 \r
                     insstmt.Empty();\r
                     insstmt.Append(wxT("SAVEPOINT ")).Append(m_imptransname).Append(imptranssn).Append(wxT(';'));\r
@@ -2518,7 +2516,7 @@ void frmImport::ImportData()
                     stxtRemainingTime->SetLabel(wxTimeSpan::Milliseconds(elapsedspan.GetMilliseconds().ToLong()*((m_srcsize-m_srcfile->Tell())/m_srcfile->Tell())).Format(wxT("%H:%M:%S.%l")));\r
                 }\r
             }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
             else if (m_datasrctype==SRCODBCPAGE)\r
             {\r
                 if (m_srcsize==-1)\r
@@ -2540,7 +2538,7 @@ void frmImport::ImportData()
                 txtLogMessages->Thaw();\r
             }\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         if (m_datasrctype==SRCODBCPAGE)\r
             for (odbccolidx=0; odbccolidx<stmtcolsnum; odbccolidx++)\r
                 if (odbcrowdata[odbccolidx])\r
@@ -2589,7 +2587,9 @@ void frmImport::ImportData()
             else if (impmode==IMPORTMODEINSERT)\r
             {\r
                 insstmt.Empty();\r
-                _itow(m_improwsnum-1, imptranssn, 10);\r
+                //_itow(m_improwsnum-1, imptranssn, 10);\r
+                swprintf(imptranssn, 32, wxT("%d"), m_improwsnum-1);\r
+\r
                 if (m_impconn->GetAsyncResult())\r
                 {\r
                     if (loginfo)\r
@@ -2687,7 +2687,7 @@ void frmImport::ImportData()
             btnImpStop->Enable();\r
             btnImpStart->SetLabel(_("&Resume"));\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
             if (m_datasrctype==SRCODBCPAGE)\r
                 delete[] odbcrowdata;\r
 #endif\r
@@ -2734,7 +2734,7 @@ void frmImport::ImportData()
         }\r
     }\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     if (m_datasrctype==SRCODBCPAGE)\r
     {\r
         for (odbccolidx=0; odbccolidx<stmtcolsnum; odbccolidx++)\r
@@ -2811,7 +2811,9 @@ void frmImport::ImportData()
             if (impdest!=IMPDESTFILE)\r
             {\r
                 insstmt.Empty();\r
-                _itow(m_improwsnum-1, imptranssn, 10);\r
+                //_itow(m_improwsnum-1, imptranssn, 10);\r
+                swprintf(imptranssn, 32, wxT("%d"), m_improwsnum-1);\r
+\r
                 if (m_impconn->GetAsyncResult())\r
                 {\r
                     if (loginfo)\r
@@ -3069,7 +3071,7 @@ bool frmImport::CheckWizardPage()
     case SRCPGSQLPAGE:\r
         isvalid = false;\r
         break;\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     case SRCODBCPAGE:\r
         isvalid = false;\r
 \r
@@ -3375,7 +3377,7 @@ void frmImport::GenColsPreview()
     {\r
         pvrowsnum = 0;\r
     }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (m_datasrctype==SRCODBCPAGE)\r
     {\r
         pvrowsnum = gridODBCPreview->GetNumberRows();\r
@@ -3492,7 +3494,7 @@ void frmImport::GenColsPreview()
     if (m_datasrctype==SRCPGSQLPAGE)\r
     {\r
     }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (m_datasrctype==SRCODBCPAGE)\r
     {\r
         if (!m_srcodbc->ReexecPrevQuery())\r
@@ -3619,7 +3621,9 @@ void frmImport::GenColsPreview()
                     if (testimp && normtrans && pvgridrowidx)\r
                     {\r
                         insstmt.Empty();\r
-                        _itow(pvgridrowidx-1, tmpspsn, 10);\r
+                        //_itow(pvgridrowidx-1, tmpspsn, 10);\r
+                        swprintf(tmpspsn, 32, wxT("%d"), pvgridrowidx-1);\r
+\r
                         if (m_impconn->GetAsyncResult())\r
                         {\r
                             txtColsImpLog->AppendText(_("Succeeded."));\r
@@ -3647,7 +3651,8 @@ void frmImport::GenColsPreview()
 \r
                     if (testimp && normtrans)\r
                     {\r
-                        _itow(pvgridrowidx, tmpspsn, 10);\r
+                        //_itow(pvgridrowidx, tmpspsn, 10);\r
+                        swprintf(tmpspsn, 32, wxT("%d"), pvgridrowidx);\r
 \r
                         insstmt.Empty();\r
                         insstmt.Append(wxT("SAVEPOINT ")).Append(tmpspname).Append(tmpspsn).Append(wxT(';'));\r
@@ -3854,7 +3859,9 @@ void frmImport::GenColsPreview()
                     if (testimp && normtrans && pvgridrowidx)\r
                     {\r
                         insstmt.Empty();\r
-                        _itow(pvgridrowidx-1, tmpspsn, 10);\r
+                        //_itow(pvgridrowidx-1, tmpspsn, 10);\r
+                        swprintf(tmpspsn, 32, wxT("%d"), pvgridrowidx-1);\r
+\r
                         if (m_impconn->GetAsyncResult())\r
                         {\r
                             txtColsImpLog->AppendText(_("Succeeded."));\r
@@ -3879,7 +3886,8 @@ void frmImport::GenColsPreview()
 \r
                     if (testimp && normtrans)\r
                     {\r
-                        _itow(pvgridrowidx, tmpspsn, 10);\r
+                        //_itow(pvgridrowidx, tmpspsn, 10);\r
+                        swprintf(tmpspsn, 32, wxT("%d"), pvgridrowidx);\r
 \r
                         insstmt.Empty();\r
                         insstmt.Append(wxT("SAVEPOINT ")).Append(tmpspname).Append(tmpspsn).Append(wxT(';'));\r
@@ -4053,7 +4061,9 @@ void frmImport::GenColsPreview()
     else if (testimp && normtrans && pvgridrowidx && impmode==IMPORTMODEINSERT)\r
     {\r
         insstmt.Empty();\r
-        _itow(pvgridrowidx-1, tmpspsn, 10);\r
+        //_itow(pvgridrowidx-1, tmpspsn, 10);\r
+        swprintf(tmpspsn, 32, wxT("%d"), pvgridrowidx-1);\r
+\r
         if (m_impconn->GetAsyncResult())\r
         {\r
             txtColsImpLog->AppendText(_("Succeeded."));\r
@@ -4543,7 +4553,7 @@ bool frmImport::GenCSVSQLData(wxString& rowdatalist, wxString& rowlog, wxString*
     return !haserror;\r
 }\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 bool frmImport::GenODBCSQLData(wxString& rowvals, wxString& rowlog, SQLWCHAR** odbcdata,\r
                             wxDateTime& clienttime, const int impmode)\r
 {\r
@@ -4858,12 +4868,11 @@ bool frmImport::GenODBCSQLData(wxString& rowvals, wxString& rowlog, SQLWCHAR** o
 \r
 void frmImport::InitWizardPage(WizardPageNumber pagenr)\r
 {\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     const SQLWCHAR **infonames;\r
     wxString **odbcstmt;\r
 #endif\r
 \r
-    wxButton* btnnxtpg;\r
     size_t encidx;\r
 \r
     switch(pagenr)\r
@@ -4901,7 +4910,7 @@ void frmImport::InitWizardPage(WizardPageNumber pagenr)
 \r
         m_archfilepginit = true;\r
         break;\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     case SRCODBCPAGE:\r
         if (m_srcodbcpginit)\r
             break;\r
@@ -4978,15 +4987,7 @@ void frmImport::InitWizardPage(WizardPageNumber pagenr)
 \r
         m_fileoptspginit = true;\r
         break;\r
-    case PROCESSPAGE:\r
-        if (m_procstatus==IMPPREPARED)\r
-        {\r
-            btnnxtpg = (wxButton*)FindWindowById(wxID_FORWARD);\r
-            btnnxtpg->Disable();\r
-            btnImpStop->Disable();\r
-            //lstLogMessages->AddColumn(wxEmptyString, wxLIST_AUTOSIZE);\r
-        }\r
-\r
+    default:\r
         break;\r
     }\r
 \r
@@ -4994,9 +4995,8 @@ void frmImport::InitWizardPage(WizardPageNumber pagenr)
 \r
 void frmImport::ResetWizardPage(WizardPageNumber pagenr)\r
 {\r
-    //int encidx;\r
-    //const wxChar** encdesc;\r
     size_t entriesnum, entriesnr;\r
+    int impmode, impdest;\r
 \r
     switch(pagenr)\r
     {\r
@@ -5061,7 +5061,7 @@ void frmImport::ResetWizardPage(WizardPageNumber pagenr)
         GenCSVPreview();\r
 \r
         break;\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     case SRCODBCPAGE:\r
         ClearODBCPreview();\r
         FetchODBCDSNList();\r
@@ -5099,8 +5099,7 @@ void frmImport::ResetWizardPage(WizardPageNumber pagenr)
 \r
         break;\r
     case DESTLOGPAGE:\r
-        int impmode = (int)chcImportMode->GetClientData(chcImportMode->GetSelection());\r
-        int impdest;\r
+        impmode = (int)chcImportMode->GetClientData(chcImportMode->GetSelection());\r
         if (chcImpDest->GetCount())\r
             impdest = (int)chcImpDest->GetClientData(chcImpDest->GetSelection());\r
         else\r
@@ -5177,6 +5176,8 @@ void frmImport::ResetWizardPage(WizardPageNumber pagenr)
         else\r
             spinCommitEvery->Enable();\r
 \r
+        break;\r
+    default:\r
         break;\r
     }\r
 }\r
@@ -5323,7 +5324,7 @@ void frmImport::InitColSettingPage()
         gridColSetting->AppendCols(SRCDBOPTCOLSCT);\r
         gridColSetting->SetColLabelValue(SRCCOLNAMENUM, _("Source column"));\r
     }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (m_datasrctype==SRCODBCPAGE)\r
     {\r
         gridColSetting->AppendCols(ODBCOPTCOLSCT);\r
@@ -5354,7 +5355,7 @@ void frmImport::InitColSettingPage()
         if (m_datasrctype==SRCPGSQLPAGE)\r
         {\r
         }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
         {\r
         }\r
@@ -5404,7 +5405,7 @@ void frmImport::ResetColSettingPage()
             || (m_origsrctype==TEXTFILEPAGE && m_datasrctype==ARCHFILEPAGE));\r
     else if (m_origsrctype==SRCPGSQLPAGE)\r
     {\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         if (m_datasrctype==SRCODBCPAGE)\r
         {\r
         }\r
@@ -5413,7 +5414,7 @@ void frmImport::ResetColSettingPage()
         {\r
         }\r
     }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (m_origsrctype==SRCODBCPAGE)\r
     {\r
         if (m_datasrctype==SRCPGSQLPAGE)\r
@@ -5432,7 +5433,7 @@ void frmImport::ResetColSettingPage()
 #endif\r
     else// import from file\r
     {\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         if (m_datasrctype==SRCODBCPAGE)\r
         {\r
             //gridColSetting->DeleteCols(FILEFMTCOLNUM);\r
@@ -5442,8 +5443,8 @@ void frmImport::ResetColSettingPage()
             gridColSetting->SetColLabelValue(ODBCONEMPTYCOLNUM, _("On NULL/empty/unset"));\r
             gridColSetting->SetColLabelValue(ODBCEXPCOLNUM, _("Expression/Constant"));\r
         }\r
-#endif\r
         else// import from pgsql\r
+#endif\r
         {\r
         }\r
     }\r
@@ -5474,7 +5475,7 @@ void frmImport::ResetColSettingSrcColEditor(bool resetsrccol)
     if (m_datasrctype==SRCPGSQLPAGE)\r
     {\r
     }\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (m_datasrctype==SRCODBCPAGE)\r
     {\r
         SQLSMALLINT stmtcolsnum = m_srcodbc->GetResultColsNum();\r
@@ -5885,7 +5886,7 @@ void frmImport::ResetColSettingFmtColEditor()
     int fmtcolnr;\r
     if (m_datasrctype==SRCPGSQLPAGE)\r
         return;\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     else if (m_datasrctype==SRCODBCPAGE)\r
         fmtcolnr = ODBCFMTCOLNUM;\r
 #endif\r
@@ -6137,7 +6138,7 @@ void frmImport::ParseColsImpSetting(int dbcolnr)
             m_coltrimmode = new int[m_tgtcolsnum];\r
 \r
         if (m_datasrctype==SRCPGSQLPAGE);\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
         {\r
             m_srcrefnum = new short[m_srcodbc->GetResultColsNum()];\r
@@ -6196,7 +6197,7 @@ void frmImport::ParseColsImpSetting(int dbcolnr)
     int wrncnt=0;\r
     int origsrccolnr;\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     SQLSMALLINT stmtcolsnum, *stmttypes;\r
     SQLWCHAR** stmtlabels;\r
     if (m_datasrctype==SRCODBCPAGE)\r
@@ -6235,11 +6236,11 @@ void frmImport::ParseColsImpSetting(int dbcolnr)
             continue;\r
         }\r
 \r
-        gridColSetting->SetCellBackgroundColour(dbcolidx, m_datasrctype==SRCODBCPAGE?ODBCEXPCOLNUM:FILEEXPCOLNUM, *wxWHITE);\r
-\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         if (m_datasrctype==SRCODBCPAGE)\r
         {\r
+            gridColSetting->SetCellBackgroundColour(dbcolidx, m_datasrctype==SRCODBCPAGE?ODBCEXPCOLNUM:FILEEXPCOLNUM, *wxWHITE);\r
+\r
             tgtcoltype = (*(m_tgtcolstypes+dbcolidx))->Name();\r
             srccolname = gridColSetting->GetCellValue(dbcolidx, SRCCOLNAMENUM);\r
 \r
@@ -6296,6 +6297,8 @@ void frmImport::ParseColsImpSetting(int dbcolnr)
         else\r
 #endif\r
         {\r
+            gridColSetting->SetCellBackgroundColour(dbcolidx, m_datasrctype==TEXTFILEPAGE?FILEEXPCOLNUM:FILEEXPCOLNUM, *wxWHITE);\r
+\r
             tgtcoltype = (*(m_tgtcolstypes+dbcolidx))->Name();\r
             srccolname = gridColSetting->GetCellValue(dbcolidx, SRCCOLNAMENUM);\r
 \r
@@ -6391,7 +6394,7 @@ void frmImport::ParseColsImpSetting(int dbcolnr)
 \r
         if (m_colsrccolnr[dbcolidx]==wxNOT_FOUND)\r
             SetGridCellReadOnly(gridColSetting, dbcolidx, fmtcolnr);\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
         else if (m_datasrctype==SRCODBCPAGE)\r
         {\r
             if (formatstyle==FORMATSTYLERFC || formatstyle==FORMATSTYLEISO ||\r
@@ -6813,7 +6816,7 @@ frmImport::exprSnippet *frmImport::ParseImportExpr(const wxString& origexpr)
     int dataidx = 0, defidx;\r
 \r
     size_t srccolnum;\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     if (m_datasrctype==SRCODBCPAGE)\r
         srccolnum = m_srcodbc->GetResultColsNum();\r
     else\r
@@ -6882,7 +6885,7 @@ frmImport::exprSnippet *frmImport::ParseImportExpr(const wxString& origexpr)
                     }\r
                     else\r
                     {\r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
                         if (m_datasrctype==SRCODBCPAGE)\r
                         {\r
                             colpos = m_srcodbc->GetResultColNr((SQLWCHAR *)colname.wc_str());\r
@@ -7070,7 +7073,7 @@ bool frmImport::ValidatePgExp(const wxString& pgexp, const wxString& exptype, wx
     return isvalid;\r
 }\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 void frmImport::FetchODBCDSNList()\r
 {\r
     cbODBCDSNNames->Clear();\r
diff --git a/pgadmin/frm/module.mk b/pgadmin/frm/module.mk
index 75c2798166c41abd085215b720637667edd508c3..160ae274e64b7575373f1d4ed029a7776fcd73c7 100644 (file)
--- a/pgadmin/frm/module.mk
+++ b/pgadmin/frm/module.mk
@@ -21,6 +21,7 @@ pgadmin3_SOURCES += \
        $(srcdir)/frm/frmGrantWizard.cpp \
        $(srcdir)/frm/frmHbaConfig.cpp \
        $(srcdir)/frm/frmHint.cpp \
+       $(srcdir)/frm/frmImport.cpp \
        $(srcdir)/frm/frmMain.cpp \
        $(srcdir)/frm/frmMainConfig.cpp \
        $(srcdir)/frm/frmMaintenance.cpp \
diff --git a/pgadmin/include/ctl/module.mk b/pgadmin/include/ctl/module.mk
index 755c09c7e4d9458aef30502a010a7257f38e2f43..37a3247fdd18eec4a148365d28f6f2639d782adb 100644 (file)
--- a/pgadmin/include/ctl/module.mk
+++ b/pgadmin/include/ctl/module.mk
@@ -13,6 +13,7 @@ pgadmin3_SOURCES += \
     $(srcdir)/include/ctl/calbox.h \
        $(srcdir)/include/ctl/ctlCheckTreeView.h \
        $(srcdir)/include/ctl/ctlComboBox.h \
+       $(srcdir)/include/ctl/ctlGrid.h \
        $(srcdir)/include/ctl/ctlListView.h \
        $(srcdir)/include/ctl/ctlMenuToolbar.h \
        $(srcdir)/include/ctl/ctlSecurityPanel.h \
diff --git a/pgadmin/include/frm/frmImport.h b/pgadmin/include/frm/frmImport.h
index 72bac52e07408f95253ed739cc7a303866a752cc..076fcfc47b7750ea3c3aa5965cce0d5061f5b81e 100755 (executable)
--- a/pgadmin/include/frm/frmImport.h
+++ b/pgadmin/include/frm/frmImport.h
@@ -2,8 +2,6 @@
 // for applied a free license of DialogBlocks to design wxWizard UI.\r
 // http://www.anthemion.co.uk/   http://www.dialogblocks.com/\r
 \r
-// To enable import from ODBC, the wxWidgets must be compiled with --with-odbc\r
-\r
 #ifndef FRMIMPORT_H\r
 #define FRMIMPORT_H\r
 \r
@@ -14,13 +12,10 @@
 #include "utils/pgcsvfile.h"\r
 #include "schema/pgDatatype.h"\r
 \r
-#ifdef __WITHODBC3__ // for ODBC\r
-#include <sqlext.h>\r
-#include <mbstring.h>\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 #include "utils/pgodbc.h"\r
 #endif\r
 \r
-\r
 #include <wx/archive.h>\r
 #include <wx/wfstream.h>\r
 #include <wx/zstream.h>\r
@@ -57,7 +52,7 @@ public:
 \r
     static const wxColour YELLOW_COLOR;\r
 \r
-#ifdef __WITHODBC3__\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     static const short IMPSQLNAMELEN = 256;\r
     static const short IMPDATABUFFLEN = 1024;\r
     static const wxString BINDATADISP, UNKNOWNTYPEDISP, UNSUPTYPEDISP, MOREDATADISP;\r
@@ -119,7 +114,7 @@ private:
     //void OnFilePathFixedWidth(wxFocusEvent &ev);\r
 \r
     //wzdODBCPage\r
-#ifdef __WITHODBC3__\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     //void OnODBCDSNNames(wxCommandEvent &ev);\r
     void OnODBCReset(wxCommandEvent &ev);\r
     void OnODBCConnect(wxCommandEvent &ev);\r
@@ -185,7 +180,7 @@ private:
 \r
     void ImportData();\r
     void ImportFileData();\r
-#ifdef __WITHODBC3__\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     void ImportODBCData();\r
 #endif\r
     bool ImportRow(wxString& impdatalist, const int impmode, const int impdest,\r
@@ -193,7 +188,7 @@ private:
                 bool logerror, bool logwarn, bool logstmt, bool loginfo, bool logproc,\r
                 const int commitevery, wxString& insstmt);\r
 \r
-#ifdef __WITHODBC3__ // for ODBC3\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     void FetchODBCDSNList();\r
     void FetchODBCInfo();\r
     void GenODBCSelectStmt(const SQLWCHAR*** colsinfo);\r
@@ -247,7 +242,7 @@ private:
     bool *m_colsettingiserr;\r
     wxString m_colsettingmsg;\r
 \r
-#ifdef __WITHODBC3__ // for ODBC\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
     pgODBC *m_srcodbc;\r
     bool m_srcodbcisok;\r
     SQLUSMALLINT m_dsnmaxcatnamelen, m_dsnmaxschemnamelen, m_dsnmaxtablenamelen, m_dsnmaxcolnamelen;\r
diff --git a/pgadmin/include/frm/module.mk b/pgadmin/include/frm/module.mk
index 750e8fbaff64442abb00061914660421d079f7b2..27c58cc9baef272c40b1a78145a3f6255be2dead 100644 (file)
--- a/pgadmin/include/frm/module.mk
+++ b/pgadmin/include/frm/module.mk
@@ -20,6 +20,7 @@ pgadmin3_SOURCES += \
        $(srcdir)/include/frm/frmGrantWizard.h \\r
        $(srcdir)/include/frm/frmHbaConfig.h \\r
        $(srcdir)/include/frm/frmHint.h \\r
+       $(srcdir)/include/frm/frmImport.h \\r
        $(srcdir)/include/frm/frmMain.h \\r
        $(srcdir)/include/frm/frmMainConfig.h \\r
        $(srcdir)/include/frm/frmMaintenance.h \\r
diff --git a/pgadmin/include/utils/module.mk b/pgadmin/include/utils/module.mk
index a811bc283c5a9fad9f5e72e151336aafff75a366..2e43244c7592f391534569a9f73188e53e729530 100644 (file)
--- a/pgadmin/include/utils/module.mk
+++ b/pgadmin/include/utils/module.mk
@@ -18,6 +18,8 @@ pgadmin3_SOURCES += \
        $(srcdir)/include/utils/pgfeatures.h \
        $(srcdir)/include/utils/pgDefs.h \
        $(srcdir)/include/utils/pgconfig.h \
+       $(srcdir)/include/utils/pgcsvfile.h \
+       $(srcdir)/include/utils/pgodbc.h \
        $(srcdir)/include/utils/sysLogger.h \
        $(srcdir)/include/utils/sysProcess.h \
        $(srcdir)/include/utils/sysSettings.h \
diff --git a/pgadmin/include/utils/pgodbc.h b/pgadmin/include/utils/pgodbc.h
index edc50f9a1a633764929161a0a6cebbac2847ebba..9762ce950ef562d1437dcc29d6d5b2b3e57a0149 100755 (executable)
--- a/pgadmin/include/utils/pgodbc.h
+++ b/pgadmin/include/utils/pgodbc.h
@@ -1,12 +1,11 @@
 #ifndef PGODBC_H\r
 #define PGODBC_H\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 \r
 #if defined(__WXMSW__)\r
 #include <sql.h>\r
 #include <sqlext.h>\r
-#include <mbstring.h>\r
 #elif defined(__WITHIODBC__)\r
 #define BOOL int\r
 #include <sql.h>\r
diff --git a/pgadmin/ui/frmImport.xrc b/pgadmin/ui/frmImport.xrc
new file mode 100755 (executable)
index 0000000..0b4a349
--- /dev/null
+++ b/pgadmin/ui/frmImport.xrc
@@ -0,0 +1,2467 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\r
+<resource>\r
+    <object class="wxWizard" name="frmImport">\r
+        <style>wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX|wxMAXIMIZE_BOX</style>\r
+        <title>Import</title>\r
+        <object class="wxWizardPageSimple" name="wzdTargetPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>2</rows>\r
+                <cols>2</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols></growablecols>\r
+                <growablerows></growablerows>\r
+                <object class="sizeritem">\r
+                    <option>0</option>\r
+                    <flag>wxALL</flag>\r
+                    <border>5</border>\r
+                    <object class="wxStaticText" name="m_staticText19">\r
+                        <label>Target</label>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdSrcTypePage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>3</rows>\r
+                <cols>1</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols></growablecols>\r
+                <growablerows></growablerows>\r
+                <object class="sizeritem">\r
+                    <option>0</option>\r
+                    <flag>wxALL</flag>\r
+                    <border>5</border>\r
+                    <object class="wxStaticText" name="m_staticText412">\r
+                        <label>Choose a datasource</label>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>4</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>20,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxRadioButton" name="rdbSrcTextFile">\r
+                                <style>wxRB_GROUP</style>\r
+                                <label>Text file</label>\r
+                                <value>0</value>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxRadioButton" name="rdbSrcArchFile">\r
+                                <label>Archive file</label>\r
+                                <value>0</value>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxRadioButton" name="rdbSrcODBC">\r
+                                <label>ODBC</label>\r
+                                <value>0</value>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxRadioButton" name="rdbSrcPgSQL">\r
+                                <label>PostgreSQL</label>\r
+                                <value>0</value>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdTextFilePage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>5</rows>\r
+                <cols>1</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols>0</growablecols>\r
+                <growablerows>4</growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText4">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Input File</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline1">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND|wxLEFT</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>4</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>2</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>20,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText1">\r
+                                <label>File</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtTextFilePath">\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxButton" name="btnTextFileBrowse">\r
+                                <label>Browse</label>\r
+                                <default>0</default>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText2">\r
+                                <label>Encoding</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxChoice" name="chcTextFileEncoding">\r
+                                <selection>0</selection>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText432">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Preview</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxEXPAND|wxALL</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline131">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>0</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>20,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxButton" name="btnTextFilePreviewMore">\r
+                                <label>More</label>\r
+                                <default>0</default>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>1</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>0</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtTextFileCont">\r
+                                <style>wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL</style>\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdArchFilePage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+                <object class="wxFlexGridSizer">\r
+                    <rows>5</rows>\r
+                    <cols>1</cols>\r
+                    <vgap>0</vgap>\r
+                    <hgap>0</hgap>\r
+                    <growablecols>0</growablecols>\r
+                    <growablerows>4</growablerows>\r
+                    <object class="sizeritem">\r
+                        <option>1</option>\r
+                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>\r
+                        <border>5</border>\r
+                        <object class="wxFlexGridSizer">\r
+                            <rows>1</rows>\r
+                            <cols>2</cols>\r
+                            <vgap>0</vgap>\r
+                            <hgap>0</hgap>\r
+                            <growablecols>1</growablecols>\r
+                            <growablerows>0</growablerows>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxStaticText" name="m_staticText46">\r
+                                    <font>\r
+                                        <family>default</family>\r
+                                        <style>normal</style>\r
+                                        <weight>bold</weight>\r
+                                        <underlined>0</underlined>\r
+                                    </font>\r
+                                    <label>Input File</label>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>\r
+                                <border>12</border>\r
+                                <object class="wxStaticLine" name="m_staticline15">\r
+                                    <style>wxLI_HORIZONTAL</style>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                    <object class="sizeritem">\r
+                        <option>1</option>\r
+                        <flag>wxEXPAND|wxLEFT</flag>\r
+                        <border>5</border>\r
+                        <object class="wxFlexGridSizer">\r
+                            <rows>2</rows>\r
+                            <cols>4</cols>\r
+                            <vgap>0</vgap>\r
+                            <hgap>0</hgap>\r
+                            <growablecols>2</growablecols>\r
+                            <growablerows>0</growablerows>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>20,0</size>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxStaticText" name="m_staticline6">\r
+                                    <label>Archive file</label>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL|wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <object class="wxTextCtrl" name="txtArchFilePath">\r
+                                    <value></value>\r
+                                    <maxlength>0</maxlength>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxButton" name="btnArchFileBrowse">\r
+                                    <label>Browse</label>\r
+                                    <default>0</default>\r
+                                </object>\r
+                            </object>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>0,0</size>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxStaticText" name="m_staticline7">\r
+                                    <label>Archive encoding</label>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxChoice" name="chcArchFileEncoding">\r
+                                    <selection>0</selection>\r
+                                    <content />\r
+                                </object>\r
+                            </object>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>0,0</size>\r
+                            </object>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>0,0</size>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxStaticText" name="m_staticText64">\r
+                                    <label>Archive entry</label>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL|wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <object class="wxChoice" name="chcArchEntryName">\r
+                                    <selection>0</selection>\r
+                                    <content />\r
+                                </object>\r
+                            </object>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>0,0</size>\r
+                            </object>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>0,0</size>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxStaticText" name="m_staticText651">\r
+                                    <label>Entry encoding</label>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxChoice" name="chcArchEntryEncoding">\r
+                                    <selection>0</selection>\r
+                                    <content />\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                    <object class="sizeritem">\r
+                        <option>1</option>\r
+                        <flag>wxEXPAND</flag>\r
+                        <border>5</border>\r
+                        <object class="wxFlexGridSizer">\r
+                            <rows>2</rows>\r
+                            <cols>2</cols>\r
+                            <vgap>0</vgap>\r
+                            <hgap>0</hgap>\r
+                            <growablecols>1</growablecols>\r
+                            <growablerows>0</growablerows>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxStaticText" name="m_staticText4321">\r
+                                    <font>\r
+                                        <family>default</family>\r
+                                        <style>normal</style>\r
+                                        <weight>bold</weight>\r
+                                        <underlined>0</underlined>\r
+                                    </font>\r
+                                    <label>Preview</label>\r
+                                </object>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxEXPAND|wxALL</flag>\r
+                                <border>12</border>\r
+                                <object class="wxStaticLine" name="m_staticline1311">\r
+                                    <style>wxLI_HORIZONTAL</style>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                    <object class="sizeritem">\r
+                        <option>1</option>\r
+                        <flag>wxEXPAND</flag>\r
+                        <border>5</border>\r
+                        <object class="wxFlexGridSizer">\r
+                            <rows>1</rows>\r
+                            <cols>2</cols>\r
+                            <vgap>0</vgap>\r
+                            <hgap>0</hgap>\r
+                            <growablecols>0</growablecols>\r
+                            <growablerows>0</growablerows>\r
+                            <object class="spacer">\r
+                                <option>1</option>\r
+                                <flag>wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <size>20,0</size>\r
+                            </object>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL</flag>\r
+                                <border>5</border>\r
+                                <object class="wxButton" name="btnArchFilePreviewMore">\r
+                                    <label>More</label>\r
+                                    <default>0</default>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                    <object class="sizeritem">\r
+                        <option>1</option>\r
+                        <flag>wxEXPAND</flag>\r
+                        <border>5</border>\r
+                        <object class="wxFlexGridSizer">\r
+                            <rows>1</rows>\r
+                            <cols>1</cols>\r
+                            <vgap>0</vgap>\r
+                            <hgap>0</hgap>\r
+                            <growablecols>0</growablecols>\r
+                            <growablerows>0</growablerows>\r
+                            <object class="sizeritem">\r
+                                <option>0</option>\r
+                                <flag>wxALL|wxEXPAND</flag>\r
+                                <border>5</border>\r
+                                <object class="wxTextCtrl" name="txtArchFileCont">\r
+                                    <style>wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL</style>\r
+                                    <value></value>\r
+                                    <maxlength>0</maxlength>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdSrcODBCPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>4</rows>\r
+                <cols>1</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols>0</growablecols>\r
+                <growablerows>2</growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>5</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>3</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText22">\r
+                                <label>DSN name</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>2</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>0</growablecols>\r
+                                <growablerows>0</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL|wxFIXED_MINSIZE</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxComboBox" name="cbODBCDSNNames">\r
+                                        <style>wxCB_READONLY</style>\r
+                                        <value></value>\r
+                                        <content />\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxButton" name="btnODBCReset">\r
+                                        <label>Reset</label>\r
+                                        <default>0</default>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText40">\r
+                                <label>User name</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtODBCUsername">\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText413">\r
+                                <label>Password</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>3</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>0</growablecols>\r
+                                <growablerows>0</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxTextCtrl" name="txtODBCPassword">\r
+                                        <style>wxTE_PASSWORD</style>\r
+                                        <value></value>\r
+                                        <maxlength>0</maxlength>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxButton" name="btnODBCConnect">\r
+                                        <label>Connect</label>\r
+                                        <default>0</default>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText45">\r
+                                <label>Tables</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxComboBox" name="cbODBCTableNames">\r
+                                <value>Combo!</value>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText641">\r
+                                <label>Customized SQL</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxCheckBox" name="chkODBCCustomizedSQL">\r
+                                <label></label>\r
+                                <checked>0</checked>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>1</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>0</growablecols>\r
+                        <growablerows>1</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND | wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxNotebook" name="m_notebook41">\r
+                                <object class="notebookpage">\r
+                                    <label>SQL Statement</label>\r
+                                    <selected>1</selected>\r
+                                    <object class="wxPanel" name="m_panel18">\r
+                                        <style>wxTAB_TRAVERSAL</style>\r
+                                        <object class="wxFlexGridSizer">\r
+                                            <rows>1</rows>\r
+                                            <cols>1</cols>\r
+                                            <vgap>0</vgap>\r
+                                            <hgap>0</hgap>\r
+                                            <growablecols>0</growablecols>\r
+                                            <growablerows>0</growablerows>\r
+                                            <object class="sizeritem">\r
+                                                <option>0</option>\r
+                                                <flag>wxALL|wxEXPAND</flag>\r
+                                                <border>5</border>\r
+                                                <object class="wxTextCtrl" name="txtODBCSQLStmt">\r
+                                                    <style>wxTE_MULTILINE|wxTE_READONLY</style>\r
+                                                    <size>-1,80</size>\r
+                                                    <value></value>\r
+                                                    <maxlength>0</maxlength>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="notebookpage">\r
+                                    <label>Where clause</label>\r
+                                    <selected>0</selected>\r
+                                    <object class="wxPanel" name="m_panel17">\r
+                                        <style>wxTAB_TRAVERSAL</style>\r
+                                        <object class="wxFlexGridSizer">\r
+                                            <rows>1</rows>\r
+                                            <cols>1</cols>\r
+                                            <vgap>0</vgap>\r
+                                            <hgap>0</hgap>\r
+                                            <growablecols>0</growablecols>\r
+                                            <growablerows>0</growablerows>\r
+                                            <object class="sizeritem">\r
+                                                <option>0</option>\r
+                                                <flag>wxALL|wxEXPAND</flag>\r
+                                                <border>5</border>\r
+                                                <object class="wxTextCtrl" name="txtODBCWhereCl">\r
+                                                    <style>wxTE_MULTILINE</style>\r
+                                                    <size>-1,80</size>\r
+                                                    <value></value>\r
+                                                    <maxlength>0</maxlength>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND | wxALL</flag>\r
+                    <border>5</border>\r
+                    <object class="wxNotebook" name="m_notebook42">\r
+                        <object class="notebookpage">\r
+                            <label>Preview</label>\r
+                            <selected>1</selected>\r
+                            <object class="wxPanel" name="m_panel171">\r
+                                <style>wxTAB_TRAVERSAL</style>\r
+                                <object class="wxFlexGridSizer">\r
+                                    <rows>2</rows>\r
+                                    <cols>1</cols>\r
+                                    <vgap>0</vgap>\r
+                                    <hgap>0</hgap>\r
+                                    <growablecols>0</growablecols>\r
+                                    <growablerows>1</growablerows>\r
+                                    <object class="sizeritem">\r
+                                        <option>1</option>\r
+                                        <flag>wxEXPAND</flag>\r
+                                        <border>5</border>\r
+                                        <object class="wxFlexGridSizer">\r
+                                            <rows>1</rows>\r
+                                            <cols>3</cols>\r
+                                            <vgap>0</vgap>\r
+                                            <hgap>0</hgap>\r
+                                            <growablecols></growablecols>\r
+                                            <growablerows></growablerows>\r
+                                            <object class="sizeritem">\r
+                                                <option>0</option>\r
+                                                <flag>wxALL</flag>\r
+                                                <border>5</border>\r
+                                                <object class="wxButton" name="btnODBCPreview">\r
+                                                    <label>Preview</label>\r
+                                                    <default>0</default>\r
+                                                </object>\r
+                                            </object>\r
+                                            <object class="sizeritem">\r
+                                                <option>0</option>\r
+                                                <flag>wxALL</flag>\r
+                                                <border>5</border>\r
+                                                <object class="wxSpinCtrl" name="spinODBCPreviewRows">\r
+                                                    <style>wxSP_ARROW_KEYS</style>\r
+                                                    <value>30</value>\r
+                                                    <min>10</min>\r
+                                                    <max>200</max>\r
+                                                </object>\r
+                                            </object>\r
+                                            <object class="sizeritem">\r
+                                                <option>0</option>\r
+                                                <flag>wxALL</flag>\r
+                                                <border>5</border>\r
+                                                <object class="wxStaticText" name="m_staticText571">\r
+                                                    <label>row(s)</label>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                    <object class="sizeritem">\r
+                                        <option>0</option>\r
+                                        <flag>wxALL|wxEXPAND</flag>\r
+                                        <border>5</border>\r
+                                        <object class="wxGrid" name="gridODBCPreview" />\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="notebookpage">\r
+                            <label>Result attributes</label>\r
+                            <selected>0</selected>\r
+                            <object class="wxPanel" name="m_panel21">\r
+                                <style>wxTAB_TRAVERSAL</style>\r
+                                <object class="wxFlexGridSizer">\r
+                                    <rows>0</rows>\r
+                                    <cols>0</cols>\r
+                                    <vgap>0</vgap>\r
+                                    <hgap>0</hgap>\r
+                                    <growablecols>0</growablecols>\r
+                                    <growablerows>0</growablerows>\r
+                                    <object class="sizeritem">\r
+                                        <option>0</option>\r
+                                        <flag>wxALL|wxEXPAND</flag>\r
+                                        <border>5</border>\r
+                                        <object class="wxListCtrl" name="lstODBCResultAttribs">\r
+                                            <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="notebookpage">\r
+                            <label>Connection info</label>\r
+                            <selected>0</selected>\r
+                            <object class="wxPanel" name="m_panel20">\r
+                                <style>wxTAB_TRAVERSAL</style>\r
+                                <object class="wxFlexGridSizer">\r
+                                    <rows>1</rows>\r
+                                    <cols>1</cols>\r
+                                    <vgap>0</vgap>\r
+                                    <hgap>0</hgap>\r
+                                    <growablecols>0</growablecols>\r
+                                    <growablerows>0</growablerows>\r
+                                    <object class="sizeritem">\r
+                                        <option>0</option>\r
+                                        <flag>wxALL|wxEXPAND</flag>\r
+                                        <border>5</border>\r
+                                        <object class="wxListCtrl" name="lstODBCConnInfo">\r
+                                            <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="notebookpage">\r
+                            <label>Table columns</label>\r
+                            <selected>0</selected>\r
+                            <object class="wxPanel" name="m_panel181">\r
+                                <style>wxTAB_TRAVERSAL</style>\r
+                                <object class="wxFlexGridSizer">\r
+                                    <rows>1</rows>\r
+                                    <cols>1</cols>\r
+                                    <vgap>0</vgap>\r
+                                    <hgap>0</hgap>\r
+                                    <growablecols>0</growablecols>\r
+                                    <growablerows>0</growablerows>\r
+                                    <object class="sizeritem">\r
+                                        <option>0</option>\r
+                                        <flag>wxALL|wxEXPAND</flag>\r
+                                        <border>5</border>\r
+                                        <object class="wxListCtrl" name="lstODBCTableCols">\r
+                                            <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdSrcPgSQLPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>2</rows>\r
+                <cols>2</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols></growablecols>\r
+                <growablerows></growablerows>\r
+                <object class="sizeritem">\r
+                    <option>0</option>\r
+                    <flag>wxALL</flag>\r
+                    <border>5</border>\r
+                    <object class="wxStaticText" name="m_staticText19">\r
+                        <label>Source database</label>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdFileSettingPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>6</rows>\r
+                <cols>1</cols>\r
+                <vgap>5</vgap>\r
+                <hgap>5</hgap>\r
+                <growablecols>0</growablecols>\r
+                <growablerows>5</growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText41">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Delimiters</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxEXPAND|wxALL</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline11">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND|wxLEFT</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>3</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>2</growablecols>\r
+                        <growablerows>1</growablerows>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>20,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxRadioButton" name="rdbFileCharDelimiter">\r
+                                <style>wxRB_GROUP</style>\r
+                                <label>Delimiter</label>\r
+                                <value>0</value>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxComboBox" name="cbFileCharDelimiter">\r
+                                <value></value>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxALIGN_CENTER_VERTICAL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxRadioButton" name="rdbFileWidthDelimiter">\r
+                                <label>Fixed width</label>\r
+                                <value>0</value>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtFileWidthDelimiter">\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText42">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Options</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxEXPAND|wxALL</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline12">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND|wxLEFT</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>3</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText3">\r
+                                <label>Text quoted between</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxComboBox" name="cbFileQuotedBy">\r
+                                <style>wxCB_READONLY</style>\r
+                                <value></value>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>20,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText592">\r
+                                <label>Header in first row</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxCheckBox" name="chkFileFirstRowIsHeader">\r
+                                <label></label>\r
+                                <checked>0</checked>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText622">\r
+                                <label>Force line break</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxCheckBox" name="chkFileForceLineBreak">\r
+                                <label></label>\r
+                                <checked>0</checked>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText5">\r
+                                <label>Backslash quote</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxCheckBox" name="chkFileBackSlashQuote">\r
+                                <label></label>\r
+                                <checked>0</checked>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText43">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Preview</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxEXPAND|wxALL</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline13">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND|wxRIGHT|wxLEFT</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>1</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>0</growablecols>\r
+                        <growablerows>1</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>3</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols></growablecols>\r
+                                <growablerows></growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText62">\r
+                                        <label>Preview</label>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxSpinCtrl" name="spinFilePreviewRows">\r
+                                        <style>wxSP_ARROW_KEYS</style>\r
+                                        <value>20</value>\r
+                                        <min>1</min>\r
+                                        <max>200</max>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText5711">\r
+                                        <label>row(s)</label>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxGrid" name="gridFilePreview" />\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdFileOptsPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>4</rows>\r
+                <cols>1</cols>\r
+                <vgap>5</vgap>\r
+                <hgap>5</hgap>\r
+                <growablecols></growablecols>\r
+                <growablerows></growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText44">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Row options</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline14">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>4</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText28">\r
+                                <label>Skip empty row(s)</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxCheckBox" name="chkFileSkipEmptyRow">\r
+                                <label></label>\r
+                                <checked>1</checked>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText29">\r
+                                <label>Import row(s) match</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtFileOptImpRegEx">\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText27">\r
+                                <label>Skip first</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>2</rows>\r
+                                <cols>2</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols></growablecols>\r
+                                <growablerows></growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxSpinCtrl" name="spinFileSkipFirstRows">\r
+                                        <style>wxSP_ARROW_KEYS</style>\r
+                                        <value>0</value>\r
+                                        <min>0</min>\r
+                                        <max>2147483647</max>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText61">\r
+                                        <label>row(s)</label>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText351">\r
+                                <label>Import</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>4</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols></growablecols>\r
+                                <growablerows></growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxRadioButton" name="rdbFileImpAllRows">\r
+                                        <style>wxRB_GROUP</style>\r
+                                        <label>All</label>\r
+                                        <value>0</value>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxRadioButton" name="rdbFileImpOnlyRows">\r
+                                        <label>Only</label>\r
+                                        <value>0</value>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxSpinCtrl" name="spinFileImpOnlyRows">\r
+                                        <style>wxSP_ARROW_KEYS</style>\r
+                                        <value>0</value>\r
+                                        <min>0</min>\r
+                                        <max>2147483647</max>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText391">\r
+                                        <label>row(s)</label>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText441">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Data options</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline141">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>3</rows>\r
+                        <cols>3</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText582">\r
+                                <label>Check true first</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxCheckBox" name="chkFileCheckTrueFirst">\r
+                                <label></label>\r
+                                <checked>0</checked>\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>0,0</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText581">\r
+                                <label>Boolean true</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtFileOptTrueVals">\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText621">\r
+                                <label>Example: yes, y, true, t, on, 1</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText591">\r
+                                <label>Boolean false</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtFileOptFalseVals">\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText63">\r
+                                <label>Example: no, n, false, f, off, 0</label>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdColsSettingPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>2</rows>\r
+                <cols>1</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols>0</growablecols>\r
+                <growablerows>1</growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>5</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText601">\r
+                                <label>Import mode</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxChoice" name="chcImportMode">\r
+                                <selection>0</selection>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                        <object class="spacer">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <size>20,5</size>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText551">\r
+                                <label>Format style</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxChoice" name="chcFormatStyle">\r
+                                <selection>0</selection>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>1</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>2</rows>\r
+                                <cols>1</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>0</growablecols>\r
+                                <growablerows>1</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText24">\r
+                                        <label>Table columns info</label>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL|wxEXPAND</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxGrid" name="gridColSetting" />\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>2</rows>\r
+                                <cols>1</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>0</growablecols>\r
+                                <growablerows>1</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>1</option>\r
+                                    <flag>wxEXPAND</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxFlexGridSizer">\r
+                                        <rows>1</rows>\r
+                                        <cols>3</cols>\r
+                                        <vgap>0</vgap>\r
+                                        <hgap>0</hgap>\r
+                                        <growablecols></growablecols>\r
+                                        <growablerows></growablerows>\r
+                                        <object class="sizeritem">\r
+                                            <option>0</option>\r
+                                            <flag>wxALL</flag>\r
+                                            <border>5</border>\r
+                                            <object class="wxButton" name="btnImpPreview">\r
+                                                <label>Preview</label>\r
+                                                <default>0</default>\r
+                                            </object>\r
+                                        </object>\r
+                                        <object class="sizeritem">\r
+                                            <option>0</option>\r
+                                            <flag>wxALL</flag>\r
+                                            <border>5</border>\r
+                                            <object class="wxCheckBox" name="chkTestImport">\r
+                                                <label>Test import into database</label>\r
+                                                <checked>1</checked>\r
+                                            </object>\r
+                                        </object>\r
+                                        <object class="sizeritem">\r
+                                            <option>0</option>\r
+                                            <flag>wxALL</flag>\r
+                                            <border>5</border>\r
+                                            <object class="wxCheckBox" name="chkValidateExpr">\r
+                                                <label>Validate constant/expression</label>\r
+                                                <checked>1</checked>\r
+                                                <enabled>0</enabled>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>1</option>\r
+                                    <flag>wxEXPAND | wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxNotebook" name="nbColsPreview">\r
+                                        <object class="notebookpage">\r
+                                            <label>Sample data</label>\r
+                                            <selected>1</selected>\r
+                                            <object class="wxPanel" name="pnlColsSampleData">\r
+                                                <style>wxTAB_TRAVERSAL</style>\r
+                                                <object class="wxFlexGridSizer">\r
+                                                    <rows>1</rows>\r
+                                                    <cols>1</cols>\r
+                                                    <vgap>0</vgap>\r
+                                                    <hgap>0</hgap>\r
+                                                    <growablecols>0</growablecols>\r
+                                                    <growablerows>0</growablerows>\r
+                                                    <object class="sizeritem">\r
+                                                        <option>0</option>\r
+                                                        <flag>wxALL|wxEXPAND</flag>\r
+                                                        <border>5</border>\r
+                                                        <object class="wxGrid" name="gridColsSampleData" />\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                        <object class="notebookpage">\r
+                                            <label>Log</label>\r
+                                            <selected>0</selected>\r
+                                            <object class="wxPanel" name="pnlColsSettingLog">\r
+                                                <style>wxTAB_TRAVERSAL</style>\r
+                                                <object class="wxFlexGridSizer">\r
+                                                    <rows>1</rows>\r
+                                                    <cols>1</cols>\r
+                                                    <vgap>0</vgap>\r
+                                                    <hgap>0</hgap>\r
+                                                    <growablecols>0</growablecols>\r
+                                                    <growablerows>0</growablerows>\r
+                                                    <object class="sizeritem">\r
+                                                        <option>0</option>\r
+                                                        <flag>wxALL|wxEXPAND</flag>\r
+                                                        <border>5</border>\r
+                                                        <object class="wxTextCtrl" name="txtColsSettingLog">\r
+                                                            <style>wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY</style>\r
+                                                            <value></value>\r
+                                                            <maxlength>0</maxlength>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                        <object class="notebookpage">\r
+                                            <label>Import log</label>\r
+                                            <selected>0</selected>\r
+                                            <object class="wxPanel" name="pnlColumnsImpLog">\r
+                                                <style>wxTAB_TRAVERSAL</style>\r
+                                                <object class="wxFlexGridSizer">\r
+                                                    <rows>1</rows>\r
+                                                    <cols>1</cols>\r
+                                                    <vgap>0</vgap>\r
+                                                    <hgap>0</hgap>\r
+                                                    <growablecols>0</growablecols>\r
+                                                    <growablerows>0</growablerows>\r
+                                                    <object class="sizeritem">\r
+                                                        <option>0</option>\r
+                                                        <flag>wxALL|wxEXPAND</flag>\r
+                                                        <border>5</border>\r
+                                                        <object class="wxTextCtrl" name="txtColsImpLog">\r
+                                                            <style>wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY</style>\r
+                                                            <value></value>\r
+                                                            <maxlength>0</maxlength>\r
+                                                        </object>\r
+                                                    </object>\r
+                                                </object>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdDestLogPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>2</rows>\r
+                <cols>1</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols>0</growablecols>\r
+                <growablerows>3</growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText642">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Destination</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline142">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>1</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText431">\r
+                                <label>Destination</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxChoice" name="chcImpDest">\r
+                                <selection>0</selection>\r
+                                <content />\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText442">\r
+                                <label>Filename</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>2</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>0</growablecols>\r
+                                <growablerows>0</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL|wxEXPAND</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxTextCtrl" name="txtDestFilePath">\r
+                                        <value></value>\r
+                                        <maxlength>0</maxlength>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxButton" name="btnDestFileBrowse">\r
+                                        <label>...</label>\r
+                                        <default>0</default>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText58">\r
+                                <label>Commit every</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>2</rows>\r
+                                <cols>2</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols></growablecols>\r
+                                <growablerows></growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxSpinCtrl" name="spinCommitEvery">\r
+                                        <style>wxSP_ARROW_KEYS</style>\r
+                                        <value>0</value>\r
+                                        <min>0</min>\r
+                                        <max>2147483647</max>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText59">\r
+                                        <label>row(s)</label>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText661">\r
+                                <label>Stop on</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>2</rows>\r
+                                <cols>2</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols></growablecols>\r
+                                <growablerows></growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxSpinCtrl" name="spinStopOnError">\r
+                                        <style>wxSP_ARROW_KEYS</style>\r
+                                        <value>0</value>\r
+                                        <min>0</min>\r
+                                        <max>2147483647</max>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxStaticText" name="m_staticText67">\r
+                                        <label>error(s)</label>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>1</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>0</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText6421">\r
+                                <font>\r
+                                    <family>default</family>\r
+                                    <style>normal</style>\r
+                                    <weight>bold</weight>\r
+                                    <underlined>0</underlined>\r
+                                </font>\r
+                                <label>Log</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>\r
+                            <border>12</border>\r
+                            <object class="wxStaticLine" name="m_staticline1421">\r
+                                <style>wxLI_HORIZONTAL</style>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>1</growablecols>\r
+                        <growablerows>2</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText68">\r
+                                <label>Log to</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>3</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>2</growablecols>\r
+                                <growablerows>0</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxRadioButton" name="rdbLogToScreen">\r
+                                        <style>wxRB_GROUP</style>\r
+                                        <label>Screen</label>\r
+                                        <value>1</value>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxRadioButton" name="rdbLogToFile">\r
+                                        <label>File</label>\r
+                                        <value>0</value>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxRadioButton" name="rdbLogToScrFile">\r
+                                        <label>Screen and file</label>\r
+                                        <value>0</value>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText70">\r
+                                <label>Log file</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>1</rows>\r
+                                <cols>2</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols>0</growablecols>\r
+                                <growablerows>0</growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL|wxEXPAND</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxTextCtrl" name="txtLogFilePath">\r
+                                        <value></value>\r
+                                        <maxlength>0</maxlength>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxButton" name="btnLogFileBrowse">\r
+                                        <label>...</label>\r
+                                        <default>0</default>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText69">\r
+                                <label>Contents</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>1</option>\r
+                            <flag>wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxFlexGridSizer">\r
+                                <rows>6</rows>\r
+                                <cols>1</cols>\r
+                                <vgap>0</vgap>\r
+                                <hgap>0</hgap>\r
+                                <growablecols></growablecols>\r
+                                <growablerows></growablerows>\r
+                                <object class="sizeritem">\r
+                                    <option>1</option>\r
+                                    <flag>wxEXPAND</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxFlexGridSizer">\r
+                                        <rows>1</rows>\r
+                                        <cols>3</cols>\r
+                                        <vgap>0</vgap>\r
+                                        <hgap>0</hgap>\r
+                                        <growablecols></growablecols>\r
+                                        <growablerows></growablerows>\r
+                                        <object class="sizeritem">\r
+                                            <option>0</option>\r
+                                            <flag>wxALL</flag>\r
+                                            <border>5</border>\r
+                                            <object class="wxRadioButton" name="rdbLogVerbose">\r
+                                                <style>wxRB_GROUP</style>\r
+                                                <label>Verbose</label>\r
+                                                <value>1</value>\r
+                                            </object>\r
+                                        </object>\r
+                                        <object class="sizeritem">\r
+                                            <option>0</option>\r
+                                            <flag>wxALL</flag>\r
+                                            <border>5</border>\r
+                                            <object class="wxRadioButton" name="rdbLogSummary">\r
+                                                <label>Summary</label>\r
+                                                <value>0</value>\r
+                                            </object>\r
+                                        </object>\r
+                                        <object class="sizeritem">\r
+                                            <option>0</option>\r
+                                            <flag>wxALL</flag>\r
+                                            <border>5</border>\r
+                                            <object class="wxRadioButton" name="rdbLogSilent">\r
+                                                <label>Silent</label>\r
+                                                <value>0</value>\r
+                                            </object>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxCheckBox" name="chkLogError">\r
+                                        <label>Error</label>\r
+                                        <checked>1</checked>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxCheckBox" name="chkLogWarn">\r
+                                        <label>Warning</label>\r
+                                        <checked>1</checked>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxCheckBox" name="chkLogStmt">\r
+                                        <label>Statement</label>\r
+                                        <checked>1</checked>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxCheckBox" name="chkLogInfo">\r
+                                        <label>Info</label>\r
+                                        <checked>1</checked>\r
+                                    </object>\r
+                                </object>\r
+                                <object class="sizeritem">\r
+                                    <option>0</option>\r
+                                    <flag>wxALL</flag>\r
+                                    <border>5</border>\r
+                                    <object class="wxCheckBox" name="chkLogProc">\r
+                                        <label>Process</label>\r
+                                        <checked>1</checked>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+        <object class="wxWizardPageSimple" name="wzdProcessPage">\r
+            <style>wxTAB_TRAVERSAL</style>\r
+            <object class="wxFlexGridSizer">\r
+                <rows>4</rows>\r
+                <cols>1</cols>\r
+                <vgap>0</vgap>\r
+                <hgap>0</hgap>\r
+                <growablecols>0</growablecols>\r
+                <growablerows>4</growablerows>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxButton" name="btnImpStart">\r
+                                <label>Start</label>\r
+                                <default>0</default>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxButton" name="btnImpStop">\r
+                                <label>Stop</label>\r
+                                <default>0</default>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>0</option>\r
+                    <flag>wxALL|wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxGauge" name="gaugeImp">\r
+                        <style>wxGA_HORIZONTAL</style>\r
+                        <range>1000</range>\r
+                        <value>0</value>\r
+                    </object>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>2</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols></growablecols>\r
+                        <growablerows></growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText49">\r
+                                <label>Status</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="stxtInsertedRows">\r
+                                <label>Inserted 0 rows</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText51">\r
+                                <label>Elapsed time</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="stxtElapsedTime">\r
+                                <label>00:00:00.0</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText53">\r
+                                <label>Remaining time</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="stxtRemainingTime">\r
+                                <label>Unknown</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText55">\r
+                                <label>Avg row time</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="stxtAvgRowTime">\r
+                                <label>0 ms</label>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+                <object class="spacer">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <size>0,10</size>\r
+                </object>\r
+                <object class="sizeritem">\r
+                    <option>1</option>\r
+                    <flag>wxEXPAND</flag>\r
+                    <border>5</border>\r
+                    <object class="wxFlexGridSizer">\r
+                        <rows>2</rows>\r
+                        <cols>1</cols>\r
+                        <vgap>0</vgap>\r
+                        <hgap>0</hgap>\r
+                        <growablecols>0</growablecols>\r
+                        <growablerows>1</growablerows>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL</flag>\r
+                            <border>5</border>\r
+                            <object class="wxStaticText" name="m_staticText57">\r
+                                <label>Import log</label>\r
+                            </object>\r
+                        </object>\r
+                        <object class="sizeritem">\r
+                            <option>0</option>\r
+                            <flag>wxALL|wxEXPAND</flag>\r
+                            <border>5</border>\r
+                            <object class="wxTextCtrl" name="txtLogMessages">\r
+                                <style>wxHSCROLL|wxTE_MULTILINE|wxTE_READONLY</style>\r
+                                <value></value>\r
+                                <maxlength>0</maxlength>\r
+                            </object>\r
+                        </object>\r
+                    </object>\r
+                </object>\r
+            </object>\r
+        </object>\r
+    </object>\r
+</resource>
\ No newline at end of file
diff --git a/pgadmin/utils/module.mk b/pgadmin/utils/module.mk
index 06af8c63da8241740ec3ab106ab372222221ea9f..d677181d7ce4eaa01dc32f19cfa60d98109c67a5 100644 (file)
--- a/pgadmin/utils/module.mk
+++ b/pgadmin/utils/module.mk
@@ -16,6 +16,8 @@ pgadmin3_SOURCES += \
        $(srcdir)/utils/md5.cpp \
        $(srcdir)/utils/misc.cpp \
        $(srcdir)/utils/pgconfig.cpp \
+       $(srcdir)/utils/pgcsvfile.cpp \
+       $(srcdir)/utils/pgodbc.cpp \
        $(srcdir)/utils/sysLogger.cpp \
        $(srcdir)/utils/sysProcess.cpp \
        $(srcdir)/utils/sysSettings.cpp \
diff --git a/pgadmin/utils/pgodbc.cpp b/pgadmin/utils/pgodbc.cpp
index 58a8af082771e9f06df0b0e1577ceb112da60880..cc32065c4440a36e0a0448f3d9e6634da4fc8a1d 100755 (executable)
--- a/pgadmin/utils/pgodbc.cpp
+++ b/pgadmin/utils/pgodbc.cpp
@@ -1,8 +1,8 @@
 \r
-#include "pgadmin3.h"\r
+#include "pgAdmin3.h"\r
 #include "utils/pgodbc.h"\r
 \r
-#if defined(__WITHODBC3__) && (defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__))\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
 \r
 const SQLWCHAR* const pgODBC::ODBCINFONAMES[] = {\r
     _T("SQL_MAX_CATALOG_NAME_LEN"),\r
pgAdmin import function dev repository