Don't define wxArrayPGProperty as std::vector in STL build.

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index a921b1825a763c5b05c3a885790169cccd4c43bf..61930ed1f5a61d1ce6a89a56e1544c89c9ca17ef 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -50,8 +50,6 @@
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 

-WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
-

 // ============================================================================
 // wxAppBase implementation
 // ============================================================================
 // ============================================================================
 // wxAppBase implementation
 // ============================================================================


@@ -244,7 +242,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
     if ( parser.Found(OPTION_MODE, &modeDesc) )
     {
         unsigned w, h, bpp;
     if ( parser.Found(OPTION_MODE, &modeDesc) )
     {
         unsigned w, h, bpp;

-        if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
+        if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 )

         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
             return false;
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
             return false;


@@ -341,33 +339,11 @@ bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
 // idle handling
 // ----------------------------------------------------------------------------
 
 // idle handling
 // ----------------------------------------------------------------------------
 

-void wxAppBase::DeletePendingObjects()
-{
-    wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
-    while (node)
-    {
-        wxObject *obj = node->GetData();
-
-        // remove it from the list first so that if we get back here somehow
-        // during the object deletion (e.g. wxYield called from its dtor) we
-        // wouldn't try to delete it the second time
-        if ( wxPendingDelete.Member(obj) )
-            wxPendingDelete.Erase(node);
-
-        delete obj;
-
-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.GetFirst();
-    }
-}
-

 // Returns true if more time is needed.
 bool wxAppBase::ProcessIdle()
 {
 // Returns true if more time is needed.
 bool wxAppBase::ProcessIdle()
 {

-    // call the base class version first, it will process the pending events
-    // (which should be done before the idle events generation) and send the
-    // idle event to wxTheApp itself
+    // call the base class version first to send the idle event to wxTheApp
+    // itself

     bool needMore = wxAppConsoleBase::ProcessIdle();
     wxIdleEvent event;
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     bool needMore = wxAppConsoleBase::ProcessIdle();
     wxIdleEvent event;
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();


@@ -379,9 +355,6 @@ bool wxAppBase::ProcessIdle()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-

 #if wxUSE_LOG
     // flush the logged messages if any
     wxLog::FlushActive();
 #if wxUSE_LOG
     // flush the logged messages if any
     wxLog::FlushActive();


@@ -479,7 +452,6 @@ wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {

-#if wxDEBUG_LEVEL

     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()
     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()


@@ -491,6 +463,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 #if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG
     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG
 #if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG
     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG

+#if wxDEBUG_LEVEL

     wxString msgDlg = msg;
 
 #if wxUSE_STACKWALKER
     wxString msgDlg = msg;
 
 #if wxUSE_STACKWALKER


@@ -501,7 +474,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
     const wxString stackTrace = GetAssertStackTrace();
     if ( !stackTrace.empty() )
 
     const wxString stackTrace = GetAssertStackTrace();
     if ( !stackTrace.empty() )

-        msgDlg << _T("\n\nCall stack:\n") << stackTrace;
+        msgDlg << wxT("\n\nCall stack:\n") << stackTrace;

 #endif // wxUSE_STACKWALKER
 
     // this message is intentionally not translated -- it is for
 #endif // wxUSE_STACKWALKER
 
     // this message is intentionally not translated -- it is for


@@ -523,7 +496,6 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
         //case wxNO: nothing to do
     }
 
         //case wxNO: nothing to do
     }

-#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG

 #else // !wxDEBUG_LEVEL
     // this function always exists (for ABI compatibility) but is never called
     // if debug level is 0 and so can simply do nothing then
 #else // !wxDEBUG_LEVEL
     // this function always exists (for ABI compatibility) but is never called
     // if debug level is 0 and so can simply do nothing then


@@ -531,6 +503,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 #endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
 
     return false;
 #endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
 
     return false;

+#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG

 }
 
 bool wxGUIAppTraitsBase::HasStderr()
 }
 
 bool wxGUIAppTraitsBase::HasStderr()


@@ -544,14 +517,3 @@ bool wxGUIAppTraitsBase::HasStderr()
 #endif
 }
 
 #endif
 }
 

-void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object)
-{
-    if ( !wxPendingDelete.Member(object) )
-        wxPendingDelete.Append(object);
-}
-
-void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
-{
-    wxPendingDelete.DeleteObject(object);
-}
-