Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / mgl / window.cpp

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index cb44a8ad2666cdda6a500d764633a19b4fe0f04f..ec655b4ebdaadb43b415382d0120b48da2429c77 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -4,8 +4,8 @@
 // Author:      Vaclav Slavik
 //              (based on GTK & MSW implementations)
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 //              (based on GTK & MSW implementations)
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -16,10 +16,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "window.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -27,27 +23,29 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/window.h"
+    #include "wx/msgdlg.h"

     #include "wx/accel.h"
     #include "wx/accel.h"

-    #include "wx/setup.h"

     #include "wx/dc.h"
     #include "wx/dcclient.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/panel.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/panel.h"

-    #include "wx/caret.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/dcscreen.h"
+    #include "wx/menu.h"

 #endif
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 
 #endif
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 

-#include "wx/log.h"

 #include "wx/sysopt.h"
 #include "wx/mgl/private.h"
 #include "wx/sysopt.h"
 #include "wx/mgl/private.h"

-#include "wx/intl.h"
-#include "wx/dcscreen.h"
+#include "wx/caret.h"

 
 #include <mgraph.hpp>
 
 
 #include <mgraph.hpp>
 


@@ -63,8 +61,11 @@
 winmng_t *g_winMng = NULL;
 MGLDevCtx *g_displayDC = NULL;
 
 winmng_t *g_winMng = NULL;
 MGLDevCtx *g_displayDC = NULL;
 

-// the window that has keyboard focus: 
+// the window that has keyboard focus:

 static wxWindowMGL *gs_focusedWindow = NULL;
 static wxWindowMGL *gs_focusedWindow = NULL;

+// the window that is about to be focused after currently focused
+// one looses focus:
+static wxWindow *gs_toBeFocusedWindow = NULL;

 // the window that is currently under mouse cursor:
 static wxWindowMGL *gs_windowUnderMouse = NULL;
 // the window that has mouse capture
 // the window that is currently under mouse cursor:
 static wxWindowMGL *gs_windowUnderMouse = NULL;
 // the window that has mouse capture


@@ -72,12 +73,14 @@ static wxWindowMGL *gs_mouseCapture = NULL;
 // the frame that is currently active (i.e. its child has focus). It is
 // used to generate wxActivateEvents
 static wxWindowMGL *gs_activeFrame = NULL;
 // the frame that is currently active (i.e. its child has focus). It is
 // used to generate wxActivateEvents
 static wxWindowMGL *gs_activeFrame = NULL;

+// track the mouse button state for wxGetMouseState()
+unsigned long g_buttonState = 0;

 
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 

-// Custom identifiers used to distinguish between various event handlers 
+// Custom identifiers used to distinguish between various event handlers

 // and capture handlers passed to MGL_wm
 enum
 {
 // and capture handlers passed to MGL_wm
 enum
 {


@@ -90,163 +93,119 @@ enum
 // private functions
 // ---------------------------------------------------------------------------
 
 // private functions
 // ---------------------------------------------------------------------------
 

-// wxCreateMGL_WM creates MGL display DC and associates it with winmng_t
-// structure. Dimensions and depth of the DC are fetched from wxSystemOptions
-// object. 
-// This function is *not* called from wxApp's initialization but rather at
-// the time when WM is needed, i.e. when first wxWindow is created. This 
-// has two important effects:
-//   a) it is possible to write windowless wxMGL apps
-//   b) the app has plenty of time in wxApp::OnInit to feed wxSystemOptions
-//      with desired settings
-
-// FIXME_MGL -- move to app.cpp??
-static void wxDesktopPainter(window_t *wnd, MGLDC *dc)
+// Returns toplevel grandparent of given window:
+static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win)

 {
 {

-    // FIXME_MGL - for now...
-    MGL_setColorRGB(0x63, 0x63, 0x96);
-    MGL_fillRectCoord(0, 0, wnd->width, wnd->height);
+    wxWindowMGL *p = win;
+    while (p && !p->IsTopLevel())
+         p = p->GetParent();
+    return p;

 }
 
 }
 

-
-bool wxCreateMGL_WM()
+// An easy way to capture screenshots:
+static void wxCaptureScreenshot(bool activeWindowOnly)

 {
 {

-    int mode;
-    int width = 640, height = 480, depth = 16;
-    int refresh = MGL_DEFAULT_REFRESH;
-    
-#if wxUSE_SYSTEM_OPTIONS
-    // FIXME_MGL -- so what is The Proper Way?
-    if ( wxSystemOptions::HasOption(wxT("mgl.screen-width") )
-        width = wxSystemOptions::GetOptionInt(wxT("mgl.screen-width"));
-    if ( wxSystemOptions::HasOption(wxT("mgl.screen-height") )
-        height = wxSystemOptions::GetOptionInt(wxT("mgl.screen-height"));
-    if ( wxSystemOptions::HasOption(wxT("mgl.screen-depth") )
-        depth = wxSystemOptions::GetOptionInt(wxT("mgl.screen-depth"));
-    if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh") )
-        refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
+#ifdef __DOS__
+    #define SCREENSHOT_FILENAME wxT("sshot%03i.png")
+#else
+    #define SCREENSHOT_FILENAME wxT("screenshot-%03i.png")

 #endif
 #endif

-        
-    mode = MGL_findMode(width, height, depth);
-    if ( mode == -1 )
-    {
-        wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), width, height, depth);
-        mode = 0; // always available
-    }
-    g_displayDC = new MGLDisplayDC(mode, 1, refresh);
-    if ( !g_displayDC->isValid() )
+    static int screenshot_num = 0;
+    wxString screenshot;
+
+    do

     {
     {

-        delete g_displayDC;
-        g_displayDC = NULL;
-        return FALSE;
-    }
-    
-    g_winMng = MGL_wmCreate(g_displayDC->getDC());
-    if (!g_winMng)
-        return FALSE;
+        screenshot.Printf(SCREENSHOT_FILENAME, screenshot_num++);
+    } while ( wxFileExists(screenshot) && screenshot_num < 1000 );

 
 

-    MGL_wmSetWindowPainter(MGL_wmGetRootWindow(g_winMng), wxDesktopPainter);
-    
-    return TRUE;
-}
+    wxRect r(0, 0, g_displayDC->sizex(), g_displayDC->sizey());

 
 

-void wxDestroyMGL_WM()
-{
-    if ( g_winMng )
-    {
-        MGL_wmDestroy(g_winMng);
-        g_winMng = NULL;
-    }
-    if ( g_displayDC )
+    if ( activeWindowOnly && gs_activeFrame )

     {
     {

-        delete g_displayDC;
-        g_displayDC = NULL;
+        r.Intersect(gs_activeFrame->GetRect());

     }
     }

-}

 
 

-// Returns toplevel grandparent of given window:
-static wxWindowMGL* wxGetTopLevelParent(wxWindowMGL *win)
-{
-    wxWindowMGL *p = win;
-    while (p && !p->IsTopLevel())
-         p = p->GetParent();
-    return p;
-}
+    g_displayDC->savePNGFromDC(screenshot.mb_str(),
+                               r.x, r. y, r.x+r.width, r.y+r.height);

 
 

-#ifdef __WXDEBUG__
-// Add an easy way to capture screenshots:
-static void CaptureScreenshot()
-{
-    wxBusyCursor bcur;
-    
-    static int screenshot_num = 0;
-    char screenshot[128];
-    sprintf(screenshot, "screenshot-%03i.png", screenshot_num++);
-    g_displayDC->savePNGFromDC(screenshot, 0, 0, 
-                               g_displayDC->sizex(), 
-                               g_displayDC->sizey());
+    wxMessageBox(wxString::Format(wxT("Screenshot captured: %s"),
+                                  screenshot.c_str()));

 }
 }

-#endif

 
 // ---------------------------------------------------------------------------
 // MGL_WM hooks:
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // MGL_WM hooks:
 // ---------------------------------------------------------------------------
 

-static void wxWindowPainter(window_t *wnd, MGLDC *dc)
+static void MGLAPI wxWindowPainter(window_t *wnd, MGLDC *dc)

 {
     wxWindowMGL *w = (wxWindow*) wnd->userData;
 {
     wxWindowMGL *w = (wxWindow*) wnd->userData;

-    
+

     if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) )
     {
         MGLDevCtx ctx(dc);
         w->HandlePaint(&ctx);
     }
     if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) )
     {
         MGLDevCtx ctx(dc);
         w->HandlePaint(&ctx);
     }

