Added a few files; fixed some warnings and wxMotif compile problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -11,10 +11,12 @@
|
||||
#ifndef _WX_WX_SERBASEH_H__
|
||||
#define _WX_WX_SERBASEH_H__
|
||||
|
||||
#include <wx/setup.h>
|
||||
#include <wx/dynlib.h>
|
||||
|
||||
#define WXSERIAL(classname) classname##_Serialize
|
||||
|
||||
#if wxUSE_SERIAL
|
||||
class wxObject_Serialize : public wxObject {
|
||||
DECLARE_DYNAMIC_CLASS(wxObject_Serialize)
|
||||
public:
|
||||
@@ -27,6 +29,8 @@ class wxObject_Serialize : public wxObject {
|
||||
protected:
|
||||
wxObject *m_object;
|
||||
};
|
||||
#endif
|
||||
// wxUSE_SERIAL
|
||||
|
||||
|
||||
#define DECLARE_SERIAL_CLASS(classname, parent) \
|
||||
@@ -54,7 +58,10 @@ IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize)
|
||||
#define IMPLEMENT_ALIAS_SERIAL_CLASS(classname, parent) \
|
||||
IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize)
|
||||
|
||||
#if wxUSE_SERIAL
|
||||
DECLARE_SERIAL_CLASS(wxList, wxObject)
|
||||
DECLARE_SERIAL_CLASS(wxHashTable, wxObject)
|
||||
#endif
|
||||
// wxUSE_SERIAL
|
||||
|
||||
#endif
|
||||
|
@@ -507,15 +507,9 @@ public:
|
||||
enum caseCompare {exact, ignoreCase};
|
||||
// values for first parameter of Strip function
|
||||
enum stripType {leading = 0x1, trailing = 0x2, both = 0x3};
|
||||
|
||||
// use Printf()
|
||||
inline int sprintf(const char *pszFormat, ...)
|
||||
{
|
||||
va_list argptr;
|
||||
va_start(argptr, pszFormat);
|
||||
int iLen = PrintfV(pszFormat, argptr);
|
||||
va_end(argptr);
|
||||
return iLen;
|
||||
}
|
||||
int sprintf(const char *pszFormat, ...);
|
||||
|
||||
// use Cmp()
|
||||
inline int CompareTo(const char* psz, caseCompare cmp = exact) const
|
||||
|
Reference in New Issue
Block a user