[this message is for the previous commit as well]

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 4d43a26b1726e7e58dd5dbfa26062c5758afb878..34416b4f9b6f1861d9ab7339a3c3288af5da3774 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -17,19 +17,17 @@
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"

-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"

 #include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

-#include "wx/msgdlg.h"

 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"

-#include "wx/cmdline.h"
+
+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"

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


@@ -39,32 +37,37 @@
     #include "wx/resource.h"
 #endif
 
     #include "wx/resource.h"
 #endif
 

-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#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/x11/private.h"
 
 #include <string.h>
 
 #include "wx/x11/private.h"
 
 #include <string.h>
 

+//------------------------------------------------------------------------
+//   global data
+//------------------------------------------------------------------------
+

 extern wxList wxPendingDelete;
 
 extern wxList wxPendingDelete;
 

+wxHashTable *wxWidgetHashTable = NULL;
+

 wxApp *wxTheApp = NULL;
 
 wxApp *wxTheApp = NULL;
 

-wxHashTable *wxWidgetHashTable = NULL;
+// This is set within wxEntryStart -- too early on
+// to put these in wxTheApp
+static int g_newArgc = 0;
+static wxChar** g_newArgv = NULL;
+static bool g_showIconic = FALSE;
+static wxSize g_initialSize = wxDefaultSize;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+// This is required for wxFocusEvent::SetWindow(). It will only
+// work for focus events which we provoke ourselves (by calling
+// SetFocus()). It will not work for those events, which X11
+// generates itself.
+static wxWindow *g_nextFocus = NULL;
+static wxWindow *g_prevFocus = NULL;

 
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+//------------------------------------------------------------------------
+//   X11 error handling
+//------------------------------------------------------------------------

 
 #ifdef __WXDEBUG__
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 #ifdef __WXDEBUG__
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);


@@ -74,13 +77,26 @@ XErrorHandlerFunc gs_pfnXErrorHandler = 0;
 static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 {
     // just forward to the default handler for now
 static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 {
     // just forward to the default handler for now

-    return gs_pfnXErrorHandler(dpy, xevent);
+    if (gs_pfnXErrorHandler)
+        return gs_pfnXErrorHandler(dpy, xevent);
+    else
+        return 0;

 }
 #endif // __WXDEBUG__
 
 }
 #endif // __WXDEBUG__
 

+//------------------------------------------------------------------------
+//   wxApp
+//------------------------------------------------------------------------
+

 long wxApp::sm_lastMessageTime = 0;
 WXDisplay *wxApp::ms_display = NULL;
 
 long wxApp::sm_lastMessageTime = 0;
 WXDisplay *wxApp::ms_display = NULL;
 

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

 bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();
 bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();


@@ -111,6 +127,10 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

+    if (g_newArgv)
+        delete[] g_newArgv;
+    g_newArgv = NULL;
+

     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 


@@ -144,7 +164,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug("There were memory leaks.");

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }


@@ -156,37 +176,95 @@ void wxApp::CleanUp()
     delete wxLog::SetActiveTarget(NULL);
 }
 
     delete wxLog::SetActiveTarget(NULL);
 }
 

-// This is set within wxEntryStart -- too early on
-// to put these in wxTheApp
-static int g_newArgc = 0;
-static wxChar** g_newArgv = NULL;
-

 // NB: argc and argv may be changed here, pass by reference!
 int wxEntryStart( int& argc, char *argv[] )
 {
 #ifdef __WXDEBUG__
 // NB: argc and argv may be changed here, pass by reference!
 int wxEntryStart( int& argc, char *argv[] )
 {
 #ifdef __WXDEBUG__

+#if !wxUSE_NANOX

     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );

+#endif

 #endif // __WXDEBUG__
 
 #endif // __WXDEBUG__
 

-    /// TODO
-#if 0
+    wxString displayName;
+    bool syncDisplay = FALSE;
+

     // Parse the arguments.
     // Parse the arguments.

-#endif
+    // We can't use wxCmdLineParser or OnInitCmdLine and friends because
+    // we have to create the Display earlier. If we can find a way to
+    // use the wxAppBase API then I'll be quite happy to change it.
+    g_newArgv = new wxChar*[argc];
+    g_newArgc = 0;
+    int i;
+    for (i = 0; i < argc; i++)
+    {
+        wxString arg(argv[i]);
+        if (arg == wxT("-display"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                displayName = argv[i];
+                continue;
+            }
+        }
+        else if (arg == wxT("-geometry"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                wxString windowGeometry = argv[i];
+                int w, h;
+                if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2)
+                {
+                    wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str());
+                }
+                else
+                {
+                    g_initialSize = wxSize(w, h);
+                }
+                continue;
+            }
+        }
+        else if (arg == wxT("-sync"))
+        {
+            syncDisplay = TRUE;
+            continue;
+        }
+        else if (arg == wxT("-iconic"))
+        {
+            g_showIconic = TRUE;

 
 

-    Display* xdisplay = XOpenDisplay(NULL);
+            continue;
+        }
+
+        // Not eaten by wxWindows, so pass through
+        g_newArgv[g_newArgc] = argv[i];
+        g_newArgc ++;
+    }
+
+    Display* xdisplay = NULL;
+    if (displayName.IsEmpty())
+        xdisplay = XOpenDisplay(NULL);
+    else
+        xdisplay = XOpenDisplay((char*) displayName.c_str());

 
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
         return -1;
     }
 
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
         return -1;
     }

