dlopen fixes

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 94e652a549e893a503a77db586c21463b5ed71d1..7836a95070695d2ff58b0d0542f133300c055d13 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -29,6 +29,10 @@
 #include "wx/module.h"
 #include "wx/memory.h"
 
 #include "wx/module.h"
 #include "wx/memory.h"
 

+#if wxUSE_THREADS
+#include "wx/thread.h"
+#endif
+

 #if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 #endif
 #if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 #endif


@@ -53,7 +57,7 @@ wxHashTable *wxWidgetHashTable = NULL;
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)

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

 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 


@@ -66,41 +70,35 @@ bool wxApp::Initialize()
 #else
     wxBuffer = new char[BUFSIZ + 512];
 #endif
 #else
     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);
-
-#endif
-  
+    

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

-
+    

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

+    
+    wxInitializeStockLists();

     wxInitializeStockObjects();
     wxInitializeStockObjects();

-
+    

 #if wxUSE_WX_RESOURCES
     wxInitializeResourceSystem();
 #endif
 #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
 #endif

-
+    

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

-
+    

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

-
+    

     wxModule::RegisterModules();
     wxModule::RegisterModules();

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

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -108,47 +106,63 @@ 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
 #if wxUSE_POSTSCRIPT

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

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

-*/
+    */

 #endif
 #endif

-
+    

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

-
+    

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

-
+    

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

-
+    
+    delete wxTheApp;
+    wxTheApp = NULL;
+    
+#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,73 +171,75 @@ 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->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().

-  
-    if (!wxTheApp->OnInit()) return 0;
-
+    

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


@@ -242,7 +258,7 @@ wxApp::wxApp()
     m_printMode = wxPRINT_POSTSCRIPT;
     m_exitOnFrameDelete = TRUE;
     m_auto3D = TRUE;
     m_printMode = wxPRINT_POSTSCRIPT;
     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;


@@ -253,60 +269,92 @@ 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
     * 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()),
     XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),

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

     XEvent event;
     XEvent event;

-
+    

     // Use this flag to allow breaking the loop via wxApp::ExitMainLoop()
     while (m_keepGoing)
     {
     // 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())
+            { 
+                // TODO: Robert, what's this for?
+#if wxUSE_THREADS
+                wxMutexGuiLeave();
+                usleep(20);  
+                wxMutexGuiEnter();
+#endif
+            }

         }
         }

+        
+    }
+    
+    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.
         // TODO: when implementing refresh optimization, we can use
         // XtAddExposureToRegion to expand the window's paint region.

-
-        XtDispatchEvent(&event);
-
-        DeletePendingObjects();
-      }
+        
+        XtDispatchEvent(event);
+    }
+    else
+    {
+        XtDispatchEvent(event);

     }
     }

-
-    return 0;

 }
 
 // Returns TRUE if more time is needed.
 }
 
 // Returns TRUE if more time is needed.


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

-
+    

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


@@ -328,13 +376,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


@@ -348,27 +403,27 @@ 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)
     // Avoid recursion (via ProcessEvent default case)
     if (inOnIdle)

-      return;
-
+        return;
+    

     inOnIdle = TRUE;
     inOnIdle = TRUE;

-
+    

     // '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() )
     // 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();
     // Send OnIdle events to all windows
     bool needMore = SendIdleEvents();

-
+    

     if (needMore)
     if (needMore)

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

     inOnIdle = FALSE;
 }
 
     inOnIdle = FALSE;
 }
 


@@ -376,15 +431,15 @@ 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))
+    wxNode* node = wxTopLevelWindows.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;
 }
 


@@ -392,23 +447,23 @@ 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))
+    
+    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,16 +472,16 @@ void wxApp::DeletePendingObjects()
     wxNode *node = wxPendingDelete.First();
     while (node)
     {
     wxNode *node = wxPendingDelete.First();
     while (node)
     {

-      wxObject *obj = (wxObject *)node->Data();
-    
-      delete obj;
-
-      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();
+        wxObject *obj = (wxObject *)node->Data();
+        
+        delete obj;
+        
+        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();

     }
 }
 
     }
 }
 


@@ -451,60 +506,96 @@ 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,

 # if XtSpecificationRelease < 5
 # if XtSpecificationRelease < 5

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

 # else
 # else

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

 # endif
     if (!dpy) {
 # endif
     if (!dpy) {

-      cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
-      exit(-1);
+        cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
+        exit(-1);

     }
     m_initialDisplay = (WXDisplay*) dpy;
     }
     m_initialDisplay = (WXDisplay*) dpy;

-
+    

     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
     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;
     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;
 }
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */
     return TRUE;
 }
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */

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

 
 

+    int defaultScreen = DefaultScreen((Display*) display);
+    Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);
+    
+    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 +603,7 @@ void wxExit()
 bool wxYield()
 {
     while (wxTheApp && wxTheApp->Pending())
 bool wxYield()
 {
     while (wxTheApp && wxTheApp->Pending())

-      wxTheApp->Dispatch();
+        wxTheApp->Dispatch();

     return TRUE;
 }
 
     return TRUE;
 }