Incomplete wxUSE_* warning fix.

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

diff --git a/samples/db/listdb.h b/samples/db/listdb.h
index 82897c2bb22a84dd8c92ba3cb077811c42988b3e..271d41b98bd807ba9858b4f31a6a3aa48b4e40f8 100644 (file)
--- a/samples/db/listdb.h
+++ b/samples/db/listdb.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        listdb.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        listdb.h

-// Purpose:     wxWindows database demo app
+// Purpose:     wxWidgets database demo app

 // Author:      George Tasker
 // Modified by:
 // Created:     1996
 // Author:      George Tasker
 // Modified by:
 // Created:     1996


@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "listdb.h"
 #endif
 
 #pragma interface "listdb.h"
 #endif
 


@@ -21,7 +21,7 @@
 #define LISTDB_DOT_H
 
 
 #define LISTDB_DOT_H
 
 

-#include <wx/dbtable.h>
+#include "wx/dbtable.h"

 
 const int LOOKUP_COL_LEN = 250;
 
 
 const int LOOKUP_COL_LEN = 250;
 


@@ -32,7 +32,7 @@ class Clookup : public wxDbTable
 
         wxChar lookupCol[LOOKUP_COL_LEN+1];
 
 
         wxChar lookupCol[LOOKUP_COL_LEN+1];
 

-        Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir="");
+        Clookup(wxString tblName, wxString colName, wxDb *pDb, const wxString &defDir=wxT(""));

 
 };  // Clookup
 
 
 };  // Clookup
 


@@ -45,7 +45,7 @@ class Clookup2 : public wxDbTable
         wxChar lookupCol1[LOOKUP_COL_LEN+1];
         wxChar lookupCol2[LOOKUP_COL_LEN+1];
 
         wxChar lookupCol1[LOOKUP_COL_LEN+1];
         wxChar lookupCol2[LOOKUP_COL_LEN+1];
 

-        Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir="");
+        Clookup2(wxString tblName, wxString colName1, wxString colName2, wxDb *pDb, const wxString &defDir=wxT(""));

 
 };  // Clookup2
 
 
 };  // Clookup2
 


@@ -68,14 +68,14 @@ class ClookUpDlg : public wxDialog
     public:
 
         // This is a generic lookup constructor that will work with any table and any column
     public:
 
         // This is a generic lookup constructor that will work with any table and any column

-        ClookUpDlg(wxWindow *parent,
-                    wxChar  *windowTitle,
-                    wxChar  *tableName,
-                    wxChar  *colName,
-                    wxChar  *where,
-                    wxChar  *orderBy,
-                    wxDb    *pDb,
-                    const wxString &defDir);
+        ClookUpDlg(wxWindow         *parent,
+                    const wxString  &windowTitle,
+                    const wxString  &tableName,
+                    const wxString  &colName,
+                    const wxString  &where,
+                    const wxString  &orderBy,
+                    wxDb            *pDb,
+                    const wxString  &defDir);

 
         //
         // This is a generic lookup constructor that will work with any table and any column.
 
         //
         // This is a generic lookup constructor that will work with any table and any column.


@@ -102,23 +102,24 @@ class ClookUpDlg : public wxDialog
         // in the lookup window.
         //
         ClookUpDlg(wxWindow *parent,
         // in the lookup window.
         //
         ClookUpDlg(wxWindow *parent,

-                    wxChar  *windowTitle,
-                    wxChar  *tableName,
-                    wxChar  *dispCol1,                  // Must have at least 1 display column
-                    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
-                    bool     allowOk    = TRUE);        // is the OK button enabled
-
-        void        OnButton( wxCommandEvent &event );
+                    const wxString  &windowTitle,
+                    const wxString  &tableName,
+                    const wxString  &dispCol1,                  // Must have at least 1 display column
+                    const wxString  &dispCol2,                  // Optional
+                    const wxString  &where,
+                    const wxString  &orderBy,
+                    wxDb            *pDb,                       // Database connection pointer
+                    const wxString  &defDir,
+                    bool             distinctValues,            // e.g. SELECT DISTINCT ...
+                    const wxString &selectStmt = wxEmptyString, // If you wish to query by SQLstmt (complicated lookups)
+                    int             maxLenCol1 = 0,             // Mandatory if querying by SQLstmt
+                    bool            allowOk    = true);         // is the OK button enabled
+
+        void        OnButton(wxCommandEvent &event);

         void        OnCommand(wxWindow& win, wxCommandEvent& event);
         void        OnClose(wxCloseEvent& event);
         void        OnActivate(bool) {};  // necessary for hot keys
         void        OnCommand(wxWindow& win, wxCommandEvent& event);
         void        OnClose(wxCloseEvent& event);
         void        OnActivate(bool) {};  // necessary for hot keys

+        void        OnDClick(wxCommandEvent &event);

 
 DECLARE_EVENT_TABLE()
 };  // class ClookUpDlg
 
 DECLARE_EVENT_TABLE()
 };  // class ClookUpDlg