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:
@@ -25,6 +25,7 @@
|
||||
#include "wx/brush.h"
|
||||
#include "wx/palette.h"
|
||||
#include "wx/icon.h"
|
||||
#include "wx/iconbndl.h"
|
||||
#include "wx/cursor.h"
|
||||
#include "wx/settings.h"
|
||||
#include "wx/bitmap.h"
|
||||
@@ -52,6 +53,7 @@ WXDLLIMPEXP_DATA_CORE(wxPen) wxNullPen;
|
||||
#if wxUSE_PALETTE
|
||||
WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
|
||||
#endif
|
||||
WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
|
||||
|
||||
const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
|
||||
const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
|
||||
|
||||
Reference in New Issue
Block a user