Toolbar/tooltip udates

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index d05b3949dba3d2fbfb2ad7801f780149b6c3729d..1783afe29d9287816e02691d82a98c5942898581 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -32,9 +32,10 @@ class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 

-#if !defined(__WXMSW__)
-
+#if defined(__WXMGL__) || defined(__WXMAC__)

 // Only used by some ports
 // Only used by some ports

+// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
+

 // ----------------------------------------------------------------------------
 // wxBitmapHandler: class which knows how to create/load/save bitmaps in
 // different formats
 // ----------------------------------------------------------------------------
 // wxBitmapHandler: class which knows how to create/load/save bitmaps in
 // different formats


@@ -44,9 +45,10 @@ class WXDLLEXPORT wxBitmapHandlerBase : public wxObject
 {
 public:
     wxBitmapHandlerBase()
 {
 public:
     wxBitmapHandlerBase()

-    {
-        m_type = wxBITMAP_TYPE_INVALID;
-    }
+        : m_name()
+        , m_extension()
+        , m_type(wxBITMAP_TYPE_INVALID)
+    { }

 
     virtual ~wxBitmapHandlerBase() { }
 
 
     virtual ~wxBitmapHandlerBase() { }
 


@@ -158,10 +160,10 @@ protected:
 #include "wx/motif/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
 #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(__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__)
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXPM__)