Add wxFont::Underlined() and MakeUnderlined() methods.

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

diff --git a/include/wx/meta/if.h b/include/wx/meta/if.h
index 3de045a61f06aa28dcc87ccd444196104a7f34f2..931591cd4811a1afe6b2200f15392f2ecbf488ea 100644 (file)
--- a/include/wx/meta/if.h
+++ b/include/wx/meta/if.h
@@ -30,19 +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
-    {
-        // unfortunately we also need to define value here because otherwise
-        // Result::value is not recognized as a class neither and it has to be
-        // complete too -- at least make it unusable because it really, really
-        // should never be used
-        class value
-        {
-        private:
-            value();
-            ~value();
-        };
-    };
+    template<typename TTrue, typename TFalse> struct Result {};

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


@@ -53,11 +41,7 @@ struct wxIfImpl<true>
 {
     template<typename TTrue, typename TFalse> struct Result
     {
 {
     template<typename TTrue, typename TFalse> struct Result
     {

-#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
-        struct value : TTrue { };
-#else

         typedef TTrue value;
         typedef TTrue value;

-#endif

     };
 };
 
     };
 };
 


@@ -67,17 +51,13 @@ struct wxIfImpl<false>
 {
     template<typename TTrue, typename TFalse> struct Result
     {
 {
     template<typename TTrue, typename TFalse> struct Result
     {

-#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
-        struct value : TFalse { };
-#else

         typedef TFalse value;
         typedef TFalse value;

-#endif

     };
 };
 
 } // namespace wxPrivate
 
     };
 };
 
 } // namespace wxPrivate
 

-// wxIf<> template defines nested type "value" which is the same as 
+// wxIf<> template defines nested type "value" which is the same as

 // TTrue if the condition Cond (boolean compile-time constant) was met and
 // TFalse if it wasn't.
 //
 // TTrue if the condition Cond (boolean compile-time constant) was met and
 // TFalse if it wasn't.
 //


@@ -85,15 +65,9 @@ struct wxIfImpl<false>
 template<bool Cond, typename TTrue, typename TFalse>
 struct wxIf
 {
 template<bool Cond, typename TTrue, typename TFalse>
 struct wxIf
 {

-#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
-    // notice that value can't be a typedef, VC6 refuses to use it as a base
-    // class in this case
-    struct value : wxPrivate::wxIfImpl<Cond>::Result<TTrue, TFalse>::value { };
-#else // !VC6++

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

-#endif

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