Removed a space (oh, dear, it looks like a joke

[wxWidgets.git] / demos / dbbrowse / browsedb.cpp

diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
index 48d3c308ec80b1b100322e0f3d43dd5bad9d38d2..5a659d131eee42a835c89f88364dee16064801bb 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 ?


@@ -103,6 +101,7 @@ bool BrowserDB::Initialize(int Quite)
 //----------------------------------------------------------------------------------------
 bool BrowserDB::OnStartDB(int Quite)
 {
 //----------------------------------------------------------------------------------------
 bool BrowserDB::OnStartDB(int Quite)
 {

+ wxStopWatch sw;

  if (!Quite)
   wxLogMessage(_("\n-I-> BrowserDB::OnStartDB(%s) : Begin "),ODBCSource.c_str());
  if (db_BrowserDB != NULL)
  if (!Quite)
   wxLogMessage(_("\n-I-> BrowserDB::OnStartDB(%s) : Begin "),ODBCSource.c_str());
  if (db_BrowserDB != NULL)


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

- DlgUser *p_Dlg = new DlgUser(pDoc->p_MainFrame, "Username and Password");
- 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;


@@ -155,7 +154,7 @@ bool BrowserDB::OnStartDB(int Quite)
    if (!Quite)
    {
     wxLogMessage(_("\n-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the table prior to making a connection\n(using tools provided by the database manufacturer)"));
    if (!Quite)
    {
     wxLogMessage(_("\n-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the table prior to making a connection\n(using tools provided by the database manufacturer)"));

-    wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End "),ODBCSource.c_str());
+    wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());

    }
    return FALSE;
   }
    }
    return FALSE;
   }


@@ -165,7 +164,7 @@ bool BrowserDB::OnStartDB(int Quite)
    Temp1 = db_BrowserDB->GetDatabaseName();
    Temp2 = db_BrowserDB->GetDataSource();
    wxLogMessage(_("-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"),Temp1.c_str(),Temp2.c_str());
    Temp1 = db_BrowserDB->GetDatabaseName();
    Temp2 = db_BrowserDB->GetDataSource();
    wxLogMessage(_("-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"),Temp1.c_str(),Temp2.c_str());

-   wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End "),ODBCSource.c_str());
+   wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());

   }
   return TRUE;
  } else return FALSE;
   }
   return TRUE;
  } else return FALSE;


@@ -328,6 +327,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quite)
 //----------------------------------------------------------------------------------------
 bool BrowserDB::OnSelect(wxString tb_Name, int Quite)
 {
 //----------------------------------------------------------------------------------------
 bool BrowserDB::OnSelect(wxString tb_Name, int Quite)
 {

+ wxStopWatch sw;

  wxString SQLStmt;
  i_Records = 0;
  //---------------------------------------------------------------------------------------
  wxString SQLStmt;
  i_Records = 0;
  //---------------------------------------------------------------------------------------


@@ -358,7 +358,7 @@ bool BrowserDB::OnSelect(wxString tb_Name, int Quite)
  //---------------------------------------------------------------------------------------
  if (!Quite)
  {
  //---------------------------------------------------------------------------------------
  if (!Quite)
  {

-  wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End "),tb_Name.c_str(),i_Records);
+  wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"),tb_Name.c_str(),i_Records,sw.Time());

  }
  return TRUE;
 }
  }
  return TRUE;
 }


@@ -378,7 +378,7 @@ bool BrowserDB::OnExecSql(wxString SQLStmt, int Quite)
  }
  if (!Quite)
  {
  }
  if (!Quite)
  {

-  // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End "),SQLStmt.c_str());
+  // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End - Time needed : %ld ms"),SQLStmt.c_str(),sw.Time());

  }
  return TRUE;
 }
  }
  return TRUE;
 }