#ifdefed out some redundant base classes so DLL version compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,6 +32,9 @@ class WXDLLEXPORT wxImage;
|
|||||||
class WXDLLEXPORT wxMask;
|
class WXDLLEXPORT wxMask;
|
||||||
class WXDLLEXPORT wxPalette;
|
class WXDLLEXPORT wxPalette;
|
||||||
|
|
||||||
|
#if !defined(__WXMSW__)
|
||||||
|
|
||||||
|
// Only used by some ports
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxBitmapHandler: class which knows how to create/load/save bitmaps in
|
// wxBitmapHandler: class which knows how to create/load/save bitmaps in
|
||||||
// different formats
|
// different formats
|
||||||
@@ -69,8 +72,6 @@ protected:
|
|||||||
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
|
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class WXDLLEXPORT wxBitmapBase : public wxGDIObject
|
class WXDLLEXPORT wxBitmapBase : public wxGDIObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -149,8 +150,7 @@ protected:
|
|||||||
|
|
||||||
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
|
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if defined(__WXMSW__)
|
#if defined(__WXMSW__)
|
||||||
#include "wx/msw/bitmap.h"
|
#include "wx/msw/bitmap.h"
|
||||||
|
Reference in New Issue
Block a user