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 f2cb35f3988a8b36987e69e664b95ceea7bb5681..68e5a11d95b9903d79135915bb6c2c5a129876bc 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,15 +1,40 @@
-#ifndef __DCMEMORYH_BASE__
-#define __DCMEMORYH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dcmemory.h
+// Purpose:     wxMemoryDC base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////

 
 

-#if defined(__WXMSW__)
+#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/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dcmemory.h"
-#elif defined(__WXGTK__)
+#include "wx/motif/dcmemory.h"
+#elif defined(__WXGTK20__)

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

-#elif defined(__WXQT__)
-#include "wx/qt/dcmemory.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcmemory.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcmemory.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/dcmemory.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcmemory.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcmemory.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcmemory.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DCMEMORYH_BASE__
+    // _WX_DCMEMORY_H_BASE_