diff --git a/include/wx/mgl/dcclient.h b/include/wx/mgl/dcclient.h
index 41bbd504da..f062e9d5e7 100644
--- a/include/wx/mgl/dcclient.h
+++ b/include/wx/mgl/dcclient.h
@@ -15,7 +15,8 @@
 #endif
 
 #include "wx/dc.h"
-#include "wx/window.h"
+
+class WXDLLEXPORT wxWindowMGL;
 
 //-----------------------------------------------------------------------------
 // classes
@@ -29,12 +30,15 @@ class WXDLLEXPORT wxClientDC;
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
-//FIXME_MGL
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
 public:
     wxWindowDC() {}
-    wxWindowDC( wxWindow *win ) {}
+    virtual ~wxWindowDC();
+    wxWindowDC(wxWindow *win);
+
+protected:
+    wxWindow *m_wnd;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
@@ -47,10 +51,11 @@ private:
 class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:
-    wxClientDC() {}
-    wxClientDC( wxWindow *win ) {}
+    wxClientDC() : wxWindowDC() {}
+    wxClientDC(wxWindow *win);
 
 private:
+    wxWindowMGL *m_wnd;
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 };
 
@@ -58,6 +63,7 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
+// FIXME_MGL
 class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
index b1c429aa17..a5f0ace17d 100644
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@@ -26,16 +26,15 @@ class WXDLLEXPORT wxScreenDC;
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-//FIXME_MGL
-class WXDLLEXPORT wxScreenDC: public wxPaintDC
+class WXDLLEXPORT wxScreenDC: public wxDC
 {
 public:
-    wxScreenDC() {}
+    wxScreenDC();
     ~wxScreenDC() {}
 
-    static bool StartDrawingOnTop( wxWindow *window ) {}
-    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL ) {}
-    static bool EndDrawingOnTop() {}
+    static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
+    static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
+    static bool EndDrawingOnTop() { return TRUE; }
   
 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
diff --git a/include/wx/mgl/frame.h b/include/wx/mgl/frame.h
index 3f115b8dda..0964f60afc 100644
--- a/include/wx/mgl/frame.h
+++ b/include/wx/mgl/frame.h
@@ -26,19 +26,19 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxToolBar;
 class WXDLLEXPORT wxStatusBar;
 
-class WXDLLEXPORT wxFrame;
+class WXDLLEXPORT wxFrameMGL;
 
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
 
 //FIXME_MGL
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLEXPORT wxFrameMGL : public wxFrameBase
 {
 public:
     // construction
-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
+    wxFrameMGL() { Init(); }
+    wxFrameMGL(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
@@ -59,7 +59,7 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr) {}
 
-    virtual ~wxFrame() {}
+    virtual ~wxFrameMGL() {}
 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = TRUE) {}
@@ -126,7 +126,7 @@ protected:
     virtual void DoGetClientSize( int *width, int *height ) const {}
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS(wxFrameMGL)
 };
 
 #endif // __WX_FRAME_H__
diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h
index 1b555e75db..02c174f892 100644
--- a/include/wx/mgl/private.h
+++ b/include/wx/mgl/private.h
@@ -23,6 +23,7 @@ class WXDLLEXPORT wxBitmap;
 // ---------------------------------------------------------------------------
 
 extern MGLDevCtx *g_displayDC;
+extern winmng_t  *g_winMng;
 
 // ---------------------------------------------------------------------------
 // helper functions
@@ -48,4 +49,7 @@ public:
 };
 
 
+extern bool wxCreateMGL_WM();
+extern void wxDestroyMGL_WM();
+
 #endif // _WX_PRIVATE_H_
diff --git a/include/wx/mgl/timer.h b/include/wx/mgl/timer.h
index fc24a250fa..b9b2841651 100644
--- a/include/wx/mgl/timer.h
+++ b/include/wx/mgl/timer.h
@@ -28,7 +28,7 @@ public:
         { Init(); }
     ~wxTimer() {}
 
-    virtual bool Start( int millisecs = -1, bool oneShot = FALSE ) {}
+    virtual bool Start( int millisecs = -1, bool oneShot = FALSE ) { return TRUE; }
     virtual void Stop() {}
 
     virtual bool IsRunning() const { return m_tag != -1; }
diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index f558f1ace4..bb3e2792b6 100644
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -1,127 +1,159 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        window.h
-// Purpose:
+// Name:        wx/mgl/window.h
+// Purpose:     wxWindow class
 // Author:      Vaclav Slavik
