don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index a9a4eaa964a1b3496c8777d7f8294969fa2ccb4f..b32e34b37521e87da2d58648dd45e4a828a84aec 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -205,7 +205,10 @@ protected:
     // only once per instance's lifetime for each requested wxArtID.
     virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),
                                   const wxArtClient& WXUNUSED(client),
-                                  const wxSize& WXUNUSED(size)) { return wxNullBitmap; }
+                                  const wxSize& WXUNUSED(size))
+    {
+        return wxNullBitmap;
+    }
 
     virtual wxIconBundle CreateIconBundle(const wxArtID& WXUNUSED(id),
                                           const wxArtClient& WXUNUSED(client))
@@ -215,6 +218,8 @@ protected:
 
 private:
     static void CommonAddingProvider();
+    static wxIconBundle DoGetIconBundle(const wxArtID& id,
+                                        const wxArtClient& client);
 
 private:
     // list of providers:
@@ -227,8 +232,8 @@ private:
 
 
 #if !defined(__WXUNIVERSAL__) && \
-    (defined(__WXGTK__) || defined(__WXMSW__) || \
-     (defined(__WXMAC__) && wxOSX_USE_CARBON))
+    ((defined(__WXGTK__) && defined(__WXGTK20__)) || defined(__WXMSW__) || \
+     (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON))
   // *some* (partial) native implementation of wxArtProvider exists; this is
   // not the same as wxArtProvider::HasNativeProvider()!
   #define wxHAS_NATIVE_ART_PROVIDER_IMPL