+
+    if (syncDisplay)
+    {
+        XSynchronize(xdisplay, True);
+    }

     
     wxApp::ms_display = (WXDisplay*) xdisplay;
     
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
         
     
     wxApp::ms_display = (WXDisplay*) xdisplay;
     
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
         

-//    wxSetDetectableAutoRepeat( TRUE );
+    wxSetDetectableAutoRepeat( TRUE );

 
     if (!wxApp::Initialize())
         return -1;
 
     if (!wxApp::Initialize())
         return -1;


@@ -194,7 +272,6 @@ int wxEntryStart( int& argc, char *argv[] )
     return 0;
 }
 
     return 0;
 }
 

-

 int wxEntryInitGui()
 {
     int retValue = 0;
 int wxEntryInitGui()
 {
     int retValue = 0;


@@ -253,6 +330,8 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp->argc = argc;
         wxTheApp->argv = argv;
     }
         wxTheApp->argc = argc;
         wxTheApp->argv = argv;
     }

+    wxTheApp->m_showIconic = g_showIconic;
+    wxTheApp->m_initialSize = g_initialSize;

 
     int retValue;
     retValue = wxEntryInitGui();
 
     int retValue;
     retValue = wxEntryInitGui();


@@ -310,6 +389,8 @@ wxApp::wxApp()
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;

+    m_showIconic = FALSE;
+    m_initialSize = wxDefaultSize;

 }
 
 bool wxApp::Initialized()
 }
 
 bool wxApp::Initialized()


@@ -322,7 +403,7 @@ bool wxApp::Initialized()
 
 int wxApp::MainLoop()
 {
 
 int wxApp::MainLoop()
 {

-     int rt;
+    int rt;

     m_mainLoop = new wxEventLoop;
 
     rt = m_mainLoop->Run();
     m_mainLoop = new wxEventLoop;
 
     rt = m_mainLoop->Run();


@@ -332,21 +413,54 @@ int wxApp::MainLoop()
     return rt;
 }
 
     return rt;
 }
 

