fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / include / wx / dcmemory.h

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 80d3c7f5debc68700a549b2b55d7544716e153ee..68e5a11d95b9903d79135915bb6c2c5a129876bc 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,14 +1,29 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcmemory.h
+// Purpose:     wxMemoryDC base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 

+#include "wx/defs.h"
+

 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcmemory.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcmemory.h"
 #if defined(__WXPALMOS__)
 #include "wx/palmos/dcmemory.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcmemory.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/dcmemory.h"
 #include "wx/gtk/dcmemory.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcmemory.h"

 #elif defined(__WXX11__)
 #include "wx/x11/dcmemory.h"
 #elif defined(__WXMGL__)
 #elif defined(__WXX11__)
 #include "wx/x11/dcmemory.h"
 #elif defined(__WXMGL__)