don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / meta / if.h

diff --git a/include/wx/meta/if.h b/include/wx/meta/if.h
index 9b533a5ab10b6834d97ab4bfb4a32e4107bbe1ec..82e6d3b13587f63e10efa5e4333fa926abf1167e 100644 (file)
--- a/include/wx/meta/if.h
+++ b/include/wx/meta/if.h
@@ -30,11 +30,7 @@ struct wxIfImpl
 // without this skeleton it doesn't recognize Result as a class at all below
 #if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
 {
 // without this skeleton it doesn't recognize Result as a class at all below
 #if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
 {

-    template<typename TTrue, typename TFalse> struct Result
-    {
-        // intentionally don't define value here, this shouldn't be actually
-        // used, it's here just to work around a compiler bug
-    };
+    template<typename TTrue, typename TFalse> struct Result {};

 }
 #endif // VC++ <= 6
 ;
 }
 #endif // VC++ <= 6
 ;


@@ -67,8 +63,11 @@ struct wxIfImpl<false>
 //
 // See wxVector<T> in vector.h for usage example
 template<bool Cond, typename TTrue, typename TFalse>
 //
 // See wxVector<T> in vector.h for usage example
 template<bool Cond, typename TTrue, typename TFalse>

-struct wxIf : wxPrivate::wxIfImpl<Cond>::template Result<TTrue, TFalse>
+struct wxIf

 {
 {

+    typedef typename wxPrivate::wxIfImpl<Cond>
+                     ::template Result<TTrue, TFalse>::value
+            value;

 };
 
 #endif // _WX_META_IF_H_
 };
 
 #endif // _WX_META_IF_H_