added missing -univ package control files.

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 7836a95070695d2ff58b0d0542f133300c055d13..fa1fd15f66d814f5f548ab8b5aa2ecf2f55cd137 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -6,11 +6,16 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "app.h"
+    #pragma implementation "app.h"
+#endif
+
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY

 #endif
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/frame.h"


@@ -28,20 +33,28 @@
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"

+#include "wx/log.h"
+#include "wx/intl.h"

 
 #if wxUSE_THREADS
 
 #if wxUSE_THREADS

-#include "wx/thread.h"
+    #include "wx/thread.h"

 #endif
 
 #if wxUSE_WX_RESOURCES
 #endif
 
 #if wxUSE_WX_RESOURCES

-#include "wx/resource.h"
+    #include "wx/resource.h"

 #endif
 
 #endif
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -54,35 +67,48 @@ wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 
 
 wxHashTable *wxWidgetHashTable = NULL;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

+

 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)

-EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxApp::OnIdle)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif
+
+#ifdef __WXDEBUG__
+    typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
+
+    XErrorHandlerFunc gs_pfnXErrorHandler = 0;
+
+    static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
+    {
+        // just forward to the default handler for now
+        return gs_pfnXErrorHandler(dpy, xevent);
+    }
+#endif // __WXDEBUG__

 
 long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {
 
 long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {

-#ifdef __WXMSW__
-    wxBuffer = new char[1500];
-#else

     wxBuffer = new char[BUFSIZ + 512];
     wxBuffer = new char[BUFSIZ + 512];

-#endif
-    
+

     wxClassInfo::InitializeClasses();
     wxClassInfo::InitializeClasses();

-    
+
+    // GL: I'm annoyed ... I don't know where to put this and I don't want to
+    // create a module for that as it's part of the core.
+#if wxUSE_THREADS
+    wxPendingEventsLocker = new wxCriticalSection();
+#endif
+

     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();

-    
+

     wxInitializeStockLists();
     wxInitializeStockObjects();
     wxInitializeStockLists();
     wxInitializeStockObjects();

-    
+

 #if wxUSE_WX_RESOURCES
     wxInitializeResourceSystem();
 #endif
 #if wxUSE_WX_RESOURCES
     wxInitializeResourceSystem();
 #endif

-    
+

     // For PostScript printing
 #if wxUSE_POSTSCRIPT
     /* Done using wxModule now
     // For PostScript printing
 #if wxUSE_POSTSCRIPT
     /* Done using wxModule now


@@ -91,14 +117,14 @@ bool wxApp::Initialize()
     wxThePrintPaperDatabase->CreateDatabase();
     */
 #endif
     wxThePrintPaperDatabase->CreateDatabase();
     */
 #endif

-    
+

     wxBitmap::InitStandardHandlers();
     wxBitmap::InitStandardHandlers();

-    
+

     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);

-    
+

     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -106,32 +132,32 @@ void wxApp::CleanUp()
 {
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 {
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;

-    
+

     wxModule::CleanUpModules();
     wxModule::CleanUpModules();

-    
+

 #if wxUSE_WX_RESOURCES
     wxCleanUpResourceSystem();
 #endif
 #if wxUSE_WX_RESOURCES
     wxCleanUpResourceSystem();
 #endif

-    
+

     wxDeleteStockObjects() ;
     wxDeleteStockObjects() ;

-    
+

     // Destroy all GDI lists, etc.
     // Destroy all GDI lists, etc.

-    
+

     delete wxTheBrushList;
     wxTheBrushList = NULL;
     delete wxTheBrushList;
     wxTheBrushList = NULL;

-    
+

     delete wxThePenList;
     wxThePenList = NULL;
     delete wxThePenList;
     wxThePenList = NULL;

-    
+

     delete wxTheFontList;
     wxTheFontList = NULL;
     delete wxTheFontList;
     wxTheFontList = NULL;

-    
+

     delete wxTheBitmapList;
     wxTheBitmapList = NULL;
     delete wxTheBitmapList;
     wxTheBitmapList = NULL;

-    
+

     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;

-    
+

 #if wxUSE_POSTSCRIPT
     /* Done using wxModule now
     wxInitializePrintSetupData(FALSE);
 #if wxUSE_POSTSCRIPT
     /* Done using wxModule now
     wxInitializePrintSetupData(FALSE);


@@ -139,17 +165,24 @@ void wxApp::CleanUp()
     wxThePrintPaperDatabase = NULL;
     */
 #endif
     wxThePrintPaperDatabase = NULL;
     */
 #endif

-    
+

     wxBitmap::CleanUpHandlers();
     wxBitmap::CleanUpHandlers();

-    
+

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

-    
+

     wxClassInfo::CleanUpClasses();
     wxClassInfo::CleanUpClasses();

-    
+

     delete wxTheApp;
     wxTheApp = NULL;
     delete wxTheApp;
     wxTheApp = NULL;

-    
+
+    // GL: I'm annoyed ... I don't know where to put this and I don't want to
+    // create a module for that as it's part of the core.
+#if wxUSE_THREADS
+    delete wxPendingEvents;
+    delete wxPendingEventsLocker;
+#endif
+

 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // At this point we want to check if there are any memory
     // blocks that aren't part of the wxDebugContext itself,
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // At this point we want to check if there are any memory
     // blocks that aren't part of the wxDebugContext itself,


@@ -162,7 +195,7 @@ void wxApp::CleanUp()
         wxDebugContext::PrintStatistics();
     }
 #endif
         wxDebugContext::PrintStatistics();
     }
 #endif

-    
+

     // do it as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
     // do it as the very last thing because everything else can log messages
     // do it as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
     // do it as the very last thing because everything else can log messages


@@ -180,10 +213,10 @@ int wxEntry( int argc, char *argv[] )
     // checked, but this is a reasonable compromise.
     wxDebugContext::SetCheckpoint();
 #endif
     // checked, but this is a reasonable compromise.
     wxDebugContext::SetCheckpoint();
 #endif

-    
+

     if (!wxApp::Initialize())
         return FALSE;
     if (!wxApp::Initialize())
         return FALSE;

-    
+

     if (!wxTheApp)
     {
         if (!wxApp::GetInitializerFunction())
     if (!wxTheApp)
     {
         if (!wxApp::GetInitializerFunction())


@@ -191,60 +224,59 @@ int wxEntry( int argc, char *argv[] )
             printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
             return 0;
         };
             printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
             return 0;
         };

-        
+

         wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
     };
         wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
     };

