X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf0836c8bb0f5bf12fa45cddd2cf4c0cdafa67d..94a09ea5d315ad552404dbea56c9c7406b5a1a5c:/samples/db/dbtest.cpp diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp index 202e7f6493..38345aacb4 100644 --- a/samples/db/dbtest.cpp +++ b/samples/db/dbtest.cpp @@ -32,24 +32,24 @@ #endif //__BORLANDC__ #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif //WX_PRECOMP -#if defined(__WXGTK__) || defined(__WXX11__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMAC__) #include "db.xpm" #endif #include /* Included strictly for reading the text file with the database parameters */ -//#include /* Required in the file which will get the data source connection */ -//#include /* Has the wxDbTable object from which all data objects will inherit their data table functionality */ +//#include "wx/db.h" /* Required in the file which will get the data source connection */ +//#include "wx/dbtable.h" /* Has the wxDbTable object from which all data objects will inherit their data table functionality */ //extern wxDbList WXDLLEXPORT *PtrBegDbList; /* from db.cpp, used in getting back error results from db connections */ #if wxUSE_NEW_GRID -#include -#include -#include +#include "wx/grid.h" +#include "wx/generic/gridctrl.h" +#include "wx/dbgrid.h" #define CHOICEINT #endif @@ -1068,7 +1068,7 @@ void Ccontact::SetupColumns() SetColDefs (10,wxT("LINE_CNT"), DB_DATA_TYPE_INTEGER, &LinesOfCode, SQL_C_ULONG, sizeof(LinesOfCode), FALSE,TRUE); SetColDefs (11,wxT("LANGUAGE"), DB_DATA_TYPE_INTEGER, &NativeLanguage, SQL_C_ENUM, sizeof(NativeLanguage), FALSE,TRUE); #if wxODBC_BLOB_EXPERIMENT > 0 - SetColDefs (12,wxT("PICTURE"), DB_DATA_TYPE_BLOB, Picture, SQL_LONGVARBINARY, sizeof(Picture), FALSE,TRUE); + SetColDefs (12,wxT("PICTURE"), DB_DATA_TYPE_BLOB, Picture, SQL_C_BINARY, sizeof(Picture), FALSE,TRUE); #endif } // Ccontact::SetupColumns