don't define wxHAS_BUTTON_BITMAP for wxUniv (closes #10907)

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index e33b1831afb5a88a43a42218a082bcfc241e239e..8837752b0089e457e0a3849035cd15c280d8ddf3 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -21,7 +21,7 @@
 // FIXME: right now only wxMSW and wxGTK implement bitmap support in wxButton
 //        itself, this shouldn't be used for the other platforms neither
 //        when all of them do it
-#if defined(__WXMSW__) || defined(__WXGTK__)
+#if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
     #define wxHAS_BUTTON_BITMAP
 #endif