-// Processes an X event.
-void wxApp::ProcessXEvent(WXEvent* _event)
+#if !wxUSE_NANOX
+//-----------------------------------------------------------------------
+// X11 predicate function for exposure compression
+//-----------------------------------------------------------------------
+
+struct wxExposeInfo
+{
+    Window window;
+    Bool found_non_matching;
+};
+
+static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
+{
+    wxExposeInfo *info = (wxExposeInfo*) arg;
+    
+    if (info->found_non_matching)
+       return FALSE;
+    
+    if (xevent->xany.type != Expose)
+    {
+        info->found_non_matching = TRUE;
+        return FALSE;
+    }
+    
+    if (xevent->xexpose.window != info->window)
+    {
+        info->found_non_matching = TRUE;
+        return FALSE;
+    }
+    
+    return TRUE;
+}
+#endif
+    // wxUSE_NANOX
+
+//-----------------------------------------------------------------------
+// Processes an X event, returning TRUE if the event was processed.
+//-----------------------------------------------------------------------
+
+bool wxApp::ProcessXEvent(WXEvent* _event)

 {
     XEvent* event = (XEvent*) _event;
 
     wxWindow* win = NULL;
 {
     XEvent* event = (XEvent*) _event;
 
     wxWindow* win = NULL;

-    Window window = event->xany.window;
+    Window window = XEventGetWindow(event);

     Window actualWindow = window;
 
     // Find the first wxWindow that corresponds to this event window
     Window actualWindow = window;
 
     // Find the first wxWindow that corresponds to this event window

-    // TODO: may need to translate coordinates from actualWindow
-    // to window, if the receiving window != wxWindow window
-    //    while (window && !(win = wxGetWindowFromTable(window)))
-    //        window = wxGetWindowParent(window);
-

     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,
     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,


@@ -354,87 +468,86 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
     win = wxGetWindowFromTable(window);
     if (!win)
 
     win = wxGetWindowFromTable(window);
     if (!win)

-           return;
+        return FALSE;

 
 

+#ifdef __WXDEBUG__
+    wxString windowClass = win->GetClassInfo()->GetClassName();
+#endif
+    

     switch (event->type)
     {
         case KeyPress:
         {
     switch (event->type)
     {
         case KeyPress:
         {

-            if (win && !win->IsEnabled())
-                return;
+            if (!win->IsEnabled())
+                return FALSE;

 
 

-            {
-                if (win)
-                {
-                    wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
-                    wxTranslateKeyEvent(keyEvent, win, window, event);
+            wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+            wxTranslateKeyEvent(keyEvent, win, window, event);
+                    
+            // wxLogDebug( "OnKey from %s", win->GetName().c_str() );

         
         

-                    // We didn't process wxEVT_KEY_DOWN, so send
-                    // wxEVT_CHAR
-                    if (!win->GetEventHandler()->ProcessEvent( keyEvent ))
-                    {
-                        keyEvent.SetEventType(wxEVT_CHAR);
-                        win->GetEventHandler()->ProcessEvent( keyEvent );
-                    }
-
-                    // We intercepted and processed the key down event
-                    return;
-                }
+            // We didn't process wxEVT_KEY_DOWN, so send
+            // wxEVT_CHAR
+            if (!win->GetEventHandler()->ProcessEvent( keyEvent ))
+            {
+                keyEvent.SetEventType(wxEVT_CHAR);
+                if (!win->GetEventHandler()->ProcessEvent( keyEvent ))
+                    return FALSE;

             }
             }

-            return;
+            return TRUE;

         }
         case KeyRelease:
         {
         }
         case KeyRelease:
         {

-            if (win && !win->IsEnabled())
-                return;
+            if (!win->IsEnabled())
+                return FALSE;

 
 

-            if (win)
-            {
-                wxKeyEvent keyEvent(wxEVT_KEY_UP);
-                wxTranslateKeyEvent(keyEvent, win, window, event);
+            wxKeyEvent keyEvent(wxEVT_KEY_UP);
+            wxTranslateKeyEvent(keyEvent, win, window, event);

         
         

-                win->GetEventHandler()->ProcessEvent( keyEvent );
+            return win->GetEventHandler()->ProcessEvent( keyEvent );
+        }
+        case ConfigureNotify:
+        {
+#if wxUSE_NANOX
+            if (event->update.utype == GR_UPDATE_SIZE)
+#endif
+            {
+                //wxLogDebug("ConfigureNotify: %s", windowClass.c_str());
+                wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
+                sizeEvent.SetEventObject( win );
+                
+                return win->GetEventHandler()->ProcessEvent( sizeEvent );

             }
             }

-            return;
+            return FALSE;
+            break;

         }
         }

+#if !wxUSE_NANOX

         case PropertyNotify:
         {
         case PropertyNotify:
         {

-            HandlePropertyChange(_event);
-            return;
+            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
+            return HandlePropertyChange(_event);

         }
         case ClientMessage:
         {
         }
         case ClientMessage:
         {

-            if (win && !win->IsEnabled())
-                return;
+            if (!win->IsEnabled())
+                return FALSE;

 
 

-            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
-            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
+            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
+            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);

 
             if (event->xclient.message_type == wm_protocols)
             {
                 if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
                 {
 
             if (event->xclient.message_type == wm_protocols)
             {
                 if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
                 {

-                    if (win)
-                    {
-                        win->Close(FALSE);
-                    }
+                    win->Close(FALSE);
+                    return TRUE;

                 }
             }
                 }
             }

-            return;
-        }
-        case ConfigureNotify:
-        {
-            if (win)
-            {
-                wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() );
-                sizeEvent.SetEventObject( win );
-                
-                win->GetEventHandler()->ProcessEvent( sizeEvent );
-            }
+            return FALSE;

         }
         case ResizeRequest:
         {
         }
         case 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.
             */
             * If resize event, don't resize until the last resize event for this
             * window is recieved. Prevents flicker as windows are resized.
             */


@@ -446,83 +559,181 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             

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

             if (win)
             {
                 wxSize sz = win->GetSize();
                 wxSizeEvent sizeEvent(sz, win->GetId());
                 sizeEvent.SetEventObject(win);
 
             if (win)
             {
                 wxSize sz = win->GetSize();
                 wxSizeEvent sizeEvent(sz, win->GetId());
                 sizeEvent.SetEventObject(win);
 

-                win->GetEventHandler()->ProcessEvent( sizeEvent );
+                return win->GetEventHandler()->ProcessEvent( sizeEvent );

             }
 
             }
 

-            return;
+            return FALSE;

         }
         }

-        case Expose:
+#endif
+#if wxUSE_NANOX
+        case GR_EVENT_TYPE_CLOSE_REQ:

         {
             if (win)
             {
         {
             if (win)
             {

-                // Schedule update for later
-                win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
-                                              event->xexpose.width, event->xexpose.height);
+                win->Close(FALSE);
+                return TRUE;
+            }
+            return FALSE;
+            break;
+        }
+#endif
+        case Expose:
+        {
+            //wxLogDebug("Expose: %s", windowClass.c_str());
+            win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
+                                          XExposeEventGetWidth(event), XExposeEventGetHeight(event));
+                                              
+            win->GetClearRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
+                                         XExposeEventGetWidth(event), XExposeEventGetHeight(event));
+                                              
+
+#if !wxUSE_NANOX
+            XEvent tmp_event;
+            wxExposeInfo info;
+            info.window = event->xexpose.window;
+            info.found_non_matching = FALSE;
+            while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+            {
+                win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
+                                              tmp_event.xexpose.width, tmp_event.xexpose.height );
+                                              
+                win->GetClearRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
+                                             tmp_event.xexpose.width, tmp_event.xexpose.height );
+            }
+#endif
+
+            win->SendEraseEvents();
+
+            return TRUE;
+        }
+#if !wxUSE_NANOX
+        case GraphicsExpose:
+        {
+            // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
+            //                              event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+            //                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                    
+            win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                                             
+            win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                         event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                                              
+            if (event->xgraphicsexpose.count == 0)
+            {
+                // Only erase background, paint in idle time.
+                win->SendEraseEvents();

             }
 
             }
 