-    
+

     if (!wxTheApp)
     {
         printf( "wxWindows error: wxTheApp == NULL\n" );
         return 0;
     };
     if (!wxTheApp)
     {
         printf( "wxWindows error: wxTheApp == NULL\n" );
         return 0;
     };

-    
+

     wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));

-    
+

     wxTheApp->argc = argc;
     wxTheApp->argv = argv;
     wxTheApp->argc = argc;
     wxTheApp->argv = argv;

-    
+

     // GUI-specific initialization, such as creating an app context.
     wxTheApp->OnInitGui();
     // GUI-specific initialization, such as creating an app context.
     wxTheApp->OnInitGui();

-    
-    // Here frames insert themselves automatically
-    // into wxTopLevelWindows by getting created
-    // in OnInit().
-    
+
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
+

     int retValue = 0;
     if (wxTheApp->OnInit())
     {
         if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
     }
     int retValue = 0;
     if (wxTheApp->OnInit())
     {
         if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
     }

-    
+

     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();
     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();

-    
+

     delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
     // for further messages
     delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
     // for further messages

-    
+

     if (wxTheApp->GetTopWindow())
     {
         delete wxTheApp->GetTopWindow();
         wxTheApp->SetTopWindow(NULL);
     }
     if (wxTheApp->GetTopWindow())
     {
         delete wxTheApp->GetTopWindow();
         wxTheApp->SetTopWindow(NULL);
     }