-    // FIXME_MGL -- root window should be a regular window so that
-    // enter/leave and activate/deactivate events work correctly

 }
 
 }
 

-static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
+static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)

 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);

+    wxPoint orig(win->GetClientAreaOrigin());

     wxPoint where;
     wxPoint where;

-    
-    MGL_wmCoordGlobalToLocal(win->GetHandle(), 
+
+    g_buttonState = e->modifiers;
+
+    MGL_wmCoordGlobalToLocal(win->GetHandle(),

                              e->where_x, e->where_y, &where.x, &where.y);
 
     for (wxWindowMGL *w = win; w; w = w->GetParent())
     {
                              e->where_x, e->where_y, &where.x, &where.y);
 
     for (wxWindowMGL *w = win; w; w = w->GetParent())
     {

-        if ( !w->IsEnabled() ) 
+        if ( !w->IsEnabled() )

             return FALSE;
         if ( w->IsTopLevel() )
             break;
     }
             return FALSE;
         if ( w->IsTopLevel() )
             break;
     }

-    
+

     wxEventType type = wxEVT_NULL;
     wxMouseEvent event;
     event.SetEventObject(win);
     event.SetTimestamp(e->when);
     wxEventType type = wxEVT_NULL;
     wxMouseEvent event;
     event.SetEventObject(win);
     event.SetTimestamp(e->when);

-    event.m_x = where.x;
-    event.m_y = where.y;
-    event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
-    event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
-    event.m_altDown = e->modifiers & EVT_LEFTALT;
-    event.m_metaDown = e->modifiers & EVT_RIGHTALT;
-    event.m_leftDown = e->modifiers & EVT_LEFTBUT;
-    event.m_middleDown = e->modifiers & EVT_MIDDLEBUT;
-    event.m_rightDown = e->modifiers & EVT_RIGHTBUT;
-    
+    event.m_x = where.x - orig.x;
+    event.m_y = where.y - orig.y;
+    event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
+    event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
+    event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
+    event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;
+    event.m_leftDown = ( e->modifiers & EVT_LEFTBUT ) != 0;
+    event.m_middleDown = ( e->modifiers & EVT_MIDDLEBUT ) != 0;
+    event.m_rightDown = ( e->modifiers & EVT_RIGHTBUT ) != 0;
+

     switch (e->what)
     {
         case EVT_MOUSEDOWN:
     switch (e->what)
     {
         case EVT_MOUSEDOWN:

-            if ( e->message & EVT_LEFTBMASK )
-                type = (e->message & EVT_DBLCLICK) ?
-                        wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN;
-            else if ( e->message & EVT_MIDDLEBMASK )
-                type = (e->message & EVT_DBLCLICK) ?
-                        wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN;
-            else if ( e->message & EVT_RIGHTBMASK )
-                type = (e->message & EVT_DBLCLICK) ? 
-                        wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN;
+            // Change focus if the user clicks outside focused window:
+            if ( win->CanAcceptFocus() && wxWindow::FindFocus() != win )
+                win->SetFocus();
+
+            if ( e->message & EVT_DBLCLICK )
+            {
+                if ( e->message & EVT_LEFTBMASK )
+                    type = wxEVT_LEFT_DCLICK;
+                else if ( e->message & EVT_MIDDLEBMASK )
+                    type = wxEVT_MIDDLE_DCLICK;
+                else if ( e->message & EVT_RIGHTBMASK )
+                    type = wxEVT_RIGHT_DCLICK;
+            }
+            else
+            {
+                if ( e->message & EVT_LEFTBMASK )
+                    type = wxEVT_LEFT_DOWN;
+                else if ( e->message & EVT_MIDDLEBMASK )
+                    type = wxEVT_MIDDLE_DOWN;
+                else if ( e->message & EVT_RIGHTBMASK )
+                    type = wxEVT_RIGHT_DOWN;
+            }
+

             break;
 
         case EVT_MOUSEUP:
             break;
 
         case EVT_MOUSEUP:


@@ -266,46 +225,50 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
                     if ( gs_windowUnderMouse )
                     {
                         wxMouseEvent event2(event);
                     if ( gs_windowUnderMouse )
                     {
                         wxMouseEvent event2(event);

-                        MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(), 
-                                                 e->where_x, e->where_y, 
+                        MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(),
+                                                 e->where_x, e->where_y,

                                                  &event2.m_x, &event2.m_y);
 
                                                  &event2.m_x, &event2.m_y);
 

+                        wxPoint orig(gs_windowUnderMouse->GetClientAreaOrigin());
+                        event2.m_x -= orig.x;
+                        event2.m_y -= orig.y;
+

                         event2.SetEventObject(gs_windowUnderMouse);
                         event2.SetEventType(wxEVT_LEAVE_WINDOW);
                         event2.SetEventObject(gs_windowUnderMouse);
                         event2.SetEventType(wxEVT_LEAVE_WINDOW);

-                        gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2);
+                        gs_windowUnderMouse->HandleWindowEvent(event2);

                     }
 
                     wxMouseEvent event3(event);
                     event3.SetEventType(wxEVT_ENTER_WINDOW);
                     }
 
                     wxMouseEvent event3(event);
                     event3.SetEventType(wxEVT_ENTER_WINDOW);

-                    win->GetEventHandler()->ProcessEvent(event3);
+                    win->HandleWindowEvent(event3);

 
                     gs_windowUnderMouse = win;
                 }
             }
             else // gs_mouseCapture
             {
 
                     gs_windowUnderMouse = win;
                 }
             }
             else // gs_mouseCapture
             {

-                bool inside = (where.x >= 0 && 
+                bool inside = (where.x >= 0 &&

                                where.y >= 0 &&
                                where.x < win->GetSize().x &&
                                where.y < win->GetSize().y);
                 if ( (inside && gs_windowUnderMouse != win) ||
                      (!inside && gs_windowUnderMouse == win) )
                 {
                                where.y >= 0 &&
                                where.x < win->GetSize().x &&
                                where.y < win->GetSize().y);
                 if ( (inside && gs_windowUnderMouse != win) ||
                      (!inside && gs_windowUnderMouse == win) )
                 {

-                    wxMouseEvent evt(inside ? 
+                    wxMouseEvent evt(inside ?

                                      wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
                     evt.SetEventObject(win);
                                      wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
                     evt.SetEventObject(win);

-                    win->GetEventHandler()->ProcessEvent(evt);
+                    win->HandleWindowEvent(evt);

                     gs_windowUnderMouse = inside ? win : NULL;
                 }
             }
                     gs_windowUnderMouse = inside ? win : NULL;
                 }
             }

-            
+

             type = wxEVT_MOTION;
             break;
 
         default:
             break;
     }
             type = wxEVT_MOTION;
             break;
 
         default:
             break;
     }

