allow compilation with wxUSE_DATETIME == 0 (patch 679822)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1047,6 +1047,15 @@
|
||||
# define wxUSE_COMBOBOX 1
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# if !wxUSE_DATETIME
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxCalendarCtrl requires wxUSE_DATETIME"
|
||||
# else
|
||||
# undef wxUSE_DATETIME
|
||||
# define wxUSE_DATETIME 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_CALENDARCTRL */
|
||||
|
||||
#if wxUSE_CHECKLISTBOX
|
||||
|
@@ -185,9 +185,11 @@ public:
|
||||
// the value in the provided pointer
|
||||
bool Found(const wxString& name, long *value) const;
|
||||
|
||||
#if wxUSE_DATETIME
|
||||
// returns TRUE if an option taking a date value was found and stores the
|
||||
// value in the provided pointer
|
||||
bool Found(const wxString& name, wxDateTime *value) const;
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
// gets the number of parameters found
|
||||
size_t GetParamCount() const;
|
||||
|
@@ -185,7 +185,7 @@ public:
|
||||
// VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO)
|
||||
|
||||
// time functions
|
||||
|
||||
#if wxUSE_DATETIME
|
||||
// set the file last access/mod and creation times
|
||||
// (any of the pointers may be NULL)
|
||||
bool SetTimes(const wxDateTime *dtAccess,
|
||||
@@ -208,6 +208,7 @@ public:
|
||||
(void)GetTimes(NULL, &dtMod, NULL);
|
||||
return dtMod;
|
||||
}
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
#ifdef __WXMAC__
|
||||
bool MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) ;
|
||||
|
@@ -46,15 +46,21 @@ class WXDLLEXPORT wxFSFile : public wxObject
|
||||
{
|
||||
public:
|
||||
wxFSFile(wxInputStream *stream, const wxString& loc,
|
||||
const wxString& mimetype, const wxString& anchor,
|
||||
wxDateTime modif)
|
||||
const wxString& mimetype, const wxString& anchor
|
||||
#if wxUSE_DATETIME
|
||||
, wxDateTime modif
|
||||
#endif // wxUSE_DATETIME
|
||||
)
|
||||
{
|
||||
m_Stream = stream;
|
||||
m_Location = loc;
|
||||
m_MimeType = mimetype; m_MimeType.MakeLower();
|
||||
m_Anchor = anchor;
|
||||
#if wxUSE_DATETIME
|
||||
m_Modif = modif;
|
||||
#endif // wxUSE_DATETIME
|
||||
}
|
||||
|
||||
virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
|
||||
|
||||
// returns stream. This doesn't _create_ stream, it only returns
|
||||
@@ -69,14 +75,18 @@ public:
|
||||
|
||||
const wxString& GetAnchor() const {return m_Anchor;}
|
||||
|
||||
#if wxUSE_DATETIME
|
||||
wxDateTime GetModificationTime() const {return m_Modif;}
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
private:
|
||||
wxInputStream *m_Stream;
|
||||
wxString m_Location;
|
||||
wxString m_MimeType;
|
||||
wxString m_Anchor;
|
||||
#if wxUSE_DATETIME
|
||||
wxDateTime m_Modif;
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
DECLARE_ABSTRACT_CLASS(wxFSFile)
|
||||
DECLARE_NO_COPY_CLASS(wxFSFile)
|
||||
|
@@ -25,6 +25,8 @@
|
||||
#define wxGRID_VALUE_CHOICEINT _T("choiceint")
|
||||
#define wxGRID_VALUE_DATETIME _T("datetime")
|
||||
|
||||
#if wxUSE_DATETIME
|
||||
|
||||
// the default renderer for the cells containing Time and dates..
|
||||
class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
|
||||
{
|
||||
@@ -59,6 +61,7 @@ protected:
|
||||
wxDateTime::TimeZone m_tz;
|
||||
};
|
||||
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
// the default renderer for the cells containing Time and dates..
|
||||
class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer
|
||||
|
@@ -26,7 +26,9 @@
|
||||
#include "wx/date.h"
|
||||
#endif // time/date
|
||||
|
||||
#include "wx/datetime.h"
|
||||
#if wxUSE_DATETIME
|
||||
#include "wx/datetime.h"
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
#if wxUSE_ODBC
|
||||
#include "wx/db.h" // will #include sqltypes.h
|
||||
@@ -105,7 +107,9 @@ public:
|
||||
wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
|
||||
wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
|
||||
//TODO: Need to document
|
||||
#if wxUSE_DATETIME
|
||||
wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date
|
||||
#endif // wxUSE_DATETIME
|
||||
wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); // String array
|
||||
#if wxUSE_ODBC
|
||||
wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
|
||||
@@ -122,9 +126,11 @@ public:
|
||||
void operator= (const wxVariant& variant);
|
||||
|
||||
//TODO: Need to document
|
||||
#if wxUSE_DATETIME
|
||||
bool operator== (const wxDateTime& value) const;
|
||||
bool operator!= (const wxDateTime& value) const;
|
||||
void operator= (const wxDateTime& value) ;
|
||||
#endif // wxUSE_DATETIME
|
||||
|
||||
bool operator== (const wxArrayString& value) const;
|
||||
bool operator!= (const wxArrayString& value) const;
|
||||
@@ -200,7 +206,9 @@ public:
|
||||
#endif
|
||||
inline operator void* () const { return GetVoidPtr(); }
|
||||
//TODO: Need to document
|
||||
#if wxUSE_DATETIME
|
||||
inline operator wxDateTime () const { return GetDateTime(); }
|
||||
#endif // wxUSE_DATETIME
|
||||
//TODO: End of Need to document
|
||||
|
||||
// Accessors
|
||||
@@ -241,7 +249,9 @@ public:
|
||||
#endif
|
||||
void* GetVoidPtr() const ;
|
||||
//TODO: Need to document
|
||||
#if wxUSE_DATETIME
|
||||
wxDateTime GetDateTime() const ;
|
||||
#endif // wxUSE_DATETIME
|
||||
wxArrayString GetArrayString() const;
|
||||
//TODO: End of Need to document
|
||||
|
||||
@@ -281,7 +291,9 @@ public:
|
||||
bool Convert(wxDate* value) const;
|
||||
#endif
|
||||
//TODO: Need to document
|
||||
#if wxUSE_DATETIME
|
||||
bool Convert(wxDateTime* value) const;
|
||||
#endif // wxUSE_DATETIME
|
||||
//TODO: End of Need to document
|
||||
|
||||
// Attributes
|
||||
|
Reference in New Issue
Block a user