gtk_window_[un]fullscreen only available with GTK >= 2.2

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 36dda96e2ad2f9d42e4b72112653328621e05d05..c17ef0ad6f63f79125a3da9fe3fe840d1c3d7c78 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.04.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     22.04.01
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "bitmapbase.h"
 #endif
 
     #pragma interface "bitmapbase.h"
 #endif
 


@@ -32,7 +32,11 @@ class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 

-#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__)
+#if defined(__WXMGL__) || \
+    defined(__WXMAC__) || \
+    defined(__WXCOCOA__) || \
+    defined(__WXMOTIF__) || \
+    defined(__WXX11__)

 // Only used by some ports
 // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
 
 // Only used by some ports
 // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
 


@@ -159,7 +163,9 @@ protected:
 };
 #endif
 
 };
 #endif
 

-#if defined(__WXMSW__)
+#if defined(__PALMOS__)
+#include "wx/palmos/bitmap.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/bitmap.h"
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/bitmap.h"