-    
+

     wxTheApp->DeletePendingObjects();
     wxTheApp->DeletePendingObjects();

-    
+

     wxTheApp->OnExit();
     wxTheApp->OnExit();

-    
+

     wxApp::CleanUp();
     wxApp::CleanUp();

-    
+

     return retValue;
 };
 
 // Static member initialization
     return retValue;
 };
 
 // Static member initialization

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {


@@ -255,10 +287,8 @@ wxApp::wxApp()
     m_appName = "";
     argc = 0;
     argv = NULL;
     m_appName = "";
     argc = 0;
     argv = NULL;

-    m_printMode = wxPRINT_POSTSCRIPT;

     m_exitOnFrameDelete = TRUE;
     m_exitOnFrameDelete = TRUE;

-    m_auto3D = TRUE;
-    
+

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


@@ -277,42 +307,43 @@ bool wxApp::Initialized()
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;

-    
+

     /*
     * Sit around forever waiting to process X-events. Property Change
     * event are handled special, because they have to refer to
     * the root window rather than to a widget. therefore we can't
     * use an Xt-eventhandler.
     */
     /*
     * Sit around forever waiting to process X-events. Property Change
     * event are handled special, because they have to refer to
     * the root window rather than to a widget. therefore we can't
     * use an Xt-eventhandler.
     */

-    
+

     XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),
         XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
         PropertyChangeMask);
     XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),
         XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
         PropertyChangeMask);

-    
+

     XEvent event;
     XEvent event;

-    
+

     // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
     while (m_keepGoing)
     {
         XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
     // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
     while (m_keepGoing)
     {
         XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);

-        
+

         ProcessXEvent((WXEvent*) & event);
         ProcessXEvent((WXEvent*) & event);

-        
+

         if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
         {
             if (!ProcessIdle())
         if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
         {
             if (!ProcessIdle())

-            { 
-                // TODO: Robert, what's this for?
+            {

 #if wxUSE_THREADS
 #if wxUSE_THREADS

+                // leave the main loop to give other threads a chance to
+                // perform their GUI work

                 wxMutexGuiLeave();
                 wxMutexGuiLeave();

-                usleep(20);  
+                wxUsleep(20);

                 wxMutexGuiEnter();
 #endif
             }
         }
                 wxMutexGuiEnter();
 #endif
             }
         }

-        
+

     }
     }

-    
+

     return 0;
 }
 
     return 0;
 }
 


@@ -320,11 +351,52 @@ int wxApp::MainLoop()
 void wxApp::ProcessXEvent(WXEvent* _event)
 {
     XEvent* event = (XEvent*) _event;
 void wxApp::ProcessXEvent(WXEvent* _event)
 {
     XEvent* event = (XEvent*) _event;

-    
-    if ((event->type == KeyPress) && CheckForAccelerator(_event))
+
+    if (event->type == KeyPress)

     {
     {

-        // Do nothing! We intercepted and processed the event as an accelerator.
-        return;
+#if 0 // def __WXDEBUG__
+        Widget widget = XtWindowToWidget(event->xany.display, event->xany.window);
+        wxLogDebug("Got key press event for 0x%08x (parent = 0x%08x)",
+                   widget, XtParent(widget));
+#endif // DEBUG
+
+       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))
+       {
+            // We intercepted and processed the key down event
+            return;
+       }
+#endif
+       else
+       {
+            XtDispatchEvent(event);
+           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;
+       }

     }
     else if (event->type == PropertyNotify)
     {
     }
     else if (event->type == PropertyNotify)
     {


@@ -333,22 +405,22 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     }
     else if (event->type == ResizeRequest)
     {
     }
     else if (event->type == ResizeRequest)
     {

-    /* Terry Gitnick <terryg@scientech.com> - 1/21/98
-    * If resize event, don't resize until the last resize event for this
-    * window is recieved. Prevents flicker as windows are resized.
-        */
-        
+        /* Terry Gitnick <terryg@scientech.com> - 1/21/98
+         * If resize event, don't resize until the last resize event for this
+         * window is recieved. Prevents flicker as windows are resized.
+         */
+

         Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
         Window win = event->xany.window;
         XEvent report;
         Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
         Window win = event->xany.window;
         XEvent report;

-        
+

         //  to avoid flicker
         report = * event;
         while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));
         //  to avoid flicker
         report = * event;
         while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));

