X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df991b9dfb98e8b65c5c806d96b991f8d6c8f55b..6c7afb7435d11d7b67d16c51e1302cad5572491e:/demos/dbbrowse/browsedb.h?ds=sidebyside

diff --git a/demos/dbbrowse/browsedb.h b/demos/dbbrowse/browsedb.h
index 9758ede57c..5abeb8ec4c 100644
--- a/demos/dbbrowse/browsedb.h
+++ b/demos/dbbrowse/browsedb.h
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------------------
 // Name:        browsedb.h
-// Purpose:     a wxDB class
-// Author:      Mark Johnson, mj10777@gmx.net
+// Purpose:     a wxDb class
+// Author:      Mark Johnson
 // Modified by:
 // Created:     19991127.mj10777
 // Copyright:   (c) Mark Johnson
@@ -14,64 +14,65 @@
 //----------------------------------------------------------------------------------------
 // Global structure for holding ODBC connection information
 //----------------------------------------------------------------------------------------
-extern struct wxDbConnectInf DbConnectInf;
+//extern wxDbConnectInf DbConnectInf;
 class MainDoc;
+
 //----------------------------------------------------------------------------------------
 class BrowserDB
 {
- public:
- //---------------------------------------------------------------------------------------
- // Pointer to the main database connection used in the program.  This
- // pointer would normally be used for doing things as database lookups
- // for user login names and passwords, getting workstation settings, etc.
- // ---> IMPORTANT <---
- //
- //  For each database object created which uses this wxDB pointer
- //    connection to the database, when a CommitTrans() or RollBackTrans()
- //    will commit or rollback EVERY object which uses this wxDB pointer.
- //
- //    To allow each table object (those derived from wxTable) to be
- //    individually committed or rolled back, you MUST use a different
- //    instance of wxDB in the constructor of the table.  Doing so creates
- //  more overhead, and will use more database connections (some DBs have
- //    connection limits...), so use connections sparringly.
- //
- //  It is recommended that one "main" database connection be created for
- //  the entire program to use for READ-ONLY database accesses, but for each
- //  table object which will do a CommitTrans() or RollbackTrans() that a
- // new wxDB object be created and used for it.
- //---------------------------------------------------------------------------------------
-  wxDB*          db_BrowserDB;
-  wxDbInf*       ct_BrowserDB;
-  wxColInf*      cl_BrowserDB;
-  wxString       ODBCSource, UserName, Password;
-  MainDoc *pDoc;
- //---------------------------------------------------------------------------------------
-  wxString       Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
-  wxString       ODBCText;
-  wxTextCtrl*    p_LogWindow;
-  wxString       s_SqlTyp[25];
-  int            i_SqlTyp[25];
-  wxString       s_dbTyp[5];
-  int            i_dbTyp[5];
-  int            i_Which;
-  int            i_Records;
-  int            i_Cols;
- //---------------------------------------------------------------------------------------
-  BrowserDB();
-  ~BrowserDB();
-  void Zeiger_auf_NULL(int Art);
-  bool Initialize(int Quite);
- //---------------------------------------------------------------------------------------
-  bool           OnStartDB(int Quite);
-  bool           OnCloseDB(int Quite);
-  bool           OnSelect(wxString tb_Name,int Quite);
-  bool           OnExecSql(wxString SQLStmt,int Quite);
-  bool           OnGetNext(int Cols,int Quite);
-  wxDbInf*       OnGetCatalog(int Quite);
-  wxColInf*      OnGetColumns(char *tableName, int numCols,int Quite);
-  void           OnFillSqlTyp();
-  void           OnFilldbTyp();
- //---------------------------------------------------------------------------------------
+public:
+    //---------------------------------------------------------------------------------------
+    // Pointer to the main database connection used in the program.  This
+    // pointer would normally be used for doing things as database lookups
+    // for user login names and passwords, getting workstation settings, etc.
+    // ---> IMPORTANT <---
+    //
+    //  For each database object created which uses this wxDb pointer
+    //    connection to the database, when a CommitTrans() or RollBackTrans()
+    //    will commit or rollback EVERY object which uses this wxDb pointer.
+    //
+    //    To allow each table object (those derived from wxDbTable) to be
+    //    individually committed or rolled back, you MUST use a different
+    //    instance of wxDb in the constructor of the table.  Doing so creates
+    //  more overhead, and will use more database connections (some DBs have
+    //    connection limits...), so use connections sparringly.
+    //
+    //  It is recommended that one "main" database connection be created for
+    //  the entire program to use for READ-ONLY database accesses, but for each
+    //  table object which will do a CommitTrans() or RollbackTrans() that a
+    // new wxDb object be created and used for it.
+    //---------------------------------------------------------------------------------------
+    wxDb*          db_BrowserDB;
+    wxDbInf*       ct_BrowserDB;
+    wxDbColInf*    cl_BrowserDB;
+    wxString       ODBCSource, UserName, Password;
+    MainDoc *pDoc;
+    //---------------------------------------------------------------------------------------
+    wxString       Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
+    wxString       ODBCText;
+    wxTextCtrl*    p_LogWindow;
+    wxString       s_SqlTyp[25];
+    int            i_SqlTyp[25];
+    wxString       s_dbTyp[5];
+    int            i_dbTyp[5];
+    int            i_Which;
+    int            i_Records;
+    int            i_Cols;
+    //---------------------------------------------------------------------------------------
+    BrowserDB();
+    ~BrowserDB();
+    void PointerToNULL(int Art);
+    bool Initialize(int Quiet);
+    //---------------------------------------------------------------------------------------
+    bool           OnStartDB(int Quiet);
+    bool           OnCloseDB(int Quiet);
+    bool           OnSelect(wxString tb_Name,int Quiet);
+    bool           OnExecSql(wxString SQLStmt,int Quiet);
+    bool           OnGetNext(int Cols,int Quiet);
+    wxDbInf*       OnGetCatalog(int Quiet);
+    wxDbColInf*    OnGetColumns(wxChar *tableName, UWORD numCols,int Quiet);
+    void           OnFillSqlTyp();
+    void           OnFilldbTyp();
+    //---------------------------------------------------------------------------------------
 };  // BrowserDB class definition
-//----------------------------------------------------------------------------------------
+    //----------------------------------------------------------------------------------------