Added __WXX11__ tests where appropriate

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/samples/animate/anitest.cpp

@@ -28,7 +28,7 @@
     #include "wx/wx.h"
 #endif
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

contrib/samples/canvas/simple/simple.cpp

@@ -20,7 +20,7 @@
 #include "simple.h"
 
 // Include icon header
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

contrib/samples/fl/fl_demo1/fl_demo1.cpp

@@ -134,7 +134,7 @@ MyFrame::MyFrame(wxFrame *frame)
     
     mpLayout = new wxFrameLayout( this, mpClientWnd );
     
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
     cbCommonPaneProperties props;
     mpLayout->GetPaneProperties( props );
     

contrib/samples/fl/fl_demo2/fl_demo2.cpp

@@ -776,7 +776,7 @@ void MyFrame::DropInSomeBars( int layoutNo )
         {
             if ( layoutNo == THIRD_LAYOUT  )
             {
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
                 cbCommonPaneProperties props;
                 layout.GetPaneProperties( props );
                 props.mRealTimeUpdatesOn = FALSE; // real-time OFF for gtk!!!
@@ -849,7 +849,7 @@ void MyFrame::CreateLayout( int layoutNo )
     {
         pLayout->PushDefaultPlugins();
         pLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for bars
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || || defined(__WXX11__) 
         pLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
 #endif
         pLayout->AddPlugin( CLASSINFO( cbRowDragPlugin ) ); 

contrib/samples/fl/fl_sample1/fl_sample1.cpp

@@ -117,7 +117,7 @@ MyFrame::MyFrame( wxWindow* parent, char *title )
     
     mpLayout = new wxFrameLayout( mpInternalFrm, mpClientWnd );
     
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
     // real-time dosn't work well under wxGtk yet
     cbCommonPaneProperties props;
     mpLayout->GetPaneProperties( props );

contrib/samples/gizmos/splittree/tree.cpp

@@ -98,7 +98,7 @@ static char * icon2_xpm[] = {
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

contrib/samples/mmedia/mmboard.cpp

@@ -37,7 +37,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

contrib/samples/ogl/ogledit/ogledit.cpp

@@ -33,7 +33,7 @@
 #include "doc.h"
 #include "view.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "ogl.xpm"
 #endif
 

contrib/samples/ogl/ogledit/palette.cpp

@@ -36,7 +36,7 @@
 #include "palette.h"
 
 // Include pixmaps
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/tool1.xpm"
 #include "bitmaps/tool2.xpm"
@@ -93,7 +93,7 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
   wxBitmap PaletteTool3("TOOL3");
   wxBitmap PaletteTool4("TOOL4");
   wxBitmap PaletteArrow("ARROWTOOL");
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
   wxBitmap PaletteTool1(tool1_xpm);
   wxBitmap PaletteTool2(tool2_xpm);
   wxBitmap PaletteTool3(tool3_xpm);

contrib/samples/ogl/studio/cspalette.cpp

@@ -36,7 +36,7 @@
 #include "cspalette.h"
 #include "symbols.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/texttool.xpm"
 #endif
@@ -118,7 +118,7 @@ bool csApp::CreatePalette(wxFrame *parent)
     wxBitmap PaletteArrow("arrowtool");
     wxBitmap TextTool("texttool");
     wxSize toolBitmapSize(32, 32);
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     wxBitmap PaletteArrow(arrow_xpm);
     wxBitmap TextTool(texttool_xpm);
     wxSize toolBitmapSize(22, 22);

contrib/samples/ogl/studio/studio.cpp

@@ -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 );

contrib/samples/xrc/xrcdemo.cpp

@@ -39,7 +39,7 @@
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
     #include "rc/appicon.xpm"
 #endif
 

contrib/src/fl/controlbar.cpp

@@ -387,7 +387,7 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
     pChild->Reparent(pNewParent);
 
     return;
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK__) || defined(__WXX11__)
     // FOR NOW:: floating with wxGtk still very buggy
 
     return;

contrib/src/fl/toolwnd.cpp

@@ -867,7 +867,7 @@ void cbMiniButton::Reset()
 
 void cbCloseBox::Draw( wxDC& dc )
 {
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
 
     cbMiniButton::Draw( dc );
     

demos/bombs/bombs.cpp

@@ -24,7 +24,7 @@
 #include <time.h>
 #include <stdlib.h>
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "bombs.xpm"
 #endif
 

distrib/msw/vc.rsp

@@ -22,237 +22,237 @@ src/regex/regex.dsw
 
 samples/samples.dsw
 
-samples/calendar/Calendar.dsp
-samples/calendar/Calendar.dsw
+samples/calendar/calendar.dsp
+samples/calendar/calendar.dsw
 
-samples/caret/Caret.dsp
-samples/caret/Caret.dsw
+samples/caret/caret.dsp
+samples/caret/caret.dsw
 
-samples/checklst/Checklst.dsp
-samples/checklst/Checklst.dsw
+samples/checklst/checklst.dsp
+samples/checklst/checklst.dsw
 
-samples/config/Config.dsp
-samples/config/Config.dsw
+samples/config/config.dsp
+samples/config/config.dsw
 
 samples/console/console.dsp
 samples/console/console.dsw
 
-samples/controls/Controls.dsp
-samples/controls/Controls.dsw
+samples/controls/controls.dsp
+samples/controls/controls.dsw
 
-samples/db/Db.dsp
-samples/db/Db.dsw
+samples/db/db.dsp
+samples/db/db.dsw
 
-samples/dialogs/Dialogs.dsp
-samples/dialogs/Dialogs.dsw
+samples/dialogs/dialogs.dsp
+samples/dialogs/dialogs.dsw
 
-samples/dialup/Dialup.dsp
-samples/dialup/Dialup.dsw
+samples/dialup/dialup.dsp
+samples/dialup/dialup.dsw
 
-samples/dnd/Dnd.dsp
-samples/dnd/Dnd.dsw
+samples/dnd/dnd.dsp
+samples/dnd/dnd.dsw
 
-samples/dragimag/Dragimag.dsp
-samples/dragimag/Dragimag.dsw
+samples/dragimag/dragimag.dsp
+samples/dragimag/dragimag.dsw
 
-samples/docview/Docview.dsp
-samples/docview/Docview.dsw
+samples/docview/docview.dsp
+samples/docview/docview.dsw
 
-samples/docvwmdi/DocVwMdi.dsp
-samples/docvwmdi/DocVwMdi.dsw
+samples/docvwmdi/docvwmdi.dsp
+samples/docvwmdi/docvwmdi.dsw
 
-samples/drawing/Drawing.dsp
-samples/drawing/Drawing.dsw
+samples/drawing/drawing.dsp
+samples/drawing/drawing.dsw
 
-samples/dynamic/Dynamic.dsp
-samples/dynamic/Dynamic.dsw
+samples/dynamic/dynamic.dsp
+samples/dynamic/dynamic.dsw
 
-samples/erase/Erase.dsp
-samples/erase/Erase.dsw
+samples/erase/erase.dsp
+samples/erase/erase.dsw
 
-samples/event/Event.dsp
-samples/event/Event.dsw
+samples/event/event.dsp
+samples/event/event.dsw
 
-samples/exec/Exec.dsp
-samples/exec/Exec.dsw
+samples/exec/exec.dsp
+samples/exec/exec.dsw
 
-samples/font/Font.dsp
-samples/font/Font.dsw
+samples/font/font.dsp
+samples/font/font.dsw
 
-samples/grid/Grid.dsp
-samples/grid/Grid.dsw
+samples/grid/grid.dsp
+samples/grid/grid.dsw
 
-samples/help/Help.dsp
-samples/help/Help.dsw
+samples/help/help.dsp
+samples/help/help.dsw
 
-samples/html/about/About.dsp
-samples/html/about/About.dsw
-samples/html/help/Help.dsp
-samples/html/help/Help.dsw
-samples/html/helpview/HelpView.dsp
-samples/html/helpview/HelpView.dsw
-samples/html/printing/Printing.dsp
-samples/html/printing/Printing.dsw
-samples/html/test/Test.dsp
-samples/html/test/Test.dsw
-samples/html/virtual/Virtual.dsp
-samples/html/virtual/Virtual.dsw
-samples/html/widget/Widget.dsp
-samples/html/widget/Widget.dsw
-samples/html/zip/Zip.dsp
-samples/html/zip/Zip.dsw
+samples/html/about/about.dsp
+samples/html/about/about.dsw
+samples/html/help/help.dsp
+samples/html/help/help.dsw
+samples/html/helpview/helpview.dsp
+samples/html/helpview/helpview.dsw
+samples/html/printing/printing.dsp
+samples/html/printing/printing.dsw
+samples/html/test/test.dsp
+samples/html/test/test.dsw
+samples/html/virtual/virtual.dsp
+samples/html/virtual/virtual.dsw
+samples/html/widget/widget.dsp
+samples/html/widget/widget.dsw
+samples/html/zip/zip.dsp
+samples/html/zip/zip.dsw
 
-samples/image/Image.dsp
-samples/image/Image.dsw
+samples/image/image.dsp
+samples/image/image.dsw
 
-samples/internat/Internat.dsp
-samples/internat/Internat.dsw
+samples/internat/internat.dsp
+samples/internat/internat.dsw
 
-samples/ipc/Client.dsp
-samples/ipc/Client.dsw
-samples/ipc/Server.dsp
-samples/ipc/Server.dsw
+samples/ipc/client.dsp
+samples/ipc/client.dsw
+samples/ipc/server.dsp
+samples/ipc/server.dsw
 
-samples/joytest/Joytest.dsp
-samples/joytest/Joytest.dsw
+samples/joytest/joytest.dsp
+samples/joytest/joytest.dsw
 
-samples/layout/Layout.dsp
-samples/layout/Layout.dsw
+samples/layout/layout.dsp
+samples/layout/layout.dsw
 
-samples/listctrl/ListCtrl.dsp
-samples/listctrl/ListCtrl.dsw
+samples/listctrl/listctrl.dsp
+samples/listctrl/listctrl.dsw
 
-samples/mdi/Mdi.dsp
-samples/mdi/Mdi.dsw
+samples/mdi/mdi.dsp
+samples/mdi/mdi.dsw
 
-samples/memcheck/Memcheck.dsp
-samples/memcheck/Memcheck.dsw
+samples/memcheck/memcheck.dsp
+samples/memcheck/memcheck.dsw
 
-samples/menu/Menu.dsp
-samples/menu/Menu.dsw
+samples/menu/menu.dsp
+samples/menu/menu.dsw
 
-samples/mfc/Mfc.dsp
-samples/mfc/Mfc.dsw
+samples/mfc/mfc.dsp
+samples/mfc/mfc.dsw
 
-samples/minimal/Minimal.dsp
-samples/minimal/Minimal.dsw
+samples/minimal/minimal.dsp
+samples/minimal/minimal.dsw
 
-samples/minifram/Minifram.dsp
-samples/minifram/Minifram.dsw
+samples/minifram/minifram.dsp
+samples/minifram/minifram.dsw
 
-samples/nativdlg/Nativdlg.dsp
-samples/nativdlg/Nativdlg.dsw
+samples/nativdlg/nativdlg.dsp
+samples/nativdlg/nativdlg.dsw
 
-samples/newgrid/Newgrid.dsp
-samples/newgrid/Newgrid.dsw
+samples/newgrid/newgrid.dsp
+samples/newgrid/newgrid.dsw
 
-samples/notebook/Notebook.dsp
-samples/notebook/Notebook.dsw
+samples/notebook/notebook.dsp
+samples/notebook/notebook.dsw
 
-samples/oleauto/Oleauto.dsp
-samples/oleauto/Oleauto.dsw
+samples/oleauto/oleauto.dsp
+samples/oleauto/oleauto.dsw
 
-samples/ownerdrw/OwnerDrw.dsp
-samples/ownerdrw/OwnerDrw.dsw
+samples/ownerdrw/ownerDrw.dsp
+samples/ownerdrw/ownerDrw.dsw
 
-samples/png/Png.dsp
-samples/png/Png.dsw
+samples/png/png.dsp
+samples/png/png.dsw
 
-samples/printing/Printing.dsp
-samples/printing/Printing.dsw
+samples/printing/printing.dsp
+samples/printing/printing.dsw
 
-samples/proplist/Proplist.dsp
-samples/proplist/Proplist.dsw
+samples/proplist/proplist.dsp
+samples/proplist/proplist.dsw
 
-samples/propsize/Propsize.dsp
-samples/propsize/Propsize.dsw
+samples/propsize/propsize.dsp
+samples/propsize/propsize.dsw
 
-samples/Regtest/Regtest.dsp
-samples/Regtest/Regtest.dsw
+samples/regtest/regtest.dsp
+samples/regtest/regtest.dsw
 
-samples/resource/Resource.dsp
-samples/resource/Resource.dsw
+samples/resource/resource.dsp
+samples/resource/resource.dsw
 
-samples/richedit/RichEdit.dsp
-samples/richedit/RichEdit.dsw
+samples/richedit/richedit.dsp
+samples/richedit/richedit.dsw
 
-samples/rotate/Rotate.dsp
-samples/rotate/Rotate.dsw
+samples/rotate/rotate.dsp
+samples/rotate/rotate.dsw
 
-samples/sashtest/Sashtest.dsp
-samples/sashtest/Sashtest.dsw
+samples/sashtest/sashtest.dsp
+samples/sashtest/sashtest.dsw
 
-samples/scroll/Scroll.dsp
-samples/scroll/Scroll.dsw
+samples/scroll/scroll.dsp
+samples/scroll/scroll.dsw
 
-samples/scrollsub/Scrollsub.dsp
-samples/scrollsub/Scrollsub.dsw
+samples/scrollsub/scrollsub.dsp
+samples/scrollsub/scrollsub.dsw
 
-samples/sockets/Client.dsp
-samples/sockets/Server.dsp
-samples/sockets/Client.dsw
-samples/sockets/Server.dsw
+samples/sockets/client.dsp
+samples/sockets/server.dsp
+samples/sockets/client.dsw
+samples/sockets/server.dsw
 
-samples/splitter/Splitter.dsp
-samples/splitter/Splitter.dsw
+samples/splitter/splitter.dsp
+samples/splitter/splitter.dsw
 
-samples/statbar/Statbar.dsp
-samples/statbar/Statbar.dsw
+samples/statbar/statbar.dsp
+samples/statbar/statbar.dsw
 
-samples/taskbar/Taskbar.dsp
-samples/taskbar/Taskbar.dsw
+samples/taskbar/taskbar.dsp
+samples/taskbar/taskbar.dsw
 
-samples/text/Text.dsp
-samples/text/Text.dsw
+samples/text/text.dsp
+samples/text/text.dsw
 
-samples/thread/Thread.dsp
-samples/thread/Thread.dsw
+samples/thread/thread.dsp
+samples/thread/thread.dsw
 
-samples/toolbar/Toolbar.dsp
-samples/toolbar/Toolbar.dsw
+samples/toolbar/toolbar.dsp
+samples/toolbar/toolbar.dsw
 
-samples/treectrl/Treectrl.dsp
-samples/treectrl/TreeCtrl.dsw
+samples/treectrl/treetest.dsp
+samples/treectrl/treetest.dsw
 
-samples/treelay/Treelay.dsp
-samples/treelay/Treelay.dsw
+samples/treelay/treelay.dsp
+samples/treelay/treelay.dsw
 
-samples/typetest/Typetest.dsp
-samples/typetest/Typetest.dsw
+samples/typetest/typetest.dsp
+samples/typetest/typetest.dsw
 
-samples/validate/Validate.dsp
-samples/validate/Validate.dsw
+samples/validate/validate.dsp
+samples/validate/validate.dsw
 
-samples/wizard/Wizard.dsp
-samples/wizard/Wizard.dsw
+samples/wizard/wizard.dsp
+samples/wizard/wizard.dsw
 
 samples/widgets/widgets.dsp
 samples/widgets/widgets.dsw
 
-samples/opengl/cube/Cube.dsp
-samples/opengl/cube/Cube.dsw
-samples/opengl/isosurf/Isosurf.dsp
-samples/opengl/isosurf/Isosurf.dsw
-samples/opengl/penguin/Penguin.dsp
-samples/opengl/penguin/Penguin.dsw
+samples/opengl/cube/cube.dsp
+samples/opengl/cube/cube.dsw
+samples/opengl/isosurf/isosurf.dsp
+samples/opengl/isosurf/isosurf.dsw
+samples/opengl/penguin/penguin.dsp
+samples/opengl/penguin/penguin.dsw
 
-demos/bombs/Bombs.dsp
-demos/bombs/Bombs.dsw
+demos/bombs/bombs.dsp
+demos/bombs/bombs.dsw
 
-demos/dbbrowse/Dbbrowse.dsp
-demos/dbbrowse/Dbbrowse.dsw
+demos/dbbrowse/dbbrowse.dsp
+demos/dbbrowse/dbbrowse.dsw
 
-demos/forty/Forty.dsp
-demos/forty/Forty.dsw
+demos/forty/forty.dsp
+demos/forty/forty.dsw
 
-demos/fractal/Fractal.dsp
-demos/fractal/Fractal.dsw
+demos/fractal/fractal.dsp
+demos/fractal/fractal.dsw
 
-demos/life/Life.dsp
-demos/life/Life.dsw
+demos/life/life.dsp
+demos/life/life.dsw
 
-demos/poem/Poem.dsp
-demos/poem/Poem.dsw
+demos/poem/poem.dsp
+demos/poem/poem.dsw
 
 utils/dialoged/src/DialogEdVC.dsp
 utils/dialoged/src/DialogEdVC.dsw
@@ -315,12 +315,16 @@ contrib/samples/plot/PlotVC.dsw
 
 contrib/src/gizmos/GizmosVC.dsp
 contrib/src/gizmos/GizmosVC.dsw
-contrib/samples/gizmos/multicell/MulticellVC.dsp
-contrib/samples/gizmos/multicell/MulticellVC.dsw
+contrib/samples/gizmos/dynsash/dynsash.dsp
+contrib/samples/gizmos/dynsash/dynsash.dsw
+contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
+contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
+contrib/samples/gizmos/editlbox/editlbox.dsp
+contrib/samples/gizmos/editlbox/editlbox.dsw
+contrib/samples/gizmos/multicell/multicell.dsp
+contrib/samples/gizmos/multicell/multicell.dsw
 contrib/samples/gizmos/splittree/TreeVC.dsp
 contrib/samples/gizmos/splittree/TreeVC.dsw
-contrib/samples/gizmos/editlbox/EditlboxVC.dsp
-contrib/samples/gizmos/editlbox/EditlboxVC.dsw
 
 contrib/src/animate/AnimateVC.dsp
 contrib/src/animate/AnimateVC.dsw

samples/caret/caret.cpp

@@ -30,7 +30,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
     #include "mondrian.xpm"
 #endif
 

samples/db/dbtest.cpp

@@ -35,7 +35,7 @@
 #include  <wx/wx.h>
 #endif //WX_PRECOMP
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
 #include "db.xpm"
 #endif
 

samples/dnd/dnd.cpp

@@ -54,7 +54,7 @@
     #include "wx/metafile.h"
 #endif // Windows
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 
     #include "dnd_copy.xpm"

samples/drawing/drawing.cpp

@@ -474,8 +474,8 @@ void MyCanvas::DrawDefault(wxDC& dc)
 {
     // mark the origin
     dc.DrawCircle(0, 0, 10);
-#if !(defined __WXGTK__) && !(defined __WXMOTIF__) && !(defined __WXMGL__)
-    // not implemented in wxGTK or wxMOTIF :-(
+#if !(defined __WXGTK__) && !(defined __WXX11__) && !(defined __WXMOTIF__) && !(defined __WXMGL__)
+    // not implemented in wxGTK or wxMOTIF or wxX11 :-(
     dc.FloodFill(0, 0, wxColour(255, 0, 0));
 #endif //
 

samples/dynamic/dynamic.cpp

@@ -25,7 +25,7 @@
 #include "wx/wx.h"
 #endif
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"
 #endif
 

samples/help/demo.cpp

@@ -75,7 +75,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
     #include "mondrian.xpm"
 #endif
 

samples/internat/internat.cpp

@@ -29,7 +29,7 @@
 #include "wx/file.h"
 #include "wx/log.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"
 #endif
 

samples/ipc/client.cpp

@@ -33,7 +33,7 @@
 
 #include "ddesetup.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "mondrian.xpm"
 #endif
 

samples/ipc/server.cpp

@@ -32,7 +32,7 @@
 // we're using TCP/IP or real DDE.
 #include "ddesetup.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

samples/mdi/mdi.cpp

@@ -31,7 +31,7 @@
 
 #include "wx/toolbar.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
     #include "bitmaps/new.xpm"
     #include "bitmaps/open.xpm"

samples/memcheck/memcheck.cpp

@@ -27,7 +27,7 @@
 
 #include "wx/datetime.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "mondrian.xpm"
 #endif
 

samples/minifram/minifram.cpp

@@ -23,7 +23,7 @@
 #include "wx/toolbar.h"
 #include "minifram.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "mondrian.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/open.xpm"

samples/oleauto/oleauto.cpp

@@ -48,7 +48,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     #include "mondrian.xpm"
 #endif
 

samples/propsize/propsize.cpp

@@ -40,7 +40,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
     #include "mondrian.xpm"
 #endif
 

samples/sockets/client.cpp

@@ -43,7 +43,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #  include "mondrian.xpm"
 #endif
 

samples/sockets/server.cpp

@@ -41,7 +41,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #  include "mondrian.xpm"
 #endif
 

samples/typetest/typetest.cpp

@@ -31,7 +31,7 @@
 
 #include "typetest.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"
 #endif
 

samples/xrc/xrcdemo.cpp

@@ -39,7 +39,7 @@
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
     #include "rc/appicon.xpm"
 #endif