Add wxBitmapBundle::FromImpl() and GetImpl()
For now they're only used internally but at least the latter will be made public later.
This commit is contained in:
@@ -63,6 +63,8 @@ public:
|
|||||||
// form name_2x or name@2x (and also using other factors) will be used.
|
// form name_2x or name@2x (and also using other factors) will be used.
|
||||||
static wxBitmapBundle FromResources(const wxString& name);
|
static wxBitmapBundle FromResources(const wxString& name);
|
||||||
|
|
||||||
|
// Create from existing implementation
|
||||||
|
static wxBitmapBundle FromImpl(wxBitmapBundleImpl* impl);
|
||||||
|
|
||||||
// Check if bitmap bundle is non-empty.
|
// Check if bitmap bundle is non-empty.
|
||||||
bool IsOk() const { return m_impl; }
|
bool IsOk() const { return m_impl; }
|
||||||
@@ -77,6 +79,9 @@ public:
|
|||||||
// If size == wxDefaultSize, GetDefaultSize() is used for it instead.
|
// If size == wxDefaultSize, GetDefaultSize() is used for it instead.
|
||||||
wxBitmap GetBitmap(const wxSize size) const;
|
wxBitmap GetBitmap(const wxSize size) const;
|
||||||
|
|
||||||
|
// Access implementation
|
||||||
|
wxBitmapBundleImpl* GetImpl() const { return m_impl.get(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef wxObjectDataPtr<wxBitmapBundleImpl> wxBitmapBundleImplPtr;
|
typedef wxObjectDataPtr<wxBitmapBundleImpl> wxBitmapBundleImplPtr;
|
||||||
|
|
||||||
|
@@ -244,6 +244,13 @@ wxBitmapBundle wxBitmapBundle::FromBitmaps(const wxVector<wxBitmap>& bitmaps)
|
|||||||
return wxBitmapBundle(new wxBitmapBundleImplSet(bitmaps));
|
return wxBitmapBundle(new wxBitmapBundleImplSet(bitmaps));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* static */
|
||||||
|
wxBitmapBundle wxBitmapBundle::FromImpl(wxBitmapBundleImpl* impl)
|
||||||
|
{
|
||||||
|
return wxBitmapBundle(impl);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// MSW has its own, actually working, version, in MSW-specific code.
|
// MSW has its own, actually working, version, in MSW-specific code.
|
||||||
#ifndef __WXMSW__
|
#ifndef __WXMSW__
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user