don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 25919336109aff232d6fb40dcbfdb1dc485e4803..8837752b0089e457e0a3849035cd15c280d8ddf3 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -18,10 +18,10 @@
 
 #include "wx/button.h"
 
-// FIXME: right now only wxMSW implements bitmap support in wxButton
+// 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
-#ifdef __WXMSW__
+#if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
     #define wxHAS_BUTTON_BITMAP
 #endif