minor rewrite of XRC's stock_id/stock_client handling, now guesses client id from context
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e1756d2af5
commit
7a442f311a
@ -352,12 +352,6 @@ protected:
|
||||
// Returns the XRCID.
|
||||
int GetID();
|
||||
|
||||
// Returns the wxArtID for a wxArtProvider-managed bitmap.
|
||||
wxArtID GetStockID(const wxString& param);
|
||||
|
||||
// Returns the wxArtClient for a wxArtProvider-managed bitmap.
|
||||
wxArtClient GetStockClient(const wxString& param);
|
||||
|
||||
// Returns the resource name.
|
||||
wxString GetName();
|
||||
|
||||
@ -381,10 +375,12 @@ protected:
|
||||
|
||||
// Gets a bitmap.
|
||||
wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
|
||||
const wxArtClient& defaultArtClient = wxART_OTHER,
|
||||
wxSize size = wxDefaultSize);
|
||||
|
||||
// Gets an icon.
|
||||
wxIcon GetIcon(const wxString& param = wxT("icon"),
|
||||
const wxArtClient& defaultArtClient = wxART_OTHER,
|
||||
wxSize size = wxDefaultSize);
|
||||
|
||||
// Gets a font.
|
||||
|
@ -352,12 +352,6 @@ protected:
|
||||
// Returns the XRCID.
|
||||
int GetID();
|
||||
|
||||
// Returns the wxArtID for a wxArtProvider-managed bitmap.
|
||||
wxArtID GetStockID(const wxString& param);
|
||||
|
||||
// Returns the wxArtClient for a wxArtProvider-managed bitmap.
|
||||
wxArtClient GetStockClient(const wxString& param);
|
||||
|
||||
// Returns the resource name.
|
||||
wxString GetName();
|
||||
|
||||
@ -381,10 +375,12 @@ protected:
|
||||
|
||||
// Gets a bitmap.
|
||||
wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
|
||||
const wxArtClient& defaultArtClient = wxART_OTHER,
|
||||
wxSize size = wxDefaultSize);
|
||||
|
||||
// Gets an icon.
|
||||
wxIcon GetIcon(const wxString& param = wxT("icon"),
|
||||
const wxArtClient& defaultArtClient = wxART_OTHER,
|
||||
wxSize size = wxDefaultSize);
|
||||
|
||||
// Gets a font.
|
||||
|
Loading…
Reference in New Issue
Block a user