support for using DIBs for wxBitmap implementation (patch 649866)

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 9e6f11f984dd5ffe6a72c95549451458fb3dc3e3..cd701f737a0fdd069191b3d806e222524804c9da 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
 
@@ -45,9 +45,10 @@ class WXDLLEXPORT wxBitmapHandlerBase : public wxObject
 {
 public:
     wxBitmapHandlerBase()
-    {
-        m_type = wxBITMAP_TYPE_INVALID;
-    }
+        : m_name()
+        , m_extension()
+        , m_type(wxBITMAP_TYPE_INVALID)
+    { }
 
     virtual ~wxBitmapHandlerBase() { }
 
@@ -159,10 +160,10 @@ protected:
 #include "wx/motif/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
+#elif defined(__WXX11__)
+#include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
-#elif defined(__WXQT__)
-#include "wx/qt/bitmap.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXPM__)