Fixes to Cygwin/Mingw32 makefile, manual now compiles wxStaticLine, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -428,7 +428,7 @@ struct DbList
|
||||
};
|
||||
|
||||
|
||||
#if __WXDEBUG__ > 0
|
||||
#ifdef __WXDEBUG__
|
||||
#include "wx/object.h"
|
||||
class CstructTablesInUse : public wxObject
|
||||
{
|
||||
|
@@ -187,7 +187,7 @@ public:
|
||||
bool SetNull(int colNo);
|
||||
bool SetNull(char *colName);
|
||||
|
||||
#if __WXDEBUG__ > 0
|
||||
#ifdef __WXDEBUG__
|
||||
ULONG GetTableID() { return tableID; };
|
||||
#endif
|
||||
|
||||
|
@@ -402,15 +402,13 @@
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
#endif
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
#define wxUSE_WX_RESOURCES 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) && defined(__WATCOMC__)
|
||||
@@ -452,13 +450,5 @@
|
||||
|
||||
#endif
|
||||
|
||||
// Problem with VC++ 5 and dobjcmn.cpp
|
||||
/*
|
||||
#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200)
|
||||
#undef wxUSE_DRAG_AND_DROP
|
||||
#define wxUSE_DRAG_AND_DROP 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
#endif
|
||||
// _WX_SETUP_H_
|
||||
|
Reference in New Issue
Block a user