Made changes to allow build with new mingw32/gcc-2.95
added wxUSE_NORLANDER_HEADERS for mingw32/gcc-2.95 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
#include "wx/tooltip.h"
|
||||
#include "wx/msw/private.h"
|
||||
|
||||
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
|
||||
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
|
||||
#include <commctrl.h>
|
||||
#endif
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
wxToolInfo(wxWindow *win)
|
||||
{
|
||||
// initialize all members
|
||||
#ifdef __GNUWIN32__
|
||||
#if defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
|
||||
memset(this, 0, sizeof(TOOLINFO));
|
||||
#else
|
||||
::ZeroMemory(this, sizeof(TOOLINFO));
|
||||
|
Reference in New Issue
Block a user