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

change some #ifdef

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Sylvain Bougnoux
1999-08-18 12:50:30 +00:00
parent 0b8558681e
commit 9ce29a28cd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/treectrl/treetest.cpp
View File

@@ -42,7 +42,9 @@
// under Windows the icons are in the .rc file // under Windows the icons are in the .rc file
#ifndef __WXMSW__ #ifndef __WXMSW__
#ifdef NO_VARIABLE_HEIGHT
#include "icon1.xpm" #include "icon1.xpm"
#endif
#include "icon2.xpm" #include "icon2.xpm"
#include "mondrian.xpm" #include "mondrian.xpm"
#endif #endif
@@ -414,11 +416,13 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
long style) long style)
: wxTreeCtrl(parent, id, pos, size, style) : wxTreeCtrl(parent, id, pos, size, style)
{ {
#if (USE_TR_HAS_VARIABLE_ROW_HIGHT && wxUSE_LIBJPEG) #ifndef NO_VARIABLE_HEIGHT
#if wxUSE_LIBJPEG
wxImage::AddHandler(new wxJPEGHandler); wxImage::AddHandler(new wxJPEGHandler);
wxImage image; wxImage image;
image.LoadFile(wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ); image.LoadFile(wxString("horse.jpg"), wxBITMAP_TYPE_JPEG );
#endif
#endif #endif
m_reverseSort = FALSE; m_reverseSort = FALSE;
@@ -430,14 +434,14 @@ MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
#if defined(__WXMSW__) && defined(__WIN16__) #if defined(__WXMSW__) && defined(__WIN16__)
// This is required in 16-bit Windows mode only because we can't load a specific (16x16) // This is required in 16-bit Windows mode only because we can't load a specific (16x16)
// icon image, so it comes out stretched // icon image, so it comes out stretched
# if USE_TR_HAS_VARIABLE_ROW_HIGHT # ifndef NO_VARIABLE_HEIGHT
m_imageListNormal->Add(image.ConvertToBitmap()); m_imageListNormal->Add(image.ConvertToBitmap());
# else # else
m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE)); m_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
# endif # endif
m_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE)); m_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
#else #else
# if USE_TR_HAS_VARIABLE_ROW_HIGHT # ifndef NO_VARIABLE_HEIGHT
m_imageListNormal->Add(image.ConvertToBitmap()); m_imageListNormal->Add(image.ConvertToBitmap());
# else # else
m_imageListNormal->Add(wxICON(icon1)); m_imageListNormal->Add(wxICON(icon1));