-// Id:          $Id$
+// RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_WINDOW_H_
+#define _WX_WINDOW_H_
 
-#ifndef __WX_WINDOW_H__
-#define __WX_WINDOW_H__
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
 
 #ifdef __GNUG__
     #pragma interface "window.h"
 #endif
 
+#include "wx/font.h"
 
-//-----------------------------------------------------------------------------
-// wxWindow
-//-----------------------------------------------------------------------------
+struct window_t;
+class MGLDevCtx;
+
+// ---------------------------------------------------------------------------
+// wxWindow declaration for MGL
+// ---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxWindowMGL : public wxWindowBase
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowMGL)
-
 public:
-    // creating the window
-    // -------------------
-    wxWindowMGL() {}
+    wxWindowMGL() { Init(); }
+
     wxWindowMGL(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr) {}
+                const wxString& name = wxPanelNameStr)
+    {
+        Init();
+        Create(parent, id, pos, size, style, name);
+    }
+
+    virtual ~wxWindowMGL();
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr) {}
-    virtual ~wxWindowMGL() {}
+                const wxString& name = wxPanelNameStr);
 
-    // implement base class (pure) virtual methods
-    // -------------------------------------------
-    virtual bool Destroy() {return TRUE;}
+    virtual void Raise();
+    virtual void Lower();
 
-    virtual void Raise() {}
-    virtual void Lower() {}
+    virtual bool Show(bool show = TRUE);
 
-    virtual bool Show( bool show = TRUE )  {return TRUE;}
-    virtual bool Enable( bool enable = TRUE )  {return TRUE;}
+    virtual void SetFocus();
 
-    virtual bool IsRetained() const  {return TRUE;}
+    virtual bool Reparent(wxWindowBase *newParent);
 
-    virtual void SetFocus() {}
-    virtual bool AcceptsFocus() const  {return TRUE;}
+    virtual void WarpPointer(int x, int y);
+    virtual void CaptureMouse();
+    virtual void ReleaseMouse();
 
-    virtual bool Reparent( wxWindowBase *newParent )  {return TRUE;}
+    virtual void Refresh(bool eraseBackground = TRUE,
+                         const wxRect *rect = (const wxRect *) NULL);
+    virtual void Update();
+    virtual void Clear();
+    virtual void Freeze();
+    virtual void Thaw();
 
-    virtual void WarpPointer(int x, int y) {}
-    virtual void CaptureMouse() {}
-    virtual void ReleaseMouse() {}
+    virtual bool SetCursor(const wxCursor &cursor);
+    virtual bool SetFont(const wxFont &font) { m_font = font; return TRUE; }
 
-    virtual void Refresh( bool eraseBackground = TRUE,
-                          const wxRect *rect = (const wxRect *) NULL ) {}
-    virtual void Clear() {}
-
-    virtual bool SetBackgroundColour( const wxColour &colour )  {return TRUE;}
-    virtual bool SetForegroundColour( const wxColour &colour ) {return TRUE;}
-    virtual bool SetCursor( const wxCursor &cursor )  {return TRUE;}
-    virtual bool SetFont( const wxFont &font )  {return TRUE;}
-
-    virtual int GetCharHeight() const {return 0;}
-    virtual int GetCharWidth() const {return 0;}
+    virtual int GetCharHeight() const;
+    virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,
                                int *descent = (int *) NULL,
                                int *externalLeading = (int *) NULL,
                                const wxFont *theFont = (const wxFont *) NULL)
-                               const {}
-
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y )  {return TRUE;}
-
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-                               int range, bool refresh = TRUE ) {}
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ) {}
-    virtual int GetScrollPos( int orient ) const  {return 0;}
-    virtual int GetScrollThumb( int orient ) const  {return 0;}
-    virtual int GetScrollRange( int orient ) const  {return 0;}
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL ) {}
+                               const;
 
 #if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget ) {}
+    virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP
 
-    virtual WXWidget GetHandle() const { return NULL; }
+    // Accept files for dragging
+    virtual void DragAcceptFiles(bool accept);
 
