Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxUSE_VARIANT guards

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-25 12:55:25 +00:00
parent 888355224c
commit d5dc103fd4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/variant.h
View File

@@ -13,6 +13,9 @@
#define _WX_VARIANT_H_ #define _WX_VARIANT_H_
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_VARIANT
#include "wx/object.h" #include "wx/object.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
@@ -278,5 +281,6 @@ protected:
extern wxVariant WXDLLIMPEXP_BASE wxNullVariant; extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
#endif #endif // wxUSE_VARIANT
// _WX_VARIANT_H_
#endif // _WX_VARIANT_H_

4
src/common/variant.cpp
View File

@@ -18,6 +18,8 @@
#include "wx/variant.h" #include "wx/variant.h"
#if wxUSE_VARIANT
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"
#include "wx/math.h" #include "wx/math.h"
@@ -2103,3 +2105,5 @@ bool wxVariant::Convert(wxDateTime* value) const
(value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val)); (value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val));
} }
#endif // wxUSE_DATETIME #endif // wxUSE_DATETIME
#endif // wxUSE_VARIANT