Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made changes to allow build with new mingw32/gcc-2.95

Browse Source 
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:
J. Russell Smyth
1999-08-04 00:42:51 +00:00
parent ea8fe90e65
commit 65fd5cb012
34 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/treectrl.cpp
View File

@@ -47,10 +47,12 @@
#include "wx/treectrl.h"
#ifdef __GNUWIN32__
#ifndef wxUSE_NORLANDER_HEADERS
#include "wx/msw/gnuwin32/extra.h"
#endif
#endif
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
#include <commctrl.h>
#endif
@@ -195,7 +197,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
if ( m_windowStyle & wxTR_LINES_AT_ROOT )
wstyle |= TVS_LINESATROOT;
#ifndef __GNUWIN32__
#if !defined( __GNUWIN32__ ) && !defined(wxUSE_NORLANDER_HEADERS)
// we emulate the multiple selection tree controls by using checkboxes: set
// up the image list we need for this if we do have multiple selections
if ( m_windowStyle & wxTR_MULTIPLE )