-        
+

         // TODO: when implementing refresh optimization, we can use
         // XtAddExposureToRegion to expand the window's paint region.
         // TODO: when implementing refresh optimization, we can use
         // XtAddExposureToRegion to expand the window's paint region.

-        
+

         XtDispatchEvent(event);
     }
     else
         XtDispatchEvent(event);
     }
     else


@@ -363,7 +435,7 @@ bool wxApp::ProcessIdle()
     wxIdleEvent event;
     event.SetEventObject(this);
     ProcessEvent(event);
     wxIdleEvent event;
     event.SetEventObject(this);
     ProcessEvent(event);

-    
+

     return event.MoreRequested();
 }
 
     return event.MoreRequested();
 }
 


@@ -376,7 +448,7 @@ void wxApp::ExitMainLoop()
 bool wxApp::Pending()
 {
     XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
 bool wxApp::Pending()
 {
     XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));

-    
+

     // Fix by Doug from STI, to prevent a stall if non-X event
     // is found.
     return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
     // Fix by Doug from STI, to prevent a stall if non-X event
     // is found.
     return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;


@@ -386,7 +458,7 @@ bool wxApp::Pending()
 void wxApp::Dispatch()
 {
     //    XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
 void wxApp::Dispatch()
 {
     //    XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);

-    
+

     XEvent event;
     XtAppNextEvent((XtAppContext) GetAppContext(), &event);
     ProcessXEvent((WXEvent*) & event);
     XEvent event;
     XtAppNextEvent((XtAppContext) GetAppContext(), &event);
     ProcessXEvent((WXEvent*) & event);


@@ -403,43 +475,63 @@ void wxApp::HandlePropertyChange(WXEvent *event)
 void wxApp::OnIdle(wxIdleEvent& event)
 {
     static bool inOnIdle = FALSE;
 void wxApp::OnIdle(wxIdleEvent& event)
 {
     static bool inOnIdle = FALSE;

-    
+

     // Avoid recursion (via ProcessEvent default case)
     if (inOnIdle)
         return;
     // Avoid recursion (via ProcessEvent default case)
     if (inOnIdle)
         return;

-    
+

     inOnIdle = TRUE;
     inOnIdle = TRUE;

-    
+
+    // 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
+
+    // Flush pending events.
+    ProcessPendingEvents();
+

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

-    
+

     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();
     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();

-    
+

     // Send OnIdle events to all windows
     bool needMore = SendIdleEvents();
     // Send OnIdle events to all windows
     bool needMore = SendIdleEvents();

-    
+

     if (needMore)
         event.RequestMore(TRUE);
     if (needMore)
         event.RequestMore(TRUE);

-    
+

     inOnIdle = FALSE;
 }
 
     inOnIdle = FALSE;
 }
 

+void wxWakeUpIdle()
+{
+    // **** please implement me! ****
+    // Wake up the idle handler processor, even if it is in another thread...
+}
+
+

 // Send idle event to all top-level windows
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 // Send idle event to all top-level windows
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;

-    wxNode* node = wxTopLevelWindows.First();
+
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
         if (SendIdleEvents(win))
             needMore = TRUE;

-        
-        node = node->Next();
+        node = node->GetNext();

     }
     }

+

     return needMore;
 }
 
     return needMore;
 }
 


