Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Second try to add "support" for deriving from

Browse Source 
wxBitmapHandlerBase.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-02-05 14:17:27 +00:00
parent c8e1af672f
commit 4b61c88d55
6 changed files with 128 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/bitmap.h
View File

@@ -71,11 +71,12 @@ public:
wxString GetExtension() const { return m_extension; }
wxBitmapType GetType() const { return m_type; }
protected:
private:
wxString m_name;
wxString m_extension;
wxBitmapType m_type;
private:
DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
};

24
include/wx/gtk/bitmap.h
View File

@@ -106,7 +106,7 @@ public:
wxPalette *GetColourMap() const { return GetPalette(); };
#endif // wxUSE_PALETTE
static void InitStandardHandlers() { }
static void InitStandardHandlers();
// implementation
// --------------
@@ -153,8 +153,30 @@ private:
friend class wxMemoryDC;
#endif
friend class wxBitmapHandler;
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
//-----------------------------------------------------------------------------
// wxBitmapHandler
//-----------------------------------------------------------------------------
class wxBitmapHandler: public wxBitmapHandlerBase
{
public:
wxBitmapHandler() { }
virtual ~wxBitmapHandler();
virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight);
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
private:
DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
};
#endif // __GTKBITMAPH__

24
include/wx/gtk1/bitmap.h
View File

@@ -106,7 +106,7 @@ public:
wxPalette *GetColourMap() const { return GetPalette(); };
#endif // wxUSE_PALETTE
static void InitStandardHandlers() { }
static void InitStandardHandlers();
// implementation
// --------------
@@ -153,8 +153,30 @@ private:
friend class wxMemoryDC;
#endif
friend class wxBitmapHandler;
private:
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
//-----------------------------------------------------------------------------
// wxBitmapHandler
//-----------------------------------------------------------------------------
class wxBitmapHandler: public wxBitmapHandlerBase
{
public:
wxBitmapHandler() { }
virtual ~wxBitmapHandler();
virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight);
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
private:
DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
};
#endif // __GTKBITMAPH__

16
include/wx/mac/carbon/bitmap.h
View File

@@ -103,9 +103,8 @@ public:
class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
{
DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
public:
wxBitmapHandler() : m_name(), m_extension(), m_type(0) { }
wxBitmapHandler() { }
virtual ~wxBitmapHandler();
virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
@@ -113,17 +112,8 @@ public:
int desiredWidth, int desiredHeight);
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
void SetName(const wxString& name) { m_name = name; }
void SetExtension(const wxString& ext) { m_extension = ext; }
void SetType(long type) { m_type = type; }
wxString GetName() const { return m_name; }
wxString GetExtension() const { return m_extension; }
long GetType() const { return m_type; }
protected:
wxString m_name;
wxString m_extension;
long m_type;
private:
DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
};
#define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())

32
src/gtk/bitmap.cpp
View File

@@ -1555,4 +1555,36 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
}
}
//-----------------------------------------------------------------------------
// wxBitmapHandler
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
wxBitmapHandler::~wxBitmapHandler()
{
}
bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
{
return FALSE;
}
bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
return FALSE;
}
bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
{
return FALSE;
}
/* static */ void wxBitmap::InitStandardHandlers()
{
// TODO: Insert handler based on GdkPixbufs handler later
}
#endif // __WXGTK20__

32
src/gtk1/bitmap.cpp
View File

@@ -1555,4 +1555,36 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
}
}
//-----------------------------------------------------------------------------
// wxBitmapHandler
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
wxBitmapHandler::~wxBitmapHandler()
{
}
bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
{
return FALSE;
}
bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
return FALSE;
}
bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
{
return FALSE;
}
/* static */ void wxBitmap::InitStandardHandlers()
{
// TODO: Insert handler based on GdkPixbufs handler later
}
#endif // __WXGTK20__