Smooth Aqua buttons in wxTreeCtrl.

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

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 7e63e26d4bfd8f47e3a774173cf7fe4775d26514..217508e3258db29a9444a5db9e276e1c0db0e95e 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -64,9 +64,14 @@ winmng_t *g_winMng = NULL;
 MGLDevCtx *g_displayDC = NULL;
 
 // the window that has keyboard focus: 
 MGLDevCtx *g_displayDC = NULL;
 
 // the window that has keyboard focus: 

-static wxWindowMGL *g_focusedWindow = NULL;
+static wxWindowMGL *gs_focusedWindow = NULL;

 // the window that is currently under mouse cursor:
 // the window that is currently under mouse cursor:

-static wxWindowMGL *g_windowUnderMouse = NULL;
+static wxWindowMGL *gs_windowUnderMouse = NULL;
+// the window that has mouse capture
+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;

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


@@ -85,107 +90,68 @@ 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()
+#ifdef __WXDEBUG__
+// Add an easy way to capture screenshots:
+static void CaptureScreenshot()

 {
 {

-    int mode;
-    int width = 640, height = 480, depth = 16;
-    int refresh = MGL_DEFAULT_REFRESH;
+    wxBusyCursor bcur;

     
     

-#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"));
-#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() )
-    {
-        delete g_displayDC;
-        g_displayDC = NULL;
-        return FALSE;
-    }
-    
-    g_winMng = MGL_wmCreate(g_displayDC->getDC());
-    if (!g_winMng)
-        return FALSE;
-
-    MGL_wmSetWindowPainter(MGL_wmGetRootWindow(g_winMng), wxDesktopPainter);
-    
-    return TRUE;
-}
-
-void wxDestroyMGL_WM()
-{
-    if ( g_winMng )
-    {
-        MGL_wmDestroy(g_winMng);
-        g_winMng = NULL;
-    }
-    if ( g_displayDC )
-    {
-        delete g_displayDC;
-        g_displayDC = NULL;
-    }
+    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());

 }
 }

+#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)
+    
+    if ( w && !(w->GetWindowStyle() & wxTRANSPARENT_WINDOW) )

     {
         MGLDevCtx ctx(dc);
         w->HandlePaint(&ctx);
     }
     {
         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 where = win->ScreenToClient(wxPoint(e->where_x, e->where_y));
+    wxPoint orig(win->GetClientAreaOrigin());
+    wxPoint where;
+    
+    MGL_wmCoordGlobalToLocal(win->GetHandle(), 
+                             e->where_x, e->where_y, &where.x, &where.y);
+
+    for (wxWindowMGL *w = win; w; w = w->GetParent())
+    {
+        if ( !w->IsEnabled() ) 
+            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_x = where.x - orig.x;
+    event.m_y = where.y - orig.y;

     event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
     event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
     event.m_altDown = e->modifiers & EVT_LEFTALT;
     event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
     event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
     event.m_altDown = e->modifiers & EVT_LEFTALT;


@@ -218,25 +184,48 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
             break;
 
         case EVT_MOUSEMOVE:
             break;
 
         case EVT_MOUSEMOVE:

-            if ( win != g_windowUnderMouse )
+            if ( !gs_mouseCapture )

             {
             {

-                if ( g_windowUnderMouse )
+                if ( win != gs_windowUnderMouse )

                 {
                 {

-                    wxMouseEvent event2(event);
-                    wxPoint where2 = g_windowUnderMouse->ScreenToClient(
-                                            wxPoint(e->where_x, e->where_y));
-                    event2.m_x = where2.x;
-                    event2.m_y = where2.y;
-                    event2.SetEventObject(g_windowUnderMouse);
-                    event2.SetEventType(wxEVT_LEAVE_WINDOW);
-                    g_windowUnderMouse->GetEventHandler()->ProcessEvent(event2);
+                    if ( gs_windowUnderMouse )
+                    {
+                        wxMouseEvent event2(event);
+                        MGL_wmCoordGlobalToLocal(gs_windowUnderMouse->GetHandle(), 
+                                                 e->where_x, e->where_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);
+                        gs_windowUnderMouse->GetEventHandler()->ProcessEvent(event2);
+                    }
+
+                    wxMouseEvent event3(event);
+                    event3.SetEventType(wxEVT_ENTER_WINDOW);
+                    win->GetEventHandler()->ProcessEvent(event3);
+
+                    gs_windowUnderMouse = win;
+                }
+            }
+            else // gs_mouseCapture
+            {
+                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) )
+                {
+                    wxMouseEvent evt(inside ? 
+                                     wxEVT_ENTER_WINDOW : wxEVT_LEAVE_WINDOW);
+                    evt.SetEventObject(win);
+                    win->GetEventHandler()->ProcessEvent(evt);
+                    gs_windowUnderMouse = inside ? win : NULL;

                 }
                 }

-                
-                wxMouseEvent event3(event);
-                event3.SetEventType(wxEVT_ENTER_WINDOW);
-                win->GetEventHandler()->ProcessEvent(event3);
-                
-                g_windowUnderMouse = win;

             }
             
             type = wxEVT_MOTION;
             }
             
             type = wxEVT_MOTION;


