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

Added __WXX11__ tests where appropriate

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-03-21 10:32:18 +00:00
parent e3baff1c85
commit 618f2efa41
34 changed files with 205 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/samples/ogl/studio/studio.cpp
View File

@@ -33,7 +33,7 @@
#include "project.h"
#include "symbols.h"
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "bitmaps/new.xpm"
#include "bitmaps/open.xpm"
#include "bitmaps/save.xpm"
@@ -322,7 +322,7 @@ void csApp::InitToolBar(wxToolBar* toolBar)
bitmaps[7] = new wxBitmap("help", wxBITMAP_TYPE_RESOURCE);
bitmaps[8] = new wxBitmap("undo", wxBITMAP_TYPE_RESOURCE);
bitmaps[9] = new wxBitmap("redo", wxBITMAP_TYPE_RESOURCE);
#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
bitmaps[0] = new wxBitmap( new_xpm );
bitmaps[1] = new wxBitmap( open_xpm );
bitmaps[2] = new wxBitmap( save_xpm );
@@ -395,7 +395,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
bitmaps[8] = new wxBitmap("newpoint", wxBITMAP_TYPE_RESOURCE);
bitmaps[9] = new wxBitmap("cutpoint", wxBITMAP_TYPE_RESOURCE);
bitmaps[10] = new wxBitmap("straighten", wxBITMAP_TYPE_RESOURCE);
#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
bitmaps[0] = new wxBitmap( alignl_xpm );
bitmaps[1] = new wxBitmap( alignr_xpm );
bitmaps[2] = new wxBitmap( alignt_xpm );