X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/422d0ff0bec79832494fe4605ffdcf8e87ba6c03..3030ae493df7500fd5da7555f141c0c8a690bd8a:/contrib/samples/ogl/studio/cspalette.cpp diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp index 7fda08634f..3eb05d3b8a 100644 --- a/contrib/samples/ogl/studio/cspalette.cpp +++ b/contrib/samples/ogl/studio/cspalette.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cspalette.cpp +// Name: contrib/samples/ogl/studio/cspalette.cpp // Purpose: OGLEdit palette // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -// #pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/laywin.h" #include #include @@ -36,7 +32,7 @@ #include "cspalette.h" #include "symbols.h" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#ifndef __WXMSW__ #include "bitmaps/arrow.xpm" #include "bitmaps/texttool.xpm" #endif @@ -122,7 +118,7 @@ bool csApp::CreatePalette(wxFrame *parent) wxBitmap PaletteArrow(_T("arrowtool")); wxBitmap TextTool(_T("texttool")); wxSize toolBitmapSize(32, 32); -#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#else // !__WXMSW__ wxBitmap PaletteArrow(arrow_xpm); wxBitmap TextTool(texttool_xpm); wxSize toolBitmapSize(22, 22); @@ -145,7 +141,7 @@ bool csApp::CreatePalette(wxFrame *parent) symbols[noSymbols] = _T("Thin Rectangle"); noSymbols ++; - + symbols[noSymbols] = _T("Triangle"); noSymbols ++; @@ -204,4 +200,3 @@ bool csApp::CreatePalette(wxFrame *parent) return true; } -