@@ -447,21 +539,21 @@ bool wxApp::SendIdleEvents()
 bool wxApp::SendIdleEvents(wxWindow* win)
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents(wxWindow* win)
 {
     bool needMore = FALSE;

-    
+

     wxIdleEvent event;
     event.SetEventObject(win);
     win->ProcessEvent(event);
     wxIdleEvent event;
     event.SetEventObject(win);
     win->ProcessEvent(event);

-    
+

     if (event.MoreRequested())
         needMore = TRUE;
     if (event.MoreRequested())
         needMore = TRUE;

-    
+

     wxNode* node = win->GetChildren().First();
     while (node)
     {
         wxWindow* win = (wxWindow*) node->Data();
         if (SendIdleEvents(win))
             needMore = TRUE;
     wxNode* node = win->GetChildren().First();
     while (node)
     {
         wxWindow* win = (wxWindow*) node->Data();
         if (SendIdleEvents(win))
             needMore = TRUE;

-        
+

         node = node->Next();
     }
     return needMore ;
         node = node->Next();
     }
     return needMore ;


@@ -473,64 +565,58 @@ void wxApp::DeletePendingObjects()
     while (node)
     {
         wxObject *obj = (wxObject *)node->Data();
     while (node)
     {
         wxObject *obj = (wxObject *)node->Data();

-        
+

         delete obj;
         delete obj;

-        
+

         if (wxPendingDelete.Member(obj))
             delete node;
         if (wxPendingDelete.Member(obj))
             delete node;

-        
+

         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
         node = wxPendingDelete.First();
     }
 }
 
         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
         node = wxPendingDelete.First();
     }
 }
 

-wxLog* wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
-
-wxWindow* wxApp::GetTopWindow() const
-{
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
-}
-

 // Create an application context
 bool wxApp::OnInitGui()
 {
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
 // Create an application context
 bool wxApp::OnInitGui()
 {
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,

-        (const char*) wxTheApp->GetClassName(), NULL,
+        (const char*) wxTheApp->GetClassName(), NULL, 0,

 # if XtSpecificationRelease < 5
 # if XtSpecificationRelease < 5

-        0,(Cardinal*) &argc,argv) ;
+        (Cardinal*) &argc,

 # else
 # else

-    0,&argc,argv) ;
+        &argc,

 # endif
 # endif

+        argv);
+

     if (!dpy) {
     if (!dpy) {

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

         exit(-1);
     }
     m_initialDisplay = (WXDisplay*) dpy;
         exit(-1);
     }
     m_initialDisplay = (WXDisplay*) dpy;

-    
+
+#ifdef __WXDEBUG__
+    // install the X error handler
+    gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
+#endif // __WXDEBUG__
+

     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
         applicationShellWidgetClass,dpy,
         NULL,0) ;
     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
         applicationShellWidgetClass,dpy,
         NULL,0) ;

-    
+

     // Add general resize proc
     XtActionsRec rec;
     rec.string = "resize";
     rec.proc = (XtActionProc)wxWidgetResizeProc;
     XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
     // Add general resize proc
     XtActionsRec rec;
     rec.string = "resize";
     rec.proc = (XtActionProc)wxWidgetResizeProc;
     XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);

-    
+

     GetMainColormap(dpy);
     m_maxRequestSize = XMaxRequestSize((Display*) dpy);
     GetMainColormap(dpy);
     m_maxRequestSize = XMaxRequestSize((Display*) dpy);

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -541,12 +627,12 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
     int defaultScreen = DefaultScreen((Display*) display);
     Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);
 
     int defaultScreen = DefaultScreen((Display*) display);
     Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);

-    
+

     Colormap c = DefaultColormapOfScreen(screen);
     Colormap c = DefaultColormapOfScreen(screen);

-    
+

     if (!m_mainColormap)
         m_mainColormap = (WXColormap) c;
     if (!m_mainColormap)
         m_mainColormap = (WXColormap) c;

-    
+

     return (WXColormap) c;
 }
 
     return (WXColormap) c;
 }
 