-    /* For compatibility across platforms (not in event table) */
-    void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
+#if WXWIN_COMPATIBILITY
+    // event handlers
+        // Handle a control command
+    virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
+
+        // Override to define new behaviour for default action (e.g. double
+        // clicking on a listbox)
+    virtual void OnDefaultAction(wxControl * WXUNUSED(initiatingItem)) { }
+#endif // WXWIN_COMPATIBILITY
+
+    virtual WXWidget GetHandle() const { return m_wnd; }
+
+
+    // implementation from now on
+    // --------------------------
+
+protected:
+    // the window handle
+    struct window_t      *m_wnd;
+    // whether there should be wxEraseEvent before wxPaintEvent or not
+    // (see wxWindow::Refresh)
+    bool                  m_frozen;
+    bool                  m_refreshAfterThaw;
+    wxFont                m_font;
 
     // implement the base class pure virtuals
-    virtual void DoClientToScreen( int *x, int *y ) const {}
-    virtual void DoScreenToClient( int *x, int *y ) const {}
-    virtual void DoGetPosition( int *x, int *y ) const {}
-    virtual void DoGetSize( int *width, int *height ) const {}
-    virtual void DoGetClientSize( int *width, int *height ) const {}
+    virtual void DoClientToScreen( int *x, int *y ) const;
+    virtual void DoScreenToClient( int *x, int *y ) const;
+    virtual void DoGetPosition( int *x, int *y ) const;
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoGetClientSize( int *width, int *height ) const;
     virtual void DoSetSize(int x, int y,
                            int width, int height,
-                           int sizeFlags = wxSIZE_AUTO) {}
-    virtual void DoSetClientSize(int width, int height) {}
-    virtual void DoMoveWindow(int x, int y, int width, int height) {}
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
 
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip ) {}
-#endif // wxUSE_TOOLTIPS
-
-    // common part of all ctors (can't be virtual because called from ctor)
-    void Init() {}
+    // move the window to the specified location and resize it: this is called
+    // from both DoSetSize() and DoSetClientSize() and would usually just call
+    // ::MoveWindow() except for composite controls which will want to arrange
+    // themselves inside the given rectangle
+    virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
+    // common part of all ctors
+    void Init();
+    // counterpart to SetFocus
+    void KillFocus();
+    
+    MGLDevCtx *m_paintMGLDC;
+    friend class wxPaintDC;
+
+    void OnEraseBackground(wxEraseEvent& event);
+    void OnSetFocus(wxFocusEvent& event);
+
+    DECLARE_DYNAMIC_CLASS(wxWindowMGL);
     DECLARE_NO_COPY_CLASS(wxWindowMGL);
+    DECLARE_EVENT_TABLE()
+
+public:
+    void HandlePaint(MGLDevCtx *dc);
+    // needed by wxWindowPainter
 };
 
-#endif // ___WX_WINDOW_H__
+
+#endif
+    // _WX_WINDOW_H_
diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 1474a34667..f1c96de528 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -21,11 +21,6 @@
 // Global data
 //-----------------------------------------------------------------------------
 
-// MGL's display DC:
-MGLDevCtx *g_displayDC = NULL;
-
-// ----
-
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 1e685b40ca..b2489c75fd 100644
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -306,7 +306,7 @@ wxImage wxBitmap::ConvertToImage() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 
-    long width, height;
+    int width, height;
     width = GetWidth();
     height = GetHeight();
     
@@ -517,6 +517,7 @@ MGLDevCtx *wxBitmap::CreateTmpDC() const
             case  4: cnt = 16;  break;
             case  8: cnt = 256; break;
             default:
+                cnt = 0;
                 wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
                 break;
         }
diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index e33904e99a..bc91b0e75e 100644
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -765,7 +765,7 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     if ( m_font.GetUnderlined() )
     {
         int x1 = xx, y1 = yy;
-        int x2, y2;
+        int x2 = 0 , y2 = 0;
         int w = m_MGLDC->textWidth(c_text);
         m_MGLDC->underScoreLocation(x1, y1, c_text);
         switch (m_MGLDC->getTextDirection())
@@ -1397,7 +1397,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
     xsrc = source->LogicalToDeviceX(xsrc);
     ysrc = source->LogicalToDeviceY(ysrc);
 
-    /* TODO: use the mask origin when drawing transparently */
+    /* FIXME_MGL: use the mask origin when drawing transparently */
     if (xsrcMask == -1 && ysrcMask == -1)
     {
         xsrcMask = xsrc; ysrcMask = ysrc;
diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
index 61b986dd39..f3bef5fbd7 100644
--- a/src/mgl/dcclient.cpp
+++ b/src/mgl/dcclient.cpp
@@ -11,9 +11,40 @@
 #pragma implementation "dcclient.h"
 #endif
 
-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/window.h"
+#endif
+
+#include <mgraph.hpp>
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC)
+
+wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
+{
+    MGLDC *dc = MGL_wmBeginPaint(m_wnd->GetHandle());
+    SetMGLDC(new MGLDevCtx(dc), FALSE);
+    // FIXME_MGL -- correctly handle setting device origin and
+    //              clipping regions
+}
+
+wxWindowDC::~wxWindowDC()
+{
+    MGL_wmEndPaint(m_wnd->GetHandle());
+}
+
+wxClientDC::wxClientDC(wxWindow *win) : wxWindowDC(win)
+{
+    wxRect r = m_wnd->GetClientRect();
+    SetClippingRegion(r);
+    SetDeviceOrigin(r.x, r.y);
+}
diff --git a/src/mgl/dcscreen.cpp b/src/mgl/dcscreen.cpp
index db34c4a945..6152e58c54 100644
--- a/src/mgl/dcscreen.cpp
+++ b/src/mgl/dcscreen.cpp
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcscreen.cpp
-// Purpose:
-// Author:      Robert Roebling
+// Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -11,8 +10,19 @@
 #pragma implementation "dcscreen.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/dcscreen.h"
-#include "wx/window.h"
+#include "wx/mgl/private.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)
 
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
+wxScreenDC::wxScreenDC() : wxDC()
+{
+    SetMGLDC(g_displayDC, FALSE /* no ownership */);
+}
diff --git a/src/mgl/frame.cpp b/src/mgl/frame.cpp
index a7536dfee5..9626dd7de8 100644
--- a/src/mgl/frame.cpp
+++ b/src/mgl/frame.cpp
@@ -20,4 +20,4 @@
 #endif
 
 #include "wx/frame.h"
-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameMGL,wxWindow)
diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 95bc72a9ff..7ad8f8af4f 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -12,7 +12,6 @@
 
 #include "wx/intl.h"
 #include "wx/log.h"
-
 #include "wx/process.h"
 
 #include <stdarg.h>
@@ -26,6 +25,8 @@
 #include "wx/unix/execute.h"
 #endif
 
+#include "wx/mgl/private.h"
+
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
@@ -39,20 +40,23 @@ void wxBell()
 // display characterstics
 // ----------------------------------------------------------------------------
 
-extern MGLDevCtx *g_displayDC;
-
-void wxDisplaySize( int *width, int *height )
+void wxDisplaySize(int *width, int *height)
 {
     wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
     if (width) *width = g_displayDC->sizex();
     if (height) *height = g_displayDC->sizey();
 }
 
-void wxGetMousePosition( int* x, int* y )
+void wxGetMousePosition(int* x, int* y)
 {
-#if 0 // FIXME_MGL
-    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
-#endif
+    MS_getPos(x, y);
+}
+
+wxPoint wxGetMousePosition()
+{
+    wxPoint pt;
+    wxGetMousePosition(&pt.x, &pt.y);
+    return pt;
 }
 
 bool wxColourDisplay()
@@ -72,7 +76,7 @@ int wxDisplayDepth()
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 #if 0 // FIXME_MGL
-        // FIXME_MGL : wxGetOsVersion, too
+        // FIXME_MGL : fix wxGetOsVersion, too
   if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
   if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
 
diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 030db27f2d..2b65c36f0d 100644
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -1,33 +1,787 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/window.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
+// Name:        src/mgl/window.cpp
+// Purpose:     wxWindow
+// Author:      Vaclav Slavik
+//              (based on GTK & MSW implementations)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
 
 #ifdef __GNUG__
     #pragma implementation "window.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/window.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxWindowMGL, wxWindowBase)
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
-wxWindow *g_captureWindow = NULL;
-wxWindow *g_focusWindow = NULL;
+#ifndef WX_PRECOMP
+    #include "wx/window.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/caret.h"
+#endif
 
