Modified to use the newly defined names for functions/classes/structs defined to...

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

diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
index 5a659d131eee42a835c89f88364dee16064801bb..cc3506c06f5d300862c46418dfa9902c06cac046 100644 (file)
--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -32,9 +32,9 @@
 //----------------------------------------------------------------------------------------
 // Global structure for holding ODBC connection information
 // - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?
-struct DbStuff ConnectInf;      // Für DBase
+struct wxDbConnectInf ConnectInf;      // Für DBase
 //----------------------------------------------------------------------------------------
-extern DbList* WXDLLEXPORT PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
+extern wxDbList* WXDLLEXPORT PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
 //----------------------------------------------------------------------------------------
 char *GetExtendedDBErrorMsg(char *ErrFile, int ErrLine)
 {
@@ -53,7 +53,8 @@ char *GetExtendedDBErrorMsg(char *ErrFile, int ErrLine)
  // msg += "\n";
  /* Scan through each database connection displaying
   * any ODBC errors that have occured. */
- for (DbList *pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
+ wxDbList *pDbList;
+ for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
  {
   // Skip over any free connections
   if (pDbList->Free)
@@ -144,7 +145,7 @@ bool BrowserDB::OnStartDB(int Quite)
   strcpy(ConnectInf.Dsn, ODBCSource);           // ODBC data source name (created with ODBC Administrator under Win95/NT)
   strcpy(ConnectInf.Uid, UserName);             // database username - must already exist in the data source
   strcpy(ConnectInf.AuthStr, Password);         // password database username
-  db_BrowserDB = GetDbConnection(&ConnectInf);
+  db_BrowserDB = wxDbGetConnection(&ConnectInf);
   // wxLogMessage(">>>%s<<<>>>%s<<<",UserName.c_str(),Password.c_str());
   if (db_BrowserDB == NULL)
   {
@@ -177,7 +178,7 @@ bool BrowserDB::OnCloseDB(int Quite)
  if (db_BrowserDB)
  {
   db_BrowserDB->Close();
-  FreeDbConnection(db_BrowserDB);
+  wxDbFreeConnection(db_BrowserDB);
 
   // Free Environment Handle that ODBC uses
   if (SQLFreeEnv(&ConnectInf.Henv) != SQL_SUCCESS)
@@ -422,7 +423,7 @@ void BrowserDB::Zeiger_auf_NULL(int Art)
   {
    db_BrowserDB->CommitTrans();
    db_BrowserDB->Close();
-   CloseDbConnections();
+   wxDbCloseConnections();
    delete db_BrowserDB;
   }
  }

diff --git a/demos/dbbrowse/browsedb.h b/demos/dbbrowse/browsedb.h
index cd695c9e2a2d1ff925da34f96857c4d831b71eda..9758ede57cd70ac114b4465fd18c9647799ac6ae 100644 (file)
--- a/demos/dbbrowse/browsedb.h
+++ b/demos/dbbrowse/browsedb.h
@@ -14,7 +14,7 @@
 //----------------------------------------------------------------------------------------
 // Global structure for holding ODBC connection information
 //----------------------------------------------------------------------------------------
-extern struct DbStuff DbConnectInf;
+extern struct wxDbConnectInf DbConnectInf;
 class MainDoc;
 //----------------------------------------------------------------------------------------
 class BrowserDB

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index df2b80db46945c288ca7d5aca82aa74e84a65273..73d2936504c6a94aec2e7aed7a426588785d6a5b 100644 (file)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -33,7 +33,7 @@
 //----------------------------------------------------------------------------------------
 //-- Some Global Vars for all Files (extern in ?.h needed) -------------------------------
 // Global structure for holding ODBC connection information
-struct DbStuff DbConnectInf;
+struct wxDbConnectInf DbConnectInf;
 //----------------------------------------------------------------------------------------
 wxConfigBase   *p_ProgramCfg;       // All Config and Path information
 wxLogTextCtrl  *p_LogBook;          // All Log messages
@@ -165,7 +165,7 @@ bool MainDoc::OnInitODBC()
  // The key will be removed after sorting
  wxString KeyString;
  //---------------------------------------------------------------------------------------
- while(GetDataSource(DbConnectInf.Henv, Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc)))
+ while(wxDbGetDataSource(DbConnectInf.Henv, Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc)))
  {
   i_DSN++;   // How many Dsn have we ?
   KeyString.Printf("%s%c%s",Dsn, sep, DsDesc);

diff --git a/demos/dbbrowse/doc.h b/demos/dbbrowse/doc.h
index 488c5093afc9d8e060c3712dd98cf58d943a0036..d831165023c8261cf57dd7025023ceb2eacc97e3 100644 (file)
--- a/demos/dbbrowse/doc.h
+++ b/demos/dbbrowse/doc.h
@@ -20,7 +20,7 @@ class DSN
 };
 //----------------------------------------------------------------------------------------
  // Global structure for holding ODBC connection information
-extern struct DbStuff DbConnectInf;
+extern struct wxDbConnectInf DbConnectInf;
 //----------------------------------------------------------------------------------------
 extern wxConfigBase   *p_ProgramCfg;       // All Config and Path information
 extern wxLogTextCtrl  *p_LogBook;          // All Log messages