X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..6d06e061dc11140151be2914c30c759ee15e3fe7:/contrib/samples/ogl/ogledit/palette.h?ds=sidebyside diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h index c38e39dbea..1ffd119d2a 100644 --- a/contrib/samples/ogl/ogledit/palette.h +++ b/contrib/samples/ogl/ogledit/palette.h @@ -6,7 +6,7 @@ // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _OGLSAMPLE_PALETTE_H_ @@ -18,11 +18,8 @@ #include #include -#if 0 // def __WXGTK__ -#include -#else -#include -#endif +#include +#include /* * Object editor tool palette @@ -32,11 +29,14 @@ // TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position! // Needs to have a parent window... // So use a simple toolbar at present. -#if 0 // def __WXGTK__ +// ABX: Simple toolbar is not available in default compilation +// so I use wxToolBar anyway +// #if 0 // def __WXGTK__ +// #define TOOLPALETTECLASS wxToolBar +// #else +// #define TOOLPALETTECLASS wxToolBarSimple +// #endif #define TOOLPALETTECLASS wxToolBar -#else -#define TOOLPALETTECLASS wxToolBarSimple -#endif class EditorToolPalette: public TOOLPALETTECLASS {