create the DIBs in correct (and not down up) line order

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 1783afe29d9287816e02691d82a98c5942898581..1faee6ed359d72122b79aa6b03212534c941839a 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "bitmapbase.h"
 #endif
 
@@ -32,7 +32,7 @@ class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
-#if defined(__WXMGL__) || defined(__WXMAC__)
+#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__)
 // Only used by some ports
 // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
 
@@ -166,10 +166,10 @@ protected:
 #include "wx/mgl/bitmap.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)
 #include "wx/os2/bitmap.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/bitmap.h"
 #endif
 
 #endif