X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc5dd6f8eb590992150b3998266fb50dfaab227..fe8aa971c4c66cc68ba6b64c61fae8149477bb5f:/samples/db/dbtest.h

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 6689d522ea..b6d1bd6ea3 100644
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -26,7 +26,7 @@ enum		DialogModes {mView,mCreate,mEdit,mSearch};
 
 
 // Name of the table to be created/opened
-const char	CONTACT_TABLE_NAME[]		=	"CONTACTS";
+const char	CONTACT_TABLE_NAME[]		=	"contacts";
 
 // Nuber of columns in the above table
 const int	CONTACT_NO_COLS			= 12;		// 0-11
@@ -40,7 +40,11 @@ enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
 class CeditorDlg;
 class CparameterDlg;
 
+#ifdef __WXGTK__
+const char paramFilename[] = "../database.cfg";
+#else
 const char paramFilename[] = "database.cfg";
+#endif
 
 
 /*
@@ -161,7 +165,8 @@ class CeditorDlg : public wxPanel
 		Ccontact					*Contact;	// this is the table object that will be being manipulated
 
 		CeditorDlg(wxWindow *parent);
-		bool	OnClose(void);
+		void    OnCloseWindow(wxCloseEvent& event);
+		void    OnButton( wxCommandEvent &event );
 		void	OnCommand(wxWindow& win, wxCommandEvent& event);
  		void	OnActivate(bool) {};  // necessary for hot keys
 
@@ -173,6 +178,8 @@ class CeditorDlg : public wxPanel
 		bool	GetNextRec();
 		bool	GetPrevRec();
 		bool	GetRec(char *whereStr);
+		
+DECLARE_EVENT_TABLE()
 };  // CeditorDlg
 
 #define EDITOR_DIALOG                   199
@@ -236,7 +243,7 @@ class CparameterDlg : public wxDialog
 
 	public:
 		CparameterDlg(wxWindow *parent);
-		bool	OnClose(void);
+		void    OnCloseWindow(wxCloseEvent& event);
 		void	OnCommand(wxWindow& win, wxCommandEvent& event);
  		void	OnActivate(bool) {};  // necessary for hot keys
 
@@ -245,6 +252,7 @@ class CparameterDlg : public wxDialog
 		bool	Save();
 		void	FillDataSourceList();
 
+DECLARE_EVENT_TABLE()
 };  // CparameterDlg
 
 #define PARAMETER_DIALOG                    400
@@ -332,8 +340,9 @@ class CqueryDlg : public wxDialog
 
 		CqueryDlg(wxWindow *parent, wxDB *pDb, char *tblName[], char *pWhereArg);
 
+		void    OnButton( wxCommandEvent &event );
 		void		OnCommand(wxWindow& win, wxCommandEvent& event);
-		bool		OnClose();
+		void        OnCloseWindow(wxCloseEvent& event);
 		void		OnActivate(bool) {};  // necessary for hot keys
 
 //		bool		SetWidgetPtrs();
@@ -342,6 +351,7 @@ class CqueryDlg : public wxDialog
 		void		ProcessCountBtn();
 		bool		ValidateWhereClause();
 
+DECLARE_EVENT_TABLE()
 };  // CqueryDlg
 
 #define QUERY_DIALOG                    300