browsedb.cpp dbtree.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
index d3150e7401ab59cd554950fe322a9a68af51241c..fd3907976e78170e1ead1b8711b7f4e19d2306c4 100644 (file)
--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -28,9 +28,7 @@
 #include "wx/wx.h"
 #endif
 //----------------------------------------------------------------------------------------
 #include "wx/wx.h"
 #endif
 //----------------------------------------------------------------------------------------

-#include <wx/dbtable.h>

 #include "std.h"
 #include "std.h"

-#include <iostream>

 //----------------------------------------------------------------------------------------
 // Global structure for holding ODBC connection information
 // - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?
 //----------------------------------------------------------------------------------------
 // Global structure for holding ODBC connection information
 // - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?


@@ -122,8 +120,8 @@ bool BrowserDB::OnStartDB(int Quite)
  //---------------------------------------------------------------------------------------
  // Connect to datasource
  //---------------------------------------------------------------------------------------
  //---------------------------------------------------------------------------------------
  // Connect to datasource
  //---------------------------------------------------------------------------------------

- DlgUser *p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,"");
- // p_Dlg->pDoc       = pDoc;
+ DlgUser *p_Dlg;
+ p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,"");

  p_Dlg->s_DSN      = ODBCSource;
  p_Dlg->s_User     = UserName;
  p_Dlg->s_Password = Password;
  p_Dlg->s_DSN      = ODBCSource;
  p_Dlg->s_User     = UserName;
  p_Dlg->s_Password = Password;

diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
index 8d3433d0cd9137f5b1a2c3fa0e8445b9c57f42a2..a6694e0921734c9549d50bef2497156bc52f6d81 100644 (file)
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -213,7 +213,7 @@ int  DBTree::OnPopulate()
   else
    wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));
   wxEndBusyCursor();
   else
    wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));
   wxEndBusyCursor();

-  Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - %6d Tables have been read. - Time needed : %ld ms"),(ct_BrowserDB->pTableInf+x)->tableName,z,sw.Time());
+  Temp0.Printf(_("-I-> DBTree::OnPopulate() - %6d Tables have been read. - Time needed : %ld ms"),z,sw.Time());

   wxLogMessage(Temp0);
   pDoc->p_MainFrame->SetStatusText(Temp0, 0);
  }       // if((pDoc->db_Br+i_Which)->Initialize(FALSE))
   wxLogMessage(Temp0);
   pDoc->p_MainFrame->SetStatusText(Temp0, 0);
  }       // if((pDoc->db_Br+i_Which)->Initialize(FALSE))