Basque translations update from Xabier Aramendi.

[wxWidgets.git] / samples / mdi / mdi.cpp

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index a1ebf73cb800df17bdfaae9603a55d4445b3e227..bf4c9006e1be35a4c8eff10ecf1e16f5793748e9 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -4,10 +4,9 @@
 // Author:      Julian Smart
 // Modified by: 2008-10-31 Vadim Zeitlin: big clean up
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by: 2008-10-31 Vadim Zeitlin: big clean up
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2008 Vadim Zeitlin
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2008 Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -32,7 +31,7 @@
 
 #include "wx/toolbar.h"
 
 
 #include "wx/toolbar.h"
 

-#if !defined(__WXMSW__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
     #include "chart.xpm"
 #endif
     #include "../sample.xpm"
     #include "chart.xpm"
 #endif


@@ -340,7 +339,7 @@ MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
                            wxNO_FULL_REPAINT_ON_RESIZE |
                            wxVSCROLL | wxHSCROLL)
 {
                            wxNO_FULL_REPAINT_ON_RESIZE |
                            wxVSCROLL | wxHSCROLL)
 {

-    SetBackgroundColour(wxColour("WHITE"));
+    SetBackgroundColour(*wxWHITE);

     SetCursor(wxCursor(wxCURSOR_PENCIL));
 
     SetScrollbars(20, 20, 50, 50);
     SetCursor(wxCursor(wxCURSOR_PENCIL));
 
     SetScrollbars(20, 20, 50, 50);