X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc1efb1d9f4e4ce7d8f889dad3aaab7026b73058..9f4de6b2cf06f53a98b28f53640f3b9ec8cf4182:/src/motif/app.cpp?ds=sidebyside

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 67a241c4e4..17699b8d08 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -13,6 +13,11 @@
     #pragma implementation "app.h"
 #endif
 
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/utils.h"
@@ -55,7 +60,6 @@
 
 #include <string.h>
 
-extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
@@ -84,8 +88,6 @@ long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {
-    wxBuffer = new char[BUFSIZ + 512];
-
     wxClassInfo::InitializeClasses();
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
@@ -138,17 +140,7 @@ void wxApp::CleanUp()
 
     // Destroy all GDI lists, etc.
 
-    delete wxTheBrushList;
-    wxTheBrushList = NULL;
-
-    delete wxThePenList;
-    wxThePenList = NULL;
-
-    delete wxTheFontList;
-    wxTheFontList = NULL;
-
-    delete wxTheBitmapList;
-    wxTheBitmapList = NULL;
+    wxDeleteStockLists();
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
@@ -163,9 +155,6 @@ void wxApp::CleanUp()
 
     wxBitmap::CleanUpHandlers();
 
-    delete[] wxBuffer;
-    wxBuffer = NULL;
-
     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;
@@ -355,43 +344,43 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                    widget, XtParent(widget));
 #endif // DEBUG
 
-	if (CheckForAccelerator(_event))
-	{
+    if (CheckForAccelerator(_event))
+    {
             // Do nothing! We intercepted and processed the event as an
             // accelerator.
             return;
-	}
+    }
 #if 1
         // It seemed before that this hack was redundant and
         // key down events were being generated by wxCanvasInputEvent.
         // But no longer - why ???
         //
-	else if (CheckForKeyDown(_event))
-	{
+    else if (CheckForKeyDown(_event))
+    {
             // We intercepted and processed the key down event
             return;
-	}
+    }
 #endif
-	else
-	{
+    else
+    {
             XtDispatchEvent(event);
-	    return;
-	}
+        return;
+    }
     }
     else if (event->type == KeyRelease)
     {
         // TODO: work out why we still need this !  -michael
         //
         if (CheckForKeyUp(_event))
-	{
-	    // We intercepted and processed the key up event
-	    return;
-	}
-	else
-	{
-	    XtDispatchEvent(event);
-	    return;
-	}
+    {
+        // We intercepted and processed the key up event
+        return;
+    }
+    else
+    {
+        XtDispatchEvent(event);
+        return;
+    }
     }
     else if (event->type == PropertyNotify)
     {
@@ -477,13 +466,20 @@ void wxApp::OnIdle(wxIdleEvent& event)
 
     inOnIdle = TRUE;
 
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
+    // If there are pending events, we must process them: pending events
+    // are either events to the threads other than main or events posted
+    // with wxPostEvent() functions
+    // GRG: I have moved this here so that all pending events are processed
+    //   before starting to delete any objects. This behaves better (in
+    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
+    //   behaviour. Also removed the '#if wxUSE_THREADS' around it.
+    //  Changed Mar/2000 before 2.1.14
 
-#if wxUSE_THREADS
     // Flush pending events.
     ProcessPendingEvents();
-#endif
+
+    // 'Garbage' collection of windows deleted with Close().
+    DeletePendingObjects();
 
     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
@@ -665,20 +661,20 @@ bool wxApp::CheckForKeyDown(WXEvent* event)
     if (xEvent->xany.type == KeyPress)
     {
         Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-					 xEvent->xany.window);
-	wxWindow* win = NULL;
+                     xEvent->xany.window);
+    wxWindow* win = NULL;
 
-	// Find the first wxWindow that corresponds to this event window
-	while (widget && !(win = wxGetWindowFromTable(widget)))
+    // Find the first wxWindow that corresponds to this event window
+    while (widget && !(win = wxGetWindowFromTable(widget)))
             widget = XtParent(widget);
 
-	if (!widget || !win)
+    if (!widget || !win)
             return FALSE;
 
-	wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
-	wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+    wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+    wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
 
-	return win->ProcessEvent( keyEvent );
+    return win->ProcessEvent( keyEvent );
     }
 
     return FALSE;
@@ -690,20 +686,20 @@ bool wxApp::CheckForKeyUp(WXEvent* event)
     if (xEvent->xany.type == KeyRelease)
     {
         Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
-					 xEvent->xany.window);
-	wxWindow* win = NULL;
+                         xEvent->xany.window);
+        wxWindow* win = NULL;
 
-	// Find the first wxWindow that corresponds to this event window
-	while (widget && !(win = wxGetWindowFromTable(widget)))
-            widget = XtParent(widget);
+        // Find the first wxWindow that corresponds to this event window
+        while (widget && !(win = wxGetWindowFromTable(widget)))
+                widget = XtParent(widget);
 
-	if (!widget || !win)
-            return FALSE;
+        if (!widget || !win)
+                return FALSE;
 
-	wxKeyEvent keyEvent(wxEVT_KEY_UP);
-	wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+        wxKeyEvent keyEvent(wxEVT_KEY_UP);
+        wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
 
-	return win->ProcessEvent( keyEvent );
+        return win->ProcessEvent( keyEvent );
     }
 
     return FALSE;
@@ -724,47 +720,29 @@ void wxExit()
 }
 
 // Yield to other processes
-bool wxYield()
-{
-    while (wxTheApp && wxTheApp->Pending())
-        wxTheApp->Dispatch();
-
-    // VZ: is it the same as this (taken from old wxExecute)?
-#if 0
-    XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-#endif
-
-    return TRUE;
-}
-
-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
 
-wxIcon
-wxApp::GetStdIcon(int which) const
+bool wxApp::Yield(bool onlyIfNeeded)
 {
-    switch(which)
+    bool s_inYield = FALSE;
+
+    if ( s_inYield )
     {
-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
 
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
+        return FALSE;
+    }
 
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
+    s_inYield = TRUE;
 
-        default:
-            wxFAIL_MSG("requested non existent standard icon");
-            // still fall through
+    while (wxTheApp && wxTheApp->Pending())
+        wxTheApp->Dispatch();
 
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
+    s_inYield = FALSE;
+
+    return TRUE;
 }
 
 // ----------------------------------------------------------------------------