1. DoSetSize() simplified, DoGetBestSize() introduced

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index ba176dce6f3c53ac1046b741c4af84b8b06b95d3..0ccb67f1dd5174c3340150b1f95308b3d3a3473a 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -6,7 +6,7 @@
 // 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__


@@ -28,9 +28,15 @@
 #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
+    #include "wx/thread.h"
+#endif

 
 #if wxUSE_WX_RESOURCES
 
 #if wxUSE_WX_RESOURCES

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

 #endif
 
 #include <Xm/Xm.h>
 #endif
 
 #include <Xm/Xm.h>


@@ -46,12 +52,18 @@
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 

+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif // wxUSE_THREADS
+

 wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

+

 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 END_EVENT_TABLE()


@@ -61,37 +73,34 @@ long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

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

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

-#endif

 
 

-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-
-    streambuf* sBuf = new wxDebugStreamBuf;
-    ostream* oStr = new ostream(sBuf) ;
-    wxDebugContext::SetStream(oStr, sBuf);
+    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
+    wxPendingEvents = new wxList();
+    wxPendingEventsLocker = new wxCriticalSection();

 #endif
 #endif

-  
-    wxClassInfo::InitializeClasses();

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

+
+    wxInitializeStockLists();

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

-  // For PostScript printing
+    // For PostScript printing

 #if wxUSE_POSTSCRIPT
 #if wxUSE_POSTSCRIPT

-/* Done using wxModule now
+    /* Done using wxModule now

     wxInitializePrintSetupData();
     wxThePrintPaperDatabase = new wxPrintPaperDatabase;
     wxThePrintPaperDatabase->CreateDatabase();
     wxInitializePrintSetupData();
     wxThePrintPaperDatabase = new wxPrintPaperDatabase;
     wxThePrintPaperDatabase->CreateDatabase();

-*/
+    */

 #endif
 
     wxBitmap::InitStandardHandlers();
 #endif
 
     wxBitmap::InitStandardHandlers();


@@ -99,7 +108,7 @@ bool wxApp::Initialize()
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
     wxModule::RegisterModules();
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
     wxModule::RegisterModules();

-    wxASSERT( wxModule::InitializeModules() == TRUE );
+    if (!wxModule::InitializeModules()) return FALSE;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -135,11 +144,11 @@ void wxApp::CleanUp()
     wxTheColourDatabase = NULL;
 
 #if wxUSE_POSTSCRIPT
     wxTheColourDatabase = NULL;
 
 #if wxUSE_POSTSCRIPT

-/* Done using wxModule now
+    /* Done using wxModule now

     wxInitializePrintSetupData(FALSE);
     delete wxThePrintPaperDatabase;
     wxThePrintPaperDatabase = NULL;
     wxInitializePrintSetupData(FALSE);
     delete wxThePrintPaperDatabase;
     wxThePrintPaperDatabase = NULL;

-*/
+    */

 #endif
 
     wxBitmap::CleanUpHandlers();
 #endif
 
     wxBitmap::CleanUpHandlers();


@@ -149,6 +158,29 @@ void wxApp::CleanUp()
 
     wxClassInfo::CleanUpClasses();
 
 
     wxClassInfo::CleanUpClasses();
 

