merged in the commit from the 2.2 branch

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 2d5ad42e0c8ed1758faec87d092c1f4b9b2ad399..f9118cb55e926d47d6886a8b685a2658df128bd8 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -1,15 +1,21 @@
-#ifndef __BITMAPH_BASE__
-#define __BITMAPH_BASE__
+#ifndef _WX_BITMAP_H_BASE_
+#define _WX_BITMAP_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/bitmap.h"
+#include "wx/motif/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bitmap.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/bitmap.h"
+#elif defined(__WXPM__)
+#include "wx/os2/bitmap.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/bitmap.h"
 #endif
 
 #endif
-    // __BITMAPH_BASE__
+    // _WX_BITMAP_H_BASE_