use wxHAVE_U_ESCAPE to accomodate old compilers

[wxWidgets.git] / contrib / samples / ogl / ogledit / palette.cpp

diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
index 1449340569cdce7514b07a4dd0168203db4cbbbc..30adc96717a32f48c5653718fe9e6ead3d35c251 100644 (file)
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.cpp
+// Name:        samples/ogl/ogledit/palette.cpp

 // Purpose:     OGLEdit palette
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     OGLEdit palette
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


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

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

 #endif
 
 #endif
 

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

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


@@ -80,21 +76,12 @@ void EditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFla
 
 EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
 {
 
 EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
 {

-  // Load palette bitmaps. MSW-specific bitmaps no
-  // longer needed.
-#if 0
-  wxBitmap PaletteTool1(_T("TOOL1"));
-  wxBitmap PaletteTool2(_T("TOOL2"));
-  wxBitmap PaletteTool3(_T("TOOL3"));
-  wxBitmap PaletteTool4(_T("TOOL4"));
-  wxBitmap PaletteArrow(_T("ARROWTOOL"));
-#else
+  // Load palette bitmaps.

   wxBitmap PaletteTool1(tool1_xpm);
   wxBitmap PaletteTool2(tool2_xpm);
   wxBitmap PaletteTool3(tool3_xpm);
   wxBitmap PaletteTool4(tool4_xpm);
   wxBitmap PaletteArrow(arrow_xpm);
   wxBitmap PaletteTool1(tool1_xpm);
   wxBitmap PaletteTool2(tool2_xpm);
   wxBitmap PaletteTool3(tool3_xpm);
   wxBitmap PaletteTool4(tool4_xpm);
   wxBitmap PaletteArrow(arrow_xpm);

-#endif

 
   EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
       wxTB_VERTICAL);
 
   EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxDefaultSize,
       wxTB_VERTICAL);


@@ -114,4 +101,3 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
   palette->currentlySelected = PALETTE_ARROW;
   return palette;
 }
   palette->currentlySelected = PALETTE_ARROW;
   return palette;
 }

-