+    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,
+    // as a special case. Then when dumping we need to ignore
+    // wxDebugContext, too.
+    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+    {
+        wxLogDebug("There were memory leaks.\n");
+        wxDebugContext::Dump();
+        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


@@ -157,23 +189,34 @@ void wxApp::CleanUp()
 
 int wxEntry( int argc, char *argv[] )
 {
 
 int wxEntry( int argc, char *argv[] )
 {

+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+    // This seems to be necessary since there are 'rogue'
+    // objects present at this point (perhaps global objects?)
+    // Setting a checkpoint will ignore them as far as the
+    // memory checking facility is concerned.
+    // Of course you may argue that memory allocated in globals should be
+    // checked, but this is a reasonable compromise.
+    wxDebugContext::SetCheckpoint();
+#endif
+

     if (!wxApp::Initialize())
     if (!wxApp::Initialize())

-      return FALSE;
+        return FALSE;
+

     if (!wxTheApp)
     {
     if (!wxTheApp)
     {

-      if (!wxApp::GetInitializerFunction())
-      {
-        printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-        return 0;
-      };
-    
-       wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
+        if (!wxApp::GetInitializerFunction())
+        {
+            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+            return 0;
+        };
+
+        wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();

     };
     };

-  
+

     if (!wxTheApp)
     {
     if (!wxTheApp)
     {

-      printf( "wxWindows error: wxTheApp == NULL\n" );
-      return 0;
+        printf( "wxWindows error: wxTheApp == NULL\n" );
+        return 0;

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


@@ -185,45 +228,35 @@ int wxEntry( int argc, char *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().
-  
-    if (!wxTheApp->OnInit()) return 0;
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().

 
     int retValue = 0;
 
     int retValue = 0;

-  
-    if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+    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();
+
+    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
+    // for further messages

 
     if (wxTheApp->GetTopWindow())
     {
 
     if (wxTheApp->GetTopWindow())
     {

-      delete wxTheApp->GetTopWindow();
-      wxTheApp->SetTopWindow(NULL);
+        delete wxTheApp->GetTopWindow();
+        wxTheApp->SetTopWindow(NULL);

     }
     }

-  
+

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

-  
+

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

-  
+

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

-    delete wxTheApp;
-    wxTheApp = NULL;
-  
-#if (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,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft() > 0)
-    {
-      wxTrace("There were memory leaks.\n");
-      wxDebugContext::Dump();
-      wxDebugContext::PrintStatistics();
-    }
-    wxDebugContext::SetStream(NULL, NULL);
-#endif
-  

     return retValue;
 };
 
     return retValue;
 };
 


@@ -253,16 +286,16 @@ wxApp::wxApp()
 bool wxApp::Initialized()
 {
     if (GetTopWindow())
 bool wxApp::Initialized()
 {
     if (GetTopWindow())

-      return TRUE;
+        return TRUE;

     else
     else

-      return FALSE;
+        return FALSE;

 }
 
 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
     * 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


@@ -270,45 +303,78 @@ int wxApp::MainLoop()
     */
 
     XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),
     */
 
     XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),

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

 
     XEvent event;
 
     // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
     while (m_keepGoing)
     {
 
     XEvent event;
 
     // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
     while (m_keepGoing)
     {

-      XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
-      if(event.type == PropertyNotify)
-      {
-        HandlePropertyChange((WXEvent*) &event);
-      } else
-      {
-        // 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. */
-        if (event.type == ResizeRequest)
+        XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event);
+
+        ProcessXEvent((WXEvent*) & event);
+
+        if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)

         {
         {

-           Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
-           Window win = event.xany.window;
-           XEvent report;
- 
-           //  to avoid flicker
-           report = event;
-           while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report));
+            if (!ProcessIdle())
+            {
+#if wxUSE_THREADS
+                // leave the main loop to give other threads a chance to
+                // perform their GUI work
+                wxMutexGuiLeave();
+                wxUsleep(20);
+                wxMutexGuiEnter();
+#endif
+            }

         }
         }

-        // TODO: when implementing refresh optimization, we can use
-        // XtAddExposureToRegion to expand the window's paint region.
-
-        XtDispatchEvent(&event);

 
 

-       ProcessIdle();
-      }

     }
 
     return 0;
 }
 
     }
 
     return 0;
 }
 

+// Processes an X event.
+void wxApp::ProcessXEvent(WXEvent* _event)
+{
+    XEvent* event = (XEvent*) _event;
+
+    if ((event->type == KeyPress) && CheckForAccelerator(_event))
+    {
+        // Do nothing! We intercepted and processed the event as an accelerator.
+        return;
+    }
+    else if (event->type == PropertyNotify)
+    {
+        HandlePropertyChange(_event);
+        return;
+    }
+    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.
+        */
+
+        Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
+        Window win = event->xany.window;
+        XEvent 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.
+
+        XtDispatchEvent(event);
+    }
+    else
+    {
+        XtDispatchEvent(event);
+    }
+}
+

 // Returns TRUE if more time is needed.
 bool wxApp::ProcessIdle()
 {
 // Returns TRUE if more time is needed.
 bool wxApp::ProcessIdle()
 {


@@ -328,13 +394,20 @@ void wxApp::ExitMainLoop()
 bool wxApp::Pending()
 {
     XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
 bool wxApp::Pending()
 {
     XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));

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

 }
 
 // Dispatch a message.
 void wxApp::Dispatch()
 {
 }
 
 // Dispatch a message.
 void wxApp::Dispatch()
 {

-    XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+    //    XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+
+    XEvent event;
+    XtAppNextEvent((XtAppContext) GetAppContext(), &event);
+    ProcessXEvent((WXEvent*) & event);

 }
 
 // This should be redefined in a derived class for
 }
 
 // This should be redefined in a derived class for


@@ -351,23 +424,28 @@ void wxApp::OnIdle(wxIdleEvent& event)
 
     // Avoid recursion (via ProcessEvent default case)
     if (inOnIdle)
 
     // Avoid recursion (via ProcessEvent default case)
     if (inOnIdle)

-      return;
+        return;

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

+#if wxUSE_THREADS
+    // Flush pending events.
+    ProcessPendingEvents();
+#endif
+

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

-      pLog->Flush();
+        pLog->Flush();

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

-      event.RequestMore(TRUE);
+        event.RequestMore(TRUE);

 
     inOnIdle = FALSE;
 }
 
     inOnIdle = FALSE;
 }


@@ -376,15 +454,16 @@ void wxApp::OnIdle(wxIdleEvent& event)
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;

