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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h
index 7719fe4afb3b22bb5a591236d3190b2725585f5e..00547bca5e9747b29f53cc026a9a2e358c6d0b63 100644 (file)
--- a/contrib/include/wx/xrc/xmlres.h
+++ b/contrib/include/wx/xrc/xmlres.h
@@ -352,12 +352,6 @@ protected:
     // Returns the XRCID.
     int GetID();
 
     // 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();
 
     // Returns the resource name.
     wxString GetName();
 


@@ -381,10 +375,12 @@ protected:
 
     // Gets a bitmap.
     wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
 
     // 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"),
                        wxSize size = wxDefaultSize);
 
     // Gets an icon.
     wxIcon GetIcon(const wxString& param = wxT("icon"),

+                   const wxArtClient& defaultArtClient = wxART_OTHER,

                    wxSize size = wxDefaultSize);
 
     // Gets a font.
                    wxSize size = wxDefaultSize);
 
     // Gets a font.

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 7719fe4afb3b22bb5a591236d3190b2725585f5e..00547bca5e9747b29f53cc026a9a2e358c6d0b63 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -352,12 +352,6 @@ protected:
     // Returns the XRCID.
     int GetID();
 
     // 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();
 
     // Returns the resource name.
     wxString GetName();
 


@@ -381,10 +375,12 @@ protected:
 
     // Gets a bitmap.
     wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
 
     // 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"),
                        wxSize size = wxDefaultSize);
 
     // Gets an icon.
     wxIcon GetIcon(const wxString& param = wxT("icon"),

+                   const wxArtClient& defaultArtClient = wxART_OTHER,

                    wxSize size = wxDefaultSize);
 
     // Gets a font.
                    wxSize size = wxDefaultSize);
 
     // Gets a font.