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

minor rewrite of XRC's stock_id/stock_client handling, now guesses client id from context

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-08-20 22:27:24 +00:00
parent e1756d2af5
commit 7a442f311a
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/include/wx/xrc/xmlres.h
View File

@@ -352,12 +352,6 @@ protected:
// Returns the XRCID. // Returns the XRCID.
int GetID(); 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. // Returns the resource name.
wxString GetName(); wxString GetName();
@@ -381,10 +375,12 @@ protected:
// Gets a bitmap. // Gets a bitmap.
wxBitmap GetBitmap(const wxString& param = wxT("bitmap"), wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
const wxArtClient& defaultArtClient = wxART_OTHER,
wxSize size = wxDefaultSize); wxSize size = wxDefaultSize);
// Gets an icon. // Gets an icon.
wxIcon GetIcon(const wxString& param = wxT("icon"), wxIcon GetIcon(const wxString& param = wxT("icon"),
const wxArtClient& defaultArtClient = wxART_OTHER,
wxSize size = wxDefaultSize); wxSize size = wxDefaultSize);
// Gets a font. // Gets a font.

8
include/wx/xrc/xmlres.h
View File

@@ -352,12 +352,6 @@ protected:
// Returns the XRCID. // Returns the XRCID.
int GetID(); 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. // Returns the resource name.
wxString GetName(); wxString GetName();
@@ -381,10 +375,12 @@ protected:
// Gets a bitmap. // Gets a bitmap.
wxBitmap GetBitmap(const wxString& param = wxT("bitmap"), wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
const wxArtClient& defaultArtClient = wxART_OTHER,
wxSize size = wxDefaultSize); wxSize size = wxDefaultSize);
// Gets an icon. // Gets an icon.
wxIcon GetIcon(const wxString& param = wxT("icon"), wxIcon GetIcon(const wxString& param = wxT("icon"),
const wxArtClient& defaultArtClient = wxART_OTHER,
wxSize size = wxDefaultSize); wxSize size = wxDefaultSize);
// Gets a font. // Gets a font.