always let the multiline text control process the Enter key presses

[wxWidgets.git] / contrib / samples / ogl / studio / cspalette.cpp

diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
index 80b48ebd534284ecc1e6222a616bd481947fa226..36ac64e236ab6d80ab4f91c5334d0f53ab7ffee0 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -36,7 +36,7 @@
 #include "cspalette.h"
 #include "symbols.h"
 
 #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
 #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);
     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);
     wxBitmap PaletteArrow(arrow_xpm);
     wxBitmap TextTool(texttool_xpm);
     wxSize toolBitmapSize(22, 22);