Sizing fixes for generic control.

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 07343e7570a79528839c6f5d4b8acf9d9ca98621..9d710d089665dba3b12a60490703739135507b5f 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "dbtest.h"
-#endif
-
 #include "wx/string.h"
 #include "wx/dbtable.h"
 
@@ -26,9 +22,9 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 #if wxUSE_GRID
 #define FILE_DBGRID_TABLE     130
 #endif
-#define FILE_EXIT             199
+#define FILE_EXIT             wxID_EXIT
 #define EDIT_PARAMETERS       200
-#define HELP_ABOUT            300
+#define HELP_ABOUT            wxID_ABOUT
 
 // this seems to be missing, Robert Roebling (?)
 #ifndef MAX_PATH
@@ -40,7 +36,7 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 #endif
 
 // Name of the table to be created/opened
-const wxChar     CONTACT_TABLE_NAME[]       = wxT("contacts");
+const wxString     CONTACT_TABLE_NAME       = wxT("CONTACTS");
 
 #define wxODBC_BLOB_SUPPORT
 
@@ -53,7 +49,7 @@ const wxChar     CONTACT_TABLE_NAME[]       = wxT("contacts");
     const int        CONTACT_NO_COLS        = 12;        // 0-11
 #endif
 
-const wxChar     PARAM_FILENAME[]           = wxT("dbtest.cfg");
+const wxString       PARAM_FILENAME         = wxT("dbtest.cfg");
 
 enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
 
@@ -479,15 +475,15 @@ enum qryOp
 
 
 // Query strings
-wxChar * const langQRY_EQ           = wxT("column = column | value");
-wxChar * const langQRY_LT           = wxT("column < column | value");
-wxChar * const langQRY_GT           = wxT("column > column | value");
-wxChar * const langQRY_LE           = wxT("column <= column | value");
-wxChar * const langQRY_GE           = wxT("column >= column | value");
-wxChar * const langQRY_BEGINS       = wxT("columns that BEGIN with the string entered");
-wxChar * const langQRY_CONTAINS     = wxT("columns that CONTAIN the string entered");
-wxChar * const langQRY_LIKE         = wxT("% matches 0 or more of any char; _ matches 1 char");
-wxChar * const langQRY_BETWEEN      = wxT("column BETWEEN value AND value");
+wxString const & langQRY_EQ           = wxT("column = column | value");
+const wxString & langQRY_LT           = wxT("column < column | value");
+const wxString & langQRY_GT           = wxT("column > column | value");
+const wxString & langQRY_LE           = wxT("column <= column | value");
+const wxString & langQRY_GE           = wxT("column >= column | value");
+const wxString & langQRY_BEGINS       = wxT("columns that BEGIN with the string entered");
+const wxString & langQRY_CONTAINS     = wxT("columns that CONTAIN the string entered");
+const wxString & langQRY_LIKE         = wxT("% matches 0 or more of any char; _ matches 1 char");
+const wxString & langQRY_BETWEEN      = wxT("column BETWEEN value AND value");
 
 
 class CqueryDlg : public wxDialog