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

Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-24 14:32:35 +00:00
parent 02161c7c81
commit cab1a6053d
42 changed files with 651 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/valgen.h
View File

@@ -41,7 +41,7 @@ public:
// Called when the value in the window must be validated.
// This function can pop up an error message.
virtual bool Validate(wxWindow * WXUNUSED(parent)) { return TRUE; }
virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; }
// Called to transfer data to the window
virtual bool TransferToWindow();
@@ -69,5 +69,5 @@ private:
#endif
// wxUSE_VALIDATORS
#endif
#endif
// _WX_VALGENH__

10
include/wx/validate.h
View File

@@ -50,17 +50,17 @@ public:
virtual wxObject *Clone() const
{ return (wxValidator *)NULL; }
bool Copy(const wxValidator& val)
{ m_validatorWindow = val.m_validatorWindow; return TRUE; }
{ m_validatorWindow = val.m_validatorWindow; return true; }
// Called when the value in the window must be validated.
// This function can pop up an error message.
virtual bool Validate(wxWindow *WXUNUSED(parent)) { return FALSE; };
virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; };
// Called to transfer data to the window
virtual bool TransferToWindow() { return FALSE; }
virtual bool TransferToWindow() { return false; }
// Called to transfer data from the window
virtual bool TransferFromWindow() { return FALSE; };
virtual bool TransferFromWindow() { return false; };
// accessors
wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
@@ -69,7 +69,7 @@ public:
// validators beep by default if invalid key is pressed, these functions
// allow to change it
static bool IsSilent() { return ms_isSilent; }
static void SetBellOnError(bool doIt = TRUE) { ms_isSilent = doIt; }
static void SetBellOnError(bool doIt = true) { ms_isSilent = doIt; }
protected:
wxWindowBase *m_validatorWindow;

10
include/wx/valtext.h
View File

@@ -6,7 +6,7 @@
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_VALTEXTH__
@@ -86,14 +86,14 @@ protected:
bool CheckValidator() const
{
wxCHECK_MSG( m_validatorWindow, FALSE,
wxCHECK_MSG( m_validatorWindow, false,
_T("No window associated with validator") );
wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), FALSE,
wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false,
_T("wxTextValidator is only for wxTextCtrl's") );
wxCHECK_MSG( m_stringValue, FALSE,
wxCHECK_MSG( m_stringValue, false,
_T("No variable storage for validator") );
return TRUE;
return true;
}
private:

12
include/wx/variant.h
View File

@@ -98,7 +98,7 @@ public:
wxVariant(const wxStringList& val, const wxString& name = wxEmptyString);
wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject
wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject
wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
#if wxUSE_DATETIME
wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date
@@ -109,7 +109,7 @@ public:
wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
#endif
wxVariant(const wxVariant& variant);
~wxVariant();
@@ -240,7 +240,7 @@ public:
// Insert at front of list
void Insert(const wxVariant& value);
// Returns TRUE if the variant is a member of the list
// Returns true if the variant is a member of the list
bool Member(const wxVariant& value) const;
// Deletes the nth element of the list
@@ -268,12 +268,12 @@ protected:
};
//Since we want type safety wxVariant we need to fetch and dynamic_cast
//in a seemingly safe way so the compiler can check, so we define
//in a seemingly safe way so the compiler can check, so we define
//a dynamic_cast /wxDynamicCast analogue.
#define wxGetVariantCast(var,classname) \
((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
var.GetWxObjectPtr() : NULL));
((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
var.GetWxObjectPtr() : NULL));
extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;

12
include/wx/version.h
View File

@@ -1,12 +1,12 @@
/**
* Name: wx/version.h
* Purpose: wxWidgets version numbers
* Name: wx/version.h
* Purpose: wxWidgets version numbers
* Author: Julian Smart
* Modified by: Ryan Norton (Converted to C)
* Created: 29/01/98
* RCS-ID: $Id$
* Copyright: (c) 1998 Julian Smart
* Licence: wxWindows licence
* Created: 29/01/98
* RCS-ID: $Id$
* Copyright: (c) 1998 Julian Smart
* Licence: wxWindows licence
*/
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */

4
include/wx/vlbox.h
View File