@@ -375,6 +364,8 @@ static long wxScanToKeyCode(event_t *event)
             break;
     }
 
             break;
     }
 

+    #undef KEY
+

     return key;
 }
 
     return key;
 }
 


@@ -383,11 +374,15 @@ static long wxAsciiToKeyCode(event_t *event)
     return (long)EVT_asciiCode(event->message);
 }
 
     return (long)EVT_asciiCode(event->message);
 }
 

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

 {
 {

-    wxEventType type = wxEVT_NULL;

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

-    wxPoint where = win->ScreenToClient(wxPoint(e->where_x, e->where_y));
+
+    if ( !win->IsEnabled() ) return FALSE;
+
+    wxPoint where;
+    MGL_wmCoordGlobalToLocal(win->GetHandle(), 
+                             e->where_x, e->where_y, &where.x, &where.y);

     
     wxKeyEvent event;
     event.SetEventObject(win);
     
     wxKeyEvent event;
     event.SetEventObject(win);


@@ -396,7 +391,6 @@ static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
     event.m_scanCode = 0; // not used by wx at all
     event.m_x = where.x;
     event.m_y = where.y;
     event.m_scanCode = 0; // not used by wx at all
     event.m_x = where.x;
     event.m_y = where.y;

-    wxLogDebug("key pressed, x=%i y=%i", event.m_x, event.m_y); // FIXME_MGL -remove

     event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
     event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
     event.m_altDown = e->modifiers & EVT_LEFTALT;
     event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
     event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
     event.m_altDown = e->modifiers & EVT_LEFTALT;


@@ -417,6 +411,14 @@ static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
     
         ret = win->GetEventHandler()->ProcessEvent(event);
 
     
         ret = win->GetEventHandler()->ProcessEvent(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 )
         {
 #if wxUSE_ACCEL
         if ( !ret )
         {


@@ -469,6 +471,11 @@ END_EVENT_TABLE()
 
 void wxWindowMGL::Init()
 {
 
 void wxWindowMGL::Init()
 {

+    // 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 )
+        wxTheApp->SetDisplayMode(wxDisplayModeInfo(640, 480, 16));
+

     // generic:
     InitBase();
 
     // generic:
     InitBase();
 


@@ -487,10 +494,25 @@ wxWindowMGL::~wxWindowMGL()
 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 

-    if ( g_focusedWindow == 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();
+        }
+    }
+    
+    if ( gs_focusedWindow == this )

         KillFocus();
         KillFocus();

-    if ( g_windowUnderMouse == this )
-        g_windowUnderMouse = NULL;
+
+    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
 
     // 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


@@ -512,22 +534,11 @@ bool wxWindowMGL::Create(wxWindow *parent,
                          long style,
                          const wxString& name)
 {
                          long style,
                          const wxString& name)
 {

-    // FIXME_MGL -- temporary!
-    //wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
-

     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 

-    if ( parent ) // FIXME_MGL temporary
+    if ( parent )

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

-    else
-        m_isShown=FALSE;// FIXME_MGL -- temporary, simulates wxTLW/wxFrame
-
-    if ( style & wxPOPUP_WINDOW )
-    {
-        // it is created hidden as other top level windows
-        m_isShown = FALSE;
-    }

 
     int x, y, w, h;
     x = pos.x, y = pos.y;
 
     int x, y, w, h;
     x = pos.x, y = pos.y;


@@ -537,20 +548,55 @@ bool wxWindowMGL::Create(wxWindow *parent,
         y = 0; // FIXME_MGL, something better, see GTK+
     w = WidthDefault(size.x);
     h = HeightDefault(size.y);
         y = 0; // FIXME_MGL, something better, see GTK+
     w = WidthDefault(size.x);
     h = HeightDefault(size.y);

+    
+    long mgl_style = 0;
+    window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
+
+    if ( !(style & wxNO_FULL_REPAINT_ON_RESIZE) )
+    {
+        mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
+    }
+    if ( style & wxSTAY_ON_TOP )
+    {
+        mgl_style |= MGL_WM_ALWAYS_ON_TOP;
+    }
+    if ( style & wxPOPUP_WINDOW )
+    {
+        mgl_style |= MGL_WM_ALWAYS_ON_TOP;
+        // it is created hidden as other top level windows
+        m_isShown = FALSE;
+        wnd_parent = NULL;
+    }

 
 

-    m_wnd = MGL_wmCreateWindow(g_winMng,
-                               parent ? parent->GetHandle() : NULL,
-                               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 = m_wnd->visible;

 
     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.Ok() )
+        MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
+    else
+        MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());

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


@@ -559,25 +605,36 @@ bool wxWindowMGL::Create(wxWindow *parent,
 
 void wxWindowMGL::SetFocus()
 {
 
 void wxWindowMGL::SetFocus()
 {

-    if (g_focusedWindow)
-        g_focusedWindow->KillFocus();
+    if ( gs_focusedWindow == this ) return;
+
+    if ( gs_focusedWindow )
+        gs_focusedWindow->KillFocus();

     
     

-    g_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();
     
     MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT, wxMGL_CAPTURE_KEYB);
 
 #if wxUSE_CARET
     // caret needs to be informed about focus change
     wxCaret *caret = GetCaret();

-    if (caret)
+    if ( caret )

         caret->OnSetFocus();
 #endif // wxUSE_CARET
 
         caret->OnSetFocus();
 #endif // wxUSE_CARET
 

-    if ( IsTopLevel() )
+    wxWindowMGL *active = wxGetTopLevelParent(this);
+    if ( !(m_windowStyle & wxPOPUP_WINDOW) && active != gs_activeFrame )

     {
     {

-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
-        event.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(event);
+        if ( gs_activeFrame )
+        {
+            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, gs_activeFrame->GetId());
+            event.SetEventObject(gs_activeFrame);
+            gs_activeFrame->GetEventHandler()->ProcessEvent(event);
+        }
+
+        gs_activeFrame = active;
+        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, gs_activeFrame->GetId());
+        event.SetEventObject(gs_activeFrame);
+        gs_activeFrame->GetEventHandler()->ProcessEvent(event);

     }
     
     wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
     }
     
     wxFocusEvent event(wxEVT_SET_FOCUS, GetId());


@@ -587,8 +644,8 @@ void wxWindowMGL::SetFocus()
 
 void wxWindowMGL::KillFocus()
 {
 
 void wxWindowMGL::KillFocus()
 {

-    if ( g_focusedWindow != this ) return;
-    g_focusedWindow = NULL;
+    if ( gs_focusedWindow != this ) return;
+    gs_focusedWindow = NULL;

 
     if ( m_isBeingDeleted ) return;
     
 
     if ( m_isBeingDeleted ) return;
     


@@ -601,13 +658,6 @@ void wxWindowMGL::KillFocus()
         caret->OnKillFocus();
 #endif // wxUSE_CARET
 
         caret->OnKillFocus();
 #endif // wxUSE_CARET
 

-    if ( IsTopLevel() )
-    {
-        wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
-        event.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(event);
-    }
-

     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
     wxFocusEvent event(wxEVT_KILL_FOCUS, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);


@@ -619,7 +669,7 @@ void wxWindowMGL::KillFocus()
 // ----------------------------------------------------------------------------
 wxWindow *wxWindowBase::FindFocus()
 {
 // ----------------------------------------------------------------------------
 wxWindow *wxWindowBase::FindFocus()
 {

-    return (wxWindow*)g_focusedWindow;
+    return (wxWindow*)gs_focusedWindow;

 }
 
 bool wxWindowMGL::Show(bool show)
 }
 
 bool wxWindowMGL::Show(bool show)


@@ -628,6 +678,17 @@ bool wxWindowMGL::Show(bool show)
         return FALSE;
 
     MGL_wmShowWindow(m_wnd, show);
         return FALSE;
 
     MGL_wmShowWindow(m_wnd, show);

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

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -645,22 +706,24 @@ void wxWindowMGL::Lower()
 
 void wxWindowMGL::CaptureMouse()
 {
 
 void wxWindowMGL::CaptureMouse()
 {

+    if ( gs_mouseCapture )
+        MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);
+
+    gs_mouseCapture = this;

     MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
 }
 
 void wxWindowMGL::ReleaseMouse()
 {
     MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
 }
 
 void wxWindowMGL::ReleaseMouse()
 {

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

     MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
     MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);

+    gs_mouseCapture = NULL;

 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()
 {
 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()
 {

-    for (captureentry_t *c = g_winMng->capturedEvents; c; c = c->next)
-    {
-        if ( c->id == wxMGL_CAPTURE_MOUSE )
-            return (wxWindow*)c->wnd->userData;
-    }
-    return NULL;
+    return (wxWindow*)gs_mouseCapture;

 }
 
 bool wxWindowMGL::SetCursor(const wxCursor& cursor)
 }
 
 bool wxWindowMGL::SetCursor(const wxCursor& cursor)


@@ -675,8 +738,6 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor)
         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());

-    
-    // FIXME_MGL -- should it set children's cursor or not?!

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -781,27 +842,21 @@ void wxWindowMGL::DoGetPosition(int *x, int *y) const
 void wxWindowMGL::DoScreenToClient(int *x, int *y) const
 {
     int ax, ay;
 void wxWindowMGL::DoScreenToClient(int *x, int *y) const
 {
     int ax, ay;

-    wxPoint co = GetClientAreaOrigin();
-
-    MGL_wmCoordGlobalToLocal(m_wnd, m_wnd->x, m_wnd->y, &ax, &ay);
-    ax -= co.x;
-    ay -= co.y;
+    MGL_wmCoordGlobalToLocal(m_wnd, 0, 0, &ax, &ay);

     if (x)
     if (x)

-        *x = ax;
+        (*x) += ax;

     if (y)
     if (y)

-        *y = ay;
+        (*y) += ay;

 }
 
 void wxWindowMGL::DoClientToScreen(int *x, int *y) const
 {
     int ax, ay;
 }
 
 void wxWindowMGL::DoClientToScreen(int *x, int *y) const
 {
     int ax, ay;

-    wxPoint co = GetClientAreaOrigin();
-
-    MGL_wmCoordGlobalToLocal(m_wnd, m_wnd->x+co.x, m_wnd->y+co.y, &ax, &ay);
+    MGL_wmCoordLocalToGlobal(m_wnd, 0, 0, &ax, &ay);

     if (x)
     if (x)

-        *x = ax;
+        (*x) += ax;

     if (y)
     if (y)

-        *y = ay;
+        (*y) += ay;

 }
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.


@@ -843,9 +898,7 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;
 
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;
 

-#if 0 // FIXME_MGL -- what's this good for?

     AdjustForParentClientOrigin(x, y, sizeFlags);
     AdjustForParentClientOrigin(x, y, sizeFlags);

-#endif

 
     wxSize size(-1, -1);
     if ( width == -1 )
 
     wxSize size(-1, -1);
     if ( width == -1 )


@@ -881,11 +934,15 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    DoMoveWindow(x, y, width, height);
+    if ( m_wnd->x != x || m_wnd->y != y || 
+         (int)m_wnd->width != width || (int)m_wnd->height != height )
+    {
+        DoMoveWindow(x, y, width, height);

 
 

-    wxSizeEvent event(wxSize(width, height), GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+        wxSizeEvent event(wxSize(width, height), GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }

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


@@ -977,6 +1034,7 @@ void wxWindowMGL::Clear()
     dc.Clear();
 }
 
     dc.Clear();
 }
 

+#include "wx/menu.h"

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


@@ -1023,6 +1081,12 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
         return;
     }
     
         return;
     }
     

+#if 0 // FIXME_MGL -- debugging stuff!
+    dc->setColorRGB(255,0,255);
+    dc->fillRect(-1000,-1000,2000,2000);
+    wxUsleep(50);
+#endif
+

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