Applied patch [ 853031 ] Japanese po file

[wxWidgets.git] / samples / db / listdb.h

diff --git a/samples/db/listdb.h b/samples/db/listdb.h
index d3c472498fbc91fe03682aa2b364b39f98d7f170..dbd943b365836fa1b3ab62c0d1ab6625a2677d3c 100644 (file)
--- a/samples/db/listdb.h
+++ b/samples/db/listdb.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "listdb.h"
 #endif
 
@@ -21,13 +21,10 @@
 #define LISTDB_DOT_H
 
 
-#include <wx/dbtable.h>
+#include "wx/dbtable.h"
 
 const int LOOKUP_COL_LEN = 250;
 
-// Global database connection
-extern wxDb *READONLY_DB;
-
 // Clookup class
 class Clookup : public wxDbTable
 {
@@ -35,10 +32,11 @@ class Clookup : public wxDbTable
 
         wxChar lookupCol[LOOKUP_COL_LEN+1];
 
-        Clookup(wxChar *tblName, wxChar *colName);
+        Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir="");
 
 };  // Clookup
 
+
 // Clookup2 class
 class Clookup2 : public wxDbTable
 {
@@ -47,10 +45,12 @@ class Clookup2 : public wxDbTable
         wxChar lookupCol1[LOOKUP_COL_LEN+1];
         wxChar lookupCol2[LOOKUP_COL_LEN+1];
 
-        Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb);
+        Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir="");
 
 };  // Clookup2
 
+
+// ClookUpDlg class
 class ClookUpDlg : public wxDialog
 {
     private:
@@ -73,16 +73,18 @@ class ClookUpDlg : public wxDialog
                     wxChar  *tableName,
                     wxChar  *colName,
                     wxChar  *where,
-                    wxChar  *orderBy);
+                    wxChar  *orderBy,
+                    wxDb    *pDb,
+                    const wxString &defDir);
 
         //
         // This is a generic lookup constructor that will work with any table and any column.
         // It extends the capabilites of the lookup dialog in the following ways:
         //
         //    1) 2 columns rather than one
-        // 2) The ability to select DISTINCT column values
+        //    2) The ability to select DISTINCT column values
         //
-        // Only set distinctValues equal to true if necessary.  In many cases, the constraints
+        // Only set distinctValues equal to TRUE if necessary.  In many cases, the constraints
         // of the index(es) will enforce this uniqueness.  Selecting DISTINCT does require
         // overhead by the database to ensure that all values returned are distinct.  Therefore,
         // use this ONLY when you need it.
@@ -95,8 +97,8 @@ class ClookUpDlg : public wxDialog
         // since it cannot be derived when you query using your own sql statement.
         //
         // The optional database connection can be used if you'd like the lookup class
-        // to use a database pointer other than the global READONLY_DB.  This is necessary if
-        // records are being saved, but not committed to the db, yet should be included
+        // to use a database pointer other than the READONLY_DB of the app.  This is necessary
+        // if records are being saved, but not committed to the db, yet should be included
         // in the lookup window.
         //
         ClookUpDlg(wxWindow *parent,
@@ -106,10 +108,11 @@ class ClookUpDlg : public wxDialog
                     wxChar  *dispCol2,                  // Optional
                     wxChar  *where,
                     wxChar  *orderBy,
+                    wxDb    *pDb,                       // Database connection pointer
+                    const wxString &defDir,
                     bool     distinctValues,            // e.g. SELECT DISTINCT ...
                     wxChar  *selectStmt = 0,            // If you wish to query by SQLstmt (complicated lookups)
                     int      maxLenCol1 = 0,            // Mandatory if querying by SQLstmt
-                    wxDb    *pDb        = READONLY_DB,  // Database connection pointer
                     bool     allowOk    = TRUE);        // is the OK button enabled
 
         void        OnButton( wxCommandEvent &event );
@@ -118,7 +121,7 @@ class ClookUpDlg : public wxDialog
         void        OnActivate(bool) {};  // necessary for hot keys
 
 DECLARE_EVENT_TABLE()
-};
+};  // class ClookUpDlg
 
 #define LOOKUP_DIALOG                   500