Aliases for [G|S]etCaretLineBack

[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 b5b9c053b97cd29b5b255c278aece2e2ba17314a..3eb05d3b8a364fc3908d367a32e43b2e608fe921 100644 (file)
--- 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:
 // Purpose:     OGLEdit palette
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,10 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <wx/wx.h>
+#include "wx/wx.h"

 #endif
 
 #endif
 

-#include <wx/laywin.h>
+#include "wx/laywin.h"

 
 #include <ctype.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <stdlib.h>


@@ -32,7 +32,7 @@
 #include "cspalette.h"
 #include "symbols.h"
 
 #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
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/texttool.xpm"
 #endif


@@ -118,7 +118,7 @@ bool csApp::CreatePalette(wxFrame *parent)
     wxBitmap PaletteArrow(_T("arrowtool"));
     wxBitmap TextTool(_T("texttool"));
     wxSize toolBitmapSize(32, 32);
     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);
     wxBitmap PaletteArrow(arrow_xpm);
     wxBitmap TextTool(texttool_xpm);
     wxSize toolBitmapSize(22, 22);


@@ -141,7 +141,7 @@ bool csApp::CreatePalette(wxFrame *parent)
 
   symbols[noSymbols] =  _T("Thin Rectangle");
   noSymbols ++;
 
   symbols[noSymbols] =  _T("Thin Rectangle");
   noSymbols ++;

- 
+

   symbols[noSymbols] =  _T("Triangle");
   noSymbols ++;
 
   symbols[noSymbols] =  _T("Triangle");
   noSymbols ++;
 


@@ -200,4 +200,3 @@ bool csApp::CreatePalette(wxFrame *parent)
 
   return true;
 }
 
   return true;
 }

-