Small fixes for Tex2RTF but alas, we still get memory problems.
Added wxUSE_MFC setting (doesn't include windows.h, removes own memory tracing); added include <ctype.h> in case where PCH isn't used; wxExit now exits :-) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -428,6 +428,9 @@
|
||||
*
|
||||
*/
|
||||
|
||||
// Make settings compatible with MFC
|
||||
#define wxUSE_MFC 0
|
||||
|
||||
#define wxUSE_OLE 1
|
||||
// drag-and-drop, clipboard, OLE Automation
|
||||
|
||||
@@ -510,6 +513,19 @@
|
||||
#define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
#endif
|
||||
|
||||
// MFC duplicates these operators
|
||||
#if wxUSE_MFC
|
||||
#undef wxUSE_GLOBAL_MEMORY_OPERATORS
|
||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
|
||||
|
||||
#undef wxUSE_DEBUG_NEW_ALWAYS
|
||||
#define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
|
||||
#ifndef _MBCS
|
||||
// #define _MBCS
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
|
||||
// Can't use OLE drag and drop in Windows 3.1 because we don't know how
|
||||
// to implement UUIDs
|
||||
|
Reference in New Issue
Block a user