-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
+
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        if (SendIdleEvents(win))

             needMore = TRUE;
             needMore = TRUE;

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

 
 

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

     return needMore;
 }
 
     return needMore;
 }
 


@@ -393,22 +472,22 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 {
     bool needMore = FALSE;
 
 {
     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))
+    wxNode* node = win->GetChildren().First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        if (SendIdleEvents(win))

             needMore = TRUE;
 
             needMore = TRUE;
 

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

     return needMore ;
 }
 
     return needMore ;
 }
 


@@ -417,19 +496,37 @@ void wxApp::DeletePendingObjects()
     wxNode *node = wxPendingDelete.First();
     while (node)
     {
     wxNode *node = wxPendingDelete.First();
     while (node)
     {

-      wxObject *obj = (wxObject *)node->Data();
-    
-      delete obj;
+        wxObject *obj = (wxObject *)node->Data();

 
 

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

 
 

-      // Deleting one object may have deleted other pending
-      // objects, so start from beginning of list again.
-      node = wxPendingDelete.First();
+        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();

     }
 }
 
     }
 }
 

+#if wxUSE_THREADS
+void wxApp::ProcessPendingEvents()
+{
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
+
+    while (node)
+    {
+        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+
+        handler->ProcessPendingEvents();
+
+        delete node;
+        node = wxPendingEvents->First();
+    }
+}
+#endif // wxUSE_THREADS
+

 wxLog* wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 wxLog* wxApp::CreateLogTarget()
 {
     return new wxLogGui;


@@ -439,8 +536,8 @@ wxWindow* wxApp::GetTopWindow() const
 {
     if (m_topWindow)
         return m_topWindow;
 {
     if (m_topWindow)
         return m_topWindow;

-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
+    else if (wxTopLevelWindows.GetCount() > 0)
+        return wxTopLevelWindows.GetFirst()->GetData();

     else
         return NULL;
 }
     else
         return NULL;
 }


@@ -451,21 +548,25 @@ bool wxApp::OnInitGui()
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
     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";
-      exit(-1);
+        wxString className(wxTheApp->GetClassName());
+        wxLogError(_("wxWindows could not open display for '%s': exiting."),
+                   (const char*) className);
+        exit(-1);

     }
     m_initialDisplay = (WXDisplay*) dpy;
 
     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
     }
     m_initialDisplay = (WXDisplay*) dpy;
 
     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),

-                                     applicationShellWidgetClass,dpy,
-                                     NULL,0) ;
+        applicationShellWidgetClass,dpy,
+        NULL,0) ;

 
     // Add general resize proc
     XtActionsRec rec;
 
     // Add general resize proc
     XtActionsRec rec;


@@ -482,29 +583,65 @@ bool wxApp::OnInitGui()
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */

-      return m_mainColormap;
+        return m_mainColormap;
+
+    int defaultScreen = DefaultScreen((Display*) display);
+    Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);

 
 

-    Colormap c =
-      DefaultColormapOfScreen(XScreenOfDisplay((Display*) display,
-                                            DefaultScreen((Display*) display)));
+    Colormap c = DefaultColormapOfScreen(screen);

 
     if (!m_mainColormap)
 
     if (!m_mainColormap)

-      m_mainColormap = (WXColormap) c;
+        m_mainColormap = (WXColormap) c;

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

+// Returns TRUE if an accelerator has been processed
+bool wxApp::CheckForAccelerator(WXEvent* event)
+{
+    XEvent* xEvent = (XEvent*) event;
+    if (xEvent->xany.type == KeyPress)
+    {
+        // Find a wxWindow for this window
+        // 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);
+
+        if (!widget || !win)
+            return FALSE;
+
+        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.
+        while (win)
+        {
+            if (win->ProcessAccelerator(keyEvent))
+                return TRUE;
+            win = win->GetParent();
+        }
+        return FALSE;
+    }
+    return FALSE;
+}
+

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

-      retValue = wxTheApp->OnExit();
+        retValue = wxTheApp->OnExit();

 
     wxApp::CleanUp();
     /*
 
     wxApp::CleanUp();
     /*

-     * Exit in some platform-specific way. Not recommended that the app calls this:
-     * only for emergencies.
-     */
+    * Exit in some platform-specific way. Not recommended that the app calls this:
+    * only for emergencies.
+    */

     exit(retValue);
 }
 
     exit(retValue);
 }
 


@@ -512,7 +649,13 @@ void wxExit()
 bool wxYield()
 {
     while (wxTheApp && wxTheApp->Pending())
 bool wxYield()
 {
     while (wxTheApp && wxTheApp->Pending())

-      wxTheApp->Dispatch();
+        wxTheApp->Dispatch();
+
+    // VZ: is it the same as this (taken from old wxExecute)?
+#if 0
+    XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
+#endif
+

     return TRUE;
 }
 
     return TRUE;
 }