-    
+

     if ( type == wxEVT_NULL )
     {
         return FALSE;
     if ( type == wxEVT_NULL )
     {
         return FALSE;


@@ -313,126 +276,152 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
     else
     {
         event.SetEventType(type);
     else
     {
         event.SetEventType(type);

-        return win->GetEventHandler()->ProcessEvent(event);
+        return win->HandleWindowEvent(event);

     }
 }
 
     }
 }
 

-static long wxScanToKeyCode(event_t *event)
+static long wxScanToKeyCode(event_t *event, bool translate)

 {
 {

-    #define KEY(mgl,wx) case mgl: key = wx; break;
+    // VS: make it __WXDEBUG__-only, since we have lots of wxLogTrace calls
+    //     here and the arguments would be stored in non-debug executable even
+    //     though wxLogTrace would be no-op...
+    #ifdef __WXDEBUG__
+      #define KEY(mgl_key,wx_key) \
+        case mgl_key: \
+          wxLogTrace(wxT("keyevents"), \
+                     wxT("key " #mgl_key ", mapped to " #wx_key)); \
+          key = wx_key; \
+          break;
+    #else
+      #define KEY(mgl_key,wx_key) \
+        case mgl_key: key = wx_key; break;
+    #endif

 
     long key = 0;
 
     long key = 0;

-    switch ( EVT_scanCode(event->message) )
+
+    if ( translate )

     {
     {

-        KEY (KB_padEnter,       WXK_NUMPAD_ENTER)
-        KEY (KB_padMinus,       WXK_NUMPAD_SUBTRACT)
-        KEY (KB_padPlus,        WXK_NUMPAD_ADD)
-        KEY (KB_padTimes,       WXK_NUMPAD_MULTIPLY)
-        KEY (KB_padDivide,      WXK_NUMPAD_DIVIDE)
-        KEY (KB_padLeft,        WXK_NUMPAD_LEFT)
-        KEY (KB_padRight,       WXK_NUMPAD_RIGHT)
-        KEY (KB_padUp,          WXK_NUMPAD_UP)
-        KEY (KB_padDown,        WXK_NUMPAD_DOWN)
-        KEY (KB_padInsert,      WXK_NUMPAD_INSERT)
-        KEY (KB_padDelete,      WXK_NUMPAD_DELETE)
-        KEY (KB_padHome,        WXK_NUMPAD_HOME)
-        KEY (KB_padEnd,         WXK_NUMPAD_END)
-        KEY (KB_padPageUp,      WXK_NUMPAD_PAGEUP)
-      //KEY (KB_padPageUp,      WXK_NUMPAD_PRIOR)
-        KEY (KB_padPageDown,    WXK_NUMPAD_PAGEDOWN)
-      //KEY (KB_padPageDown,    WXK_NUMPAD_NEXT)
-        KEY (KB_padCenter,      WXK_NUMPAD_SEPARATOR) // ?
-        KEY (KB_F1,             WXK_F1)
-        KEY (KB_F2,             WXK_F2)
-        KEY (KB_F3,             WXK_F3)
-        KEY (KB_F4,             WXK_F4)
-        KEY (KB_F5,             WXK_F5)
-        KEY (KB_F6,             WXK_F6)
-        KEY (KB_F7,             WXK_F7)
-        KEY (KB_F8,             WXK_F8)
-        KEY (KB_F9,             WXK_F9)
-        KEY (KB_F10,            WXK_F10)
-        KEY (KB_F11,            WXK_F11)
-        KEY (KB_F12,            WXK_F12)
-        KEY (KB_left,           WXK_LEFT)
-        KEY (KB_right,          WXK_RIGHT)
-        KEY (KB_up,             WXK_UP)
-        KEY (KB_down,           WXK_DOWN)
-        KEY (KB_insert,         WXK_INSERT)
-        KEY (KB_delete,         WXK_DELETE)
-        KEY (KB_home,           WXK_HOME)
-        KEY (KB_end,            WXK_END)
-        KEY (KB_pageUp,         WXK_PAGEUP)
-        KEY (KB_pageDown,       WXK_PAGEDOWN)
-        KEY (KB_capsLock,       WXK_CAPITAL)
-        KEY (KB_numLock,        WXK_NUMLOCK)
-        KEY (KB_scrollLock,     WXK_SCROLL)
-        KEY (KB_leftShift,      WXK_SHIFT)
-        KEY (KB_rightShift,     WXK_SHIFT)
-        KEY (KB_leftCtrl,       WXK_CONTROL)
-        KEY (KB_rightCtrl,      WXK_CONTROL)
-        KEY (KB_leftAlt,        WXK_ALT)
-        KEY (KB_rightAlt,       WXK_ALT)
-        KEY (KB_leftWindows,    WXK_START)
-        KEY (KB_rightWindows,   WXK_START)
-        KEY (KB_menu,           WXK_MENU)
-        KEY (KB_sysReq,         WXK_SNAPSHOT)
-        KEY (KB_esc,            WXK_ESCAPE)
-        KEY (KB_1,              '1')
-        KEY (KB_2,              '2')
-        KEY (KB_3,              '3')
-        KEY (KB_4,              '4')
-        KEY (KB_5,              '5')
-        KEY (KB_6,              '6')
-        KEY (KB_7,              '7')
-        KEY (KB_8,              '8')
-        KEY (KB_9,              '9')
-        KEY (KB_0,              '0')
-        KEY (KB_minus,          WXK_SUBTRACT)
-        KEY (KB_equals,         WXK_ADD)
-        KEY (KB_backSlash,      '\\')
-        KEY (KB_backspace,      WXK_BACK)
-        KEY (KB_tab,            WXK_TAB)
-        KEY (KB_Q,              'Q')
-        KEY (KB_W,              'W')
-        KEY (KB_E,              'E')
-        KEY (KB_R,              'R')
-        KEY (KB_T,              'T')
-        KEY (KB_Y,              'Y')
-        KEY (KB_U,              'U')
-        KEY (KB_I,              'I')
-        KEY (KB_O,              'O')
-        KEY (KB_P,              'P')
-        KEY (KB_leftSquareBrace,'[')
-        KEY (KB_rightSquareBrace,']')
-        KEY (KB_enter,          WXK_RETURN) 
-        KEY (KB_A,              'A')
-        KEY (KB_S,              'S')
-        KEY (KB_D,              'D')
-        KEY (KB_F,              'F')
-        KEY (KB_G,              'G')
-        KEY (KB_H,              'H')
-        KEY (KB_J,              'J')
-        KEY (KB_K,              'K')
-        KEY (KB_L,              'L')
-        KEY (KB_semicolon,      ';')
-        KEY (KB_apostrophe,     '\'')
-        KEY (KB_Z,              'Z')
-        KEY (KB_X,              'X')
-        KEY (KB_C,              'C')
-        KEY (KB_V,              'V')
-        KEY (KB_B,              'B')
-        KEY (KB_N,              'N')
-        KEY (KB_M,              'M')
-        KEY (KB_comma,          ',')
-        KEY (KB_period,         '.')
-        KEY (KB_divide,         WXK_DIVIDE)
-        KEY (KB_space,          WXK_SPACE)
-        KEY (KB_tilde,          '~')
-
-        default:                  
-            key = EVT_asciiCode(event->message); 
-            break;
+        bool numlock = (event->modifiers & EVT_NUMLOCK) != 0;
+
+        switch ( EVT_scanCode(event->message) )
+        {
+            KEY (KB_padMinus,       WXK_NUMPAD_SUBTRACT)
+            KEY (KB_padPlus,        WXK_NUMPAD_ADD)
+            KEY (KB_padTimes,       WXK_NUMPAD_MULTIPLY)
+            KEY (KB_padDivide,      WXK_NUMPAD_DIVIDE)
+            KEY (KB_padCenter,      numlock ? WXK_NUMPAD5 : WXK_NUMPAD_SEPARATOR) // ?
+            KEY (KB_padLeft,        numlock ? WXK_NUMPAD4 : WXK_NUMPAD_LEFT)
+            KEY (KB_padRight,       numlock ? WXK_NUMPAD6 : WXK_NUMPAD_RIGHT)
+            KEY (KB_padUp,          numlock ? WXK_NUMPAD8 : WXK_NUMPAD_UP)
+            KEY (KB_padDown,        numlock ? WXK_NUMPAD2 : WXK_NUMPAD_DOWN)
+            KEY (KB_padInsert,      numlock ? WXK_NUMPAD0 : WXK_NUMPAD_INSERT)
+            KEY (KB_padDelete,      numlock ? WXK_DECIMAL : WXK_NUMPAD_DELETE)
+            KEY (KB_padHome,        numlock ? WXK_NUMPAD7 : WXK_NUMPAD_HOME)
+            KEY (KB_padEnd,         numlock ? WXK_NUMPAD1 : WXK_NUMPAD_END)
+            KEY (KB_padPageUp,      numlock ? WXK_NUMPAD9 : WXK_NUMPAD_PAGEUP)
+            KEY (KB_padPageDown,    numlock ? WXK_NUMPAD3 : WXK_NUMPAD_PAGEDOWN)
+            KEY (KB_1,              '1')
+            KEY (KB_2,              '2')
+            KEY (KB_3,              '3')
+            KEY (KB_4,              '4')
+            KEY (KB_5,              '5')
+            KEY (KB_6,              '6')
+            KEY (KB_7,              '7')
+            KEY (KB_8,              '8')
+            KEY (KB_9,              '9')
+            KEY (KB_0,              '0')
+            KEY (KB_minus,          WXK_SUBTRACT)
+            KEY (KB_equals,         WXK_ADD)
+            KEY (KB_backSlash,      '\\')
+            KEY (KB_Q,              'Q')
+            KEY (KB_W,              'W')
+            KEY (KB_E,              'E')
+            KEY (KB_R,              'R')
+            KEY (KB_T,              'T')
+            KEY (KB_Y,              'Y')
+            KEY (KB_U,              'U')
+            KEY (KB_I,              'I')
+            KEY (KB_O,              'O')
+            KEY (KB_P,              'P')
+            KEY (KB_leftSquareBrace,'[')
+            KEY (KB_rightSquareBrace,']')
+            KEY (KB_A,              'A')
+            KEY (KB_S,              'S')
+            KEY (KB_D,              'D')
+            KEY (KB_F,              'F')
+            KEY (KB_G,              'G')
+            KEY (KB_H,              'H')
+            KEY (KB_J,              'J')
+            KEY (KB_K,              'K')
+            KEY (KB_L,              'L')
+            KEY (KB_semicolon,      ';')
+            KEY (KB_apostrophe,     '\'')
+            KEY (KB_Z,              'Z')
+            KEY (KB_X,              'X')
+            KEY (KB_C,              'C')
+            KEY (KB_V,              'V')
+            KEY (KB_B,              'B')
+            KEY (KB_N,              'N')
+            KEY (KB_M,              'M')
+            KEY (KB_comma,          ',')
+            KEY (KB_period,         '.')
+            KEY (KB_divide,         WXK_DIVIDE)
+            KEY (KB_space,          WXK_SPACE)
+            KEY (KB_tilde,          '~')
+
+            default: break;
+        }
+    }
+
+    if ( key == 0 )
+    {
+        switch ( EVT_scanCode(event->message) )
+        {
+            KEY (KB_padEnter,       WXK_NUMPAD_ENTER)
+            KEY (KB_F1,             WXK_F1)
+            KEY (KB_F2,             WXK_F2)
+            KEY (KB_F3,             WXK_F3)
+            KEY (KB_F4,             WXK_F4)
+            KEY (KB_F5,             WXK_F5)
+            KEY (KB_F6,             WXK_F6)
+            KEY (KB_F7,             WXK_F7)
+            KEY (KB_F8,             WXK_F8)
+            KEY (KB_F9,             WXK_F9)
+            KEY (KB_F10,            WXK_F10)
+            KEY (KB_F11,            WXK_F11)
+            KEY (KB_F12,            WXK_F12)
+            KEY (KB_left,           WXK_LEFT)
+            KEY (KB_right,          WXK_RIGHT)
+            KEY (KB_up,             WXK_UP)
+            KEY (KB_down,           WXK_DOWN)
+            KEY (KB_insert,         WXK_INSERT)
+            KEY (KB_delete,         WXK_DELETE)
+            KEY (KB_home,           WXK_HOME)
+            KEY (KB_end,            WXK_END)
+            KEY (KB_pageUp,         WXK_PAGEUP)
+            KEY (KB_pageDown,       WXK_PAGEDOWN)
+            KEY (KB_capsLock,       WXK_CAPITAL)
+            KEY (KB_numLock,        WXK_NUMLOCK)
+            KEY (KB_scrollLock,     WXK_SCROLL)
+            KEY (KB_leftShift,      WXK_SHIFT)
+            KEY (KB_rightShift,     WXK_SHIFT)
+            KEY (KB_leftCtrl,       WXK_CONTROL)
+            KEY (KB_rightCtrl,      WXK_CONTROL)
+            KEY (KB_leftAlt,        WXK_ALT)
+            KEY (KB_rightAlt,       WXK_ALT)
+            KEY (KB_leftWindows,    WXK_START)
+            KEY (KB_rightWindows,   WXK_START)
+            KEY (KB_menu,           WXK_MENU)
+            KEY (KB_sysReq,         WXK_SNAPSHOT)
+            KEY (KB_esc,            WXK_ESCAPE)
+            KEY (KB_backspace,      WXK_BACK)
+            KEY (KB_tab,            WXK_TAB)
+            KEY (KB_enter,          WXK_RETURN)
+
+            default:
+                key = EVT_asciiCode(event->message);
+                break;
+        }

     }
 
     #undef KEY
     }
 
     #undef KEY


@@ -440,37 +429,48 @@ static long wxScanToKeyCode(event_t *event)
     return key;
 }
 
     return key;
 }
 

-static long wxAsciiToKeyCode(event_t *event)
+static bool wxHandleSpecialKeys(wxKeyEvent& event)

 {
 {

-    return (long)EVT_asciiCode(event->message);
+    // Add an easy way to capture screenshots:
+    if ( event.m_keyCode == WXK_SNAPSHOT
+    #ifdef __WXDEBUG__ // FIXME_MGL - remove when KB_sysReq works in MGL!
+         || (event.m_keyCode == WXK_F1 &&
+            event.m_shiftDown && event.m_controlDown)
+    #endif
+       )
+    {
+        wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
+        return true;
+    }
+
+    return false;

 }
 
 }
 

-static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
+static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)

 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
 
     if ( !win->IsEnabled() ) return FALSE;
 
     wxPoint where;
 {
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
 
     if ( !win->IsEnabled() ) return FALSE;
 
     wxPoint where;

-    MGL_wmCoordGlobalToLocal(win->GetHandle(), 
+    MGL_wmCoordGlobalToLocal(win->GetHandle(),

                              e->where_x, e->where_y, &where.x, &where.y);
                              e->where_x, e->where_y, &where.x, &where.y);

-    
+

     wxKeyEvent event;
     event.SetEventObject(win);
     event.SetTimestamp(e->when);
     wxKeyEvent event;
     event.SetEventObject(win);
     event.SetTimestamp(e->when);

-    event.m_keyCode = wxScanToKeyCode(e);
-    event.m_scanCode = 0; // not used by wx at all
+    event.m_keyCode = wxScanToKeyCode(e, true);

     event.m_x = where.x;
     event.m_y = where.y;
     event.m_x = where.x;
     event.m_y = where.y;

-    event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
-    event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
-    event.m_altDown = e->modifiers & EVT_LEFTALT;
-    event.m_metaDown = e->modifiers & EVT_RIGHTALT;
+    event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
+    event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
+    event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
+    event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;

 
     if ( e->what == EVT_KEYUP )
     {
         event.SetEventType(wxEVT_KEY_UP);
 
     if ( e->what == EVT_KEYUP )
     {
         event.SetEventType(wxEVT_KEY_UP);

-        return win->GetEventHandler()->ProcessEvent(event);
+        return win->HandleWindowEvent(event);

     }
     else
     {
     }
     else
     {


@@ -479,45 +479,39 @@ static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
 
         event.SetEventType(wxEVT_KEY_DOWN);
         event2 = event;
 
         event.SetEventType(wxEVT_KEY_DOWN);
         event2 = event;

-    
-        ret = win->GetEventHandler()->ProcessEvent(event);

 
 

+        ret = win->HandleWindowEvent(event);

 
 

-#ifdef __WXDEBUG__
-        // Add an easy way to capture screenshots:
-        if ( event.m_keyCode == WXK_F1 && 
-             event.m_shiftDown && event.m_controlDown )
-            CaptureScreenshot();
-#endif
-
-#if wxUSE_ACCEL
-        if ( !ret )
+        // wxMSW doesn't send char events with Alt pressed
+        // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
+        // will only be sent if it is not in an accelerator table:
+        event2.m_keyCode = wxScanToKeyCode(e, false);
+        if ( !ret && event2.m_keyCode != 0 )

         {
         {

-            for (wxWindowMGL *w = win; w; w = w->GetParent())
-            {
-                int command = w->GetAcceleratorTable()->GetCommand(event);
-                if ( command != -1 )
-                {
-                    wxCommandEvent eventc(wxEVT_COMMAND_MENU_SELECTED, command);
-                    ret = w->GetEventHandler()->ProcessEvent(eventc);
-                    break;
-                }
-                if ( w->IsTopLevel() )
-                    break;
-            }
+            event2.SetEventType(wxEVT_CHAR);
+            ret = win->HandleWindowEvent(event2);

         }
         }

-#endif // wxUSE_ACCEL

 
 

-        /* wxMSW doesn't send char events with Alt pressed */
-        /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
-           will only be sent if it is not in an accelerator table. */
-        event2.m_keyCode = wxAsciiToKeyCode(e);
-        if ( !ret && event2.m_keyCode != 0 )
+        // Synthetize navigation key event, but do it only if the TAB key
+        // wasn't handled yet:
+        if ( !ret && event.m_keyCode == WXK_TAB &&
+             win->GetParent() && win->GetParent()->HasFlag(wxTAB_TRAVERSAL) )

         {
         {

-            event2.SetEventType(wxEVT_CHAR);
-            ret = win->GetEventHandler()->ProcessEvent(event2);
+            wxNavigationKeyEvent navEvent;
+            navEvent.SetEventObject(win->GetParent());
+            // Shift-TAB goes in reverse direction:
+            navEvent.SetDirection(!event.m_shiftDown);
+            // Ctrl-TAB changes the (parent) window, i.e. switch notebook page:
+            navEvent.SetWindowChange(event.m_controlDown);
+            navEvent.SetCurrentFocus(wxStaticCast(win, wxWindow));
+            ret = win->HandleWindowEvent(navEvent);

         }
         }

-        
+
+        // Finally, process special meaning keys that are usually
+        // a responsibility of OS or window manager:
+        if ( !ret )
+            ret = wxHandleSpecialKeys(event);
+

         return ret;
     }
 }
         return ret;
     }
 }