-            return;
+            return TRUE;

         }
         }

+#endif

         case EnterNotify:
         case LeaveNotify:
         case ButtonPress:
         case ButtonRelease:
         case MotionNotify:
         {
         case EnterNotify:
         case LeaveNotify:
         case ButtonPress:
         case ButtonRelease:
         case MotionNotify:
         {

-            if (win && !win->IsEnabled())
-                return;
-
-            if (win)
+            if (!win->IsEnabled())
+                return FALSE;
+                
+            // Here we check if the top level window is
+            // disabled, which is one aspect of modality.
+            wxWindow *tlw = win;
+            while (tlw && !tlw->IsTopLevel())
+                tlw = tlw->GetParent();
+            if (tlw && !tlw->IsEnabled())
+                return FALSE;
+                
+            if (event->type == ButtonPress)

             {
             {

-                wxMouseEvent wxevent;
-                wxTranslateMouseEvent(wxevent, win, window, event);
-                win->GetEventHandler()->ProcessEvent( wxevent );
+                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                {
+                    // This might actually be done in wxWindow::SetFocus()
+                    // and not here. TODO.
+                    g_prevFocus = wxWindow::FindFocus();
+                    g_nextFocus = win;
+                    
+                    win->SetFocus();
+                    // return TRUE;
+                }

             }
             }

-            return;
+            
+#if !wxUSE_NANOX
+            if (event->type == LeaveNotify || event->type == EnterNotify)
+            {
+                // Throw out NotifyGrab and NotifyUngrab
+                if (event->xcrossing.mode != NotifyNormal)
+                    return FALSE;
+            }
+#endif
+            wxMouseEvent wxevent;
+            wxTranslateMouseEvent(wxevent, win, window, event);
+            return win->GetEventHandler()->ProcessEvent( wxevent );

         }
         case FocusIn:
             {
         }
         case FocusIn:
             {

-                if (win && event->xfocus.detail != NotifyPointer)
+#if !wxUSE_NANOX
+                if ((event->xfocus.detail != NotifyPointer) &&
+                    (event->xfocus.mode == NotifyNormal))
+#endif

                 {
                 {

+                    // wxLogDebug( "FocusIn from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                    

                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);

-                    win->GetEventHandler()->ProcessEvent(focusEvent);
+                    focusEvent.SetWindow( g_prevFocus );
+                    g_prevFocus = NULL;
+                    
+                    return win->GetEventHandler()->ProcessEvent(focusEvent);

                 }
                 }

+                return FALSE;

                 break;
             }
         case FocusOut:
             {
                 break;
             }
         case FocusOut:
             {

-                if (win && event->xfocus.detail != NotifyPointer)
+#if !wxUSE_NANOX
+                if ((event->xfocus.detail != NotifyPointer) &&
+                    (event->xfocus.mode == NotifyNormal))
+#endif

                 {
                 {

+                    // wxLogDebug( "FocusOut from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                    

                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);

-                    win->GetEventHandler()->ProcessEvent(focusEvent);
+                    focusEvent.SetWindow( g_nextFocus );
+                    g_nextFocus = NULL;
+                    return win->GetEventHandler()->ProcessEvent(focusEvent);

                 }
                 }

