projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed semicolons from end of DECLARE_DYNAMIC_CLASS() and DECLARE_NO_COPY_CLASS...
[wxWidgets.git]
/
include
/
wx
/
bitmap.h
diff --git
a/include/wx/bitmap.h
b/include/wx/bitmap.h
index 4a1d3b0296a4c8a3891e29266fc87c27dd66cf0e..aa86bc86b90f0552072c42f04b0457e8f9860a22 100644
(file)
--- a/
include/wx/bitmap.h
+++ b/
include/wx/bitmap.h
@@
-32,6
+32,10
@@
class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette;
class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette;
+#if defined(__WXMGL__) || defined(__WXMAC__)
+// 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
@@
-69,8
+73,6
@@
protected:
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
};
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
};
-
-
class WXDLLEXPORT wxBitmapBase : public wxGDIObject
{
public:
class WXDLLEXPORT wxBitmapBase : public wxGDIObject
{
public:
@@
-149,8
+151,7
@@
protected:
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
};
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
};
-
-
+#endif
#if defined(__WXMSW__)
#include "wx/msw/bitmap.h"
#if defined(__WXMSW__)
#include "wx/msw/bitmap.h"
@@
-160,8
+161,6
@@
protected:
#include "wx/gtk/bitmap.h"
#elif defined(__WXMGL__)
#include "wx/mgl/bitmap.h"
#include "wx/gtk/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__)