@@ -540,17 +534,23 @@ END_EVENT_TABLE()
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 

+extern wxVideoMode wxGetDefaultDisplayMode();
+

 void wxWindowMGL::Init()
 {
 void wxWindowMGL::Init()
 {

-    // generic:
-    InitBase();
+    // First of all, make sure window manager is up and running. If it is
+    // not the case, initialize it in default display mode
+    if ( !g_winMng )
+    {
+        if ( !wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode()) )
+        {
+            wxLogFatalError(_("Cannot initialize display."));
+        }
+    }

 
     // mgl specific:
     m_wnd = NULL;
 
     // mgl specific:
     m_wnd = NULL;

-    m_isShown = TRUE;
-    m_isBeingDeleted = FALSE;
-    m_isEnabled = TRUE;
-    m_frozen = FALSE;
+    m_isShown = true;

     m_paintMGLDC = NULL;
     m_eraseBackground = -1;
 }
     m_paintMGLDC = NULL;
     m_eraseBackground = -1;
 }


@@ -558,36 +558,35 @@ void wxWindowMGL::Init()
 // Destructor
 wxWindowMGL::~wxWindowMGL()
 {
 // Destructor
 wxWindowMGL::~wxWindowMGL()
 {

-    m_isBeingDeleted = TRUE;
+    SendDestroyEvent();

 
     if ( gs_mouseCapture == this )
         ReleaseMouse();
 
     if (gs_activeFrame == this)
     {
 
     if ( gs_mouseCapture == this )
         ReleaseMouse();
 
     if (gs_activeFrame == this)
     {

-       gs_activeFrame = NULL;
-       // activate next frame in Z-order:
-       if ( m_wnd->prev )
-       {
-           wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
-           win->SetFocus();
+        gs_activeFrame = NULL;
+        // activate next frame in Z-order:
+        if ( m_wnd->prev )
+        {
+            wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+            win->SetFocus();
+        }
+        else if ( m_wnd->next )
+        {
+            wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData;
+            win->SetFocus();

         }
     }
         }
     }

-    
+

     if ( gs_focusedWindow == this )
         KillFocus();
 
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;
 
     if ( gs_focusedWindow == this )
         KillFocus();
 
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;
 

-    // VS: destroy children first and _then_ detach *this from its parent.
-    //     If we'd do it the other way around, children wouldn't be able
-    //     find their parent frame (see above).

     DestroyChildren();
 
     DestroyChildren();
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     if ( m_wnd )
         MGL_wmDestroyWindow(m_wnd);
 }
     if ( m_wnd )
         MGL_wmDestroyWindow(m_wnd);
 }


