missing commit

[wxWidgets.git] / src / motif / evtloop.cpp

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index cd7800a3806610e8f9f4869a44a608fe901d5d78..f5041784f4c3f60551b97a155bb0d2bb3d8dc8a2 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -6,7 +6,7 @@
 // Created:     01.11.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Mattia Barbon
 // Created:     01.11.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Mattia Barbon

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -99,13 +99,13 @@ bool wxEventLoopImpl::SendIdleMessage()
 
 wxGUIEventLoop::~wxGUIEventLoop()
 {
 
 wxGUIEventLoop::~wxGUIEventLoop()
 {

-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
+    wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );

 }
 
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
 }
 
 int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!

-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );

 
     wxEventLoopActivator activate(this);
 
 
     wxEventLoopActivator activate(this);
 


@@ -121,15 +121,14 @@ int wxGUIEventLoop::Run()
     OnExit();
 
     int exitcode = m_impl->GetExitCode();
     OnExit();
 
     int exitcode = m_impl->GetExitCode();

-    delete m_impl;
-    m_impl = NULL;
+    wxDELETE(m_impl);

 
     return exitcode;
 }
 
 void wxGUIEventLoop::Exit(int rc)
 {
 
     return exitcode;
 }
 
 void wxGUIEventLoop::Exit(int rc)
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );

 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepGoing( false );
 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepGoing( false );


@@ -137,7 +136,7 @@ void wxGUIEventLoop::Exit(int rc)
     ::wxBreakDispatch();
 }
 
     ::wxBreakDispatch();
 }
 

-bool wxGUIEventLoop::YieldFor(ong eventsToProcess)
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)

 {
     m_isInsideYield = true;
     m_eventsToProcessInsideYield = eventsToProcess;
 {
     m_isInsideYield = true;
     m_eventsToProcessInsideYield = eventsToProcess;