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:
@@ -80,7 +80,7 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#ifndef __GNUWIN32__
|
||||
#if !defined(__GNUWIN32__)|| defined(wxUSE_NORLANDER_HEADERS)
|
||||
#include <shellapi.h>
|
||||
#include <mmsystem.h>
|
||||
#endif
|
||||
@@ -89,13 +89,15 @@
|
||||
#include <windowsx.h>
|
||||
#endif
|
||||
|
||||
#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ )
|
||||
#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
|
||||
#include <commctrl.h>
|
||||
#endif
|
||||
|
||||
#ifndef __TWIN32__
|
||||
#ifdef __GNUWIN32__
|
||||
#include <wx/msw/gnuwin32/extra.h>
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
#include <wx/msw/gnuwin32/extra.h>
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user