Fixed apparent typo in wxGridCellAttr::MergeWith, hopefully fixing

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 1cba260bf5301fed46647f3dd8b219d9c54ebac7..34fdebf6809238943122f1f9acb4bb128fb71899 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -13,6 +13,11 @@
     #pragma implementation "app.h"
 #endif
 
     #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"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/utils.h"


@@ -55,7 +60,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern char *wxBuffer;

 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;


@@ -84,8 +88,6 @@ long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {
 
 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
     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.
 
 
     // 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;
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;


@@ -163,9 +155,6 @@ void wxApp::CleanUp()
 
     wxBitmap::CleanUpHandlers();
 
 
     wxBitmap::CleanUpHandlers();
 

-    delete[] wxBuffer;
-    wxBuffer = NULL;
-

     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;
     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;


@@ -275,14 +264,8 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";

     argc = 0;
     argv = NULL;
     argc = 0;
     argv = NULL;

-    m_exitOnFrameDelete = TRUE;

 
     m_mainColormap = (WXColormap) NULL;
     m_appContext = (WXAppContext) NULL;
 
     m_mainColormap = (WXColormap) NULL;
     m_appContext = (WXAppContext) NULL;


@@ -355,43 +338,43 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                    widget, XtParent(widget));
 #endif // DEBUG
 
                    widget, XtParent(widget));
 #endif // DEBUG
 

-       if (CheckForAccelerator(_event))
-       {
+    if (CheckForAccelerator(_event))
+    {

             // Do nothing! We intercepted and processed the event as an
             // accelerator.
             return;
             // 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 ???
         //
 #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;
             // We intercepted and processed the key down event
             return;

-       }
+    }

 #endif
 #endif

-       else
-       {
+    else
+    {

             XtDispatchEvent(event);
             XtDispatchEvent(event);

-           return;
-       }
+        return;
+    }

     }
     else if (event->type == KeyRelease)
     {
         // TODO: work out why we still need this !  -michael
         //
         if (CheckForKeyUp(_event))
     }
     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)
     {
     }
     else if (event->type == PropertyNotify)
     {


@@ -572,11 +555,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() ;
 // 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
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
         (const char*) wxTheApp->GetClassName(), NULL, 0,
 # if XtSpecificationRelease < 5


@@ -587,6 +580,8 @@ bool wxApp::OnInitGui()
         argv);
 
     if (!dpy) {
         argv);
 
     if (!dpy) {

+         // if you don't log to stderr, nothing will be shown...
+        delete wxLog::SetActiveTarget(new wxLogStderr);

         wxString className(wxTheApp->GetClassName());
         wxLogError(_("wxWindows could not open display for '%s': exiting."),
                    (const char*) className);
         wxString className(wxTheApp->GetClassName());
         wxLogError(_("wxWindows could not open display for '%s': exiting."),
                    (const char*) className);


@@ -672,20 +667,20 @@ bool wxApp::CheckForKeyDown(WXEvent* event)
     if (xEvent->xany.type == KeyPress)
     {
         Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
     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);
 
             widget = XtParent(widget);
 

-       if (!widget || !win)
+    if (!widget || !win)

             return FALSE;
 
             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;
     }
 
     return FALSE;


@@ -697,20 +692,20 @@ bool wxApp::CheckForKeyUp(WXEvent* event)
     if (xEvent->xany.type == KeyRelease)
     {
         Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
     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;
     }
 
     return FALSE;


@@ -731,47 +726,29 @@ void wxExit()
 }
 
 // Yield to other processes
 }
 
 // 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;
+    }
+
+    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;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------