1. changed wxIconBundle to use m_refData and COW to make copying icon bundles
fast (which was needed for 2) 2. make it possible to return wxIconBundles from wxArtProvider 3. implement Mac-specific wxArtProvider doing (2) (modified patch 1581960) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,6 +37,7 @@ class WXDLLIMPEXP_CORE wxPalette;
|
||||
class WXDLLIMPEXP_CORE wxPen;
|
||||
class WXDLLIMPEXP_CORE wxRegion;
|
||||
class WXDLLIMPEXP_BASE wxString;
|
||||
class WXDLLIMPEXP_CORE wxIconBundle;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// constants
|
||||
@@ -712,9 +713,10 @@ extern WXDLLEXPORT_DATA(wxIcon) wxNullIcon;
|
||||
extern WXDLLEXPORT_DATA(wxCursor) wxNullCursor;
|
||||
extern WXDLLEXPORT_DATA(wxPen) wxNullPen;
|
||||
extern WXDLLEXPORT_DATA(wxBrush) wxNullBrush;
|
||||
extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette;
|
||||
extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette;
|
||||
extern WXDLLEXPORT_DATA(wxFont) wxNullFont;
|
||||
extern WXDLLEXPORT_DATA(wxColour) wxNullColour;
|
||||
extern WXDLLEXPORT_DATA(wxIconBundle) wxNullIconBundle;
|
||||
|
||||
extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase;
|
||||
|
||||
|
Reference in New Issue
Block a user