Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin

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

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 256db8c2f95bebb3531ff87164cbb2af9c5aed3a..8e8c4cd3c27fa01516d2be99a4541742cb0f5e07 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,13 +1,21 @@
-#ifndef __DCMEMORYH_BASE__
-#define __DCMEMORYH_BASE__
+#ifndef _WX_DCMEMORY_H_BASE_
+#define _WX_DCMEMORY_H_BASE_
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/dcmemory.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/dcmemory.h"
+#elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
+#elif defined(__WXQT__)
+#include "wx/qt/dcmemory.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcmemory.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcmemory.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcmemory.h"
 #endif
 
 #endif
-    // __DCMEMORYH_BASE__
+    // _WX_DCMEMORY_H_BASE_