wxXML load/save improvements: added ability to not ignore whitespace and specify...

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 7ce0770d85f3df61b16ea209c75a670ba2171465..7d688bc7886b823b81173f8cfb38520e4349d0ae 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "bitmapbase.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -33,6 +29,7 @@ class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
 #if defined(__WXMGL__) || \
 class WXDLLEXPORT wxPalette;
 
 #if defined(__WXMGL__) || \

+    defined(__WXDFB__) || \

     defined(__WXMAC__) || \
     defined(__WXGTK__) || \
     defined(__WXCOCOA__) || \
     defined(__WXMAC__) || \
     defined(__WXGTK__) || \
     defined(__WXCOCOA__) || \


@@ -83,9 +80,6 @@ private:
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:

-    wxBitmapBase() : wxGDIObject() {}
-    virtual ~wxBitmapBase() {}
-

     /*
     Derived class must implement these:
 
     /*
     Derived class must implement these:
 


@@ -94,10 +88,8 @@ public:
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits);
     wxBitmap(char **bits);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits);
     wxBitmap(char **bits);

-    wxBitmap(const wxBitmap& bmp);

     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);

-    wxBitmap& operator = (const wxBitmap& bmp);

     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;
 
     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;
 


@@ -171,12 +163,16 @@ protected:
 #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"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/bitmap.h"
 #include "wx/gtk/bitmap.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/bitmap.h"

 #elif defined(__WXX11__)
 #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
 #elif defined(__WXX11__)
 #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"

+#elif defined(__WXDFB__)
+#include "wx/dfb/bitmap.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXCOCOA__)