]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix compilation when wxAny was disabled (fixes #12148)
authorJaakko Salli <jaakko.salli@dnainternet.net>
Tue, 15 Jun 2010 13:34:01 +0000 (13:34 +0000)
committerJaakko Salli <jaakko.salli@dnainternet.net>
Tue, 15 Jun 2010 13:34:01 +0000 (13:34 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/variant.cpp

index 1820f4b8d5ef41912126fc9a2e31fc4b0ec9b387..f5a417ce37ab02cb9f7b04d8c296d6d5376f8ab7 100644 (file)
@@ -270,18 +270,20 @@ public:
 
     virtual wxString GetType() const { return wxT("long"); }
 
+#if wxUSE_ANY
     // Since wxAny does not have separate type for integers shorter than
     // longlong, we do not usually implement wxVariant->wxAny conversion
     // here (but in wxVariantDataLongLong instead).
-#ifndef wxLongLong_t
+  #ifndef wxLongLong_t
     DECLARE_WXANY_CONVERSION()
-#else
+  #else
     bool GetAsAny(wxAny* any) const
     {
         *any = m_value;
         return true;
     }
-#endif
+  #endif
+#endif // wxUSE_ANY
 
 protected:
     long m_value;