Disable disabling wxWeakRef<T>

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index ced854cefcea8822daa69c89cf5e9a7ef1d06dde..cca944651ecfd1e7691b7bfcb7c4cc06a8d1bc9b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -719,7 +719,6 @@ WX_ARG_FEATURE(textbuf,       [  --enable-textbuf        use wxTextBuffer class]
 WX_ARG_FEATURE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
 WX_ARG_FEATURE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
 WX_ARG_FEATURE(variant,       [  --enable-variant        use wxVariant class], wxUSE_VARIANT)
-WX_ARG_FEATURE(weakref,       [  --enable-weakref        make wxEvtHandler trackable with wxWeakRef<>], wxUSE_WEAKREF)
 WX_ARG_FEATURE(zipstream,     [  --enable-zipstream      use wxZip streams], wxUSE_ZIPSTREAM)
 
 dnl URL-related classes
@@ -6099,10 +6098,6 @@ if test "$wxUSE_VARIANT" = "yes"; then
     AC_DEFINE(wxUSE_VARIANT)
 fi
 
-if test "$wxUSE_WEAKREF" = "yes"; then
-    AC_DEFINE(wxUSE_WEAKREF)
-fi
-
 if test "$wxUSE_FS_INET" = "yes"; then
   AC_DEFINE(wxUSE_FS_INET)
 fi

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 8d36d10b0cf9e6e30e0c7610065f87ca5db82989..9fb5dbbf083f82313afe9a94d5564420d68f5ba5 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -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."

diff --git a/include/wx/event.h b/include/wx/event.h
index e9b0220996ee968f8f6e8d18d9c232b95c96b6cd..68089351630b48e44a5a9a1078f83666ffba96bd 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -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.

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 2c0e20dbf13773d751af4189f8e5a5bfd07efc6e..dba42e11ea67330a6e2f18374368c309e7e68d2b 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -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

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index ccb4722a47fab46b4e7080ea39097b7c1f93f750..41bddf14355305c47a46909e9bd1ba01c323b98f 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 174fe9977d9114d15ecd5372705d9efa36b24246..2c78ac864c15e9e312b3e6b708c13d7971b20aae 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -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

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index e863f80917361acace9803e9ac07ec05598bd3ac..a5b561330f73699fd625654f466a671cd83d4937 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -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

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 823a4e8687401b123ee7455c2d2dfaac851accff..d9604eb55207e39f269f53b8ee1b19bbfd864794 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -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

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index c6873eb5b1439f6944702431cb0f7f1052152013..0433d57944a1c0294778556443d38da094623ce8 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -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

diff --git a/include/wx/setup_gccxml.h b/include/wx/setup_gccxml.h
index 2a96e01681a3024e3d772ab49b9261f3d3b876cf..3c0e43d71137f1f0ce5c228a71f18c3a18048f48 100644 (file)
--- a/include/wx/setup_gccxml.h
+++ b/include/wx/setup_gccxml.h
@@ -196,8 +196,6 @@
 
 #define wxUSE_THREADS 1
 
-#define wxUSE_WEAKREF 1
-
 #define wxUSE_STREAMS 1
 
 #if defined(__DMC__) || defined(__WATCOMC__) \

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 7cd3ef5538ed070bc4bd85370e3ae9d99caf467e..882fe92e03561040d78c6782900d3b52c6fb39b3 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 8610adb8bf3cdf9185f1930a770cd88c967339bc..c0759f852b8c1b8b54464af5eeeca22c34e70f58 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -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

diff --git a/setup.h.in b/setup.h.in
index 162d88073be12099586928d640ff0fe5bbe60e62..6849432200d032d66ff865a2b3806f187c1ab85f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -196,8 +196,6 @@
 
 #define wxUSE_THREADS 0
 
-#define wxUSE_WEAKREF 0
-
 #define wxUSE_STREAMS       0
 
 #if defined(__DMC__) || defined(__WATCOMC__) \

diff --git a/src/common/event.cpp b/src/common/event.cpp
index d2bd83d29b477bd84f3a689a656b163728f96e71..6c18e84338c1f11352c688db6f5cf60176071a37 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1061,7 +1061,6 @@ wxEvtHandler::~wxEvtHandler()
         {
             wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
 
-#if wxUSE_WEAKREF
             // Remove ourselves from sink destructor notifications
             // (this has usually been been done, in wxTrackable destructor)
             wxEvtHandler *eventSink = entry->m_eventSink;
@@ -1075,7 +1074,6 @@ wxEvtHandler::~wxEvtHandler()
                     delete evtConnRef;
                 }
             }
-#endif // wxUSE_WEAKREF
 
             if (entry->m_callbackUserData)
                 delete entry->m_callbackUserData;
@@ -1379,7 +1377,6 @@ void wxEvtHandler::Connect( int id, int lastId,
     // Insert at the front of the list so most recent additions are found first
     m_dynamicEvents->Insert( (wxObject*) entry );
 
-#if wxUSE_WEAKREF
     // Make sure we get to know when a sink is destroyed
     if ( eventSink && eventSink != this )
     {
@@ -1389,7 +1386,6 @@ void wxEvtHandler::Connect( int id, int lastId,
         else
             evtConnRef = new wxEventConnectionRef(this, eventSink);
     }
-#endif // wxUSE_WEAKREF
 }
 
 bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
@@ -1400,7 +1396,6 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
     if (!m_dynamicEvents)
         return false;
 
-#if wxUSE_WEAKREF
     // Remove connection from tracker node (wxEventConnectionRef)
     if ( eventSink && eventSink != this )
     {
@@ -1408,7 +1403,6 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
         if ( evtConnRef )
             evtConnRef->DecRef();
     }
-#endif // wxUSE_WEAKREF
 
     wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
     while (node)
@@ -1500,7 +1494,6 @@ void *wxEvtHandler::DoGetClientData() const
     return m_clientData;
 }
 
-#if wxUSE_WEAKREF
 // A helper to find an wxEventConnectionRef object
 wxEventConnectionRef *
 wxEvtHandler::FindRefInTrackerList(wxEvtHandler *eventSink)
@@ -1540,7 +1533,6 @@ void wxEvtHandler::OnSinkDestroyed( wxEvtHandler *sink )
         node = node_nxt;
     }
 }
-#endif // wxUSE_WEAKREF
 
 #endif // wxUSE_BASE