@@ -601,7 +600,7 @@ bool wxWindowMGL::Create(wxWindow *parent,
                          const wxString& name)
 {
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
                          const wxString& name)
 {
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);


@@ -612,13 +611,14 @@ bool wxWindowMGL::Create(wxWindow *parent,
         x = 0; // FIXME_MGL, something better, see GTK+
     if ( y == -1 )
         y = 0; // FIXME_MGL, something better, see GTK+
         x = 0; // FIXME_MGL, something better, see GTK+
     if ( y == -1 )
         y = 0; // FIXME_MGL, something better, see GTK+

+    AdjustForParentClientOrigin(x, y, 0);

     w = WidthDefault(size.x);
     h = HeightDefault(size.y);
     w = WidthDefault(size.x);
     h = HeightDefault(size.y);

-    
+

     long mgl_style = 0;
     window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
 
     long mgl_style = 0;
     window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
 

-    if ( !(style & wxNO_FULL_REPAINT_ON_RESIZE) )
+    if ( style & wxFULL_REPAINT_ON_RESIZE )

     {
         mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
     }
     {
         mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
     }


@@ -630,22 +630,39 @@ bool wxWindowMGL::Create(wxWindow *parent,
     {
         mgl_style |= MGL_WM_ALWAYS_ON_TOP;
         // it is created hidden as other top level windows
     {
         mgl_style |= MGL_WM_ALWAYS_ON_TOP;
         // it is created hidden as other top level windows

-        m_isShown = FALSE;
+        m_isShown = false;

         wnd_parent = NULL;
     }
 
         wnd_parent = NULL;
     }
 

-    m_wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h);
+    window_t *wnd = MGL_wmCreateWindow(g_winMng, wnd_parent, x, y, w, h);
+
+    MGL_wmSetWindowFlags(wnd, mgl_style);
+    MGL_wmShowWindow(wnd, m_isShown);
+
+    SetMGLwindow_t(wnd);
+
+    return true;
+}
+
+void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd)
+{
+    if ( m_wnd )
+        MGL_wmDestroyWindow(m_wnd);
+
+    m_wnd = wnd;
+    if ( !m_wnd ) return;
+
+    m_isShown = (bool)m_wnd->visible;

 
 

-    MGL_wmSetWindowFlags(m_wnd, mgl_style);

     MGL_wmSetWindowUserData(m_wnd, (void*) this);
     MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);
     MGL_wmSetWindowUserData(m_wnd, (void*) this);
     MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);