-/* static */
-wxWindow *wxWindowBase::GetCapture()
+#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/intl.h"
+#include "wx/dcscreen.h"
+
+#include <mgraph.hpp>
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
+
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
+
+// MGL window manager and associated DC.
+winmng_t *g_winMng = NULL;
+MGLDevCtx *g_displayDC = NULL;
+
+extern wxList WXDLLEXPORT wxPendingDelete;
+ // FIXME_MGL -- ???
+ 
+static wxWindowMGL *g_focusedWindow;
+
+// ---------------------------------------------------------------------------
+// constants
+// ---------------------------------------------------------------------------
+
+// Custom identifiers used to distinguish between various event handlers 
+// and capture handlers passed to MGL_wm
+enum
 {
-    return (wxWindow *)g_captureWindow;
+    wxMGL_CAPTURE_MOUSE = 1,
+    wxMGL_CAPTURE_KEYB  = 2
+};
+
+
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+
+static void wxWindowPainter(window_t *wnd, MGLDC *dc);
+
+// 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
+
+bool wxCreateMGL_WM()
+{
+    int mode;
+    int width = 640, height = 480, depth = 16;
+    int refresh = MGL_DEFAULT_REFRESH;
+    
+#if wxUSE_SYSTEM_OPTIONS
+    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;
+    
+    return TRUE;
 }
 
