Applied patch from Ian Brown to make menus look better in wxMotif (#586347)

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index d1899f78a65165d5c4444905d590114e2b620bf0..f6fc696ffc9da3a81df836fc6f5f830bac5d8602 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -60,7 +60,6 @@
 
 #include <string.h>
 
-extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
@@ -89,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
@@ -143,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;
@@ -168,9 +155,6 @@ void wxApp::CleanUp()
 
     wxBitmap::CleanUpHandlers();
 
-    delete[] wxBuffer;
-    wxBuffer = NULL;
-
     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;
@@ -360,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)
     {
@@ -577,11 +561,21 @@ void wxApp::DeletePendingObjects()
     }
 }
 
+static char *fallbackResources[] = {
+    "*menuBar.marginHeight: 0",
+    "*menuBar.shadowThickness: 1",
+    "*background: #c0c0c0",
+    "*foreground: black",
+    NULL
+};
+
 // Create an application context
 bool wxApp::OnInitGui()
 {
     XtToolkitInitialize() ;
-    wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
+    wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
+    XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
+
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
         (const char*) wxTheApp->GetClassName(), NULL, 0,
 # if XtSpecificationRelease < 5
@@ -677,20 +671,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;
@@ -702,20 +696,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;
@@ -736,47 +730,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" ) );
+        }
+
+        return FALSE;
+    }
 
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
+    s_inYield = TRUE;
 
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
+    while (wxTheApp && wxTheApp->Pending())
+        wxTheApp->Dispatch();
 
-        default:
-            wxFAIL_MSG("requested non existent standard icon");
-            // still fall through
+    s_inYield = FALSE;
 
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
+    return TRUE;
 }
 
 // ----------------------------------------------------------------------------