Get rid of wxFontMapper in wxBase library.

[wxWidgets.git] / include / wx / artprov.h

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 3576b4bad5fc766c2f2e186eb45f7987c155bdc0..7abfbfa7af78fbb02b300cc28195299a0e4af1f5 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -137,9 +137,9 @@ public:
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 

-    // Get the size of an icon from a specific wxArtClient, queries 
+    // Get the size hint of an icon from a specific wxArtClient, queries 

     // the topmost provider if platform_dependent = false
     // the topmost provider if platform_dependent = false

-    static wxSize GetSize(const wxArtClient& client, bool platform_dependent = false);
+    static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false);

 
 protected:
     friend class wxArtProviderModule;
 
 protected:
     friend class wxArtProviderModule;


@@ -151,9 +151,9 @@ protected:
     static void CleanUpProviders();
 
     // Get the default size of an icon for a specific client
     static void CleanUpProviders();
 
     // Get the default size of an icon for a specific client

-    virtual wxSize DoGetSize(const wxArtClient& client) 
+    virtual wxSize DoGetSizeHint(const wxArtClient& client) 

     {
     {

-        return GetSize(client, true);
+        return GetSizeHint(client, true);

     }
                              
     // Derived classes must override this method to create requested
     }
                              
     // Derived classes must override this method to create requested