+void wxDestroyMGL_WM()
+{
+    if (g_winMng)
+    {
+        MGL_wmDestroy(g_winMng);
+        g_winMng = NULL;
+    }
+    delete g_displayDC;
+    g_displayDC = NULL;
+}
+
+
+// ---------------------------------------------------------------------------
+// event tables
+// ---------------------------------------------------------------------------
+
+// in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
+// method
+IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase)
+
+BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase)
+    EVT_ERASE_BACKGROUND(wxWindowMGL::OnEraseBackground)
+    EVT_SET_FOCUS(wxWindowMGL::OnSetFocus)
+END_EVENT_TABLE()
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ----------------------------------------------------------------------------
+// constructors and such
+// ----------------------------------------------------------------------------
+
+void wxWindowMGL::Init()
+{
+    // generic:
+    InitBase();
+
+    // mgl specific:
+    if ( !g_winMng && !wxCreateMGL_WM() )
+        wxFatalError(_T("Can't initalize MGL, aborting!"));
+
+    m_wnd = NULL;
+    m_isShown = TRUE;
+    m_isBeingDeleted = FALSE;
+    m_isEnabled = TRUE;
+    m_frozen = FALSE;
+    m_paintMGLDC = NULL;
+}
+
+// Destructor
+wxWindowMGL::~wxWindowMGL()
+{
+    m_isBeingDeleted = TRUE;
+
+    if ( g_focusedWindow == this )
+        g_focusedWindow = NULL;
+#if 0 // -- fixme - do we need this?
+    // VS: make sure there's no wxFrame with last focus set to us:
+    for (wxWindow *win = GetParent(); win; win = win->GetParent())
+    {
+        wxFrame *frame = wxDynamicCast(win, wxFrame);
+        if ( frame )
+        {
+            if ( frame->GetLastFocus() == this )
+                frame->SetLastFocus((wxWindow*)NULL);
+            break;
+        }
+    }
+#endif
+
+    // 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();
+
+    if ( m_parent )
+        m_parent->RemoveChild(this);
+
+    if ( m_wnd )
+        MGL_wmDestroyWindow(m_wnd);
+}
+
+// real construction (Init() must have been called before!)
+bool wxWindowMGL::Create(wxWindow *parent,
+                         wxWindowID id,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxString& name)
+{
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return FALSE;
+
+    parent->AddChild(this);
+
+    if ( style & wxPOPUP_WINDOW )
+    {
+        // it is created hidden as other top level windows
+        m_isShown = FALSE;
+    }
+
+    m_wnd = MGL_wmCreateWindow(g_winMng,
+                               parent ? parent->GetHandle() : NULL,
+                               pos.x, pos.y, size.x, size.y);
+    MGL_wmSetWindowUserData(m_wnd, (void*) this);
+    MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);
+    return TRUE;
+}
+
+// ---------------------------------------------------------------------------
+// basic operations
+// ---------------------------------------------------------------------------
+
+void wxWindowMGL::SetFocus()
+{
+    if (g_focusedWindow)
+        g_focusedWindow->KillFocus();
+    
+    g_focusedWindow = this;
+    
+    MGL_wmCaptureEvents(GetHandle(), EVT_KEYEVT | EVT_JOYEVT, wxMGL_CAPTURE_KEYB);
+
+    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
+    if (panel)
+        panel->SetLastFocus((wxWindow*)this);
+
+#if wxUSE_CARET
+    // caret needs to be informed about focus change
+    wxCaret *caret = GetCaret();
+    if (caret)
+        caret->OnSetFocus();
+#endif // wxUSE_CARET
+
+    if (IsTopLevel())
+    {
+        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+    
+    wxFocusEvent event(wxEVT_SET_FOCUS, GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+void wxWindowMGL::KillFocus()
+{
+    if ( g_focusedWindow != this ) return;
+    g_focusedWindow = NULL;
+
+    MGL_wmUncaptureEvents(GetHandle(), wxMGL_CAPTURE_KEYB);
+
+#if wxUSE_CARET
+    // caret needs to be informed about focus change
+    wxCaret *caret = GetCaret();
+    if (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);
+}
+
+// ----------------------------------------------------------------------------
+// this wxWindowBase function is implemented here (in platform-specific file)
+// because it is static and so couldn't be made virtual
+// ----------------------------------------------------------------------------
 wxWindow *wxWindowBase::FindFocus()
 {
-    // the cast is necessary when we compile in wxUniversal mode
-    return (wxWindow *)g_focusWindow;
+    return (wxWindow*)g_focusedWindow;
+}
+
+bool wxWindowMGL::Show(bool show)
+{
+    if ( !wxWindowBase::Show(show) )
+        return FALSE;
+
+    MGL_wmShowWindow(m_wnd, show);
+    return TRUE;
+}
+
+// Raise the window to the top of the Z order
+void wxWindowMGL::Raise()
+{
+    MGL_wmRaiseWindow(m_wnd);
+}
+
+// Lower the window to the bottom of the Z order
+void wxWindowMGL::Lower()
+{
+    MGL_wmLowerWindow(m_wnd);
+}
+
+void wxWindowMGL::CaptureMouse()
+{
+    MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
+}
+
+void wxWindowMGL::ReleaseMouse()
+{
+    MGL_wmUncaptureEvents(m_wnd, wxMGL_CAPTURE_MOUSE);
+}
+
+/* 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;
+}
+
+bool wxWindowMGL::SetCursor(const wxCursor& cursor)
+{
+    if ( !wxWindowBase::SetCursor(cursor) )
+    {
+        // no change
+        return FALSE;
+    }
+
+    if ( m_cursor.Ok() )
+        MGL_wmSetWindowCursor(m_wnd, *m_cursor.GetMGLCursor());
+
+    return TRUE;
+}
+
+void wxWindowMGL::WarpPointer(int x, int y)
+{
+    ClientToScreen(&x, &y);
+    EVT_setMousePos(x, y);
+}
+
+#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
+
+#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;
+}
+#endif // WXWIN_COMPATIBILITY
+
+// Set this window to be the child of 'parent'.
+bool wxWindowMGL::Reparent(wxWindowBase *parent)
+{
+    if ( !wxWindowBase::Reparent(parent) )
+        return FALSE;
+
+    MGL_wmReparentWindow(m_wnd, parent->GetHandle());
+
+    return TRUE;
+}
+
+
+// ---------------------------------------------------------------------------
+// drag and drop
+// ---------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+void wxWindowMGL::SetDropTarget(wxDropTarget *pDropTarget)
+{
+    if ( m_dropTarget != 0 ) {
+        m_dropTarget->Revoke(m_hWnd);
+        delete m_dropTarget;
+    }
+
+    m_dropTarget = pDropTarget;
+    if ( m_dropTarget != 0 )
+        m_dropTarget->Register(m_hWnd);
+}
+// FIXME_MGL
+#endif // wxUSE_DRAG_AND_DROP
+
+// old style file-manager drag&drop support: we retain the old-style
+// DragAcceptFiles in parallel with SetDropTarget.
+void wxWindowMGL::DragAcceptFiles(bool accept)
+{
+#if 0 // FIXME_MGL
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::DragAcceptFiles(hWnd, (BOOL)accept);
+#endif
+}
+
+// ---------------------------------------------------------------------------
+// moving and resizing
+// ---------------------------------------------------------------------------
+
+// Get total size
+void wxWindowMGL::DoGetSize(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;
+}
+
+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;
+    if (x)
+        *x = ax;
+    if (y)
+        *y = 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);
+    if (x)
+        *x = ax;
+    if (y)
+        *y = ay;
+}
+
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindowMGL::DoGetClientSize(int *x, int *y) const
+{
+    DoGetSize(x, y);
+}
+
+void wxWindowMGL::DoMoveWindow(int x, int y, int width, int height)
+{
+    MGL_wmSetWindowPosition(GetHandle(), x, y, width, height);
+}
+
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
+    {
+        return;
+    }
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+#if 0 // FIXME_MGL -- what's this good for?
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+#endif
+
+    wxSize size(-1, -1);
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }
+    }
+
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above
+
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }
+    }
+
+    DoMoveWindow(x, y, width, height);
+
+    wxSizeEvent event(wxSize(width, height), GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+void wxWindowMGL::DoSetClientSize(int width, int height)
+{
+    SetSize(width, height);
+}
+
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------
+
+int wxWindowMGL::GetCharHeight() const
+{
+    wxScreenDC dc;
+    dc.SetFont(m_font);
+    return dc.GetCharHeight();
+}
+
+int wxWindowMGL::GetCharWidth() const
+{
+    wxScreenDC dc;
+    dc.SetFont(m_font);
+    return dc.GetCharWidth();
+}
+
+void wxWindowMGL::GetTextExtent(const wxString& string,
+                             int *x, int *y,
+                             int *descent, int *externalLeading,
+                             const wxFont *theFont) const
+{
+    wxScreenDC dc;
+    if (!theFont)
+        theFont = &m_font;
+    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
+
+
+// ---------------------------------------------------------------------------
+// activation/focus
+// ---------------------------------------------------------------------------
+
+void wxWindowMGL::OnSetFocus(wxFocusEvent& event)
+{
+    // panel wants to track the window which was the last to have focus in it,
+    // so we want to set ourselves as the window which last had focus
+    //
+    // notice that it's also important to do it upwards the tree becaus
+    // otherwise when the top level panel gets focus, it won't set it back to
+    // us, but to some other sibling
+    wxWindow *win = (wxWindow *)this;
+    while ( win )
+    {
+        wxWindow *parent = win->GetParent();
+        wxPanel *panel = wxDynamicCast(parent, wxPanel);
+        if ( panel )
+        {
+            panel->SetLastFocus(win);
+        }
+
+        win = parent;
+    }
+
+    event.Skip();
+}
+
+
+// ---------------------------------------------------------------------------
+// painting
+// ---------------------------------------------------------------------------
+
+void wxWindowMGL::Clear()
+{
+    wxClientDC dc((wxWindow *)this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();
+}
+
+void wxWindowMGL::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
+{
+    if ( rect )
+    {
+        rect_t r;
+        r.left = rect->GetLeft(), r.right = rect->GetRight();
+        r.top = rect->GetTop(), r.bottom = rect->GetBottom();
+        MGL_wmInvalidateWindowRect(GetHandle(), &r);
+    }
+    else
+        MGL_wmInvalidateWindow(GetHandle());
+}
+
+void wxWindowMGL::Update()
+{
+    Refresh();
+    if ( !m_frozen )
+        MGL_wmUpdateDC(g_winMng);
+}
+
+void wxWindowMGL::Freeze()
+{
+    m_frozen = TRUE;
+    m_refreshAfterThaw = FALSE;
+}
+
+void wxWindowMGL::Thaw()
+{
+    m_frozen = FALSE;
+    if ( m_refreshAfterThaw )
+        Refresh();
+}
+
+static void wxWindowPainter(window_t *wnd, MGLDC *dc)
+{
+    wxWindow *w = (wxWindow*) wnd->userData;
+    if (w)
+    {
+        MGLDevCtx ctx(dc);
+        w->HandlePaint(&ctx);
+    }
+}
+
+void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
+{
+    if ( m_frozen )
+    {
+        // Don't paint anything if the window is frozen. 
+        return;
+    }
+
+    region_t *clip = NULL;
+    MGL_getClipRegionDC(*dc, clip);
+    m_updateRegion = wxRegion(MGLRegion(clip));
+    m_paintMGLDC = dc;
+
+    wxEraseEvent eventEr(m_windowId, NULL);
+    eventEr.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(eventEr);
+
+    wxNcPaintEvent eventNc(GetId());
+    eventNc.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(eventNc);
+    
+    wxPaintEvent eventPt(GetId());
+    eventPt.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(eventPt);
+}
+
+void wxWindowMGL::OnEraseBackground(wxEraseEvent& event)
+{
+    Clear();
+}
+
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    return wxFindWindowAtPoint(pt = wxGetMousePosition());
+}
+
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    window_t *wnd = MGL_wmGetWindowAtPosition(g_winMng, pt.x, pt.y);
+    return (wxWindow*)wnd->userData;
 }