@@ -560,17 +646,17 @@ bool wxApp::CheckForAccelerator(WXEvent* event)
         // TODO: should get display for the window, not the current display
         Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), xEvent->xany.window);
         wxWindow* win = NULL;
         // TODO: should get display for the window, not the current display
         Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), 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_CHAR);
         wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
         wxKeyEvent keyEvent(wxEVT_CHAR);
         wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);

-        
+

         // Now we have a wxKeyEvent and we have a wxWindow.
         // Go up the hierarchy until we find a matching accelerator,
         // or we get to the top.
         // Now we have a wxKeyEvent and we have a wxWindow.
         // Go up the hierarchy until we find a matching accelerator,
         // or we get to the top.


@@ -585,12 +671,62 @@ bool wxApp::CheckForAccelerator(WXEvent* event)
     return FALSE;
 }
 
     return FALSE;
 }
 

+bool wxApp::CheckForKeyDown(WXEvent* event)
+{
+    XEvent* xEvent = (XEvent*) event;
+    if (xEvent->xany.type == KeyPress)
+    {
+        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+                                        xEvent->xany.window);
+       wxWindow* win = NULL;
+
+       // Find the first wxWindow that corresponds to this event window
+       while (widget && !(win = wxGetWindowFromTable(widget)))
+            widget = XtParent(widget);
+
+       if (!widget || !win)
+            return FALSE;
+
+       wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+       wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+
+       return win->ProcessEvent( keyEvent );
+    }
+
+    return FALSE;
+}
+
+bool wxApp::CheckForKeyUp(WXEvent* event)
+{
+    XEvent* xEvent = (XEvent*) event;
+    if (xEvent->xany.type == KeyRelease)
+    {
+        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+                                        xEvent->xany.window);
+       wxWindow* win = NULL;
+
+       // Find the first wxWindow that corresponds to this event window
+       while (widget && !(win = wxGetWindowFromTable(widget)))
+            widget = XtParent(widget);
+
+       if (!widget || !win)
+            return FALSE;
+
+       wxKeyEvent keyEvent(wxEVT_KEY_UP);
+       wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+
+       return win->ProcessEvent( keyEvent );
+    }
+
+    return FALSE;
+}
+

 void wxExit()
 {
     int retValue = 0;
     if (wxTheApp)
         retValue = wxTheApp->OnExit();
 void wxExit()
 {
     int retValue = 0;
     if (wxTheApp)
         retValue = wxTheApp->OnExit();

-    
+

     wxApp::CleanUp();
     /*
     * Exit in some platform-specific way. Not recommended that the app calls this:
     wxApp::CleanUp();
     /*
     * Exit in some platform-specific way. Not recommended that the app calls this:


@@ -600,10 +736,76 @@ void wxExit()
 }
 
 // Yield to other processes
 }
 
 // Yield to other processes

+
+static bool gs_inYield = FALSE;
+

 bool wxYield()
 {
 bool wxYield()
 {

+#ifdef __WXDEBUG__    
+    if (gs_inYield)
+        wxFAIL_MSG( wxT("wxYield called recursively" ) );
+#endif
+    
+    gs_inYield = TRUE;
+

     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
     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
+
+    gs_inYield = FALSE;
+

     return TRUE;
 }
 
     return TRUE;
 }
 

+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()
+{
+    if (gs_inYield)
+        return FALSE;
+        
+    return wxYield();
+}
+
+
+// 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
+{
+    switch(which)
+    {
+        case wxICON_INFORMATION:
+            return wxIcon(info_xpm);
+
+        case wxICON_QUESTION:
+            return wxIcon(question_xpm);
+
+        case wxICON_EXCLAMATION:
+            return wxIcon(warning_xpm);
+
+        default:
+            wxFAIL_MSG("requested non existent standard icon");
+            // still fall through
+
+        case wxICON_HAND:
+            return wxIcon(error_xpm);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+    return (XtAppContext)wxTheApp->GetAppContext();
+}