-    MGL_wmShowWindow(m_wnd, m_isShown);
-    MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
-

     MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0);
     MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0);
     MGL_wmPushWindowEventHandler(m_wnd, wxWindowMouseHandler, EVT_MOUSEEVT, 0);
     MGL_wmPushWindowEventHandler(m_wnd, wxWindowKeybHandler, EVT_KEYEVT, 0);

-    
-    return TRUE;
+
+    if ( m_cursor.IsOk() )
+        MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
+    else
+        MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());

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


@@ -656,39 +673,51 @@ void wxWindowMGL::SetFocus()
 {
     if ( gs_focusedWindow == this ) return;
 
 {
     if ( gs_focusedWindow == this ) return;
 

+    wxWindowMGL *oldFocusedWindow = gs_focusedWindow;
+

     if ( gs_focusedWindow )
     if ( gs_focusedWindow )

+    {
+        gs_toBeFocusedWindow = (wxWindow*)this;

         gs_focusedWindow->KillFocus();
         gs_focusedWindow->KillFocus();

-    
+        gs_toBeFocusedWindow = NULL;
+    }
+

     gs_focusedWindow = this;
     gs_focusedWindow = this;

-    
-    MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);

 
 

-#if wxUSE_CARET
-    // caret needs to be informed about focus change
-    wxCaret *caret = GetCaret();
-    if ( caret )
-        caret->OnSetFocus();
-#endif // wxUSE_CARET
+    MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);

 
     wxWindowMGL *active = wxGetTopLevelParent(this);
     if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame )
     {
         if ( gs_activeFrame )
         {
 
     wxWindowMGL *active = wxGetTopLevelParent(this);
     if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame )
     {
         if ( gs_activeFrame )
         {

-            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, gs_activeFrame->GetId());
+            wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId());

             event.SetEventObject(gs_activeFrame);
             event.SetEventObject(gs_activeFrame);

-            gs_activeFrame->GetEventHandler()->ProcessEvent(event);
+            gs_activeFrame->HandleWindowEvent(event);

         }
 
         gs_activeFrame = active;
         }
 
         gs_activeFrame = active;

-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, gs_activeFrame->GetId());
+        wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId());

         event.SetEventObject(gs_activeFrame);
         event.SetEventObject(gs_activeFrame);

-        gs_activeFrame->GetEventHandler()->ProcessEvent(event);
+        gs_activeFrame->HandleWindowEvent(event);

     }
     }

-    
+
+    // notify the parent keeping track of focus for the kbd navigation
+    // purposes that we got it
+    wxChildFocusEvent eventFocus((wxWindow*)this);
+    HandleWindowEvent(eventFocus);
+

     wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
     event.SetEventObject(this);
     wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
     event.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(event);
+    event.SetWindow((wxWindow*)oldFocusedWindow);
+    HandleWindowEvent(event);
+
+#if wxUSE_CARET
+    // caret needs to be informed about focus change
+    wxCaret *caret = GetCaret();
+    if ( caret )
+        caret->OnSetFocus();
+#endif // wxUSE_CARET

 }
 
 void wxWindowMGL::KillFocus()
 }
 
 void wxWindowMGL::KillFocus()


@@ -697,7 +726,7 @@ void wxWindowMGL::KillFocus()
     gs_focusedWindow = NULL;
 
     if ( m_isBeingDeleted ) return;
     gs_focusedWindow = NULL;
 
     if ( m_isBeingDeleted ) return;

-    
+

     MGL_wmUncaptureEvents(GetHandle(), wxMGL_CAPTURE_KEYB);
 
 #if wxUSE_CARET
     MGL_wmUncaptureEvents(GetHandle(), wxMGL_CAPTURE_KEYB);
 
 #if wxUSE_CARET


@@ -709,14 +738,15 @@ void wxWindowMGL::KillFocus()
 
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);
 
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(event);
+    event.SetWindow(gs_toBeFocusedWindow);
+    HandleWindowEvent(event);

 }
 
 // ----------------------------------------------------------------------------
 // this wxWindowBase function is implemented here (in platform-specific file)
 // because it is static and so couldn't be made virtual
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // this wxWindowBase function is implemented here (in platform-specific file)
 // because it is static and so couldn't be made virtual
 // ----------------------------------------------------------------------------

-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()

 {
     return (wxWindow*)gs_focusedWindow;
 }
 {
     return (wxWindow*)gs_focusedWindow;
 }


@@ -724,21 +754,30 @@ wxWindow *wxWindowBase::FindFocus()
 bool wxWindowMGL::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )
 bool wxWindowMGL::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )

-        return FALSE;
+        return false;

 
     MGL_wmShowWindow(m_wnd, show);
 
     MGL_wmShowWindow(m_wnd, show);

-    
+

     if (!show && gs_activeFrame == this)
     {
     if (!show && gs_activeFrame == this)
     {

-       // activate next frame in Z-order:
-       if ( m_wnd->prev )
-       {
-           wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
-           win->SetFocus();
+        // activate next frame in Z-order:
+        if ( m_wnd->prev )
+        {
+            wxWindowMGL *win = (wxWindowMGL*)m_wnd->prev->userData;
+            win->SetFocus();
+        }
+        else if ( m_wnd->next )
+        {
+            wxWindowMGL *win = (wxWindowMGL*)m_wnd->next->userData;
+            win->SetFocus();
+        }
+        else
+        {
+            gs_activeFrame = NULL;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // Raise the window to the top of the Z order
 }
 
 // Raise the window to the top of the Z order


@@ -753,7 +792,7 @@ void wxWindowMGL::Lower()
     MGL_wmLowerWindow(m_wnd);
 }
 
     MGL_wmLowerWindow(m_wnd);
 }
 

-void wxWindowMGL::CaptureMouse()
+void wxWindowMGL::DoCaptureMouse()

 {
     if ( gs_mouseCapture )
         MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);
 {
     if ( gs_mouseCapture )
         MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);


@@ -762,10 +801,10 @@ void wxWindowMGL::CaptureMouse()
     MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
 }
 
     MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
 }
 

-void wxWindowMGL::ReleaseMouse()
+void wxWindowMGL::DoReleaseMouse()

 {
 {

-    wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") )
-    
+    wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") );
+

     MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
     gs_mouseCapture = NULL;
 }
     MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
     gs_mouseCapture = NULL;
 }


@@ -780,63 +819,44 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor)
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     }
 

-    if ( m_cursor.Ok() )
+    if ( m_cursor.IsOk() )

         MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
     else
         MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
 
         MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
     else
         MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
 

-    return TRUE;
+    return true;

 }
 
 void wxWindowMGL::WarpPointer(int x, int y)
 {
 }
 
 void wxWindowMGL::WarpPointer(int x, int y)
 {

-    ClientToScreen(&x, &y);
-    EVT_setMousePos(x, y);
-}
+    int w, h;
+    wxDisplaySize(&w, &h);

 
 

-#if WXWIN_COMPATIBILITY
-// If nothing defined for this, try the parent.
-// E.g. we may be a button loaded from a resource, with no callback function
-// defined.
-void wxWindowMGL::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-    if ( GetEventHandler()->ProcessEvent(event)  )
-        return;
-    if ( m_parent )
-        m_parent->GetEventHandler()->OnCommand(win, event);
-}
-#endif // WXWIN_COMPATIBILITY_2
+    ClientToScreen(&x, &y);
+    if ( x < 0 )
+        x = 0;
+    if ( y < 0 )
+        y = 0;
+    if ( x >= w )
+        x = w-1;
+    if ( y >= h )
+        y = h-1;

 
 

-#if WXWIN_COMPATIBILITY
-wxObject* wxWindowMGL::GetChild(int number) const
-{
-    // Return a pointer to the Nth object in the Panel
-    wxNode *node = GetChildren().First();
-    int n = number;
-    while (node && n--)
-        node = node->Next();
-    if ( node )
-    {
-        wxObject *obj = (wxObject *)node->Data();
-        return(obj);
-    }
-    else
-        return NULL;
+    EVT_setMousePos(x, y);

 }
 }

-#endif // WXWIN_COMPATIBILITY

 
 // Set this window to be the child of 'parent'.
 bool wxWindowMGL::Reparent(wxWindowBase *parent)
 {
     if ( !wxWindowBase::Reparent(parent) )
 
 // Set this window to be the child of 'parent'.
 bool wxWindowMGL::Reparent(wxWindowBase *parent)
 {
     if ( !wxWindowBase::Reparent(parent) )

-        return FALSE;
+        return false;

 
     MGL_wmReparentWindow(m_wnd, parent->GetHandle());
 
 
     MGL_wmReparentWindow(m_wnd, parent->GetHandle());
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -862,7 +882,7 @@ void wxWindowMGL::SetDropTarget(wxDropTarget *pDropTarget)
 
 // old style file-manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.
 
 // old style file-manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.

-void wxWindowMGL::DragAcceptFiles(bool accept)
+void wxWindowMGL::DragAcceptFiles(bool WXUNUSED(accept))

 {
 #if 0 // FIXME_MGL
     HWND hWnd = GetHwnd();
 {
 #if 0 // FIXME_MGL
     HWND hWnd = GetHwnd();


@@ -878,14 +898,21 @@ void wxWindowMGL::DragAcceptFiles(bool accept)
 // Get total size
 void wxWindowMGL::DoGetSize(int *x, int *y) const
 {
 // Get total size
 void wxWindowMGL::DoGetSize(int *x, int *y) const
 {

+    wxASSERT_MSG( m_wnd, wxT("invalid window") );
+

     if (x) *x = m_wnd->width;
     if (y) *y = m_wnd->height;
 }
 
 void wxWindowMGL::DoGetPosition(int *x, int *y) const
 {
     if (x) *x = m_wnd->width;
     if (y) *y = m_wnd->height;
 }
 
 void wxWindowMGL::DoGetPosition(int *x, int *y) const
 {

-    if (x) *x = m_wnd->x;
-    if (y) *y = m_wnd->y;
+    wxASSERT_MSG( m_wnd, wxT("invalid window") );
+
+    int pX = 0, pY = 0;
+    AdjustForParentClientOrigin(pX, pY, 0);
+
+    if (x) *x = m_wnd->x - pX;
+    if (y) *y = m_wnd->y - pY;

 }
 
 void wxWindowMGL::DoScreenToClient(int *x, int *y) const
 }
 
 void wxWindowMGL::DoScreenToClient(int *x, int *y) const


@@ -916,7 +943,33 @@ void wxWindowMGL::DoGetClientSize(int *x, int *y) const
 
 void wxWindowMGL::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxWindowMGL::DoMoveWindow(int x, int y, int width, int height)
 {

-    MGL_wmSetWindowPosition(GetHandle(), x, y, width, height);
+    wxRect rcClient(GetClientRect());
+
+    MGL_wmSetWindowPosition(m_wnd, x, y, width, height);
+
+    // When the origin or a window stays fixed but the height or width
+    // changes, invalidate the old and new non-client areas
+    if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) &&
+         m_wnd->x == x && m_wnd->y == y &&
+         rcClient.Intersect(GetClientRect()) != wxRect(0, 0, width, height) )
+    {
+        wxRegion rgn(0, 0, width, height);
+        rgn.Subtract(rcClient);
+
+        // This should work I think, but doesn't seem to:
+        //MGL_wmInvalidateWindowRegion(m_wnd, rgn.GetMGLRegion().rgnPointer());
+
+        // Use MGL_wmInvalidateWindowRect instead:
+        for (wxRegionIterator it(rgn); it; it++)
+        {
+            rect_t rc;
+            rc.left = it.GetX();
+            rc.top = it.GetY();
+            rc.right = rc.left + it.GetW();
+            rc.bottom = rc.top + it.GetH();
+            MGL_wmInvalidateWindowRect(m_wnd, &rc);
+        }
+    }

 }
 
 // set the size of the window: if the dimensions are positive, just use them,
 }
 
 // set the size of the window: if the dimensions are positive, just use them,


@@ -983,11 +1036,26 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    DoMoveWindow(x, y, width, height);
+    int maxWidth = GetMaxWidth(),
+        minWidth = GetMinWidth(),
+        maxHeight = GetMaxHeight(),
+        minHeight = GetMinHeight();

 
 

-    wxSizeEvent event(wxSize(width, height), GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    if ( minWidth != -1 && width < minWidth ) width = minWidth;
+    if ( maxWidth != -1 && width > maxWidth ) width = maxWidth;
+    if ( minHeight != -1 && height < minHeight ) height = minHeight;
+    if ( maxHeight != -1 && height > maxHeight ) height = maxHeight;
+
+    if ( m_wnd->x != x || m_wnd->y != y ||
+         (int)m_wnd->width != width || (int)m_wnd->height != height )
+    {
+        DoMoveWindow(x, y, width, height);
+
+        wxSize newSize(width, height);
+        wxSizeEvent event(newSize, GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }

 }
 
 void wxWindowMGL::DoSetClientSize(int width, int height)
 }
 
 void wxWindowMGL::DoSetClientSize(int width, int height)


@@ -1013,10 +1081,11 @@ int wxWindowMGL::GetCharWidth() const
     return dc.GetCharWidth();
 }
 
     return dc.GetCharWidth();
 }
 