+                return FALSE;

                 break;
             }
                 break;
             }

-        case DestroyNotify:
+#ifndef wxUSE_NANOX
+         case DestroyNotify:

             {
                 // Do we want to process this (for top-level windows)?
                 // But we want to be able to veto closes, anyway
             {
                 // Do we want to process this (for top-level windows)?
                 // But we want to be able to veto closes, anyway

+                return FALSE;

                 break;
             }
                 break;
             }

+#endif

         default:
         {
 #ifdef __WXDEBUG__
             //wxString eventName = wxGetXEventName(XEvent& event);
             //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
 #endif
         default:
         {
 #ifdef __WXDEBUG__
             //wxString eventName = wxGetXEventName(XEvent& event);
             //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
 #endif

+            return FALSE;

             break;
         }
     }
             break;
         }
     }

+    return FALSE;

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


@@ -557,11 +768,12 @@ void wxApp::Dispatch()
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.

-void wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *event)

 {
     // by default do nothing special
     // TODO: what to do for X11
 {
     // by default do nothing special
     // TODO: what to do for X11

-    // XtDispatchEvent((XEvent*) event); /* let Motif do the work */
+    // XtDispatchEvent((XEvent*) event);
+    return FALSE;

 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)


@@ -660,7 +872,7 @@ void wxApp::DeletePendingObjects()
     }
 }
 
     }
 }
 

-// Create an application context
+// Create display, and other initialization

 bool wxApp::OnInitGui()
 {
     // Eventually this line will be removed, but for
 bool wxApp::OnInitGui()
 {
     // Eventually this line will be removed, but for


@@ -669,10 +881,10 @@ bool wxApp::OnInitGui()
     delete wxLog::SetActiveTarget(new wxLogStderr);
     
     if (!wxAppBase::OnInitGui())
     delete wxLog::SetActiveTarget(new wxLogStderr);
     
     if (!wxAppBase::OnInitGui())

-       return FALSE;
+    return FALSE;

     
     

-

     GetMainColormap( wxApp::GetDisplay() );
     GetMainColormap( wxApp::GetDisplay() );

+

     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
     return TRUE;
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
     return TRUE;


@@ -701,10 +913,20 @@ Window wxGetWindowParent(Window window)
     return (Window) 0;
 
     Window parent, root = 0;
     return (Window) 0;
 
     Window parent, root = 0;

+#if wxUSE_NANOX
+    int noChildren = 0;
+#else

     unsigned int noChildren = 0;
     unsigned int noChildren = 0;

+#endif

     Window* children = NULL;
     Window* children = NULL;

-    int res = XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
-                        & children, & noChildren);
+
+    // #define XQueryTree(d,w,r,p,c,nc)     GrQueryTree(w,p,c,nc)
+    int res = 1;
+#if !wxUSE_NANOX
+    res =
+#endif
+        XQueryTree((Display*) wxGetDisplay(), window, & root, & parent,
+             & children, & noChildren);

     if (children)
         XFree(children);
     if (res)
     if (children)
         XFree(children);
     if (res)


@@ -753,39 +975,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 }
 
     return TRUE;
 }
 

-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-#undef static
-
-wxIcon
-wxApp::GetStdIcon(int which) const
+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);
-    }
+    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);

 }
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 }
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)