@@ -192,7 +192,7 @@ public:
virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
{ /* do nothing */ }
virtual wxVisualAttributes GetDefaultAttributes() const
{
return GetClassDefaultAttributes(GetWindowVariant());
@@ -200,7 +200,7 @@ public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected:
// the derived class must implement this function to actually draw the item
// with the given index on the provided DC

10
include/wx/vms_x_fix.h
View File

@@ -748,10 +748,10 @@
#define _XEatData _XEATDATA
#define _XFlush _XFLUSH
#define _XFreeTemp _XFREETEMP
#define _XGetAsyncReply _XGETASYNCREPLY
#define _XGetAsyncReply _XGETASYNCREPLY
#define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
#define _XRead _XREAD
#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE
#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE
#define _XReply _XREPLY
#define _XSend _XSEND
#define _XUnregisterFilter _XUNREGISTERFILTER
@@ -1077,10 +1077,10 @@
#define SetReqLen(req,n,badlen) \
if ((req->length + n) > (unsigned)65535) { \
n = badlen; \
req->length += n; \
n = badlen; \
req->length += n; \
} else \
req->length += n
req->length += n
#ifdef __cplusplus
extern "C" {

2
include/wx/wave.h
View File

@@ -6,7 +6,7 @@
// Created: 2004/02/01
// RCS-ID: $Id$
// Copyright: (c) 2004, Vaclav Slavik
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_WAVE_H_BASE_

2
include/wx/window.h
View File

@@ -1202,7 +1202,7 @@ protected:
void SetBestSize(const wxSize& size) { SetBestFittingSize(size); }
// set the initial window size if none is given (i.e. at least one of the
// components of the size passed to ctor/Create() is -1)
// components of the size passed to ctor/Create() is wxDefaultCoord)
//
// normally just calls SetBestSize() for controls, but can be overridden
// not to do it for the controls which have to do some additional

36
include/wx/wizard.h
View File

@@ -180,7 +180,7 @@ public:
function taking the following arguments:
wxWizard(wxWindow *parent,
int id = -1,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition,
@@ -188,8 +188,8 @@ public:
*/
wxWizardBase() { }
// executes the wizard starting from the given page, returns TRUE if it was
// successfully finished, FALSE if user cancelled it
// executes the wizard starting from the given page, returns true if it was
// successfully finished, false if user cancelled it
virtual bool RunWizard(wxWizardPage *firstPage) = 0;
// get the current page (NULL if RunWizard() isn't running)
@@ -214,15 +214,15 @@ public:
// Adding pages to page area sizer enlarges wizard
virtual wxSizer *GetPageAreaSizer() const = 0;
// Set border around page area. Default is 0 if you add at least one
// page to GetPageAreaSizer and 5 if you don't.
virtual void SetBorder(int border) = 0;
// wxWizard should be created using "new wxWizard" now, not with Create()
#if WXWIN_COMPATIBILITY_2_2
static wxWizard *Create(wxWindow *parent,
int id = -1,
int id = wxID_ANY,
const wxString& title = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxPoint& pos = wxDefaultPosition,
@@ -239,7 +239,7 @@ public:
{ return page->GetPrev() != NULL; }
/// Override these functions to stop InitDialog from calling TransferDataToWindow
/// for _all_ pages when the wizard starts. Instead 'ShowPage' will call
/// for _all_ pages when the wizard starts. Instead 'ShowPage' will call
/// TransferDataToWindow for the first page only.
bool TransferDataToWindow() { return true; }
bool TransferDataFromWindow() { return true; }
@@ -262,13 +262,13 @@ class WXDLLIMPEXP_ADV wxWizardEvent : public wxNotifyEvent
{
public:
wxWizardEvent(wxEventType type = wxEVT_NULL,
int id = -1,
bool direction = TRUE,
int id = wxID_ANY,
bool direction = true,
wxWizardPage* page = NULL);
// for EVT_WIZARD_PAGE_CHANGING, return TRUE if we're going forward or
// FALSE otherwise and for EVT_WIZARD_PAGE_CHANGED return TRUE if we came
// from the previous page and FALSE if we returned from the next one
// for EVT_WIZARD_PAGE_CHANGING, return true if we're going forward or
// false otherwise and for EVT_WIZARD_PAGE_CHANGED return true if we came
// from the previous page and false if we returned from the next one
// (this function doesn't make sense for CANCEL events)
bool GetDirection() const { return m_direction; }
@@ -297,21 +297,21 @@ END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxWizardEventFunction)(wxWizardEvent&);
// notifies that the page has just been changed (can't be vetoed)
#define EVT_WIZARD_PAGE_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
#define EVT_WIZARD_PAGE_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "<Back" or "Next>" button and the page is going to be
// changed - unless the event handler vetoes the event
#define EVT_WIZARD_PAGE_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
#define EVT_WIZARD_PAGE_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_PAGE_CHANGING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Cancel" button and the wizard is going to be dismissed -
// unless the event handler vetoes the event
#define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
#define EVT_WIZARD_CANCEL(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_CANCEL, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Finish" button and the wizard is going to be dismissed -
#define EVT_WIZARD_FINISHED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_FINISHED, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
#define EVT_WIZARD_FINISHED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_FINISHED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Help" button
#define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
// the user pressed "Help" button
#define EVT_WIZARD_HELP(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WIZARD_HELP, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxWizardEventFunction, & fn ), (wxObject *)NULL),
#endif // wxUSE_WIZARDDLG

74
include/wx/wx_cw.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -18,47 +18,47 @@
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__
#include <wx_PPC++_prof.mch>
#elif __INTEL__
#include <wx_x86++_prof.mch>
#elif __CFM68K__
#include <wx_cfm++_prof.mch>
#else
#include <wx_68k++_prof.mch>
#endif
#if __POWERPC__
#include <wx_PPC++_prof.mch>
#elif __INTEL__
#include <wx_x86++_prof.mch>
#elif __CFM68K__
#include <wx_cfm++_prof.mch>
#else
#include <wx_68k++_prof.mch>
#endif
#else
#if __POWERPC__
#include <wx_PPC_prof.mch>
#elif __INTEL__
#include <wx_x86_prof.mch>
#elif __CFM68K__
#include <wx_cfm_prof.mch>
#else
#include <wx_68k_prof.mch>
#endif
#if __POWERPC__
#include <wx_PPC_prof.mch>
#elif __INTEL__
#include <wx_x86_prof.mch>
#elif __CFM68K__
#include <wx_cfm_prof.mch>
#else
#include <wx_68k_prof.mch>
#endif
#endif
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wx_PPC++.mch>
#elif __INTEL__
#include <wx_x86++.mch>
#elif __CFM68K__
#include <wx_cfm++.mch>
#else
#include <wx_68k++.mch>
#endif
#if __POWERPC__
#include <wx_PPC++.mch>
#elif __INTEL__
#include <wx_x86++.mch>
#elif __CFM68K__
#include <wx_cfm++.mch>
#else
#include <wx_68k++.mch>
#endif
#else
#if __POWERPC__
#include <wx_PPC.mch>
#elif __INTEL__
#include <wx_x86.mch>
#elif __CFM68K__
#include <wx_cfm.mch>
#else
#include <wx_68k.mch>
#endif
#if __POWERPC__
#include <wx_PPC.mch>
#elif __INTEL__
#include <wx_x86.mch>
#elif __CFM68K__
#include <wx_cfm.mch>
#else
#include <wx_68k.mch>
#endif
#endif
#endif
#endif

40
include/wx/wx_cw_cm.h
View File

@@ -1,4 +1,4 @@
#define MSL_USE_PRECOMPILED_HEADERS 0
#define MSL_USE_PRECOMPILED_HEADERS 0
#if __WXDEBUG__
// mac os assert levels
#define DEBUG 1
@@ -6,7 +6,7 @@
#endif
#if !defined( __MWERKS__ )
#error "this file is only for builds with Metrowerks CodeWarrior"
#endif
#endif
#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
@@ -29,7 +29,7 @@
#elif __BEOS__
#include <ansi_prefix.be.h>
#include <Be.h>
#else
#else
#error unknown MW compiler
#endif
@@ -38,32 +38,32 @@
#include <ansi_parms.h>
#ifdef __MWERKS__
#if defined( __MSL__ ) && __MSL__ >= 0x5012 && __MSL__ < 0x7000
#define fileno _fileno
#define fdopen _fdopen
#define tell _tell
#define fileno _fileno
#define fdopen _fdopen
#define tell _tell
#endif
#endif
#elif defined( __WXMAC__)
#define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/
#define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/
#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
#define OPAQUE_TOOLBOX_STRUCTS 1
#ifdef __MACH__
#include <ansi_prefix.mach.h>
#include <msl_c_version.h>
#include <stdint.h>
#undef WCHAR_MAX
#include <machine/ansi.h>
#include <ansi_prefix.mach.h>
#include <msl_c_version.h>
#include <stdint.h>
#undef WCHAR_MAX
#include <machine/ansi.h>
#else
#include <ansi_prefix.mac.h>
#endif
// for getting the correct expat includes
// for getting the correct expat includes
#define MACOS_CLASSIC
/*
#include <MacTypes.h>
#if UNIVERSAL_INTERFACES_VERSION < 0x0340
#error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
#endif
*/
#if UNIVERSAL_INTERFACES_VERSION < 0x0340
#error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
#endif
*/
#endif
#define USE_DEFINE
@@ -72,11 +72,11 @@
#ifdef __cplusplus
extern "C"
extern "C"
{
#endif
char *strdup(const char *s) ;
int isascii( int c ) ;
char *strdup(const char *s) ;
int isascii( int c ) ;
#ifdef __cplusplus
}
#endif

38
include/wx/wx_cw_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,25 +20,25 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wx_PPC++_d.mch>
#elif __INTEL__
#include <wx_x86++_d.mch>
#elif __CFM68K__
#include <wx_cfm++_d.mch>
#else
#include <wx_68k++_d.mch>
#endif
#if __POWERPC__
#include <wx_PPC++_d.mch>
#elif __INTEL__
#include <wx_x86++_d.mch>
#elif __CFM68K__
#include <wx_cfm++_d.mch>
#else
#include <wx_68k++_d.mch>
#endif
#else
#if __POWERPC__
#include <wx_PPC_d.mch>
#elif __INTEL__
#include <wx_x86_d.mch>
#elif __CFM68K__
#include <wx_cfm_d.mch>
#else
#include <wx_68k_d.mch>
#endif
#if __POWERPC__
#include <wx_PPC_d.mch>
#elif __INTEL__
#include <wx_x86_d.mch>
#elif __CFM68K__
#include <wx_cfm_d.mch>
#else
#include <wx_68k_d.mch>
#endif
#endif
#endif

42
include/wx/wx_cwc.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -18,31 +18,31 @@
#if __option(profile)
#ifdef __cplusplus
#ifdef __MACH__
#include <wx_Mach++_prof.mch>
#elif __POWERPC__
#include <wx_Carbon++_prof.mch>
#endif
#ifdef __MACH__
#include <wx_Mach++_prof.mch>
#elif __POWERPC__
#include <wx_Carbon++_prof.mch>
#endif
#else
#ifdef __MACH__
#include <wx_Mach_prof.mch>
#elif __POWERPC__
#include <wx_Carbon_prof.mch>
#endif
#ifdef __MACH__
#include <wx_Mach_prof.mch>
#elif __POWERPC__
#include <wx_Carbon_prof.mch>
#endif
#endif
#else
#ifdef __cplusplus
#ifdef __MACH__
#include <wx_Mach++.mch>
#elif __POWERPC__
#include <wx_Carbon++.mch>
#endif
#ifdef __MACH__
#include <wx_Mach++.mch>
#elif __POWERPC__
#include <wx_Carbon++.mch>
#endif
#else
#ifdef __MACH__
#include <wx_Mach.mch>
#elif __POWERPC__
#include <wx_Carbon.mch>
#endif
#ifdef __MACH__
#include <wx_Mach.mch>
#elif __POWERPC__
#include <wx_Carbon.mch>
#endif
#endif
#endif
#endif

22
include/wx/wx_cwc_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,17 +20,17 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#ifdef __MACH__
#include "wx_Mach++_d.mch"
#elif __POWERPC__
#include "wx_Carbon++_d.mch"
#endif
#ifdef __MACH__
#include "wx_Mach++_d.mch"
#elif __POWERPC__
#include "wx_Carbon++_d.mch"
#endif
#else
#ifdef __MACH__
#include "wx_Mach_d.mch"
#elif __POWERPC__
#include "wx_Carbon_d.mch"
#endif
#ifdef __MACH__
#include "wx_Mach_d.mch"
#elif __POWERPC__
#include "wx_Carbon_d.mch"
#endif
#endif
#endif

38
include/wx/wx_cwu_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,25 +20,25 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wx_PPCu++_d.mch>
#elif __INTEL__
#include <wx_x86u++_d.mch>
#elif __CFM68K__
#include <wx_cfmu++_d.mch>
#else
#include <wx_68ku++_d.mch>
#endif
#if __POWERPC__
#include <wx_PPCu++_d.mch>
#elif __INTEL__
#include <wx_x86u++_d.mch>
#elif __CFM68K__
#include <wx_cfmu++_d.mch>
#else
#include <wx_68ku++_d.mch>
#endif
#else
#if __POWERPC__
#include <wx_PPCu_d.mch>
#elif __INTEL__
#include <wx_x86u_d.mch>
#elif __CFM68K__
#include <wx_cfmu_d.mch>
#else
#include <wx_68ku_d.mch>
#endif
#if __POWERPC__
#include <wx_PPCu_d.mch>
#elif __INTEL__
#include <wx_x86u_d.mch>
#elif __CFM68K__
#include <wx_cfmu_d.mch>
#else
#include <wx_68ku_d.mch>
#endif
#endif
#endif

16
include/wx/wxchar.h
View File

@@ -74,9 +74,9 @@
#endif
#endif
#if defined(__MWERKS__) && !defined(__MACH__)
#ifndef HAVE_WCSLEN
#define HAVE_WCSLEN
#endif
#ifndef HAVE_WCSLEN
#define HAVE_WCSLEN
#endif
#endif
#if wxUSE_WCHAR_T
@@ -441,7 +441,7 @@
#else
#define wxPutchar(wch) wxPutc(wch, stdout)
#endif
#ifdef HAVE_PUTWS
#define wxPuts putws
#else
@@ -656,10 +656,10 @@
#ifdef HAVE_WCSLEN
#define wxWcslen wcslen
#else
#if defined( __WXMAC_XCODE__ ) && !defined( __cplusplus )
/* xcode native targets are giving multiply defined symbols on regex */
static
#endif
#if defined( __WXMAC_XCODE__ ) && !defined( __cplusplus )
/* xcode native targets are giving multiply defined symbols on regex */
static
#endif
inline size_t wxWcslen(const wchar_t *s)
{
size_t n = 0;

74
include/wx/wxshlb_cw.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -18,47 +18,47 @@
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlb_PPC++_prof.mch>
#elif __INTEL__
#include <wxshlb_x86++_prof.mch>
#elif __CFM68K__
#include <wxshlb_cfm++_prof.mch>
#else
#include <wxshlb_68k++_prof.mch>
#endif
#if __POWERPC__
#include <wxshlb_PPC++_prof.mch>
#elif __INTEL__
#include <wxshlb_x86++_prof.mch>
#elif __CFM68K__
#include <wxshlb_cfm++_prof.mch>
#else
#include <wxshlb_68k++_prof.mch>
#endif
#else
#if __POWERPC__
#include <wxshlb_PPC_prof.mch>
#elif __INTEL__
#include <wxshlb_x86_prof.mch>
#elif __CFM68K__
#include <wxshlb_cfm_prof.mch>
#else
#include <wxshlb_68k_prof.mch>
#endif
#if __POWERPC__
#include <wxshlb_PPC_prof.mch>
#elif __INTEL__
#include <wxshlb_x86_prof.mch>
#elif __CFM68K__
#include <wxshlb_cfm_prof.mch>
#else
#include <wxshlb_68k_prof.mch>
#endif
#endif
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlb_PPC++.mch>
#elif __INTEL__
#include <wxshlb_x86++.mch>
#elif __CFM68K__
#include <wxshlb_cfm++.mch>
#else
#include <wxshlb_68k++.mch>
#endif
#if __POWERPC__
#include <wxshlb_PPC++.mch>
#elif __INTEL__
#include <wxshlb_x86++.mch>
#elif __CFM68K__
#include <wxshlb_cfm++.mch>
#else
#include <wxshlb_68k++.mch>
#endif
#else
#if __POWERPC__
#include <wxshlb_PPC.mch>
#elif __INTEL__
#include <wxshlb_x86.mch>
#elif __CFM68K__
#include <wxshlb_cfm.mch>
#else
#include <wxshlb_68k.mch>
#endif
#if __POWERPC__
#include <wxshlb_PPC.mch>
#elif __INTEL__
#include <wxshlb_x86.mch>
#elif __CFM68K__
#include <wxshlb_cfm.mch>
#else
#include <wxshlb_68k.mch>
#endif
#endif
#endif
#endif

38
include/wx/wxshlb_cw_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,25 +20,25 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlb_PPC++_d.mch>
#elif __INTEL__
#include <wxshlb_x86++_d.mch>
#elif __CFM68K__
#include <wxshlb_cfm++_d.mch>
#else
#include <wxshlb_68k++_d.mch>
#endif
#if __POWERPC__
#include <wxshlb_PPC++_d.mch>
#elif __INTEL__
#include <wxshlb_x86++_d.mch>
#elif __CFM68K__
#include <wxshlb_cfm++_d.mch>
#else
#include <wxshlb_68k++_d.mch>
#endif
#else
#if __POWERPC__
#include <wxshlb_PPC_d.mch>
#elif __INTEL__
#include <wxshlb_x86_d.mch>
#elif __CFM68K__
#include <wxshlb_cfm_d.mch>
#else
#include <wxshlb_68k_d.mch>
#endif
#if __POWERPC__
#include <wxshlb_PPC_d.mch>
#elif __INTEL__
#include <wxshlb_x86_d.mch>
#elif __CFM68K__
#include <wxshlb_cfm_d.mch>
#else
#include <wxshlb_68k_d.mch>
#endif
#endif
#endif

34
include/wx/wxshlb_cwc.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -18,27 +18,27 @@
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlb_Carbon++_prof.mch>
#endif
#if __POWERPC__
#include <wxshlb_Carbon++_prof.mch>
#endif
#else
#if __POWERPC__
#include <wxshlb_Carbon_prof.mch>
#endif
#if __POWERPC__
#include <wxshlb_Carbon_prof.mch>
#endif
#endif
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlb_Carbon++.mch>
#elif __MACH__
#include <wxshlb_Mach++.mch>
#endif
#if __POWERPC__
#include <wxshlb_Carbon++.mch>
#elif __MACH__
#include <wxshlb_Mach++.mch>
#endif
#else
#if __POWERPC__
#include <wxshlb_Carbon.mch>
#elif __MACH__
#include <wxshlb_Mach.mch>
#endif
#if __POWERPC__
#include <wxshlb_Carbon.mch>
#elif __MACH__
#include <wxshlb_Mach.mch>
#endif
#endif
#endif
#endif

22
include/wx/wxshlb_cwc_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,17 +20,17 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#ifdef __MACH__
#include <wxshlb_Mach++_d.mch>
#elif __POWERPC__
#include <wxshlb_Carbon++_d.mch>
#endif
#ifdef __MACH__
#include <wxshlb_Mach++_d.mch>
#elif __POWERPC__
#include <wxshlb_Carbon++_d.mch>
#endif
#else
#ifdef __MACH__
#include <wxshlb_Mach_d.mch>
#elif __POWERPC__
#include <wxshlb_Carbon_d.mch>
#endif
#ifdef __MACH__
#include <wxshlb_Mach_d.mch>
#elif __POWERPC__
#include <wxshlb_Carbon_d.mch>
#endif
#endif
#endif

74
include/wx/wxshlba_cw.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -18,47 +18,47 @@
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlba_PPC++_prof.mch>
#elif __INTEL__
#include <wxshlba_x86++_prof.mch>
#elif __CFM68K__
#include <wxshlba_cfm++_prof.mch>
#else
#include <wxshlba_68k++_prof.mch>
#endif
#if __POWERPC__
#include <wxshlba_PPC++_prof.mch>
#elif __INTEL__
#include <wxshlba_x86++_prof.mch>
#elif __CFM68K__
#include <wxshlba_cfm++_prof.mch>
#else
#include <wxshlba_68k++_prof.mch>
#endif
#else
#if __POWERPC__
#include <wxshlba_PPC_prof.mch>
#elif __INTEL__
#include <wxshlba_x86_prof.mch>
#elif __CFM68K__
#include <wxshlba_cfm_prof.mch>
#else
#include <wxshlba_68k_prof.mch>
#endif
#if __POWERPC__
#include <wxshlba_PPC_prof.mch>
#elif __INTEL__
#include <wxshlba_x86_prof.mch>
#elif __CFM68K__
#include <wxshlba_cfm_prof.mch>
#else
#include <wxshlba_68k_prof.mch>
#endif
#endif
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlba_PPC++.mch>
#elif __INTEL__
#include <wxshlba_x86++.mch>
#elif __CFM68K__
#include <wxshlba_cfm++.mch>
#else
#include <wxshlba_68k++.mch>
#endif
#if __POWERPC__
#include <wxshlba_PPC++.mch>
#elif __INTEL__
#include <wxshlba_x86++.mch>
#elif __CFM68K__
#include <wxshlba_cfm++.mch>
#else
#include <wxshlba_68k++.mch>
#endif
#else
#if __POWERPC__
#include <wxshlba_PPC.mch>
#elif __INTEL__
#include <wxshlba_x86.mch>
#elif __CFM68K__
#include <wxshlba_cfm.mch>
#else
#include <wxshlba_68k.mch>
#endif
#if __POWERPC__
#include <wxshlba_PPC.mch>
#elif __INTEL__
#include <wxshlba_x86.mch>
#elif __CFM68K__
#include <wxshlba_cfm.mch>
#else
#include <wxshlba_68k.mch>
#endif
#endif
#endif
#endif

38
include/wx/wxshlba_cw_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,25 +20,25 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlba_PPC++_d.mch>
#elif __INTEL__
#include <wxshlba_x86++_d.mch>
#elif __CFM68K__
#include <wxshlba_cfm++_d.mch>
#else
#include <wxshlba_68k++_d.mch>
#endif
#if __POWERPC__
#include <wxshlba_PPC++_d.mch>
#elif __INTEL__
#include <wxshlba_x86++_d.mch>
#elif __CFM68K__
#include <wxshlba_cfm++_d.mch>
#else
#include <wxshlba_68k++_d.mch>
#endif
#else
#if __POWERPC__
#include <wxshlba_PPC_d.mch>
#elif __INTEL__
#include <wxshlba_x86_d.mch>
#elif __CFM68K__
#include <wxshlba_cfm_d.mch>
#else
#include <wxshlba_68k_d.mch>
#endif
#if __POWERPC__
#include <wxshlba_PPC_d.mch>
#elif __INTEL__
#include <wxshlba_x86_d.mch>
#elif __CFM68K__
#include <wxshlba_cfm_d.mch>
#else
#include <wxshlba_68k_d.mch>
#endif
#endif
#endif

34
include/wx/wxshlba_cwc.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -18,27 +18,27 @@
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__
#include <wxshlba_Carbon++_prof.mch>
#endif
#if __POWERPC__
#include <wxshlba_Carbon++_prof.mch>
#endif
#else
#if __POWERPC__
#include <wxshlba_Carbon_prof.mch>
#endif
#if __POWERPC__
#include <wxshlba_Carbon_prof.mch>
#endif
#endif
#else
#ifdef __cplusplus
#ifdef __MACH__
#include <wxshlba_Mach++.mch>
#elif __POWERPC__
#include <wxshlba_Carbon++.mch>
#endif
#ifdef __MACH__
#include <wxshlba_Mach++.mch>
#elif __POWERPC__
#include <wxshlba_Carbon++.mch>
#endif
#else
#ifdef __MACH__
#include <wxshlba_Mach.mch>
#elif __POWERPC__
#include <wxshlba_Carbon.mch>
#endif
#ifdef __MACH__
#include <wxshlba_Mach.mch>
#elif __POWERPC__
#include <wxshlba_Carbon.mch>
#endif
#endif
#endif
#endif

22
include/wx/wxshlba_cwc_d.h
View File

@@ -6,7 +6,7 @@
// Created: 12/10/98
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CW__
@@ -20,17 +20,17 @@
#error "profiling is not supported in debug versions"
#else
#ifdef __cplusplus
#ifdef __MACH__
#include <wxshlba_Mach++_d.mch>
#elif __POWERPC__
#include <wxshlba_Carbon++_d.mch>
#endif
#ifdef __MACH__
#include <wxshlba_Mach++_d.mch>
#elif __POWERPC__
#include <wxshlba_Carbon++_d.mch>
#endif
#else
#ifdef __MACH__
#include <wxshlba_Mach_d.mch>
#elif __POWERPC__
#include <wxshlba_Carbon_d.mch>
#endif
#ifdef __MACH__
#include <wxshlba_Mach_d.mch>
#elif __POWERPC__
#include <wxshlba_Carbon_d.mch>
#endif
#endif
#endif

51
include/wx/xti.h
View File

@@ -94,7 +94,7 @@ class WXDLLIMPEXP_BASE wxEvent;
typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
#if wxUSE_FUNC_TEMPLATE_POINTER
# define wxTO_STRING(type) wxToStringConverter<type>
# define wxTO_STRING(type) wxToStringConverter<type>
# define wxTO_STRING_IMP(type)
# define wxFROM_STRING(type) wxFromStringConverter<type>
# define wxFROM_STRING_IMP(type)
@@ -533,8 +533,8 @@ public :
wxTypeInfo( wxT_COLLECTION , to , from , name )
{ m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
#endif
const wxTypeInfo* GetElementType() const
{
const wxTypeInfo* GetElementType() const
{
if ( m_elementType == NULL )
m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ;
return m_elementType ; }
@@ -707,7 +707,7 @@ template<typename T>
void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }
template<typename T>
void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; }
void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; }
// ----------------------------------------------------------------------------
// Property Support
@@ -1042,13 +1042,13 @@ public :
~wxPropertyInfo() ;
// return the class this property is declared in
const wxClassInfo* GetDeclaringClass() const { return m_itsClass ; }
const wxClassInfo* GetDeclaringClass() const { return m_itsClass ; }
// return the name of this property
const wxString& GetName() const { return m_name ; }
const wxString& GetName() const { return m_name ; }
// returns the flags of this property
wxPropertyInfoFlags GetFlags() const { return m_flags ;}
wxPropertyInfoFlags GetFlags() const { return m_flags ;}
// returns the short help string of this property
const wxString& GetHelpString() const { return m_helpString ; }
@@ -1057,7 +1057,7 @@ public :
const wxString& GetGroupString() const { return m_groupString ; }
// return the element type info of this property (for collections, otherwise NULL)
const wxTypeInfo * GetCollectionElementTypeInfo() const
const wxTypeInfo * GetCollectionElementTypeInfo() const
{
if ( m_collectionElementTypeInfo == NULL )
m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;
@@ -1065,7 +1065,7 @@ public :
}
// return the type info of this property
const wxTypeInfo * GetTypeInfo() const
const wxTypeInfo * GetTypeInfo() const
{
if ( m_typeInfo == NULL )
m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
@@ -1079,7 +1079,7 @@ public :
wxPropertyInfo* GetNext() const { return m_next ; }
// returns the default value of this property, its kind may be wxT_VOID if it is not valid
wxxVariant GetDefaultValue() const { return m_defaultValue ; }
wxxVariant GetDefaultValue() const { return m_defaultValue ; }
private :
void Insert(wxPropertyInfo* &iter)
{
@@ -1103,7 +1103,7 @@ private :
mutable wxTypeInfo* m_collectionElementTypeInfo ;
wxString m_collectionElementTypeName ;
wxPropertyAccessor* m_accessor ;
wxxVariant m_defaultValue;
wxxVariant m_defaultValue;
wxPropertyInfoFlags m_flags ;
wxString m_helpString ;
wxString m_groupString ;
@@ -1225,13 +1225,13 @@ public :
~wxHandlerInfo() ;
// return the name of this handler
const wxString& GetName() const { return m_name ; }
const wxString& GetName() const { return m_name ; }
// return the class info of the event
const wxClassInfo * GetEventClassInfo() const { return m_eventClassInfo ; }
const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; }
// get the handler function pointer
wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; }
wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; }
// returns NULL if this is the last handler of this class
wxHandlerInfo* GetNext() const { return m_next ; }
@@ -1739,10 +1739,11 @@ public:
// we must be able to cast variants to wxObject pointers, templates seem not to be suitable
wxObject* VariantToInstance( wxxVariant &data ) const
{ if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
return m_variantToObjectConverter( data ) ;
else
return m_variantOfPtrToObjectConverter( data ) ;
{
if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
return m_variantToObjectConverter( data ) ;
else
return m_variantOfPtrToObjectConverter( data ) ;
}
wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }
@@ -1778,15 +1779,15 @@ public:
static wxHashTable *sm_classTable;
protected :
wxPropertyInfo * m_firstProperty ;
wxHandlerInfo * m_firstHandler ;
wxPropertyInfo * m_firstProperty ;
wxHandlerInfo * m_firstHandler ;
private:
const wxClassInfo** m_parents ;
const wxChar* m_unitName;
const wxClassInfo** m_parents ;
const wxChar* m_unitName;
wxConstructorBridge* m_constructor ;
const wxChar ** m_constructorProperties ;
const int m_constructorPropertiesCount ;
wxConstructorBridge* m_constructor ;
const wxChar ** m_constructorProperties ;
const int m_constructorPropertiesCount ;
wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
wxVariantToObjectConverter m_variantToObjectConverter ;
wxObjectToVariantConverter m_objectToVariantConverter ;

32
include/wx/xtistrm.h
View File

@@ -2,7 +2,7 @@
// Name: wx/xtistrm.h
// Purpose: streaming runtime metadata information (extended class info)
// Author: Stefan Csomor
// Modified by:
// Modified by:
// Created: 27/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Stefan Csomor
@@ -50,28 +50,28 @@ class WXDLLIMPEXP_BASE wxPersister
{
public :
// will be called before an object is written, may veto by returning false
virtual bool BeforeWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) , wxxVariantArray &WXUNUSED(metadata)) { return true ; }
virtual bool BeforeWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) , wxxVariantArray &WXUNUSED(metadata)) { return true ; }
// will be called after this object has been written, may be needed for adjusting stacks
virtual void AfterWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) ) {}
// will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( -1 , -1 ) or veto
// will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( wxDefaultCoord , wxDefaultCoord ) or veto
// writing that property at all by returning false
virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariant &WXUNUSED(value) ) { return true ; }
virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariant &WXUNUSED(value) ) { return true ; }
// will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( -1 , -1 ) or veto
// will be called before a property gets written, may change the value , eg replace a concrete wxSize by wxSize( wxDefaultCoord , wxDefaultCoord ) or veto
// writing that property at all by returning false
virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariantArray &WXUNUSED(value) ) { return true ; }
virtual bool BeforeWriteProperty( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxPropertyInfo *WXUNUSED(propInfo) , wxxVariantArray &WXUNUSED(value) ) { return true ; }
// will be called after a property has been written out, may be needed for adjusting stacks
virtual void AfterWriteProperty( wxWriter *WXUNUSED(writer) , const wxPropertyInfo *WXUNUSED(propInfo) ) {}
// will be called before this delegate gets written
virtual bool BeforeWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) ,
const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { return true ; }
virtual bool BeforeWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) ,
const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { return true ; }
virtual void AfterWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) ,
const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { }
virtual void AfterWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) ,
const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { }
} ;
class WXDLLIMPEXP_BASE wxWriter : public wxObject
@@ -86,7 +86,7 @@ public :
//
// Managing the object identity table a.k.a context
//
// these methods make sure that no object gets written twice, because sometimes multiple calls to the WriteObject will be
// these methods make sure that no object gets written twice, because sometimes multiple calls to the WriteObject will be
// made without wanting to have duplicate objects written, the object identity table will be reset manually
virtual void ClearObjectContext() ;
@@ -125,14 +125,14 @@ public :
virtual void DoBeginWriteElement() = 0 ;
virtual void DoEndWriteElement() = 0 ;
// insert an object reference to an already written object
// insert an object reference to an already written object
virtual void DoWriteRepeatedObject( int objectID ) = 0 ;
// insert a null reference
virtual void DoWriteNullObject() = 0 ;
// writes a delegate in the stream format
virtual void DoWriteDelegate( const wxObject *object, const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,
virtual void DoWriteDelegate( const wxObject *object, const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,
const wxObject *eventSink , int sinkObjectID , const wxClassInfo* eventSinkClassInfo , const wxHandlerInfo* handlerIndo ) = 0;
private :
@@ -170,7 +170,7 @@ public :
bool HasObjectClassInfo( int objectID ) ;
void SetObjectClassInfo(int objectID, wxClassInfo* classInfo);
// Reads the component the reader is pointed at from the underlying format.
// Reads the component the reader is pointed at from the underlying format.
// The return value is the root object ID, which can
// then be used to ask the depersister about that object
// if there was a problem you will get back wxInvalidObjectID and the current
@@ -270,7 +270,7 @@ public :
wxRuntimeDepersister();
virtual ~wxRuntimeDepersister();
// returns the object having the corresponding ID fully constructed
// returns the object having the corresponding ID fully constructed
wxObject *GetObject(int objectID) ;
// allocate the new object on the heap, that object will have the passed in ID
@@ -343,7 +343,7 @@ public :
/*
wxDepersisterCode implements the callbacks that will depersist
an object into a C++ initialization function. this will move to
an object into a C++ initialization function. this will move to
a utility lib soon
*/

6
include/wx/xtixml.h
View File

@@ -2,7 +2,7 @@
// Name: wx/xtixml.h
// Purpose: xml streaming runtime metadata information (extended class info)
// Author: Stefan Csomor
// Modified by:
// Modified by:
// Created: 27/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Stefan Csomor
@@ -66,14 +66,14 @@ public :
virtual void DoBeginWriteElement() ;
virtual void DoEndWriteElement() ;
// insert an object reference to an already written object
// insert an object reference to an already written object
virtual void DoWriteRepeatedObject( int objectID ) ;
// insert a null reference
virtual void DoWriteNullObject() ;
// writes a delegate in the stream format
virtual void DoWriteDelegate( const wxObject *object, const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,
virtual void DoWriteDelegate( const wxObject *object, const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,
const wxObject *eventSink , int sinkObjectID , const wxClassInfo* eventSinkClassInfo , const wxHandlerInfo* handlerIndo ) ;
private :
struct wxXmlWriterInternal ;

8
include/wx/zipstrm.h
View File

@@ -15,7 +15,7 @@
#include "wx/defs.h"
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#include "wx/stream.h"
@@ -54,8 +54,8 @@ private:
};
#endif
// wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#endif
// wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#endif
#endif
// __ZIPSTREAM_H__