-void wxWindowMGL::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+void wxWindowMGL::DoGetTextExtent(const wxString& string,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const

 {
     wxScreenDC dc;
     if (!theFont)
 {
     wxScreenDC dc;
     if (!theFont)


@@ -1024,69 +1093,18 @@ void wxWindowMGL::GetTextExtent(const wxString& string,
     dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
 }
 
     dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
 }
 

-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::CreateCaret(int w, int h)
-{
-    SetCaret(new wxCaret(this, w, h));
-}
-
-void wxWindowMGL::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
-{
-    wxFAIL_MSG("not implemented");
-}
-
-void wxWindowMGL::ShowCaret(bool show)
-{
-    wxCHECK_RET( m_caret, "no caret to show" );
-
-    m_caret->Show(show);
-}
-
-void wxWindowMGL::DestroyCaret()
-{
-    SetCaret(NULL);
-}
-
-void wxWindowMGL::SetCaretPos(int x, int y)
-{
-    wxCHECK_RET( m_caret, "no caret to move" );
-
-    m_caret->Move(x, y);
-}
-
-void wxWindowMGL::GetCaretPos(int *x, int *y) const
-{
-    wxCHECK_RET( m_caret, "no caret to get position of" );
-
-    m_caret->GetPosition(x, y);
-}
-#endif // wxUSE_CARET
-

 
 // ---------------------------------------------------------------------------
 // painting
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // painting
 // ---------------------------------------------------------------------------
 

-void wxWindowMGL::Clear()
-{
-    wxClientDC dc((wxWindow *)this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
-
-#include "wx/menu.h"

 void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
 {
     if ( m_eraseBackground == -1 )
         m_eraseBackground = eraseBack;
     else
         m_eraseBackground |= eraseBack;
 void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
 {
     if ( m_eraseBackground == -1 )
         m_eraseBackground = eraseBack;
     else
         m_eraseBackground |= eraseBack;

-        
+

     if ( rect )
     {
         rect_t r;
     if ( rect )
     {
         rect_t r;


@@ -1100,59 +1118,76 @@ void wxWindowMGL::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxWindowMGL::Update()
 {
 
 void wxWindowMGL::Update()
 {

-    if ( !m_frozen )
+    if ( !IsFrozen() )

         MGL_wmUpdateDC(g_winMng);
 }
 
         MGL_wmUpdateDC(g_winMng);
 }
 

-void wxWindowMGL::Freeze()
+void wxWindowMGL::DoFreeze()

 {
 {

-    m_frozen = TRUE;
-    m_refreshAfterThaw = FALSE;
+    m_refreshAfterThaw = false;

 }
 
 }
 

-void wxWindowMGL::Thaw()
+void wxWindowMGL::DoThaw()

 {
 {

-    m_frozen = FALSE;

     if ( m_refreshAfterThaw )
         Refresh();
 }
 
 void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
 {
     if ( m_refreshAfterThaw )
         Refresh();
 }
 
 void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
 {

-    if ( m_frozen )
+    if ( IsFrozen() )

     {
     {

-        // Don't paint anything if the window is frozen. 
-        m_refreshAfterThaw = TRUE;
+        // Don't paint anything if the window is frozen.
+        m_refreshAfterThaw = true;

         return;
     }
         return;
     }

-    
-#if 0 // FIXME_MGL -- debugging stuff!
-    dc->setColorRGB(255,0,255);
-    dc->fillRect(-1000,-1000,2000,2000);
-    wxUsleep(50);
-#endif
+
+#if wxDEBUG_LEVEL >= 2
+    // FIXME_MGL -- debugging stuff, to be removed!
+    static int debugPaintEvents = -1;
+    if ( debugPaintEvents == -1 )
+        debugPaintEvents = wxGetEnv(wxT("WXMGL_DEBUG_PAINT_EVENTS"), NULL);
+    if ( debugPaintEvents )
+    {
+        dc->setColorRGB(255,0,255);
+        dc->fillRect(-1000,-1000,2000,2000);
+        wxMilliSleep(50);
+    }
+#endif // wxDEBUG_LEVEL >= 2

 
     MGLRegion clip;
     dc->getClipRegion(clip);
     m_updateRegion = wxRegion(clip);
     m_paintMGLDC = dc;
 
 
     MGLRegion clip;
     dc->getClipRegion(clip);
     m_updateRegion = wxRegion(clip);
     m_paintMGLDC = dc;
 

+#if wxUSE_CARET
+    // must hide caret temporarily, otherwise we'd get rendering artifacts
+    wxCaret *caret = GetCaret();
+    if ( caret )
+        caret->Hide();
+#endif // wxUSE_CARET
+

     if ( m_eraseBackground != 0 )
     {
         wxWindowDC dc((wxWindow*)this);
         wxEraseEvent eventEr(m_windowId, &dc);
         eventEr.SetEventObject(this);
     if ( m_eraseBackground != 0 )
     {
         wxWindowDC dc((wxWindow*)this);
         wxEraseEvent eventEr(m_windowId, &dc);
         eventEr.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(eventEr);
+        HandleWindowEvent(eventEr);

     }
     m_eraseBackground = -1;
 
     wxNcPaintEvent eventNc(GetId());
     eventNc.SetEventObject(this);
     }
     m_eraseBackground = -1;
 
     wxNcPaintEvent eventNc(GetId());
     eventNc.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(eventNc);
-    
+    HandleWindowEvent(eventNc);
+

     wxPaintEvent eventPt(GetId());
     eventPt.SetEventObject(this);
     wxPaintEvent eventPt(GetId());
     eventPt.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(eventPt);
+    HandleWindowEvent(eventPt);
+
+#if wxUSE_CARET
+    if ( caret )
+        caret->Show();
+#endif // wxUSE_CARET

 
     m_paintMGLDC = NULL;
     m_updateRegion.Clear();
 
     m_paintMGLDC = NULL;
     m_updateRegion.Clear();