Disable disabling wxWeakRef<T>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -299,14 +299,6 @@
|
||||
# endif
|
||||
#endif /* wxUSE_VARIANT */
|
||||
|
||||
#ifndef wxUSE_WEAKREF
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_WEAKREF must be defined."
|
||||
# else
|
||||
# define wxUSE_WEAKREF 0
|
||||
# endif
|
||||
#endif /* wxUSE_WEAKREF */
|
||||
|
||||
#ifndef wxUSE_XLOCALE
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_XLOCALE must be defined."
|
||||
|
@@ -2260,9 +2260,7 @@ protected:
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_BASE wxEvtHandler : public wxObject
|
||||
#if wxUSE_WEAKREF
|
||||
, public wxTrackable
|
||||
#endif
|
||||
{
|
||||
public:
|
||||
wxEvtHandler();
|
||||
@@ -2381,9 +2379,7 @@ public:
|
||||
|
||||
// Avoid problems at exit by cleaning up static hash table gracefully
|
||||
void ClearEventHashTable() { GetEventHashTable().Clear(); }
|
||||
#if wxUSE_WEAKREF
|
||||
void OnSinkDestroyed( wxEvtHandler *sink );
|
||||
#endif
|
||||
|
||||
private:
|
||||
static const wxEventTableEntry sm_eventTableEntries[];
|
||||
@@ -2450,16 +2446,13 @@ protected:
|
||||
virtual void DoSetClientData( void *data );
|
||||
virtual void *DoGetClientData() const;
|
||||
|
||||
#if wxUSE_WEAKREF
|
||||
// Search tracker objects for event connection with this sink
|
||||
wxEventConnectionRef *FindRefInTrackerList(wxEvtHandler *eventSink);
|
||||
#endif
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
|
||||
};
|
||||
|
||||
#if wxUSE_WEAKREF
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxEventConnectionRef represents all connections between two event handlers
|
||||
// and enables automatic disconnect when an event handler sink goes out of
|
||||
@@ -2508,7 +2501,6 @@ private:
|
||||
|
||||
DECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef)
|
||||
};
|
||||
#endif // wxUSE_WEAKREF
|
||||
|
||||
// Post a message to the given event handler which will be processed during the
|
||||
// next event loop iteration.
|
||||
|
@@ -235,16 +235,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -234,16 +234,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -234,16 +234,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -234,16 +234,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -234,16 +234,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -234,16 +234,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -196,8 +196,6 @@
|
||||
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
#define wxUSE_STREAMS 1
|
||||
|
||||
#if defined(__DMC__) || defined(__WATCOMC__) \
|
||||
|
@@ -230,16 +230,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
@@ -233,16 +233,6 @@
|
||||
// Recommended setting: 0 unless you do plan to develop MT applications
|
||||
#define wxUSE_THREADS 1
|
||||
|
||||
// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes
|
||||
// in wxWidgets (wxWeakRef<T>). Set to 0 if your compiler has problems with
|
||||
// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug
|
||||
// in this area, Visual C compiler options "/vmm /vmg" may help then).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WEAKREF 1
|
||||
|
||||
// If enabled, compiles wxWidgets streams classes
|
||||
//
|
||||
// wx stream classes are used for image IO, process IO redirection, network
|
||||
|
Reference in New Issue
Block a user