]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/window.cpp
Last correction for makefile.g95: win32 mkdir does not like forward slashes as directory
[wxWidgets.git] / src / os2 / window.cpp
index 6970db0614bbfba50fd3f20362a12d788452c6aa..846ed5696f5a2c0a5ae410293f3b9b9bfeba781c 100644 (file)
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
 // Purpose:     wxWindow
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/12/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "window.h"
+//
+// For compilers that support precompilation, includes "wx.h".
+//
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #define INCL_DOS
+    #define INCL_PM
+    #include <os2.h>
+    #include "wx/window.h"
+    #include "wx/accel.h"
+    #include "wx/setup.h"
+    #include "wx/menu.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/panel.h"
+    #include "wx/layout.h"
+    #include "wx/dialog.h"
+    #include "wx/frame.h"
+    #include "wx/listbox.h"
+    #include "wx/button.h"
+    #include "wx/msgdlg.h"
+    #include "wx/scrolwin.h"
+
+    #include <stdio.h>
 #endif
 
-#include "wx/setup.h"
-#include "wx/menu.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/panel.h"
-#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
-#include "wx/frame.h"
+#if     wxUSE_OWNER_DRAWN
+    #include "wx/ownerdrw.h"
+#endif
+
+#if     wxUSE_DRAG_AND_DROP
+    #include "wx/dnd.h"
+#endif
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
-#if  wxUSE_DRAG_AND_DROP
-#include "wx/dnd.h"
+#include "wx/os2/private.h"
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
 #endif
 
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET
+
+#include "wx/intl.h"
+#include "wx/log.h"
+
+
+#include "wx/textctrl.h"
+
 #include <string.h>
 
-extern wxList wxPendingDelete;
+//
+// Place compiler, OS specific includes here
+//
+
+//
+// Standard macros -- these are for OS/2 PM, but most GUI's have something similar
+//
+#ifndef GET_X_LPARAM
+//
+//  SHORT1FROMMP -- LOWORD
+//
+    #define GET_X_LPARAM(mp) ((unsigned short)(unsigned long)(mp))
+//
+//  SHORT2FROMMP -- HIWORD
+//
+    #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16))
+#endif // GET_X_LPARAM
+
+#ifndef CW_USEDEFAULT
+#  define CW_USEDEFAULT    ((int)0x80000000)
+#endif
+
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+//
+// The last PM message we got (MT-UNSAFE)
+//
+QMSG                      s_currentMsg;
 
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_CHAR(wxWindow::OnChar)
-  EVT_KEY_DOWN(wxWindow::OnKeyDown)
-  EVT_KEY_UP(wxWindow::OnKeyUp)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-END_EVENT_TABLE()
+#if wxUSE_MENUS_NATIVE
+wxMenu*                   wxCurrentPopupMenu = NULL;
+#endif // wxUSE_MENUS_NATIVE
 
+#if !defined(__VISAGECPP__) || (__IBMCPP__ < 400)
+extern wxChar             wxCanvasClassName[];
 #endif
+wxList*                   wxWinHandleList = NULL;
+
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+
+//
+// the window proc for all our windows; most gui's have something similar
+//
+MRESULT EXPENTRY wxWndProc( HWND hWnd
+                           ,ULONG message
+                           ,MPARAM mp1
+                           ,MPARAM mp2
+                          );
+
+#ifdef  __WXDEBUG__
+    const char *wxGetMessageName(int message);
+#endif  //__WXDEBUG__
+
+void      wxRemoveHandleAssociation(wxWindowOS2* pWin);
+void      wxAssociateWinWithHandle( HWND         hWnd
+                                   ,wxWindowOS2* pWin
+                                  );
+wxWindow* wxFindWinFromHandle(WXHWND hWnd);
+
+//
+// This magical function is used to translate VK_APPS key presses to right
+// mouse clicks
+//
+// Unused?
+#if 0
+static void TranslateKbdEventToMouse( wxWindow* pWin
+                                     ,int*      pX
+                                     ,int*      pY
+                                     ,MPARAM*   pFlags
+                                    );
+#endif
+//
+// get the current state of SHIFT/CTRL keys
+//
+static inline bool IsShiftDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x8000) != 0; }
+static inline bool IsCtrlDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000) != 0; }
+// ---------------------------------------------------------------------------
+// event tables
+// ---------------------------------------------------------------------------
+
+// in wxUniv-OS/2 this class is abstract because it doesn't have DoPopupMenu()
+// method
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowOS2, wxWindowBase)
+#else // __WXPM__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXPM__
+
+BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
+    EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
+    EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindowOS2::OnInitDialog)
+    EVT_IDLE(wxWindowOS2::OnIdle)
+    EVT_SET_FOCUS(wxWindowOS2::OnSetFocus)
+END_EVENT_TABLE()
 
+// ===========================================================================
+// implementation
+// ===========================================================================
 
-// Constructor
-wxWindow::wxWindow()
+// ---------------------------------------------------------------------------
+// wxWindow utility functions
+// ---------------------------------------------------------------------------
+
+//
+// Find an item given the PM Window id
+//
+wxWindow* wxWindowOS2::FindItem(
+  long                              lId
+) const
 {
-    // Generic
-    m_isWindow = TRUE; // An optimization
-    m_windowId = 0;
-    m_windowStyle = 0;
-    m_windowParent = NULL;
-    m_windowEventHandler = this;
-    m_windowName = "";
-    m_windowCursor = *wxSTANDARD_CURSOR;
-    m_children = new wxList;
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-    m_windowSizer = NULL;
-    m_sizerParent = NULL;
-    m_autoLayout = FALSE;
-    m_windowValidator = NULL;
-    m_defaultItem = NULL;
-    m_returnCode = 0;
-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
-    m_caretShown = FALSE;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    m_foregroundColour = *wxBLACK;
-
-#if  wxUSE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
+#if wxUSE_CONTROLS
+    wxControl*                      pItem = wxDynamicCast(this, wxControl);
+
+    if (pItem)
+    {
+        //
+        // I it we or one of our "internal" children?
+        //
+        if (pItem->GetId() == lId
+#ifndef __WXUNIVERSAL__
+            || (pItem->GetSubcontrols().Index(lId) != wxNOT_FOUND)
 #endif
+            )
+        {
+            return pItem;
+        }
+    }
+#endif // wxUSE_CONTROLS
+
+    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+
+    while (pCurrent)
+    {
+        wxWindow*                   pChildWin = pCurrent->GetData();
+        wxWindow*                   pWnd = pChildWin->FindItem(lId);
+
+        if (pWnd)
+            return pWnd;
+
+        pCurrent = pCurrent->GetNext();
+    }
+    return(NULL);
+} // end of wxWindowOS2::FindItem
+
+//
+// Find an item given the PM Window handle
+//
+wxWindow* wxWindowOS2::FindItemByHWND(
+  WXHWND                            hWnd
+, bool                              bControlOnly
+) const
+{
+    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+
+    while (pCurrent)
+    {
+        wxWindow*                   pParent = pCurrent->GetData();
+
+        //
+        // Do a recursive search.
+        //
+        wxWindow*                   pWnd = pParent->FindItemByHWND(hWnd);
+
+        if (pWnd)
+            return(pWnd);
+
+        if (!bControlOnly
+#if wxUSE_CONTROLS
+            || pParent->IsKindOf(CLASSINFO(wxControl))
+#endif // wxUSE_CONTROLS
+            )
+        {
+            wxWindow*               pItem = pCurrent->GetData();
+
+            if (pItem->GetHWND() == hWnd)
+                return(pItem);
+            else
+            {
+                if (pItem->ContainsHWND(hWnd))
+                    return(pItem);
+            }
+        }
+        pCurrent = pCurrent->GetNext();
+    }
+    return(NULL);
+} // end of wxWindowOS2::FindItemByHWND
+
+//
+// Default command handler
+//
+bool wxWindowOS2::OS2Command(
+  WXUINT                            WXUNUSED(uParam)
+, WXWORD                            WXUNUSED(uId)
+)
+{
+    return(FALSE);
 }
 
+// ----------------------------------------------------------------------------
+// constructors and such
+// ----------------------------------------------------------------------------
+
+void wxWindowOS2::Init()
+{
+    //
+    // Generic
+    //
+    InitBase();
+
+    //
+    // PM specific
+    //
+    m_bDoubleClickAllowed = 0;
+    m_bWinCaptured = FALSE;
+
+    m_isBeingDeleted = FALSE;
+    m_fnOldWndProc = 0;
+    m_bUseCtl3D = FALSE;
+    m_bMouseInWindow = FALSE;
+
+    //
+    // wxWnd
+    //
+    m_hMenu             = 0L;
+    m_hWnd              = 0L;
+    m_hWndScrollBarHorz = 0L;
+    m_hWndScrollBarVert = 0L;
+
+    //
+    // Pass WM_GETDLGCODE to DefWindowProc()
+    m_lDlgCode = 0;
+
+    m_nXThumbSize = 0;
+    m_nYThumbSize = 0;
+    m_bBackgroundTransparent = FALSE;
+
+    //
+    // As all windows are created with WS_VISIBLE style...
+    //
+    m_isShown = TRUE;
+
+#if wxUSE_MOUSEEVENT_HACK
+    m_lLastMouseX =
+    m_lLastMouseY = -1;
+    m_nLastMouseEvent = -1;
+#endif // wxUSE_MOUSEEVENT_HACK
+} // wxWindowOS2::Init
+
+//
 // Destructor
-wxWindow::~wxWindow()
+//
+wxWindowOS2::~wxWindowOS2()
 {
-       // Have to delete constraints/sizer FIRST otherwise
-       // sizers may try to look at deleted windows as they
-       // delete themselves.
-#if wxUSE_CONSTRAINTS
-    DeleteRelatedConstraints();
-    if (m_constraints)
+    m_isBeingDeleted = TRUE;
+
+    OS2DetachWindowMenu();
+    for (wxWindow* pWin = GetParent(); pWin; pWin = pWin->GetParent())
+    {
+        wxFrame*                    pFrame = wxDynamicCast(pWin, wxFrame);
+
+        if (pFrame)
+        {
+            if (pFrame->GetLastFocus() == this)
+                pFrame->SetLastFocus((wxWindow*)NULL);
+        }
+    }
+
+    DestroyChildren();
+
+    if (m_parent)
+        m_parent->RemoveChild(this);
+
+    if (m_hWnd)
     {
-        // This removes any dangling pointers to this window
-        // in other windows' constraintsInvolvedIn lists.
-        UnsetConstraints(m_constraints);
-        delete m_constraints;
-        m_constraints = NULL;
+        if(!::WinDestroyWindow(GetHWND()))
+            wxLogLastError(wxT("DestroyWindow"));
+        //
+        // remove hWnd <-> wxWindow association
+        //
+        wxRemoveHandleAssociation(this);
     }
-    if (m_windowSizer)
+} // end of wxWindowOS2::~wxWindowOS2
+
+// real construction (Init() must have been called before!)
+bool wxWindowOS2::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lStyle
+, const wxString&                   rName
+)
+{
+    HWND                            hParent = NULLHANDLE;
+    wxPoint                         vPos = rPos; // The OS/2 position
+    ULONG                           ulCreateFlags = 0;
+    WXDWORD                         dwExStyle = 0;
+
+    wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent"));
+
+    if ( !CreateBase( pParent
+                     ,vId
+                     ,rPos
+                     ,rSize
+                     ,lStyle
+                     ,wxDefaultValidator
+                     ,rName
+                    ))
+        return(FALSE);
+
+    if (pParent)
     {
-        delete m_windowSizer;
-        m_windowSizer = NULL;
+        int                         nTempy;
+
+        pParent->AddChild(this);
+        hParent = GetWinHwnd(pParent);
+
+        if ( pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)) ||
+             pParent->IsKindOf(CLASSINFO(wxScrolledWindow))
+           )
+            ulCreateFlags |= WS_CLIPSIBLINGS;
     }
-    // If this is a child of a sizer, remove self from parent
-    if (m_sizerParent)
-        m_sizerParent->RemoveChild((wxWindow *)this);
+
+    //
+    // Most wxSTYLES are really PM Class specific styles and will be
+    // set in those class create procs.  PM's basic windows styles are
+    // very limited.
+    //
+    ulCreateFlags |=  WS_VISIBLE;
+
+
+#ifdef __WXUNIVERSAL__
+    // no 3d effects, we draw them ourselves
+    WXDWORD exStyle = 0;
+#else // !wxUniversal
+    if (lStyle & wxCLIP_SIBLINGS)
+        ulCreateFlags |= WS_CLIPSIBLINGS;
+
+    if (lStyle & wxCLIP_CHILDREN )
+        ulCreateFlags |= WS_CLIPCHILDREN;
+
+    //
+    //
+    //
+    bool                            bWant3D;
+    dwExStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D);
+
 #endif
 
-    if (m_windowParent)
-        m_windowParent->RemoveChild(this);
+    //
+    // Add the simple border style as we'll use this to draw borders
+    //
+    if (lStyle & wxSIMPLE_BORDER)
+        dwExStyle |= wxSIMPLE_BORDER;
 
-    DestroyChildren();
+    if (lStyle & wxPOPUP_WINDOW)
+    {
+        // a popup window floats on top of everything
+//TODO: fix this...
+//        exStyle |= WS_EX_TOPMOST | WS_EX_TOOLWINDOW;
 
-    // TODO: destroy the window
+        // it is also created hidden as other top level windows
+        ulCreateFlags &= ~WS_VISIBLE;
+        m_isShown = FALSE;
+    }
 
-    delete m_children;
-    m_children = NULL;
+    //
+    // Generic OS/2 Windows are created with no owner, no Z Order, no Control data,
+    // and no presentation parameters
+    //
+    OS2Create( hParent
+              ,(PSZ)wxCanvasClassName
+              ,rName.c_str()
+              ,ulCreateFlags
+              ,vPos.x
+              ,vPos.y
+              ,WidthDefault(rSize.x)
+              ,HeightDefault(rSize.y)
+              ,NULLHANDLE
+              ,NULLHANDLE
+              ,m_windowId
+              ,NULL
+              ,NULL
+              ,dwExStyle
+             );
+
+    return(TRUE);
+} // end of wxWindowOS2::Create
+
+// ---------------------------------------------------------------------------
+// basic operations
+// ---------------------------------------------------------------------------
+
+void wxWindowOS2::SetFocus()
+{
+    HWND                            hWnd = GetHwnd();
+    wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );
 
-    // Just in case the window has been Closed, but
-    // we're then deleting immediately: don't leave
-    // dangling pointers.
-    wxPendingDelete.DeleteObject(this);
+    if (hWnd)
+        ::WinSetFocus(HWND_DESKTOP, hWnd);
+} // end of wxWindowOS2::SetFocus
 
-    if ( m_windowValidator )
-           delete m_windowValidator;
-}
+wxWindow* wxWindowBase::FindFocus()
+{
+    HWND                            hWnd = ::WinQueryFocus(HWND_DESKTOP);
+
+    if (hWnd)
+    {
+        return wxFindWinFromHandle((WXHWND)hWnd);
+    }
+    return NULL;
+} // wxWindowBase::FindFocus
 
-// Destroy the window (delayed, if a managed window)
-bool wxWindow::Destroy()
+bool wxWindowOS2::Enable(
+  bool                              bEnable
+)
 {
-    delete this;
+    if (!wxWindowBase::Enable(bEnable))
+        return(FALSE);
+
+    HWND                            hWnd = GetHwnd();
+
+    if ( hWnd )
+        ::WinEnableWindow(hWnd, (BOOL)bEnable);
+
+    wxWindowList::Node*             pNode = GetChildren().GetFirst();
+
+    while (pNode)
+    {
+        wxWindow*                   pChild = pNode->GetData();
+
+        pChild->Enable(bEnable);
+        pNode = pNode->GetNext();
+    }
     return TRUE;
-}
+} // end of wxWindowOS2::Enable
 
-// Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+bool wxWindowOS2::Show(
+  bool                              bShow
+)
 {
-    // Generic
-    m_isWindow = TRUE; // An optimization
-    m_windowId = 0;
-    m_windowStyle = 0;
-    m_windowParent = NULL;
-    m_windowEventHandler = this;
-    m_windowName = "";
-    m_windowCursor = *wxSTANDARD_CURSOR;
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-    m_windowSizer = NULL;
-    m_sizerParent = NULL;
-    m_autoLayout = FALSE;
-    m_windowValidator = NULL;
+    if (!wxWindowBase::Show(bShow))
+        return(FALSE);
 
-#if wxUSE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
-#endif
+    HWND                            hWnd = GetHwnd();
 
-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
-    m_caretShown = FALSE;
-    m_minSizeX = -1;
-    m_minSizeY = -1;
-    m_maxSizeX = -1;
-    m_maxSizeY = -1;
-    m_defaultItem = NULL;
-    m_windowParent = NULL;
-    if (!parent)
-        return FALSE;
+    ::WinShowWindow(hWnd, bShow);
 
-    if (parent) parent->AddChild(this);
+    if (bShow)
+    {
+        ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER);
+    }
+    return TRUE;
+} // end of wxWindowOS2::Show
 
-    m_returnCode = 0;
+void wxWindowOS2::Raise()
+{
+    ::WinSetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE);
+} // end of wxWindowOS2::Raise
 
-    SetName(name);
+void wxWindowOS2::Lower()
+{
+    ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE);
+} // end of wxWindowOS2::Lower
 
-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+void wxWindowOS2::SetTitle(
+  const wxString&                   rTitle
+)
+{
+    ::WinSetWindowText(GetHwnd(), rTitle.c_str());
+} // end of wxWindowOS2::SetTitle
 
-    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-    m_foregroundColour = *wxBLACK;
+wxString wxWindowOS2::GetTitle() const
+{
+    return wxGetWindowText(GetHWND());
+} // end of wxWindowOS2::GetTitle
 
-    m_windowStyle = style;
+void wxWindowOS2::CaptureMouse()
+{
+    HWND                            hWnd = GetHwnd();
 
-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+    if (hWnd && !m_bWinCaptured)
+    {
+        ::WinSetCapture(HWND_DESKTOP, hWnd);
+        m_bWinCaptured = TRUE;
+    }
+} // end of wxWindowOS2::GetTitle
 
-    // TODO: create the window
+void wxWindowOS2::ReleaseMouse()
+{
+    if (m_bWinCaptured)
+    {
+        ::WinSetCapture(HWND_DESKTOP, NULLHANDLE);
+        m_bWinCaptured = FALSE;
+    }
+} // end of wxWindowOS2::ReleaseMouse
 
-    return TRUE;
-}
+/* static */ wxWindow* wxWindowBase::GetCapture()
+{
+    HWND hwnd = ::WinQueryCapture(HWND_DESKTOP);
+    return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : (wxWindow *)NULL;
+} // end of wxWindowBase::GetCapture
 
-void wxWindow::SetFocus()
+bool wxWindowOS2::SetFont(
+  const wxFont&                     rFont
+)
 {
-    // TODO
+    if (!wxWindowBase::SetFont(rFont))
+    {
+        // nothing to do
+        return(FALSE);
+    }
+
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd != 0)
+    {
+        char                        zFont[128];
+        char                        zFacename[30];
+        char                        zWeight[30];
+        char                        zStyle[30];
+
+        //
+        // The fonts available for Presentation Params are just three
+        // outline fonts, the rest are available to the GPI, so we must
+        // map the families to one of these three
+        //
+        switch(rFont.GetFamily())
+        {
+            case wxSCRIPT:
+            case wxDECORATIVE:
+            case wxROMAN:
+                strcpy(zFacename,"Times New Roman");
+                break;
+
+            case wxTELETYPE:
+            case wxMODERN:
+                strcpy(zFacename, "Courier");
+                break;
+
+            case wxSWISS:
+            case wxDEFAULT:
+            default:
+                strcpy(zFacename, "Helvetica");
+                break;
+        }
+
+        switch(rFont.GetWeight())
+        {
+            default:
+            case wxNORMAL:
+            case wxLIGHT:
+                zWeight[0] = '\0';
+                break;
+
+            case wxBOLD:
+            case wxFONTWEIGHT_MAX:
+                strcpy(zWeight, "Bold");
+                break;
+        }
+        switch(rFont.GetStyle())
+        {
+            case wxITALIC:
+            case wxSLANT:
+                strcpy(zStyle, "Italic");
+                break;
+
+            default:
+                zStyle[0] = '\0';
+                break;
+        }
+        sprintf(zFont, "%d.%s", rFont.GetPointSize(), zFacename);
+        if (zWeight[0] != '\0')
+        {
+            strcat(zFont, " ");
+            strcat(zFont, zWeight);
+        }
+        if (zStyle[0] != '\0')
+        {
+            strcat(zFont, " ");
+            strcat(zFont, zStyle);
+        }
+        ::WinSetPresParam(hWnd, PP_FONTNAMESIZE, strlen(zFont) + 1, (PVOID)zFont);
+    }
+    return(TRUE);
 }
 
-void wxWindow::Enable(bool enable)
+bool wxWindowOS2::SetCursor(
+  const wxCursor&                   rCursor
+) // check if base implementation is OK
 {
-    // TODO
-}
+    if ( !wxWindowBase::SetCursor(rCursor))
+    {
+        // no change
+        return FALSE;
+    }
+
+    if ( m_cursor.Ok() ) {
+        HWND                            hWnd = GetHwnd();
+        POINTL                          vPoint;
+        RECTL                           vRect;
+
+        ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+        ::WinQueryWindowRect(hWnd, &vRect);
+
+        if (::WinPtInRect(vHabmain, &vRect, &vPoint) && !wxIsBusy())
+        {
+            ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR());
+        }
+    }
+    return TRUE;
+} // end of wxWindowOS2::SetCursor
 
-void wxWindow::CaptureMouse()
+void wxWindowOS2::WarpPointer(
+  int                               nXPos
+, int                               nYPos
+)
 {
-    // TODO
-}
+    int                             nX = nXPos;
+    int                             nY = nYPos;
+    RECTL                           vRect;
+
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    nX += vRect.xLeft;
+    nY += vRect.yBottom;
 
-void wxWindow::ReleaseMouse()
+    ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
+} // end of wxWindowOS2::WarpPointer
+
+#if WXWIN_COMPATIBILITY
+void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const
 {
-    // TODO
 }
+#endif // WXWIN_COMPATIBILITY
 
-// Push/pop event handler (i.e. allow a chain of event handlers
-// be searched)
-void wxWindow::PushEventHandler(wxEvtHandler *handler)
+// ---------------------------------------------------------------------------
+// scrolling stuff
+// ---------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY
+void wxWindowOS2::SetScrollRange(
+  int                               nOrient
+, int                               nRange
+, bool                              bRefresh
+)
 {
-       handler->SetNextHandler(GetEventHandler());
-       SetEventHandler(handler);
-}
+    int                             nRange1 = nRange;
+    int                             nPageSize = GetScrollPage(nOrient);
 
-wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
-{
-       if ( GetEventHandler() )
-       {
-               wxEvtHandler *handlerA = GetEventHandler();
-               wxEvtHandler *handlerB = handlerA->GetNextHandler();
-               handlerA->SetNextHandler(NULL);
-               SetEventHandler(handlerB);
-               if ( deleteHandler )
-               {
-                       delete handlerA;
-                       return NULL;
-               }
-               else
-                       return handlerA;
-       }
-       else
-               return NULL;
-}
+    if (nPpageSize > 1 && nRange > 0)
+    {
+        nRange1 += (nPageSize - 1);
+    }
 
-#if    wxUSE_DRAG_AND_DROP
+    if (nOrient == wxHORIZONTAL)
+    {
+        ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
+        ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
+    }
+    else
+    {
+        ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
+        ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
+    }
+} // end of wxWindowOS2::SetScrollRange
 
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowOS2::SetScrollPage(
+  int                               nOrient
+, int                               nPage
+, bool                              bRefresh
+)
 {
-  if ( m_pDropTarget != 0 ) {
-    delete m_pDropTarget;
-  }
+    if (nOrient == wxHORIZONTAL )
+        m_nXThumbSize = nPage;
+    else
+        m_nYThumbSize = nPage;
+} // end of wxWindowOS2::SetScrollPage
 
-  m_pDropTarget = pDropTarget;
-  if ( m_pDropTarget != 0 )
-  {
-    // TODO
-  }
-}
+int wxWindowOS2::OldGetScrollRange(
+  int                               nOrient
+) const
+{
+    MRESULT                         mRc;
+    HWND                            hWnd = GetHwnd();
 
-#endif
+    if (hWnd)
+    {
+        mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L);
+        return(SHORT2FROMMR(mRc));
+     }
+     return 0;
+} // end of wxWindowOS2::OldGetScrollRange
+
+int  wxWindowOS2::GetScrollPage(
+  int                               nOrient
+) const
+{
+    if (nOrient == wxHORIZONTAL)
+        return m_nXThumbSize;
+    else
+        return m_nYThumbSize;
+} // end of wxWindowOS2::GetScrollPage
+#endif // WXWIN_COMPATIBILITY
 
-// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+int  wxWindowOS2::GetScrollPos(
+  int                               nOrient
+) const
 {
-    // TODO
-}
+    if (nOrient == wxHORIZONTAL)
+        return((int)::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL));
+    else
+        return((int)::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL));
+} // end of wxWindowOS2::GetScrollPos
 
-// Get total size
-void wxWindow::GetSize(int *x, int *y) const
+int wxWindowOS2::GetScrollRange(
+  int                               nOrient
+) const
 {
-    // TODO
-}
+    MRESULT                         mr;
 
-void wxWindow::GetPosition(int *x, int *y) const
+    if (nOrient == wxHORIZONTAL)
+        mr = ::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL);
+    else
+        mr = ::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL);
+    return((int)SHORT2FROMMR(mr));
+} // end of wxWindowOS2::GetScrollRange
+
+int wxWindowOS2::GetScrollThumb(
+  int                               nOrient
+) const
 {
-    // TODO
-}
+    if (nOrient == wxHORIZONTAL )
+        return m_nXThumbSize;
+    else
+        return m_nYThumbSize;
+} // end of wxWindowOS2::GetScrollThumb
+
+void wxWindowOS2::SetScrollPos(
+  int                               nOrient
+, int                               nPos
+, bool                              WXUNUSED(bRefresh)
+)
+{
+    if (nOrient == wxHORIZONTAL )
+        ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL);
+    else
+        ::WinSendMsg(m_hWndScrollBarVert, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL);
+} // end of wxWindowOS2::SetScrollPos
+
+void wxWindowOS2::SetScrollbar(
+  int                               nOrient
+, int                               nPos
+, int                               nThumbVisible
+, int                               nRange
+, bool                              WXUNUSED(bRefresh)
+)
+{
+    int                             nOldRange = nRange - nThumbVisible;
+    int                             nRange1 = nOldRange;
+    int                             nPageSize = nThumbVisible;
+    SBCDATA                         vInfo;
+    HWND                            hWnd = GetHwnd();
+    ULONG                           ulStyle = WS_VISIBLE | WS_SYNCPAINT;
+    RECTL                           vRect;
+
+    ::WinQueryWindowRect(hWnd, &vRect);
+    if (nPageSize > 1 && nRange > 0)
+    {
+        nRange1 += (nPageSize - 1);
+    }
+
+    vInfo.cb = sizeof(SBCDATA);
+    vInfo.posFirst = 0;
+    vInfo.posLast = (SHORT)nRange1;
+    vInfo.posThumb = nPos;
+
+    if (nOrient == wxHORIZONTAL )
+    {
+        ulStyle |= SBS_HORZ;
+        if (m_hWndScrollBarHorz == 0L)
+        {
+            //
+            // We create the scrollbars with the desktop so that they are not
+            // registered as child windows of the window in order that child
+            // windows may be scrolled without scrolling the scrollbars themselves!
+            //
+            m_hWndScrollBarHorz = ::WinCreateWindow( hWnd
+                                                    ,WC_SCROLLBAR
+                                                    ,(PSZ)NULL
+                                                    ,ulStyle
+                                                    ,vRect.xLeft
+                                                    ,vRect.yBottom
+                                                    ,vRect.xRight - vRect.xLeft
+                                                    ,20
+                                                    ,hWnd
+                                                    ,HWND_TOP
+                                                    ,FID_HORZSCROLL
+                                                    ,&vInfo
+                                                    ,NULL
+                                                   );
+        }
+        else
+        {
+            RECTL                   vRect2;
+
+            //
+            // Only want to resize the scrollbar if it changes, otherwise
+            // we'd probably end up in a recursive loop until we crash the call stack
+            // because this method is called in a ScrolledWindow OnSize event and SWP_MOVE | SWP_SIZE
+            // generates those events.
+            //
+            ::WinQueryWindowRect(m_hWndScrollBarHorz, &vRect2);
+            if (!(vRect2.xLeft == vRect.xLeft     &&
+                  vRect2.xRight == vRect.xRight   &&
+                  vRect2.yBottom == vRect.yBottom &&
+                  vRect2.yTop == vRect.yTop
+                ) )
+            {
+                ::WinSetWindowPos( m_hWndScrollBarHorz
+                                  ,HWND_TOP
+                                  ,vRect.xLeft
+                                  ,vRect.yBottom
+                                  ,vRect.xRight - vRect.xLeft
+                                  ,20
+                                  ,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
+                                 );
+            }
+            ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)nPos, MPFROM2SHORT(0, (SHORT)nRange1));
+            ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
+        }
+    }
+    else
+    {
+        ulStyle |= SBS_VERT;
+        if (m_hWndScrollBarVert == 0L)
+        {
+            m_hWndScrollBarVert = ::WinCreateWindow( hWnd
+                                                    ,WC_SCROLLBAR
+                                                    ,(PSZ)NULL
+                                                    ,ulStyle
+                                                    ,vRect.xRight - 20
+                                                    ,vRect.yBottom + 20
+                                                    ,20
+                                                    ,vRect.yTop - (vRect.yBottom + 20)
+                                                    ,hWnd
+                                                    ,HWND_TOP
+                                                    ,FID_VERTSCROLL
+                                                    ,&vInfo
+                                                    ,NULL
+                                                   );
+        }
+        else
+        {
+            RECTL                   vRect2;
+
+            //
+            // Only want to resize the scrollbar if it changes, otherwise
+            // we'd probably end up in a recursive loop until we crash the call stack
+            // because this method is called in a ScrolledWindow OnSize event and SWP_MOVE | SWP_SIZE
+            // generates those events.
+            //
+            ::WinQueryWindowRect(m_hWndScrollBarVert, &vRect2);
+            if (!(vRect2.xLeft == vRect.xLeft     &&
+                  vRect2.xRight == vRect.xRight   &&
+                  vRect2.yBottom == vRect.yBottom &&
+                  vRect2.yTop == vRect.yTop
+                ) )
+            {
+                ::WinSetWindowPos( m_hWndScrollBarVert
+                                  ,HWND_TOP
+                                  ,vRect.xRight - 20
+                                  ,vRect.yBottom + 20
+                                  ,20
+                                  ,vRect.yTop - (vRect.yBottom + 20)
+                                  ,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
+                                 );
+            }
+            ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)nPos, MPFROM2SHORT(0, (SHORT)nRange1));
+            ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
+        }
+        m_nYThumbSize = nThumbVisible;
+    }
+} // end of wxWindowOS2::SetScrollbar
 
-void wxWindow::ScreenToClient(int *x, int *y) const
+void wxWindowOS2::ScrollWindow(
+  int                               nDx
+, int                               nDy
+, const wxRect*                     pRect
+)
 {
-    // TODO
-}
+    RECTL                           vRect;
+    RECTL                           vRect2;
+
+    nDy *= -1; // flip the sign of Dy as OS/2 is opposite wxWin.
+    if (pRect)
+    {
+        vRect2.xLeft   = pRect->x;
+        vRect2.yTop    = pRect->y + pRect->height;
+        vRect2.xRight  = pRect->x + pRect->width;
+        vRect2.yBottom = pRect->y;
+    }
+    else
+    {
+        ::WinQueryWindowRect(GetHwnd(), &vRect2);
+        ::WinQueryWindowRect(m_hWndScrollBarHorz, &vRect);
+        vRect2.yBottom += vRect.yTop - vRect.yBottom;
+        ::WinQueryWindowRect(m_hWndScrollBarVert, &vRect);
+        vRect2.xRight -= vRect.xRight - vRect.xLeft;
+
+    }
+    if (pRect)
+        ::WinScrollWindow( GetHwnd()
+                          ,(LONG)nDx
+                          ,(LONG)nDy
+                          ,&vRect2
+                          ,NULL
+                          ,NULLHANDLE
+                          ,NULL
+                          ,SW_INVALIDATERGN
+                         );
+    else
+        ::WinScrollWindow( GetHwnd()
+                          ,nDx
+                          ,nDy
+                          ,NULL
+                          ,NULL
+                          ,NULLHANDLE
+                          ,NULL
+                          ,SW_INVALIDATERGN
+                         );
+
+    //
+    // Move the children
+    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+    SWP                             vSwp;
+
+    while (pCurrent)
+    {
+        wxWindow*                   pChildWin = pCurrent->GetData();
+
+        if (pChildWin->GetHWND() != NULLHANDLE)
+        {
+            ::WinQueryWindowPos(pChildWin->GetHWND(), &vSwp);
+            ::WinQueryWindowRect(pChildWin->GetHWND(), &vRect);
+            if (pChildWin->GetHWND() == m_hWndScrollBarVert ||
+                pChildWin->GetHWND() == m_hWndScrollBarHorz)
+            {
+                ::WinSetWindowPos( pChildWin->GetHWND()
+                                  ,HWND_TOP
+                                  ,vSwp.x + nDx
+                                  ,vSwp.y + nDy
+                                  ,0
+                                  ,0
+                                  ,SWP_MOVE | SWP_SHOW | SWP_ZORDER
+                                 );
+            }
+            else
+            {
+                ::WinSetWindowPos( pChildWin->GetHWND()
+                                  ,HWND_BOTTOM
+                                  ,vSwp.x + nDx
+                                  ,vSwp.y + nDy
+                                  ,0
+                                  ,0
+                                  ,SWP_MOVE | SWP_ZORDER
+                                 );
+                ::WinInvalidateRect(pChildWin->GetHWND(), &vRect, FALSE);
+            }
+        }
+        pCurrent = pCurrent->GetNext();
+    }
+} // end of wxWindowOS2::ScrollWindow
 
-void wxWindow::ClientToScreen(int *x, int *y) const
+// ---------------------------------------------------------------------------
+// subclassing
+// ---------------------------------------------------------------------------
+
+void wxWindowOS2::SubclassWin(
+  WXHWND                            hWnd
+)
 {
-    // TODO
-}
+    HWND                            hwnd = (HWND)hWnd;
+
+    wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") );
+    wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") );
+    m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc);
+} // end of wxWindowOS2::SubclassWin
+
+void wxWindowOS2::UnsubclassWin()
+{
+    //
+    // Restore old Window proc
+    //
+    HWND                            hwnd = GetHWND();
+
+    if (m_hWnd)
+    {
+        wxCHECK_RET( ::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in UnsubclassWin") );
+
+        PFNWP                       fnProc = (PFNWP)::WinQueryWindowPtr(hwnd, QWP_PFNWP);
+
+        if ( (m_fnOldWndProc != 0) && (fnProc != (PFNWP) m_fnOldWndProc))
+        {
+            WinSubclassWindow(hwnd, (PFNWP)m_fnOldWndProc);
+            m_fnOldWndProc = 0;
+        }
+    }
+} // end of wxWindowOS2::UnsubclassWin
+
+//
+// Make a Windows extended style from the given wxWindows window style
+//
+WXDWORD wxWindowOS2::MakeExtendedStyle(
+  long                              lStyle
+, bool                              bEliminateBorders
+)
+{
+   //
+   // Simply fill out with wxWindow extended styles.  We'll conjure
+   // something up in OS2Create and all window redrawing pieces later
+   //
+    WXDWORD                         dwStyle = 0;
+
+    if (lStyle & wxTRANSPARENT_WINDOW )
+        dwStyle |= wxTRANSPARENT_WINDOW;
+
+    if (!bEliminateBorders)
+    {
+        if (lStyle & wxSUNKEN_BORDER)
+            dwStyle |= wxSUNKEN_BORDER;
+        if (lStyle & wxDOUBLE_BORDER)
+            dwStyle |= wxDOUBLE_BORDER;
+        if (lStyle & wxRAISED_BORDER )
+            dwStyle |= wxRAISED_BORDER;
+        if (lStyle & wxSTATIC_BORDER)
+            dwStyle |= wxSTATIC_BORDER;
+    }
+    return dwStyle;
+} // end of wxWindowOS2::MakeExtendedStyle
+
+//
+// Determines whether simulated 3D effects or CTL3D should be used,
+// applying a default border style if required, and returning an extended
+// style to pass to OS2Create.
+//
+WXDWORD wxWindowOS2::Determine3DEffects(
+  WXDWORD                           dwDefaultBorderStyle
+, bool*                             pbWant3D
+) const
+{
+    WXDWORD                         dwStyle = 0L;
+
+    //
+    // Native PM does not have any specialize 3D effects like WIN32 does,
+    // so we have to try and invent them.
+    //
+
+    //
+    // If matches certain criteria, then assume no 3D effects
+    // unless specifically requested (dealt with in MakeExtendedStyle)
+    //
+    if (!GetParent()                    ||
+        !IsKindOf(CLASSINFO(wxControl)) ||
+        (m_windowStyle & wxNO_BORDER)
+       )
+    {
+        *pbWant3D = FALSE;
+        return MakeExtendedStyle(m_windowStyle, FALSE);
+    }
+
+    //
+    // 1) App can specify global 3D effects
+    //
+    *pbWant3D = wxTheApp->GetAuto3D();
+
+    //
+    // 2) If the parent is being drawn with user colours, or simple border
+    //    specified, switch effects off.
+    //
+    if (GetParent() &&
+        (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) ||
+        (m_windowStyle & wxSIMPLE_BORDER)
+       )
+        *pbWant3D = FALSE;
+
+    //
+    // 3) Control can override this global setting by defining
+    //    a border style, e.g. wxSUNKEN_BORDER
+    //
+    if ((m_windowStyle & wxDOUBLE_BORDER) ||
+        (m_windowStyle & wxRAISED_BORDER) ||
+        (m_windowStyle & wxSTATIC_BORDER) ||
+        (m_windowStyle & wxSUNKEN_BORDER)
+       )
+        *pbWant3D = TRUE;
+
+    dwStyle = MakeExtendedStyle( m_windowStyle
+                                ,FALSE
+                               );
+
+    //
+    // If we want 3D, but haven't specified a border here,
+    // apply the default border style specified.
+    //
+    if (dwDefaultBorderStyle && (*pbWant3D) &&
+        !((m_windowStyle & wxDOUBLE_BORDER) ||
+          (m_windowStyle & wxRAISED_BORDER) ||
+          (m_windowStyle & wxSTATIC_BORDER) ||
+          (m_windowStyle & wxSIMPLE_BORDER)
+         )
+        )
+        dwStyle |= dwDefaultBorderStyle;
+    return dwStyle;
+} // end of wxWindowOS2::Determine3DEffects
+
+#if WXWIN_COMPATIBILITY
+void wxWindowOS2::OnCommand(
+  wxWindow&                         rWin
+, wxCommandEvent&                   rEvent
+)
+{
+    if (GetEventHandler()->ProcessEvent(rEvent))
+        return;
+    if (m_parent)
+        m_parent->GetEventHandler()->OnCommand( rWin
+                                               ,rEvent
+                                              );
+} // end of wxWindowOS2::OnCommand
+
+wxObject* wxWindowOS2::GetChild(
+  int                               nNumber
+) const
+{
+    //
+    // Return a pointer to the Nth object in the Panel
+    //
+    wxNode*                         pNode = GetChildren().First();
+    int                             n = nNumber;
+
+    while (pNode && n--)
+        pNode = pNode->Next();
+    if (pNode)
+    {
+        wxObject*                   pObj = (wxObject*)pNode->Data();
+        return(pObj);
+    }
+    else
+        return NULL;
+} // end of wxWindowOS2::GetChild
+
+#endif // WXWIN_COMPATIBILITY
+
+//
+// Setup background and foreground colours correctly
+//
+void wxWindowOS2::SetupColours()
+{
+    if ( GetParent() )
+        SetBackgroundColour(GetParent()->GetBackgroundColour());
+} // end of wxWindowOS2::SetupColours
+
+void wxWindowOS2::OnIdle(
+  wxIdleEvent&                      WXUNUSED(rEvent)
+)
+{
+    //
+    // Check if we need to send a LEAVE event
+    //
+    if (m_bMouseInWindow)
+    {
+        POINTL                      vPoint;
+
+        ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+        if (::WinWindowFromPoint(HWND_DESKTOP, &vPoint, FALSE) != (HWND)GetHwnd())
+        {
+            //
+            // Generate a LEAVE event
+            //
+            m_bMouseInWindow = FALSE;
+
+            //
+            // Unfortunately the mouse button and keyboard state may have changed
+            // by the time the OnIdle function is called, so 'state' may be
+            // meaningless.
+            //
+            int                     nState = 0;
+
+            if (::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) != 0)
+                nState |= VK_SHIFT;
+            if (::WinGetKeyState(HWND_DESKTOP, VK_CTRL) != 0);
+                nState |= VK_CTRL;
+
+            wxMouseEvent            rEvent(wxEVT_LEAVE_WINDOW);
+
+            InitMouseEvent( rEvent
+                           ,vPoint.x
+                           ,vPoint.y
+                           ,nState
+                          );
+            (void)GetEventHandler()->ProcessEvent(rEvent);
+        }
+    }
+    UpdateWindowUI();
+} // end of wxWindowOS2::OnIdle
+
+//
+// Set this window to be the child of 'parent'.
+//
+bool wxWindowOS2::Reparent(
+  wxWindow*                         pParent
+)
+{
+    if (!wxWindowBase::Reparent(pParent))
+        return FALSE;
+
+    HWND                            hWndChild = GetHwnd();
+    HWND                            hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0;
+
+    ::WinSetParent(hWndChild, hWndParent, TRUE);
+    return TRUE;
+} // end of wxWindowOS2::Reparent
+
+void wxWindowOS2::Clear()
+{
+    wxClientDC                      vDc((wxWindow*)this);
+    wxBrush                         vBrush( GetBackgroundColour()
+                                           ,wxSOLID
+                                          );
+
+    vDc.SetBackground(vBrush);
+    vDc.Clear();
+} // end of wxWindowOS2::Clear
+
+void wxWindowOS2::Refresh(
+  bool                              bEraseBack
+, const wxRect*                     pRect
+)
+{
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd)
+    {
+        if (pRect)
+        {
+            RECTL                   vOs2Rect;
+
+            vOs2Rect.xLeft   = pRect->x;
+            vOs2Rect.yTop    = pRect->y;
+            vOs2Rect.xRight  = pRect->x + pRect->width;
+            vOs2Rect.yBottom = pRect->y + pRect->height;
+
+            ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
+        }
+        else
+            ::WinInvalidateRect(hWnd, NULL, bEraseBack);
+    }
+} // end of wxWindowOS2::Refresh
+
+// ---------------------------------------------------------------------------
+// drag and drop
+// ---------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+void wxWindowOS2::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);
+} // end of wxWindowOS2::SetDropTarget
+#endif
+
+//
+// old style file-manager drag&drop support: we retain the old-style
+// DragAcceptFiles in parallel with SetDropTarget.
+//
+void wxWindowOS2::DragAcceptFiles(
+  bool                              bAccept
+)
+{
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd && bAccept)
+        ::DrgAcceptDroppedFiles(hWnd, NULL, NULL, DO_COPY, 0L);
+} // end of wxWindowOS2::DragAcceptFiles
+
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS
+
+void wxWindowOS2::DoSetToolTip(
+  wxToolTip*                        pTooltip
+)
+{
+    wxWindowBase::DoSetToolTip(pTooltip);
+
+    if (m_tooltip)
+        m_tooltip->SetWindow(this);
+} // end of wxWindowOS2::DoSetToolTip
+
+#endif // wxUSE_TOOLTIPS
+
+// ---------------------------------------------------------------------------
+// moving and resizing
+// ---------------------------------------------------------------------------
+
+// Get total size
+void wxWindowOS2::DoGetSize(
+  int*                              pWidth
+, int*                              pHeight
+) const
+{
+    HWND                            hWnd = GetHwnd();
+    RECTL                           vRect;
+
+    ::WinQueryWindowRect(hWnd, &vRect);
+
+    if (pWidth)
+        *pWidth = vRect.xRight - vRect.xLeft;
+    if (pHeight )
+        // OS/2 PM is backwards from windows
+        *pHeight = vRect.yTop - vRect.yBottom;
+} // end of wxWindowOS2::DoGetSize
+
+void wxWindowOS2::DoGetPosition(
+  int*                              pX
+, int*                              pY
+) const
+{
+    HWND                            hWnd = GetHwnd();
+    SWP                             vSwp;
+    POINTL                          vPoint;
+    wxWindow*                       pParent = GetParent();
+
+    //
+    // It would seem that WinQueryWindowRect would be the correlary to
+    // the WIN32 WinGetRect, but unlike WinGetRect which returns the window
+    // origin position in screen coordinates, WinQueryWindowRect returns it
+    // relative to itself, i.e. (0,0).  To get the same under PM we must
+    // us WinQueryWindowPos.  This call, unlike the WIN32 call, however,
+    // returns a position relative to it's parent, so no parent adujstments
+    // are needed under OS/2.  Also, windows should be created using
+    // wxWindow coordinates, i.e 0,0 is the TOP left so vSwp will already
+    // reflect that.
+    //
+    ::WinQueryWindowPos(hWnd, &vSwp);
+
+    vPoint.x = vSwp.x;
+    vPoint.y = vSwp.y;
+
+    //
+    // We may be faking the client origin. So a window that's really at (0,
+    // 30) may appear (to wxWin apps) to be at (0, 0).
+    //
+    if (pParent)
+    {
+        wxPoint                     vPt(pParent->GetClientAreaOrigin());
+
+        vPoint.x -= vPt.x;
+        vPoint.y -= vPt.y;
+    }
+
+    if (pX)
+        *pX = vPoint.x;
+    if  (pY)
+        *pY = vPoint.y;
+} // end of wxWindowOS2::DoGetPosition
+
+void wxWindowOS2::DoScreenToClient(
+  int*                              pX
+, int*                              pY
+) const
+{
+    HWND                            hWnd = GetHwnd();
+    SWP                             vSwp;
+
+    ::WinQueryWindowPos(hWnd, &vSwp);
+
+    if (pX)
+        *pX += vSwp.x;
+    if (pY)
+        *pY += vSwp.y;
+} // end of wxWindowOS2::DoScreenToClient
+
+void wxWindowOS2::DoClientToScreen(
+  int*                              pX
+, int*                              pY
+) const
+{
+    HWND                            hWnd = GetHwnd();
+    SWP                             vSwp;
+
+    ::WinQueryWindowPos(hWnd, &vSwp);
+
+    if (pX)
+        *pX += vSwp.x;
+    if (pY)
+        *pY += vSwp.y;
+} // end of wxWindowOS2::DoClientToScreen
+
+//
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+// Must be a frame type window
+//
+void wxWindowOS2::DoGetClientSize(
+  int*                              pWidth
+, int*                              pHeight
+) const
+{
+    HWND                            hWnd = GetHwnd();
+    HWND                            hWndClient;
+    RECTL                           vRect;
+
+    if (IsKindOf(CLASSINFO(wxFrame)))
+        hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    else
+        hWndClient = NULLHANDLE;
+    if( hWndClient == NULLHANDLE)
+       ::WinQueryWindowRect(GetHwnd(), &vRect);
+    else
+       ::WinQueryWindowRect(hWndClient, &vRect);
+
+    if (pWidth)
+        *pWidth  = vRect.xRight;
+    if (pHeight)
+        *pHeight = vRect.yTop;
+} // end of wxWindowOS2::DoGetClientSize
+
+void wxWindowOS2::DoMoveWindow(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+)
+{
+    RECTL                           vRect;
+    HWND                            hParent;
+    wxWindow*                       pParent = GetParent();
+
+    if (pParent)
+    {
+        hParent = GetWinHwnd(pParent);
+        if (pParent->IsKindOf(CLASSINFO(wxFrame)))
+        {
+            if (IsKindOf(CLASSINFO(wxStatusBar)) ||
+                IsKindOf(CLASSINFO(wxMenuBar)) ||
+                IsKindOf(CLASSINFO(wxToolBar))
+               )
+                nY = pParent->GetSize().y - (nY + nHeight);
+            else
+                nY = pParent->GetClientSize().y - (nY + nHeight);
+        }
+        else
+            nY = pParent->GetSize().y - (nY + nHeight);
+    }
+    else
+    {
+        RECTL                       vRect;
+
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nY = vRect.yTop - (nY + nHeight);
+    }
+    ::WinSetWindowPos( GetHwnd()
+                      ,HWND_TOP
+                      ,(LONG)nX
+                      ,(LONG)nY
+                      ,(LONG)nWidth
+                      ,(LONG)nHeight
+                      ,SWP_ZORDER | SWP_SIZE | SWP_MOVE | SWP_SHOW
+                     );
+} // end of wxWindowOS2::DoMoveWindow
+
+//
+// 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 wxWindowOS2::DoSetSize(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, int                               nSizeFlags
+)
+{
+    //
+    // Get the current size and position...
+    //
+    int                             nCurrentX;
+    int                             nCurrentY;
+    int                             nCurrentWidth;
+    int                             nCurrentHeight;
+    wxSize                          vSize(-1, -1);
+
+    GetPosition(&nCurrentX, &nCurrentY);
+    GetSize(&nCurrentWidth, &nCurrentHeight);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if (nX == nCurrentX && nY == nCurrentY &&
+        nWidth == nCurrentWidth && nHeight == nCurrentHeight)
+    {
+        return;
+    }
+
+    if (nX == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        nX = nCurrentX;
+    if (nY == -1 && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        nY = nCurrentY;
+
+    AdjustForParentClientOrigin(nX, nY, nSizeFlags);
+
+    if (nWidth == -1)
+    {
+        if (nSizeFlags & wxSIZE_AUTO_WIDTH)
+        {
+            vSize  = DoGetBestSize();
+            nWidth = vSize.x;
+        }
+        else
+        {
+            //
+            // Just take the current one
+            //
+            nWidth = nCurrentWidth;
+        }
+    }
+
+    if (nHeight == -1)
+    {
+        if (nSizeFlags & wxSIZE_AUTO_HEIGHT)
+        {
+            if (vSize.x == -1)
+            {
+                vSize = DoGetBestSize();
+            }
+            nHeight = vSize.y;
+        }
+        else
+        {
+            // just take the current one
+            nHeight = nCurrentHeight;
+        }
+    }
+
+    DoMoveWindow( nX
+                 ,nY
+                 ,nWidth
+                 ,nHeight
+                );
+} // end of wxWindowOS2::DoSetSize
+
+void wxWindowOS2::DoSetClientSize(
+  int                               nWidth
+, int                               nHeight
+)
+{
+    wxWindow*                       pParent = GetParent();
+    HWND                            hWnd = GetHwnd();
+    HWND                            hParentWnd = (HWND)0;
+    POINTL                          vPoint;
+    RECTL                           vRect;
+    RECTL                           vRect2;
+    RECTL                           vRect3;
+    HWND                            hClientWnd = (HWND)0;
+
+    hClientWnd = ::WinWindowFromID(hWnd, FID_CLIENT);
+    ::WinQueryWindowRect(hClientWnd, &vRect2);
+    ::WinQueryWindowRect(hWnd, &vRect);
+    ::WinQueryWindowRect(hParentWnd, &vRect3);
+
+    int                             nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
+    int                             nActualHeight = vRect2.yTop - vRect2.yBottom - vRect.yTop + nHeight;
+
+    vPoint.x = vRect2.xLeft;
+    vPoint.y = vRect2.yBottom;
+    if (pParent)
+    {
+        vPoint.x -= vRect3.xLeft;
+        vPoint.y -= vRect3.yBottom;
+    }
+
+    DoMoveWindow(vPoint.x, vPoint.y, nActualWidth, nActualHeight);
+
+    wxSizeEvent                     vEvent(wxSize(nWidth, nHeight), m_windowId);
+    vEvent.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::DoSetClientSize
+
+wxPoint wxWindowOS2::GetClientAreaOrigin() const
+{
+    return wxPoint(0, 0);
+} // end of wxWindowOS2::GetClientAreaOrigin
+
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------
+
+int wxWindowOS2::GetCharHeight() const
+{
+    HPS                             hPs;
+    FONTMETRICS                     vFontMetrics;
+
+    hPs = ::WinGetPS(GetHwnd());
+
+    if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics))
+    {
+        ::WinReleasePS(hPs);
+        return (0);
+    }
+    ::WinReleasePS(hPs);
+    return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender);
+} // end of wxWindowOS2::GetCharHeight
+
+int wxWindowOS2::GetCharWidth() const
+{
+    HPS                             hPs;
+    FONTMETRICS                     vFontMetrics;
+
+    hPs = ::WinGetPS(GetHwnd());
+
+    if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics))
+    {
+        ::WinReleasePS(hPs);
+        return (0);
+    }
+    ::WinReleasePS(hPs);
+    return(vFontMetrics.lAveCharWidth);
+} // end of wxWindowOS2::GetCharWidth
+
+void wxWindowOS2::GetTextExtent(
+  const wxString&                   rString
+, int*                              pX
+, int*                              pY
+, int*                              pDescent
+, int*                              pExternalLeading
+, const wxFont*                     pTheFont
+) const
+{
+    POINTL                          avPoint[TXTBOX_COUNT];
+    POINTL                          vPtMin;
+    POINTL                          vPtMax;
+    int                             i;
+    int                             l;
+    FONTMETRICS                     vFM; // metrics structure
+    BOOL                            bRc;
+    char*                           pStr;
+    ERRORID                         vErrorCode; // last error id code
+    HPS                             hPS;
+
+
+    hPS = ::WinGetPS(GetHwnd());
+
+    l = rString.Length();
+    if (l > 0L)
+    {
+        pStr = (PCH)rString.c_str();
+
+        //
+        // In world coordinates.
+        //
+        bRc = ::GpiQueryTextBox( hPS
+                                ,l
+                                ,pStr
+                                ,TXTBOX_COUNT // return maximum information
+                                ,avPoint      // array of coordinates points
+                               );
+        if (bRc)
+        {
+            vPtMin.x = avPoint[0].x;
+            vPtMax.x = avPoint[0].x;
+            vPtMin.y = avPoint[0].y;
+            vPtMax.y = avPoint[0].y;
+            for (i = 1; i < 4; i++)
+            {
+                if(vPtMin.x > avPoint[i].x) vPtMin.x = avPoint[i].x;
+                if(vPtMin.y > avPoint[i].y) vPtMin.y = avPoint[i].y;
+                if(vPtMax.x < avPoint[i].x) vPtMax.x = avPoint[i].x;
+                if(vPtMax.y < avPoint[i].y) vPtMax.y = avPoint[i].y;
+            }
+            bRc = ::GpiQueryFontMetrics( hPS
+                                        ,sizeof(FONTMETRICS)
+                                        ,&vFM
+                                       );
+            if (!bRc)
+            {
+                vPtMin.x = 0;
+                vPtMin.y = 0;
+                vPtMax.x = 0;
+                vPtMax.y = 0;
+            }
+        }
+        else
+        {
+            vPtMin.x = 0;
+            vPtMin.y = 0;
+            vPtMax.x = 0;
+            vPtMax.y = 0;
+        }
+    }
+    else
+    {
+        vPtMin.x = 0;
+        vPtMin.y = 0;
+        vPtMax.x = 0;
+        vPtMax.y = 0;
+    }
+    if (pX)
+        *pX = (vPtMax.x - vPtMin.x + 1);
+    if (pY)
+        *pY = (vPtMax.y - vPtMin.y + 1);
+    if (pDescent)
+    {
+        if (bRc)
+            *pDescent = vFM.lMaxDescender;
+        else
+            *pDescent = 0;
+    }
+    if (pExternalLeading)
+    {
+        if (bRc)
+            *pExternalLeading = vFM.lExternalLeading;
+        else
+            *pExternalLeading = 0;
+    }
+    ::WinReleasePS(hPS);
+} // end of wxWindow::GetTextExtent
+
+#if wxUSE_CARET && WXWIN_COMPATIBILITY
+// ---------------------------------------------------------------------------
+// Caret manipulation
+// ---------------------------------------------------------------------------
+
+void wxWindowOS2::CreateCaret(
+  int                               nWidth
+, int                               nHeight
+)
+{
+    SetCaret(new wxCaret( this
+                         ,nWidth
+                         ,nHeight
+                        ));
+} // end of wxWindowOS2::CreateCaret
+
+void wxWindowOS2::CreateCaret(
+  const wxBitmap*                   pBitmap
+)
+{
+    wxFAIL_MSG("not implemented");
+} // end of wxWindowOS2::CreateCaret
+
+void wxWindowOS2::ShowCaret(
+  bool                              bShow
+)
+{
+    wxCHECK_RET( m_caret, "no caret to show" );
+
+    m_caret->Show(bShow);
+} // end of wxWindowOS2::ShowCaret
+
+void wxWindowOS2::DestroyCaret()
+{
+    SetCaret(NULL);
+} // end of wxWindowOS2::DestroyCaret
+
+void wxWindowOS2::SetCaretPos(
+  int                               nX
+, int                               nY)
+{
+    wxCHECK_RET( m_caret, "no caret to move" );
+
+    m_caret->Move( nX
+                  ,nY
+                 );
+} // end of wxWindowOS2::SetCaretPos
+
+void wxWindowOS2::GetCaretPos(
+  int*                              pX
+, int*                              pY
+) const
+{
+    wxCHECK_RET( m_caret, "no caret to get position of" );
+
+    m_caret->GetPosition( pX
+                         ,pY
+                        );
+} // end of wxWindowOS2::GetCaretPos
+
+#endif //wxUSE_CARET
+
+// ---------------------------------------------------------------------------
+// popup menu
+// ---------------------------------------------------------------------------
+//
+#if wxUSE_MENUS_NATIVE
+static void wxYieldForCommandsOnly()
+{
+    //
+    // Peek all WM_COMMANDs (it will always return WM_QUIT too but we don't
+    // want to process it here)
+    //
+    QMSG                            vMsg;
+
+    while (::WinPeekMsg(vHabmain, &vMsg, (HWND)0, WM_COMMAND,
+           WM_COMMAND,PM_REMOVE) && vMsg.msg != WM_QUIT)
+    {
+        wxTheApp->DoMessage((WXMSG*)&vMsg);
+    }
+}
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_MENUS_NATIVE
+bool wxWindowOS2::DoPopupMenu(
+  wxMenu*                           pMenu
+, int                               nX
+, int                               nY
+)
+{
+    HWND                            hWnd = GetHwnd();
+    HWND                            hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0;
+    HWND                            hMenu = GetHmenuOf(pMenu);
+
+    pMenu->SetInvokingWindow(this);
+    pMenu->UpdateUI();
+
+    DoClientToScreen( &nX
+                     ,&nY
+                    );
+    wxCurrentPopupMenu = pMenu;
+
+    ::WinPopupMenu( hWndParent
+                   ,hWnd
+                   ,hMenu
+                   ,nX
+                   ,nY
+                   ,0L
+                   ,PU_MOUSEBUTTON2DOWN | PU_MOUSEBUTTON2 | PU_KEYBOARD
+                  );
+    // we need to do it righ now as otherwise the events are never going to be
+    // sent to wxCurrentPopupMenu from ;()
+    //
+    // note that even eliminating (ugly) wxCurrentPopupMenu global wouldn't
+    // help and we'd still need wxYieldForCommandsOnly() as the menu may be
+    // destroyed as soon as we return (it can be a local variable in the caller
+    // for example) and so we do need to process the event immediately
+    wxYieldForCommandsOnly();
+    wxCurrentPopupMenu = NULL;
+
+    pMenu->SetInvokingWindow(NULL);
+    return TRUE;
+} // end of wxWindowOS2::DoPopupMenu
+#endif // wxUSE_MENUS_NATIVE
+
+// ===========================================================================
+// pre/post message processing
+// ===========================================================================
+
+MRESULT wxWindowOS2::OS2DefWindowProc(
+  WXUINT                            uMsg
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    if (m_fnOldWndProc)
+        return (MRESULT)m_fnOldWndProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam);
+    else
+        return ::WinDefWindowProc(GetHWND(), uMsg, (MPARAM)wParam, (MPARAM)lParam);
+} // end of wxWindowOS2::OS2DefWindowProc
+
+bool wxWindowOS2::OS2ProcessMessage(
+  WXMSG*                            pMsg
+)
+{
+// wxUniversal implements tab traversal itself
+#ifndef __WXUNIVERSAL__
+    QMSG*                           pQMsg = (QMSG*)pMsg;
+
+    if (m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL))
+    {
+        //
+        // Intercept dialog navigation keys
+        //
+        bool                        bProcess = TRUE;
+        USHORT                      uKeyFlags = SHORT1FROMMP(pQMsg->mp1);
+
+        if (uKeyFlags & KC_KEYUP)
+            bProcess = FALSE;
+
+        if (uKeyFlags & KC_ALT)
+            bProcess = FALSE;
+
+        if (!(uKeyFlags & KC_VIRTUALKEY))
+            bProcess = FALSE;
+
+        if (bProcess)
+        {
+            bool                    bCtrlDown = IsCtrlDown();
+            bool                    bShiftDown = IsShiftDown();
+
+            //
+            // WM_QUERYDLGCODE: ask the control if it wants the key for itself,
+            // don't process it if it's the case (except for Ctrl-Tab/Enter
+            // combinations which are always processed)
+            //
+            ULONG                   ulDlgCode = 0;
+
+            if (!bCtrlDown)
+            {
+                ulDlgCode = (ULONG)::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0);
+            }
+
+            bool                    bForward = TRUE;
+            bool                    bWindowChange = FALSE;
+
+            switch (SHORT2FROMMP(pQMsg->mp2))
+            {
+                //
+                // Going to make certain assumptions about specific types of controls
+                // here, so we may have to alter some things later if they prove invalid
+                //
+                case VK_TAB:
+                    //
+                    // Shift tabl will always be a nav-key but tabs may be wanted
+                    //
+                    if (!bShiftDown)
+                    {
+                        bProcess = FALSE;
+                    }
+                    else
+                    {
+                        //
+                        // Entry Fields want tabs for themselve usually
+                        //
+                        switch (ulDlgCode)
+                        {
+                            case DLGC_ENTRYFIELD:
+                            case DLGC_MLE:
+                                bProcess = TRUE;
+                                break;
+
+                            default:
+                                bProcess = FALSE;
+                        }
+
+                        //
+                        // Ctrl-Tab cycles thru notebook pages
+                        //
+                        bWindowChange = bCtrlDown;
+                        bForward = !bShiftDown;
+                    }
+                    break;
+
+                case VK_UP:
+                case VK_LEFT:
+                    if (bCtrlDown)
+                        bProcess = FALSE;
+                    else
+                        bForward = FALSE;
+                    break;
+
+                case VK_DOWN:
+                case VK_RIGHT:
+                    if (bCtrlDown)
+                        bProcess = FALSE;
+                    break;
+
+                case VK_ENTER:
+                    {
+                        if (bCtrlDown)
+                        {
+                            //
+                            // ctrl-enter is not processed
+                            //
+                            return FALSE;
+                        }
+                        else if (ulDlgCode & DLGC_BUTTON)
+                        {
+                            //
+                            // buttons want process Enter themselevs
+                            //
+                            bProcess = FALSE;
+                        }
+                        else
+                        {
+                            wxButton*   pBtn = wxDynamicCast( GetDefaultItem()
+                                                             ,wxButton
+                                                            );
+
+                            if (pBtn && pBtn->IsEnabled())
+                            {
+                                //
+                                // If we do have a default button, do press it
+                                //
+                                pBtn->OS2Command(BN_CLICKED, 0 /* unused */);
+                                return TRUE;
+                            }
+                            // else: but if it does not it makes sense to make
+                            //       it work like a TAB - and that's what we do.
+                            //       Note that Ctrl-Enter always works this way.
+                        }
+                    }
+                    break;
+
+                default:
+                    bProcess = FALSE;
+            }
+
+            if (bProcess)
+            {
+                wxNavigationKeyEvent    vEvent;
+
+                vEvent.SetDirection(bForward);
+                vEvent.SetWindowChange(bWindowChange);
+                vEvent.SetEventObject(this);
+
+                if (GetEventHandler()->ProcessEvent(vEvent))
+                {
+                    wxButton*       pBtn = wxDynamicCast(FindFocus(), wxButton);
+
+                    if (pBtn)
+                    {
+                        //
+                        // The button which has focus should be default
+                        //
+                        pBtn->SetDefault();
+                    }
+                    return TRUE;
+                }
+            }
+        }
+        //
+        // Let Dialogs process
+        //
+        if (::WinSendMsg(pQMsg->hwnd, WM_QUERYDLGCODE, pQMsg, 0));
+            return TRUE;
+    }
+#else
+    pMsg = pMsg; // just shut up the compiler
+#endif // __WXUNIVERSAL__
+
+#if wxUSE_TOOLTIPS
+    if ( m_tooltip )
+    {
+        // relay mouse move events to the tooltip control
+        QMSG*                       pQMsg = (QMSG*)pMsg;
+
+        if (pQMsg->msg == WM_MOUSEMOVE )
+            m_tooltip->RelayEvent(pMsg);
+    }
+#endif // wxUSE_TOOLTIPS
+
+    return FALSE;
+} // end of wxWindowOS2::OS2ProcessMessage
+
+bool wxWindowOS2::OS2TranslateMessage(
+  WXMSG*                            pMsg
+)
+{
+#if wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
+  return m_acceleratorTable.Translate(m_hWnd, pMsg);
+#else
+  pMsg = pMsg;
+  return FALSE;
+#endif //wxUSE_ACCEL
+} // end of wxWindowOS2::OS2TranslateMessage
+
+// ---------------------------------------------------------------------------
+// message params unpackers
+// ---------------------------------------------------------------------------
+
+void wxWindowOS2::UnpackCommand(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WORD*                             pId
+, WXHWND*                           phWnd
+, WORD*                             pCmd
+)
+{
+    *pId = LOWORD(wParam);
+    *phWnd = NULL;  // or may be GetHWND() ?
+    *pCmd = LOWORD(lParam);
+} // end of wxWindowOS2::UnpackCommand
+
+void wxWindowOS2::UnpackActivate(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WXWORD*                           pState
+, WXHWND*                           phWnd
+)
+{
+    *pState     = LOWORD(wParam);
+    *phWnd      = (WXHWND)lParam;
+} // end of wxWindowOS2::UnpackActivate
+
+void wxWindowOS2::UnpackScroll(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WXWORD*                           pCode
+, WXWORD*                           pPos
+, WXHWND*                           phWnd
+)
+{
+    ULONG                           ulId;
+    HWND                            hWnd;
+
+    ulId    = (ULONG)LONGFROMMP(wParam);
+    hWnd = ::WinWindowFromID(GetHwnd(), ulId);
+    if (hWnd == m_hWndScrollBarHorz || hWnd == m_hWndScrollBarVert)
+        *phWnd = NULLHANDLE;
+    else
+        *phWnd = hWnd;
+
+    *pPos  = SHORT1FROMMP(lParam);
+    *pCode = SHORT2FROMMP(lParam);
+} // end of wxWindowOS2::UnpackScroll
+
+void wxWindowOS2::UnpackMenuSelect(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WXWORD*                           pItem
+, WXWORD*                           pFlags
+, WXHMENU*                          phMenu
+)
+{
+    *pItem = (WXWORD)LOWORD(wParam);
+    *pFlags = HIWORD(wParam);
+    *phMenu = (WXHMENU)lParam;
+} // end of wxWindowOS2::UnpackMenuSelect
+
+// ---------------------------------------------------------------------------
+// Main wxWindows window proc and the window proc for wxWindow
+// ---------------------------------------------------------------------------
+
+//
+// Hook for new window just as it's being created, when the window isn't yet
+// associated with the handle
+//
+wxWindowOS2*                         wxWndHook = NULL;
+
+//
+// Main window proc
+//
+MRESULT EXPENTRY wxWndProc(
+  HWND                              hWnd
+, ULONG                             ulMsg
+, MPARAM                            wParam
+, MPARAM                            lParam
+)
+{
+    //
+    // Trace all ulMsgs - useful for the debugging
+    //
+#ifdef __WXDEBUG__
+    wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"),
+               wxGetMessageName(ulMsg), wParam, lParam);
+#endif // __WXDEBUG__
+
+    wxWindowOS2*                    pWnd = wxFindWinFromHandle((WXHWND)hWnd);
+
+    //
+    // When we get the first message for the HWND we just created, we associate
+    // it with wxWindow stored in wxWndHook
+    //
+    if (!pWnd && wxWndHook)
+    {
+        wxAssociateWinWithHandle(hWnd, wxWndHook);
+        pWnd = wxWndHook;
+        wxWndHook = NULL;
+        pWnd->SetHWND((WXHWND)hWnd);
+    }
+
+    MRESULT                         rc = (MRESULT)0;
+
+
+    //
+    // Stop right here if we don't have a valid handle in our wxWindow object.
+    //
+    if (pWnd && !pWnd->GetHWND())
+    {
+        pWnd->SetHWND((WXHWND) hWnd);
+        rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam );
+        pWnd->SetHWND(0);
+    }
+    else
+    {
+        if (pWnd)
+            rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+        else
+            rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
+    }
+
+    return rc;
+} // end of wxWndProc
+
+//
+// We will add (or delete) messages we need to handle at this default
+// level as we go
+//
+MRESULT wxWindowOS2::OS2WindowProc(
+  WXUINT                            uMsg
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    //
+    // Did we process the uMsg?
+    //
+    bool                            bProcessed = FALSE;
+    MRESULT                         mResult;
+
+    //
+    // For most messages we should return 0 when we do process the message
+    //
+    mResult = (MRESULT)0;
+
+    switch (uMsg)
+    {
+        case WM_CREATE:
+            {
+                bool                bMayCreate;
+
+                bProcessed = HandleCreate( (WXLPCREATESTRUCT)lParam
+                                          ,&bMayCreate
+                                         );
+                if (bProcessed)
+                {
+                    //
+                    // Return 0 to bAllow window creation
+                    //
+                    mResult = (MRESULT)(bMayCreate ? 0 : -1);
+                }
+            }
+            break;
+
+        case WM_DESTROY:
+             HandleDestroy();
+             bProcessed = TRUE;
+             break;
+
+        case WM_MOVE:
+            bProcessed = HandleMove( LOWORD(lParam)
+                                    ,HIWORD(lParam)
+                                   );
+            break;
+
+        case WM_SIZE:
+            bProcessed = HandleSize( LOWORD(lParam)
+                                    ,HIWORD(lParam)
+                                    ,(WXUINT)wParam
+                                   );
+            break;
+
+        case WM_ACTIVATE:
+            {
+                WXWORD              wState;
+                WXHWND              hWnd;
+
+                UnpackActivate( wParam
+                               ,lParam
+                               ,&wState
+                               ,&hWnd
+                              );
+
+                bProcessed = HandleActivate( wState
+                                            ,(WXHWND)hWnd
+                                           );
+                bProcessed = FALSE;
+            }
+            break;
+
+        case WM_SETFOCUS:
+            if (SHORT1FROMMP((MPARAM)lParam) == TRUE)
+                bProcessed = HandleSetFocus((WXHWND)(HWND)wParam);
+            else
+                bProcessed = HandleKillFocus((WXHWND)(HWND)wParam);
+            break;
+
+        case WM_PAINT:
+            bProcessed = HandlePaint();
+            break;
+
+        case WM_CLOSE:
+            //
+            // Don't let the DefWindowProc() destroy our window - we'll do it
+            // ourselves in ~wxWindow
+            //
+            bProcessed = TRUE;
+            mResult = (MRESULT)TRUE;
+            break;
+
+        case WM_SHOW:
+            bProcessed = HandleShow(wParam != 0, (int)lParam);
+            break;
+
+        //
+        // Under OS2 PM Joysticks are treated just like mouse events
+        // The "Motion" events will be prevelent in joysticks
+        //
+        case WM_MOUSEMOVE:
+        case WM_BUTTON1DOWN:
+        case WM_BUTTON1UP:
+        case WM_BUTTON1DBLCLK:
+        case WM_BUTTON1MOTIONEND:
+        case WM_BUTTON1MOTIONSTART:
+        case WM_BUTTON2DOWN:
+        case WM_BUTTON2UP:
+        case WM_BUTTON2DBLCLK:
+        case WM_BUTTON2MOTIONEND:
+        case WM_BUTTON2MOTIONSTART:
+        case WM_BUTTON3DOWN:
+        case WM_BUTTON3UP:
+        case WM_BUTTON3DBLCLK:
+        case WM_BUTTON3MOTIONEND:
+        case WM_BUTTON3MOTIONSTART:
+            {
+                short x = LOWORD(lParam);
+                short y = HIWORD(lParam);
+
+                bProcessed = HandleMouseEvent(uMsg, x, y, (WXUINT)wParam);
+            }
+            break;
+        case WM_SYSCOMMAND:
+            bProcessed = HandleSysCommand(wParam, lParam);
+            break;
+
+        case WM_COMMAND:
+            {
+                WORD id, cmd;
+                WXHWND hwnd;
+                UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
+
+                bProcessed = HandleCommand(id, cmd, hwnd);
+            }
+            break;
+
+            //
+            // For these messages we must return TRUE if process the message
+            //
+        case WM_DRAWITEM:
+        case WM_MEASUREITEM:
+            {
+                int                 nIdCtrl = (UINT)wParam;
+
+                if ( uMsg == WM_DRAWITEM )
+                {
+                    bProcessed = OS2OnDrawItem(nIdCtrl,
+                                              (WXDRAWITEMSTRUCT *)lParam);
+                }
+                else
+                {
+                    bProcessed = OS2OnMeasureItem(nIdCtrl,
+                                                 (WXMEASUREITEMSTRUCT *)lParam);
+                }
+
+                if ( bProcessed )
+                    mResult = (MRESULT)TRUE;
+            }
+            break;
+
+        case WM_QUERYDLGCODE:
+            if ( m_lDlgCode )
+            {
+                mResult = (MRESULT)m_lDlgCode;
+                bProcessed = TRUE;
+            }
+            //
+            //else: get the dlg code from the DefWindowProc()
+            //
+            break;
+
+        //
+        // In OS/2 PM all keyboard events are of the WM_CHAR type.  Virtual key and key-up
+        // and key-down events are obtained from the WM_CHAR params.
+        //
+        case WM_CHAR:
+            {
+                USHORT                  uKeyFlags = SHORT1FROMMP((MPARAM)wParam);
+
+                if (uKeyFlags & KC_KEYUP)
+                {
+                    //TODO: check if the cast to WXWORD isn't causing trouble
+                    bProcessed = HandleKeyUp((WXDWORD)wParam, lParam);
+                    break;
+                }
+                else // keydown event
+                {
+                    //
+                    // If this has been processed by an event handler,
+                    // return 0 now (we've handled it). DON't RETURN
+                    // we still need to process further
+                    //
+                    HandleKeyDown((WXDWORD)wParam, lParam);
+                    if (uKeyFlags & KC_VIRTUALKEY)
+                    {
+                        USHORT          uVk = SHORT2FROMMP((MPARAM)lParam);
+
+                        //
+                        // We consider these message "not interesting" to OnChar
+                        //
+                        if (uVk == VK_SHIFT || uVk == VK_CTRL )
+                        {
+                            bProcessed = TRUE;
+                            break;
+                        }
+                        switch(uVk)
+                        {
+                            //
+                            // Avoid duplicate messages to OnChar for these ASCII keys: they
+                            // will be translated by TranslateMessage() and received in WM_CHAR
+                            case VK_ESC:
+                            case VK_SPACE:
+                            case VK_ENTER:
+                            case VK_BACKSPACE:
+                            case VK_TAB:
+                                // But set processed to FALSE, not TRUE to still pass them to
+                                // the control's default window proc - otherwise built-in
+                                // keyboard handling won't work
+                                bProcessed = FALSE;
+                                break;
+
+                            case VK_LEFT:
+                            case VK_RIGHT:
+                            case VK_DOWN:
+                            case VK_UP:
+                            default:
+                                bProcessed = HandleChar((WXDWORD)wParam, lParam);
+                         }
+                         break;
+                    }
+                    else // WM_CHAR -- Always an ASCII character
+                    {
+                        bProcessed = HandleChar((WXDWORD)wParam, lParam, TRUE);
+                        break;
+                    }
+                }
+            }
+
+        case WM_HSCROLL:
+        case WM_VSCROLL:
+            {
+                WXWORD              wCode;
+                WXWORD              wPos;
+                WXHWND              hWnd;
+                UnpackScroll( wParam
+                             ,lParam
+                             ,&wCode
+                             ,&wPos
+                             ,&hWnd
+                            );
+
+                bProcessed = OS2OnScroll( uMsg == WM_HSCROLL ? wxHORIZONTAL
+                                                             : wxVERTICAL
+                                         ,wCode
+                                         ,wPos
+                                         ,hWnd
+                                        );
+            }
+            break;
+
+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+        case WM_CTLCOLORCHANGE:
+            {
+                bProcessed = HandleCtlColor(&hBrush);
+            }
+            break;
+#endif
+        case WM_ERASEBACKGROUND:
+            //
+            // Returning TRUE to requestw PM to paint the window background
+            // in SYSCLR_WINDOW. We don't really want that
+            //
+            bProcessed = HandleEraseBkgnd((WXHDC)(HPS)wParam);
+            mResult = (MRESULT)(FALSE);
+            break;
+
+            // the return value for this message is ignored
+        case WM_SYSCOLORCHANGE:
+            bProcessed = HandleSysColorChange();
+            break;
+
+        case WM_REALIZEPALETTE:
+            bProcessed = HandlePaletteChanged();
+            break;
+
+        // move all drag and drops to wxDrg
+        case WM_ENDDRAG:
+            bProcessed = HandleEndDrag(wParam);
+            break;
+
+        case WM_INITDLG:
+            bProcessed = HandleInitDialog((WXHWND)(HWND)wParam);
+
+            if ( bProcessed )
+            {
+                // we never set focus from here
+                mResult = FALSE;
+            }
+            break;
+
+        // wxFrame specific message
+        case WM_MINMAXFRAME:
+            bProcessed = HandleGetMinMaxInfo((PSWP)wParam);
+            break;
+
+        case WM_SYSVALUECHANGED:
+            // TODO: do something
+            mResult = (MRESULT)TRUE;
+            break;
+
+        //
+        // Comparable to WM_SETPOINTER for windows, only for just controls
+        //
+        case WM_CONTROLPOINTER:
+            bProcessed = HandleSetCursor( SHORT1FROMMP(wParam) // Control ID
+                                         ,(HWND)lParam         // Cursor Handle
+                                        );
+            if (bProcessed )
+            {
+                //
+                // Returning TRUE stops the DefWindowProc() from further
+                // processing this message - exactly what we need because we've
+                // just set the cursor.
+                //
+                mResult = (MRESULT)TRUE;
+            }
+            break;
+    }
+    if (!bProcessed)
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
+                   wxGetMessageName(uMsg));
+#endif // __WXDEBUG__
+        if (IsKindOf(CLASSINFO(wxFrame)))
+            mResult = ::WinDefWindowProc(m_hWnd, uMsg, wParam, lParam);
+        else
+            mResult = OS2DefWindowProc(uMsg, wParam, lParam);
+    }
+    return mResult;
+} // end of wxWindowOS2::OS2WindowProc
+
+//
+// Dialog window proc
+//
+MRESULT wxDlgProc(
+  HWND                              WXUNUSED(hWnd)
+, UINT                              uMsg
+, MPARAM                            WXUNUSED(wParam)
+, MPARAM                            WXUNUSED(lParam))
+{
+    if (uMsg == WM_INITDLG)
+    {
+        //
+        // For this message, returning TRUE tells system to set focus to the
+        // first control in the dialog box
+        //
+        return (MRESULT)TRUE;
+    }
+    else
+    {
+        //
+        // For all the other ones, FALSE means that we didn't process the
+        // message
+        //
+        return (MRESULT)0;
+    }
+} // end of wxDlgProc
+
+wxWindow* wxFindWinFromHandle(
+  WXHWND                            hWnd
+)
+{
+    wxNode*                         pNode = wxWinHandleList->Find((long)hWnd);
+
+    if (!pNode)
+        return NULL;
+    return (wxWindow *)pNode->Data();
+} // end of wxFindWinFromHandle
+
+void wxAssociateWinWithHandle(
+  HWND                              hWnd
+, wxWindowOS2*                      pWin
+)
+{
+    //
+    // Adding NULL hWnd is (first) surely a result of an error and
+    // (secondly) breaks menu command processing
+    //
+    wxCHECK_RET( hWnd != (HWND)NULL,
+                 wxT("attempt to add a NULL hWnd to window list ignored") );
+
+
+    wxWindow*                       pOldWin = wxFindWinFromHandle((WXHWND) hWnd);
+
+    if (pOldWin && (pOldWin != pWin))
+    {
+        wxString                    str(pWin->GetClassInfo()->GetClassName());
+        wxLogError( "Bug! Found existing HWND %X for new window of class %s"
+                   ,(int)hWnd
+                   ,(const char*)str
+                  );
+    }
+    else if (!pOldWin)
+    {
+        wxWinHandleList->Append( (long)hWnd
+                                ,pWin
+                               );
+    }
+} // end of wxAssociateWinWithHandle
+
+void wxRemoveHandleAssociation(
+  wxWindowOS2*                      pWin
+)
+{
+    wxWinHandleList->DeleteObject(pWin);
+} // end of wxRemoveHandleAssociation
+
+//
+// Default destroyer - override if you destroy it in some other way
+// (e.g. with MDI child windows)
+//
+void wxWindowOS2::OS2DestroyWindow()
+{
+}
+
+void wxWindowOS2::OS2DetachWindowMenu()
+{
+#ifndef __WXUNIVERSAL__
+    if (m_hMenu)
+    {
+        HMENU                       hMenu = (HMENU)m_hMenu;
+
+        int                         nN = (int)::WinSendMsg(hMenu, MM_QUERYITEMCOUNT, 0, 0);
+        int                         i;
+
+        for (i = 0; i < nN; i++)
+        {
+            wxChar                   zBuf[100];
+            int                      nChars = (int)::WinSendMsg( hMenu
+                                                                ,MM_QUERYITEMTEXT
+                                                                ,MPFROM2SHORT(i, nN)
+                                                                ,zBuf
+                                                               );
+            if (!nChars)
+            {
+                wxLogLastError(wxT("GetMenuString"));
+                continue;
+            }
+
+            if (wxStrcmp(zBuf, wxT("&Window")) == 0)
+            {
+                ::WinSendMsg(hMenu, MM_DELETEITEM, MPFROM2SHORT(i, TRUE), 0);
+                break;
+            }
+        }
+    }
+#endif // __WXUNIVERSAL__
+} // end of wxWindowOS2::OS2DetachWindowMenu
+
+bool wxWindowOS2::OS2Create(
+  WXHWND                            hParent
+, PSZ                               zClass
+, const wxChar*                     zTitle
+, WXDWORD                           dwStyle
+, long                              lX
+, long                              lY
+, long                              lWidth
+, long                              lHeight
+, WXHWND                            hOwner
+, WXHWND                            WXUNUSED(hZOrder)
+, unsigned long                     ulId
+, void*                             pCtlData
+, void*                             pPresParams
+, WXDWORD                           dwExStyle
+)
+{
+    ERRORID                         vError;
+    wxString                        sError;
+    long                            lX1      = 0L;
+    long                            lY1      = 0L;
+    long                            lWidth1  = 20L;
+    long                            lHeight1 = 20L;
+    int                             nControlId = 0;
+    int                             nNeedsubclass = 0;
+    PCSZ                            pszClass = zClass;
+
+    //
+    // Find parent's size, if it exists, to set up a possible default
+    // panel size the size of the parent window
+    //
+    lX1 = lX;
+    lY1 = lY;
+    if (lWidth > -1L)
+        lWidth1 = lWidth;
+    if (lHeight > -1L)
+        lHeight1 = lHeight;
+
+    wxWndHook = this;
+
+    //
+    // check to see if the new window is a standard control
+    //
+    if ((ULONG)zClass == (ULONG)WC_BUTTON ||
+        (ULONG)zClass == (ULONG)WC_COMBOBOX ||
+        (ULONG)zClass == (ULONG)WC_CONTAINER ||
+        (ULONG)zClass == (ULONG)WC_ENTRYFIELD ||
+        (ULONG)zClass == (ULONG)WC_FRAME ||
+        (ULONG)zClass == (ULONG)WC_LISTBOX ||
+        (ULONG)zClass == (ULONG)WC_MENU ||
+        (ULONG)zClass == (ULONG)WC_NOTEBOOK ||
+        (ULONG)zClass == (ULONG)WC_SCROLLBAR ||
+        (ULONG)zClass == (ULONG)WC_SPINBUTTON ||
+        (ULONG)zClass == (ULONG)WC_STATIC ||
+        (ULONG)zClass == (ULONG)WC_TITLEBAR ||
+        (ULONG)zClass == (ULONG)WC_VALUESET
+       )
+    {
+            nControlId = ulId;
+    }
+    else
+    {
+        // no standard controls
+        if(wxString (wxT("wxFrameClass")) == wxString(zClass) )
+        {
+            pszClass =  WC_FRAME;
+            nNeedsubclass = 1;
+        }
+        else
+        {
+            nControlId = ulId;
+            if(nControlId < 0)
+                nControlId = FID_CLIENT;
+        }
+    }
+
+   HWND parent;
+   if ( GetWindowStyleFlag() & wxPOPUP_WINDOW )
+   {
+       // popup windows should have desktop as parent because they shouldn't
+       // be limited to the parents client area as child windows usually are
+       parent = HWND_DESKTOP;
+   }
+   else if ( hParent )
+   {
+       parent = hParent;
+   }
+   else
+   {
+       // top level window
+       parent = NULL;
+   }
+
+    //
+    // We will either have a registered class via string name or a standard PM Class via a long
+    //
+    m_hWnd = (WXHWND)::WinCreateWindow(parent, zClass,
+                                       (PSZ)zTitle ? zTitle : wxT(""),
+                                       dwStyle, lX1, lY1, lWidth, lHeight,
+                                       hOwner, HWND_TOP, (ULONG)nControlId,
+                                       pCtlData, pPresParams);
+
+    if (!m_hWnd)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Can't create window of class %s!. Error: %s\n", zClass, sError);
+        return FALSE;
+    }
+    m_dwExStyle = dwExStyle;
+    ::WinSetWindowULong(m_hWnd, QWL_USER, (ULONG) this);
+    wxWndHook = NULL;
+
+#ifdef __WXDEBUG__
+    wxNode*                         pNode = wxWinHandleList->Member(this);
+
+    if (pNode)
+    {
+        HWND                        hWnd = (HWND)pNode->GetKeyInteger();
+
+        if (hWnd != (HWND)m_hWnd)
+
+        {
+            wxLogError("A second HWND association is being added for the same window!");
+        }
+    }
+#endif
+    wxAssociateWinWithHandle((HWND)m_hWnd
+                             ,this
+                            );
+    //
+    // Now need to subclass window.
+    //
+    if(!nNeedsubclass)
+    {
+         wxAssociateWinWithHandle((HWND)m_hWnd,this);
+    }
+    else
+    {
+        SubclassWin(GetHWND());
+    }
+    return TRUE;
+} // end of wxWindowOS2::OS2Create
+
+// ===========================================================================
+// OS2 PM message handlers
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// window creation/destruction
+// ---------------------------------------------------------------------------
+
+bool wxWindowOS2::HandleCreate(
+  WXLPCREATESTRUCT                  WXUNUSED(vCs)
+, bool*                             pbMayCreate
+)
+{
+    wxWindowCreateEvent             vEvent((wxWindow*)this);
+
+    (void)GetEventHandler()->ProcessEvent(vEvent);
+    *pbMayCreate = TRUE;
+    return TRUE;
+} // end of wxWindowOS2::HandleCreate
+
+bool wxWindowOS2::HandleDestroy()
+{
+    wxWindowDestroyEvent            vEvent((wxWindow*)this);
+
+    (void)GetEventHandler()->ProcessEvent(vEvent);
+
+    //
+    // Delete our drop target if we've got one
+    //
+#if wxUSE_DRAG_AND_DROP
+    if (m_dropTarget != NULL)
+    {
+        m_dropTarget->Revoke(m_hWnd);
+        delete m_dropTarget;
+        m_dropTarget = NULL;
+    }
+#endif // wxUSE_DRAG_AND_DROP
+
+    //
+    // WM_DESTROY handled
+    //
+    return TRUE;
+} // end of wxWindowOS2::HandleDestroy
+
+// ---------------------------------------------------------------------------
+// activation/focus
+// ---------------------------------------------------------------------------
+void wxWindowOS2::OnSetFocus(
+  wxFocusEvent&                     rEvent
+)
+{
+    rEvent.Skip();
+} // end of wxWindowOS2::OnSetFocus
+
+bool wxWindowOS2::HandleActivate(
+  int                               nState
+, WXHWND                            WXUNUSED(hActivate)
+)
+{
+    wxActivateEvent                 vEvent( wxEVT_ACTIVATE
+                                           ,(bool)nState
+                                           ,m_windowId
+                                          );
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleActivate
+
+bool wxWindowOS2::HandleSetFocus(
+  WXHWND                            WXUNUSED(hWnd)
+)
+{
+#if wxUSE_CARET
+    //
+    // Deal with caret
+    //
+    if (m_caret)
+    {
+        m_caret->OnSetFocus();
+    }
+#endif // wxUSE_CARET
+
+#if wxUSE_TEXTCTRL
+    // If it's a wxTextCtrl don't send the event as it will be done
+    // after the control gets to process it from EN_FOCUS handler
+    if ( wxDynamicCastThis(wxTextCtrl) )
+    {
+        return FALSE;
+    }
+#endif // wxUSE_TEXTCTRL
+
+    wxFocusEvent                    vEvent(wxEVT_SET_FOCUS, m_windowId);
+
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleSetFocus
+
+bool wxWindowOS2::HandleKillFocus(
+  WXHWND                            WXUNUSED(hWnd)
+)
+{
+#if wxUSE_CARET
+    //
+    // Deal with caret
+    //
+    if (m_caret)
+    {
+        m_caret->OnKillFocus();
+    }
+#endif // wxUSE_CARET
+
+    wxFocusEvent                    vEvent( wxEVT_KILL_FOCUS
+                                           ,m_windowId
+                                          );
+
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleKillFocus
 
-void wxWindow::SetCursor(const wxCursor& cursor)
+// ---------------------------------------------------------------------------
+// miscellaneous
+// ---------------------------------------------------------------------------
+
+bool wxWindowOS2::HandleShow(
+  bool                              bShow
+, int                               WXUNUSED(nStatus)
+)
 {
-  m_windowCursor = cursor;
-  if (m_windowCursor.Ok())
-  {
-    // TODO
-  }
-}
+    wxShowEvent                     vEvent(GetId(), bShow);
 
+    vEvent.m_eventObject = this;
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleShow
 
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::GetClientSize(int *x, int *y) const
+bool wxWindowOS2::HandleInitDialog(
+  WXHWND                            WXUNUSED(hWndFocus)
+)
 {
-    // TODO
-}
+    wxInitDialogEvent               vEvent(GetId());
 
-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-}
+    vEvent.m_eventObject = this;
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleInitDialog
 
-void wxWindow::SetClientSize(int width, int height)
+bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
 {
-    // TODO
+   // TODO: We'll handle drag and drop later
+    return FALSE;
 }
 
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
+bool wxWindowOS2::HandleSetCursor(
+  USHORT                            WXUNUSED(vId)
+, WXHWND                            hPointer
+)
 {
-    return wxPoint(0, 0);
-}
-
-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+    //
+    // Under OS/2 PM this allows the pointer to be changed
+    // as it passes over a control
+    //
+    ::WinSetPointer(HWND_DESKTOP, (HPOINTER)hPointer);
+    return TRUE;
+} // end of wxWindowOS2::HandleSetCursor
+
+// ---------------------------------------------------------------------------
+// owner drawn stuff
+// ---------------------------------------------------------------------------
+bool wxWindowOS2::OS2OnDrawItem(
+  int                               vId
+, WXDRAWITEMSTRUCT*                 pItemStruct
+)
 {
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+#if wxUSE_OWNER_DRAWN
+    wxDC                            vDc;
+
+#if wxUSE_MENUS_NATIVE
+    //
+    // Is it a menu item?
+    //
+    if (vId == 0)
     {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-}
+        ERRORID                     vError;
+        wxString                    sError;
+        POWNERITEM                  pMeasureStruct = (POWNERITEM)pItemStruct;
+        wxFrame*                    pFrame = (wxFrame*)this;
+        wxMenuItem*                 pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem);
+        HDC                         hDC = ::GpiQueryDevice(pMeasureStruct->hps);
+        wxRect                      vRect( pMeasureStruct->rclItem.xLeft
+                                          ,pMeasureStruct->rclItem.yBottom
+                                          ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
+                                          ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
+                                         );
+        vDc.SetHDC( hDC
+                   ,FALSE
+                  );
+        vDc.SetHPS(pMeasureStruct->hps);
+        //
+        // Load the wxWindows Pallete and set to RGB mode
+        //
+        if (!::GpiCreateLogColorTable( pMeasureStruct->hps
+                                      ,0L
+                                      ,LCOLF_CONSECRGB
+                                      ,0L
+                                      ,(LONG)wxTheColourDatabase->m_nSize
+                                      ,(PLONG)wxTheColourDatabase->m_palTable
+                                     ))
+        {
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError("Unable to set current color table. Error: %s\n", sError);
+        }
+        //
+        // Set the color table to RGB mode
+        //
+        if (!::GpiCreateLogColorTable( pMeasureStruct->hps
+                                      ,0L
+                                      ,LCOLF_RGB
+                                      ,0L
+                                      ,0L
+                                      ,NULL
+                                     ))
+        {
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError("Unable to set current color table. Error: %s\n", sError);
+        }
 
-bool wxWindow::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
 
-bool wxWindow::IsShown() const
-{
-    // TODO
-    return FALSE;
-}
 
-int wxWindow::GetCharHeight() const
-{
-    // TODO
-    return 0;
-}
+        int                         eAction = 0;
+        int                         eStatus = 0;
 
-int wxWindow::GetCharWidth() const
-{
-    // TODO
-    return 0;
-}
+        if (pMeasureStruct->fsAttribute == pMeasureStruct->fsAttributeOld)
+        {
+            //
+            // Entire Item needs to be redrawn (either it has reappeared from
+            // behind another window or is being displayed for the first time
+            //
+            eAction = wxOwnerDrawn::wxODDrawAll;
 
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
-{
-  wxFont *fontToUse = (wxFont *)theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont *) & m_windowFont;
+            if (pMeasureStruct->fsAttribute & MIA_HILITED)
+            {
+                //
+                // If it is currently selected we let the system handle it
+                //
+                eStatus |= wxOwnerDrawn::wxODSelected;
+            }
+            if (pMeasureStruct->fsAttribute & MIA_CHECKED)
+            {
+                //
+                // If it is currently checked we draw our own
+                //
+                eStatus |= wxOwnerDrawn::wxODChecked;
+                pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_CHECKED;
+            }
+            if (pMeasureStruct->fsAttribute & MIA_DISABLED)
+            {
+                //
+                // If it is currently disabled we let the system handle it
+                //
+                eStatus |= wxOwnerDrawn::wxODDisabled;
+            }
+            //
+            // Don't really care about framed (indicationg focus) or NoDismiss
+            //
+        }
+        else
+        {
+            if (pMeasureStruct->fsAttribute & MIA_HILITED)
+            {
+                eAction = wxOwnerDrawn::wxODDrawAll;
+                eStatus |= wxOwnerDrawn::wxODSelected;
+                //
+                // Keep the system from trying to highlight with its bogus colors
+                //
+                pMeasureStruct->fsAttributeOld = pMeasureStruct->fsAttribute &= ~MIA_HILITED;
+            }
+            else if (!(pMeasureStruct->fsAttribute & MIA_HILITED))
+            {
+                eAction = wxOwnerDrawn::wxODDrawAll;
+                eStatus = 0;
+                //
+                // Keep the system from trying to highlight with its bogus colors
+                //
+                pMeasureStruct->fsAttribute = pMeasureStruct->fsAttributeOld &= ~MIA_HILITED;
+            }
+            else
+            {
+                //
+                // For now we don't care about anything else
+                // just ignore the entire message!
+                //
+                return TRUE;
+            }
+        }
+        //
+        // Now redraw the item
+        //
+        return(pMenuItem->OnDrawItem( vDc
+                                     ,vRect
+                                     ,(wxOwnerDrawn::wxODAction)eAction
+                                     ,(wxOwnerDrawn::wxODStatus)eStatus
+                                    ));
+        //
+        // leave the fsAttribute and fsOldAttribute unchanged.  If different,
+        // the system will do the highlight or fraeming or disabling for us,
+        // otherwise, we'd have to do it ourselves.
+        //
+    }
+#endif // wxUSE_MENUS_NATIVE
 
-    // TODO
-}
+    wxWindow*                       pItem = FindItem(vId);
 
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
-{
-    // TODO
-}
+    if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
+    {
+        return ((wxControl *)pItem)->OS2OnDraw(pItemStruct);
+    }
+#else
+    vId = vId;
+    pItemStruct = pItemStruct;
+#endif
+    return FALSE;
+} // end of wxWindowOS2::OS2OnDrawItem
 
-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+bool wxWindowOS2::OS2OnMeasureItem(
+  int                               lId
+, WXMEASUREITEMSTRUCT*              pItemStruct
+)
 {
-    wxNode *node = GetChildren().First();
-    while ( node )
+#if wxUSE_OWNER_DRAWN
+    //
+    // Is it a menu item?
+    //
+    if (lId == 65536) // I really don't like this...has to be a better indicator
     {
-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
+        if (IsKindOf(CLASSINFO(wxFrame))) // we'll assume if Frame then a menu
         {
-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
+            size_t                  nWidth;
+            size_t                  nHeight;
+            POWNERITEM              pMeasureStruct = (POWNERITEM)pItemStruct;
+            wxFrame*                pFrame = (wxFrame*)this;
+            wxMenuItem*             pMenuItem = pFrame->GetMenuBar()->FindItem(pMeasureStruct->idItem, pMeasureStruct->hItem);
+
+            wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
+            nWidth  = 0L;
+            nHeight = 0L;
+            if (pMenuItem->OnMeasureItem( &nWidth
+                                         ,&nHeight
+                                        ))
+            {
+                pMeasureStruct->rclItem.xRight  = nWidth;
+                pMeasureStruct->rclItem.xLeft   = 0L;
+                pMeasureStruct->rclItem.yTop    = nHeight;
+                pMeasureStruct->rclItem.yBottom = 0L;
+                return TRUE;
+            }
+            return FALSE;
         }
+    }
+    wxWindow*                      pItem = FindItem(lId);
 
-        node = node->Next();
+    if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
+    {
+        return ((wxControl *)pItem)->OS2OnMeasure(pItemStruct);
     }
+#else
+    lId = lId;
+    pItemStruct = pItemStruct;
+#endif // wxUSE_OWNER_DRAWN
+    return FALSE;
 }
 
-// This can be called by the app (or wxWindows) to do default processing for the current
-// event. Save message/event info in wxWindow so they can be used in this function.
-long wxWindow::Default()
-{
-    // TODO
-    return 0;
-}
+// ---------------------------------------------------------------------------
+// colours and palettes
+// ---------------------------------------------------------------------------
 
-void wxWindow::InitDialog()
+bool wxWindowOS2::HandleSysColorChange()
 {
-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-}
+    wxSysColourChangedEvent         vEvent;
 
-// Default init dialog behaviour is to transfer data to window
-void wxWindow::OnInitDialog(wxInitDialogEvent& event)
-{
-  TransferDataToWindow();
-}
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleSysColorChange
 
-// Caret manipulation
-void wxWindow::CreateCaret(int w, int h)
+bool wxWindowOS2::HandleCtlColor(
+  WXHBRUSH*                         WXUNUSED(phBrush)
+)
 {
-  m_caretWidth = w;
-  m_caretHeight = h;
-  m_caretEnabled = TRUE;
-}
+    //
+    // Not much provided with message. So not sure I can do anything with it
+    //
+    return TRUE;
+} // end of wxWindowOS2::HandleCtlColor
 
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
-{
-    // TODO
-}
 
-void wxWindow::ShowCaret(bool show)
+// Define for each class of dialog and control
+WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC WXUNUSED(hDC),
+                                 WXHWND WXUNUSED(hWnd),
+                                 WXUINT WXUNUSED(nCtlColor),
+                                 WXUINT WXUNUSED(message),
+                                 WXWPARAM WXUNUSED(wParam),
+                                 WXLPARAM WXUNUSED(lParam))
 {
-    // TODO
+    return (WXHBRUSH)0;
 }
 
-void wxWindow::DestroyCaret()
+bool wxWindowOS2::HandlePaletteChanged()
 {
-    // TODO
-    m_caretEnabled = FALSE;
-}
+    // need to set this to something first
+    WXHWND                          hWndPalChange = NULLHANDLE;
 
-void wxWindow::SetCaretPos(int x, int y)
-{
-    // TODO
-}
+    wxPaletteChangedEvent           vEvent(GetId());
 
-void wxWindow::GetCaretPos(int *x, int *y) const
-{
-    // TODO
-}
+    vEvent.SetEventObject(this);
+    vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
 
-wxWindow *wxGetActiveWindow()
-{
-    // TODO
-    return NULL;
-}
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandlePaletteChanged
 
-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH))
+//
+// Responds to colour changes: passes event on to children.
+//
+void wxWindowOS2::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)
 {
-  m_minSizeX = minW;
-  m_minSizeY = minH;
-  m_maxSizeX = maxW;
-  m_maxSizeY = maxH;
-}
+    wxNode*                         pNode = GetChildren().First();
 
-void wxWindow::Centre(int direction)
-{
-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+    while (pNode)
+    {
+        //
+        // Only propagate to non-top-level windows
+        //
+        wxWindow*                   pWin = (wxWindow *)pNode->Data();
 
-  wxWindow *father = (wxWindow *)GetParent();
-  if (!father)
-    return;
+        if (pWin->GetParent())
+        {
+            wxSysColourChangedEvent vEvent;
 
-  father->GetClientSize(&panel_width, &panel_height);
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+            rEvent.m_eventObject = pWin;
+            pWin->GetEventHandler()->ProcessEvent(vEvent);
+        }
+        pNode = pNode->Next();
+    }
+} // end of wxWindowOS2::OnSysColourChanged
 
-  new_x = -1;
-  new_y = -1;
+// ---------------------------------------------------------------------------
+// painting
+// ---------------------------------------------------------------------------
 
-  if (direction & wxHORIZONTAL)
-    new_x = (int)((panel_width - width)/2);
+bool wxWindowOS2::HandlePaint()
+{
+    HRGN                            hRgn;
+    wxPaintEvent                    vEvent(m_windowId);
+    HPS                             hPS;
+    RECTL                           vRect;
+    bool                            bProcessed;
+
+    // Create empty region
+    // TODO: get HPS somewhere else if possible
+    hPS  = ::WinGetPS(GetHwnd());
+    hRgn = ::GpiCreateRegion(hPS, 0, NULL);
+
+    if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_ERROR)
+    {
+         wxLogLastError("CreateRectRgn");
+         return FALSE;
+    }
 
-  if (direction & wxVERTICAL)
-    new_y = (int)((panel_height - height)/2);
+    m_updateRegion = wxRegion(hRgn, hPS);
 
-  SetSize(new_x, new_y, -1, -1);
+    vEvent.SetEventObject(this);
+    bProcessed = GetEventHandler()->ProcessEvent(vEvent);
 
-}
+    return GetEventHandler()->ProcessEvent(vEvent); //bProcessed;
+} // end of wxWindowOS2::HandlePaint
 
-// Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+bool wxWindowOS2::HandleEraseBkgnd(
+  WXHDC                             hDC
+)
 {
-    // TODO
-}
+    SWP                             vSwp;
+    bool                            rc;
 
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
-{
-    // TODO
-    Default();
-}
+    ::WinQueryWindowPos(GetHwnd(), &vSwp);
+    if (vSwp.fl & SWP_MINIMIZE)
+        return TRUE;
 
-int wxWindow::GetScrollPos(int orient) const
-{
-    // TODO
-    return 0;
-}
+    wxDC                            vDC;
 
-// This now returns the whole range, not just the number
-// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
-{
-    // TODO
-    return 0;
-}
+    vDC.m_hPS = (HPS)hDC; // this is really a PS
+    vDC.SetWindow((wxWindow*)this);
+    vDC.BeginDrawing();
 
-int wxWindow::GetScrollThumb(int orient) const
-{
-    // TODO
-    return 0;
-}
+    wxEraseEvent                    vEvent(m_windowId, &vDC);
 
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
-{
-    // TODO
-    return;
-}
+    vEvent.SetEventObject(this);
 
-// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
-    int range, bool refresh)
-{
-    // TODO
-}
+    rc = GetEventHandler()->ProcessEvent(vEvent);
 
-// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
-{
-    // TODO
-    return;
-}
+    vDC.EndDrawing();
+    vDC.m_hPS = NULLHANDLE;
+    return TRUE;
+} // end of wxWindowOS2::HandleEraseBkgnd
 
-void wxWindow::SetFont(const wxFont& font)
+void wxWindowOS2::OnEraseBackground(
+  wxEraseEvent&                     rEvent
+)
 {
-    m_windowFont = font;
-
-    if (!m_windowFont.Ok())
-           return;
-    // TODO
-}
+    RECTL                           vRect;
+    HPS                             hPS = rEvent.m_dc->m_hPS;
+    APIRET                          rc;
+    LONG                            lColor = m_backgroundColour.GetPixel();
 
-void wxWindow::OnChar(wxKeyEvent& event)
-{
-/* ??
-    if ( event.KeyCode() == WXK_TAB ) {
-        // propagate the TABs to the parent - it's up to it to decide what
-        // to do with it
-        if ( GetParent() ) {
-            if ( GetParent()->ProcessEvent(event) )
-                return;
-        }
-    }
-*/
-    Default();
-}
+    rc = ::WinQueryWindowRect(GetHwnd(), &vRect);
+    rc = ::WinFillRect(hPS, &vRect, lColor);
+}  // end of wxWindowOS2::OnEraseBackground
 
-void wxWindow::OnKeyDown(wxKeyEvent& event)
-{
-    Default();
-}
+// ---------------------------------------------------------------------------
+// moving and resizing
+// ---------------------------------------------------------------------------
 
-void wxWindow::OnKeyUp(wxKeyEvent& event)
+bool wxWindowOS2::HandleMinimize()
 {
-    Default();
-}
+    wxIconizeEvent                  vEvent(m_windowId);
 
-void wxWindow::OnPaint(wxPaintEvent& event)
-{
-       Default();
-}
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleMinimize
 
-bool wxWindow::IsEnabled() const
+bool wxWindowOS2::HandleMaximize()
 {
-    // TODO
-    return FALSE;
-}
-
-// Dialog support: override these and call
-// base class members to add functionality
-// that can't be done using validators.
-// NOTE: these functions assume that controls
-// are direct children of this window, not grandchildren
-// or other levels of descendant.
-
-// Transfer values to controls. If returns FALSE,
-// it's an application error (pops up a dialog)
-bool wxWindow::TransferDataToWindow()
-{
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() &&
-                    !child->GetValidator()->TransferToWindow() )
-               {
-                       wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
-}
+    wxMaximizeEvent                 vEvent(m_windowId);
 
-// Transfer values from controls. If returns FALSE,
-// validation failed: don't quit
-bool wxWindow::TransferDataFromWindow()
-{
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
-}
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleMaximize
 
-bool wxWindow::Validate()
+bool wxWindowOS2::HandleMove(
+  int                               nX
+, int                               nY
+)
 {
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
-               {
-                       return FALSE;
-               }
+    wxMoveEvent                     vEvent(wxPoint(nX, nY), m_windowId);
 
-               node = node->Next();
-       }
-       return TRUE;
-}
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+}  // end of wxWindowOS2::HandleMove
 
-// Get the window with the focus
-wxWindow *wxWindow::FindFocus()
+bool wxWindowOS2::HandleSize(
+  int                               nWidth
+, int                               nHeight
+, WXUINT                            WXUNUSED(nFlag)
+)
 {
-    // TODO
-    return NULL;
-}
+    wxSizeEvent                     vEvent(wxSize(nWidth, nHeight), m_windowId);
 
-void wxWindow::AddChild(wxWindow *child)
-{
-    GetChildren().Append(child);
-    child->m_windowParent = this;
-}
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleSize
 
-void wxWindow::RemoveChild(wxWindow *child)
+bool wxWindowOS2::HandleGetMinMaxInfo(
+  PSWP                              pSwp
+)
 {
-    GetChildren().DeleteObject(child);
-    child->m_windowParent = NULL;
-}
-
-void wxWindow::DestroyChildren()
-{
-    wxNode *node;
-    while ((node = GetChildren().First()) != (wxNode *)NULL) {
-      wxWindow *child;
-      if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
-        delete child;
-               if ( GetChildren().Member(child) )
-                       delete node;
-      }
-    } /* while */
-}
+    bool                            bRc = FALSE;
+    POINTL                          vPoint;
 
-void wxWindow::MakeModal(bool modal)
+    switch(pSwp->fl)
+    {
+        case SWP_MAXIMIZE:
+            ::WinGetMaxPosition(GetHwnd(), pSwp);
+            m_maxWidth = pSwp->cx;
+            m_maxHeight = pSwp->cy;
+            break;
+
+        case SWP_MINIMIZE:
+            ::WinGetMinPosition(GetHwnd(), pSwp, &vPoint);
+            m_minWidth = pSwp->cx;
+            m_minHeight = pSwp->cy;
+            break;
+
+        default:
+            return FALSE;
+    }
+    return TRUE;
+} // end of wxWindowOS2::HandleGetMinMaxInfo
+
+// ---------------------------------------------------------------------------
+// command messages
+// ---------------------------------------------------------------------------
+bool wxWindowOS2::HandleCommand(
+  WXWORD                            wId
+, WXWORD                            wCmd
+, WXHWND                            hControl
+)
 {
-  // Disable all other windows
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxNode *node = wxTopLevelWindows.First();
-    while (node)
+#if wxUSE_MENUS_NATIVE
+    if (wxCurrentPopupMenu)
     {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (win != this)
-        win->Enable(!modal);
+        wxMenu*                     pPopupMenu = wxCurrentPopupMenu;
 
-      node = node->Next();
+        wxCurrentPopupMenu = NULL;
+        return pPopupMenu->OS2Command(wCmd, wId);
     }
-  }
-}
+#endif // wxUSE_MENUS_NATIVE
 
-// 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 wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-  if (GetEventHandler()->ProcessEvent(event) )
-    return;
-  if (m_windowParent)
-    m_windowParent->GetEventHandler()->OnCommand(win, event);
-}
+    wxWindow*                       pWin = FindItem(wId);
 
-void wxWindow::SetConstraints(wxLayoutConstraints *c)
-{
-  if (m_constraints)
-  {
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-  }
-  m_constraints = c;
-  if (m_constraints)
-  {
-    // Make sure other windows know they're part of a 'meaningful relationship'
-    if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
-      m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
-      m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
-      m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
-      m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
-      m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
-      m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
-      m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
-      m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-  }
-}
+    if (!pWin)
+    {
+        pWin = wxFindWinFromHandle(hControl);
+    }
 
-// This removes any dangling pointers to this window
-// in other windows' constraintsInvolvedIn lists.
-void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
-{
-  if (c)
-  {
-    if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
-      c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
-      c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
-      c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
-      c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
-      c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
-      c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-  }
-}
+    if (pWin)
+        return pWin->OS2Command(wCmd, wId);
 
-// Back-pointer to other windows we're involved with, so if we delete
-// this window, we must delete any constraints we're involved with.
-void wxWindow::AddConstraintReference(wxWindow *otherWin)
-{
-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
-}
+    return FALSE;
+} // end of wxWindowOS2::HandleCommand
 
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
+bool wxWindowOS2::HandleSysCommand(
+  WXWPARAM                          wParam
+, WXLPARAM                          WXUNUSED(lParam)
+)
 {
-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
-}
-
-// Reset any constraints that mention this window
-void wxWindow::DeleteRelatedConstraints()
-{
-  if (m_constraintsInvolvedIn)
-  {
-    wxNode *node = m_constraintsInvolvedIn->First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      wxNode *next = node->Next();
-      wxLayoutConstraints *constr = win->GetConstraints();
-
-      // Reset any constraints involving this window
-      if (constr)
-      {
-        constr->left.ResetIfWin((wxWindow *)this);
-        constr->top.ResetIfWin((wxWindow *)this);
-        constr->right.ResetIfWin((wxWindow *)this);
-        constr->bottom.ResetIfWin((wxWindow *)this);
-        constr->width.ResetIfWin((wxWindow *)this);
-        constr->height.ResetIfWin((wxWindow *)this);
-        constr->centreX.ResetIfWin((wxWindow *)this);
-        constr->centreY.ResetIfWin((wxWindow *)this);
-      }
-      delete node;
-      node = next;
-    }
-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }
-}
+    //
+    // 4 bits are reserved
+    //
+    switch (SHORT1FROMMP(wParam))
+    {
+        case SC_MAXIMIZE:
+            return HandleMaximize();
 
-void wxWindow::SetSizer(wxSizer *sizer)
+        case SC_MINIMIZE:
+            return HandleMinimize();
+    }
+    return FALSE;
+} // end of wxWindowOS2::HandleSysCommand
+
+// ---------------------------------------------------------------------------
+// mouse events
+// ---------------------------------------------------------------------------
+//TODO!!! check against MSW
+void wxWindowOS2::InitMouseEvent(
+  wxMouseEvent&                     rEvent
+, int                               nX
+, int                               nY
+, WXUINT                            uFlags
+)
 {
-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
-}
+    rEvent.m_x           = nX;
+    rEvent.m_y           = nY;
+    rEvent.m_shiftDown   = ((uFlags & VK_SHIFT) != 0);
+    rEvent.m_controlDown = ((uFlags & VK_CTRL) != 0);
+    rEvent.m_leftDown    = ((uFlags & VK_BUTTON1) != 0);
+    rEvent.m_middleDown  = ((uFlags & VK_BUTTON3) != 0);
+    rEvent.m_rightDown   = ((uFlags & VK_BUTTON2) != 0);
+    rEvent.SetTimestamp(s_currentMsg.time);
+    rEvent.m_eventObject = this;
+
+#if wxUSE_MOUSEEVENT_HACK
+    m_lastMouseX = nX;
+    m_lastMouseY = nY;
+    m_lastMouseEvent = rEvent.GetEventType();
+#endif // wxUSE_MOUSEEVENT_HACK
+} // end of wxWindowOS2::InitMouseEvent
+
+bool wxWindowOS2::HandleMouseEvent(
+  WXUINT                            uMsg
+, int                               nX
+, int                               nY
+, WXUINT                            uFlags
+)
+{
+    //
+    // The mouse events take consecutive IDs from WM_MOUSEFIRST to
+    // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST
+    // from the message id and take the value in the table to get wxWin event
+    // id
+    //
+    static const wxEventType eventsMouse[] =
+    {
+        wxEVT_MOTION,
+        wxEVT_LEFT_DOWN,
+        wxEVT_LEFT_UP,
+        wxEVT_LEFT_DCLICK,
+        wxEVT_RIGHT_DOWN,
+        wxEVT_RIGHT_UP,
+        wxEVT_RIGHT_DCLICK,
+        wxEVT_MIDDLE_DOWN,
+        wxEVT_MIDDLE_UP,
+        wxEVT_MIDDLE_DCLICK
+    };
+
+    wxMouseEvent                    vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]);
+
+    InitMouseEvent( vEvent
+                   ,nX
+                   ,nY
+                   ,uFlags
+                  );
+
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::HandleMouseEvent
+
+bool wxWindowOS2::HandleMouseMove(
+  int                               nX
+, int                               nY
+, WXUINT                            uFlags
+)
+{
+    if (!m_bMouseInWindow)
+    {
+        //
+        // Generate an ENTER event
+        //
+        m_bMouseInWindow = TRUE;
 
-/*
- * New version
- */
-
-bool wxWindow::Layout()
-{
-  if (GetConstraints())
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    GetConstraints()->width.SetValue(w);
-    GetConstraints()->height.SetValue(h);
-  }
-  
-  // If top level (one sizer), evaluate the sizer's constraints.
-  if (GetSizer())
-  {
-    int noChanges;
-    GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-    GetSizer()->LayoutPhase1(&noChanges);
-    GetSizer()->LayoutPhase2(&noChanges);
-    GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
-    return TRUE;
-  }
-  else
-  {
-    // Otherwise, evaluate child constraints
-    ResetConstraints();   // Mark all constraints as unevaluated
-    DoPhase(1);           // Just one phase need if no sizers involved
-    DoPhase(2);
-    SetConstraintSizes(); // Recursively set the real window sizes
-  }
-  return TRUE;
-}
+        wxMouseEvent                vEvent(wxEVT_ENTER_WINDOW);
 
+        InitMouseEvent( vEvent
+                       ,nX
+                       ,nY
+                       ,uFlags
+                      );
 
-// Do a phase of evaluating constraints:
-// the default behaviour. wxSizers may do a similar
-// thing, but also impose their own 'constraints'
-// and order the evaluation differently.
-bool wxWindow::LayoutPhase1(int *noChanges)
+        (void)GetEventHandler()->ProcessEvent(vEvent);
+    }
+    return HandleMouseEvent( WM_MOUSEMOVE
+                            ,nX
+                            ,nY
+                            ,uFlags
+                           );
+} // end of wxWindowOS2::HandleMouseMove
+
+// ---------------------------------------------------------------------------
+// keyboard handling
+// ---------------------------------------------------------------------------
+
+//
+// Create the key event of the given type for the given key - used by
+// HandleChar and HandleKeyDown/Up
+//
+wxKeyEvent wxWindowOS2::CreateKeyEvent(
+  wxEventType                       eType
+, int                               nId
+, WXLPARAM                          lParam
+) const
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
-}
-
-bool wxWindow::LayoutPhase2(int *noChanges)
+    wxKeyEvent                      vEvent(eType);
+
+    vEvent.SetId(GetId());
+    vEvent.m_shiftDown   = IsShiftDown();
+    vEvent.m_controlDown = IsCtrlDown();
+    vEvent.m_altDown     = (HIWORD(lParam) & KC_ALT) == KC_ALT;
+
+    vEvent.m_eventObject = (wxWindow *)this; // const_cast
+    vEvent.m_keyCode     = nId;
+    vEvent.SetTimestamp(s_currentMsg.time);
+
+    //
+    // Translate the position to client coords
+    //
+    POINTL                          vPoint;
+    RECTL                           vRect;
+
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+    ::WinQueryWindowRect( GetHwnd()
+                         ,&vRect
+                        );
+
+    vPoint.x -= vRect.xLeft;
+    vPoint.y -= vRect.yBottom;
+
+    vEvent.m_x = vPoint.x;
+    vEvent.m_y = vPoint.y;
+
+    return vEvent;
+} // end of wxWindowOS2::CreateKeyEvent
+
+//
+// isASCII is TRUE only when we're called from WM_CHAR handler and not from
+// WM_KEYDOWN one
+//
+bool wxWindowOS2::HandleChar(
+  WXDWORD                           wParam
+, WXLPARAM                          lParam
+, bool                              isASCII
+)
 {
-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
-}
+    bool                            bCtrlDown = FALSE;
+    int                             vId;
 
-// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(int phase)
-{
-  int noIterations = 0;
-  int maxIterations = 500;
-  int noChanges = 1;
-  int noFailures = 0;
-  wxList succeeded;
-  while ((noChanges > 0) && (noIterations < maxIterations))
-  {
-    noChanges = 0;
-    noFailures = 0;
-    wxNode *node = GetChildren().First();
-    while (node)
-    {
-      wxWindow *child = (wxWindow *)node->Data();
-      if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))
-      {
-        wxLayoutConstraints *constr = child->GetConstraints();
-        if (constr)
+    if (isASCII)
+    {
+        //
+        // If 1 -> 26, translate to CTRL plus a letter.
+        //
+        vId = wParam;
+        if ((vId > 0) && (vId < 27))
         {
-          if (succeeded.Member(child))
-          {
-          }
-          else
-          {
-            int tempNoChanges = 0;
-            bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
-            noChanges += tempNoChanges;
-            if (success)
+            switch (vId)
             {
-              succeeded.Append(child);
-            }
-          }
-        }
-      }
-      node = node->Next();
-    }
-    noIterations ++;
-  }
-  return TRUE;
-}
+                case 13:
+                    vId = WXK_RETURN;
+                    break;
 
-void wxWindow::ResetConstraints()
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    constr->left.SetDone(FALSE);
-    constr->top.SetDone(FALSE);
-    constr->right.SetDone(FALSE);
-    constr->bottom.SetDone(FALSE);
-    constr->width.SetDone(FALSE);
-    constr->height.SetDone(FALSE);
-    constr->centreX.SetDone(FALSE);
-    constr->centreY.SetDone(FALSE);
-  }
-  wxNode *node = GetChildren().First();
-  while (node)
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-      win->ResetConstraints();
-    node = node->Next();
-  }
-}
+                case 8:
+                    vId = WXK_BACK;
+                    break;
 
-// Need to distinguish between setting the 'fake' size for
-// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(bool recurse)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr && constr->left.GetDone() && constr->right.GetDone() &&
-                constr->width.GetDone() && constr->height.GetDone())
-  {
-    int x = constr->left.GetValue();
-    int y = constr->top.GetValue();
-    int w = constr->width.GetValue();
-    int h = constr->height.GetValue();
+                case 9:
+                    vId = WXK_TAB;
+                    break;
 
-    // If we don't want to resize this window, just move it...
-    if ((constr->width.GetRelationship() != wxAsIs) ||
-        (constr->height.GetRelationship() != wxAsIs))
+                default:
+                    bCtrlDown = TRUE;
+                    vId = vId + 96;
+            }
+        }
+    }
+    else if ( (vId = wxCharCodeOS2ToWX(wParam)) == 0)
     {
-      // Calls Layout() recursively. AAAGH. How can we stop that.
-      // Simply take Layout() out of non-top level OnSizes.
-      SizerSetSize(x, y, w, h);
+        //
+        // It's ASCII and will be processed here only when called from
+        // WM_CHAR (i.e. when isASCII = TRUE), don't process it now
+        //
+        vId = -1;
     }
-    else
+
+    if (vId != -1)
     {
-      SizerMove(x, y);
-    }
-  }
-  else if (constr)
-  {
-    char *windowClass = this->GetClassInfo()->GetClassName();
-
-    wxString winName;
-       if (GetName() == "")
-               winName = "unnamed";
-       else
-               winName = GetName();
-    wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
-    if (!constr->left.GetDone())
-      wxDebugMsg("  unsatisfied 'left' constraint.\n");
-    if (!constr->right.GetDone())
-      wxDebugMsg("  unsatisfied 'right' constraint.\n");
-    if (!constr->width.GetDone())
-      wxDebugMsg("  unsatisfied 'width' constraint.\n");
-    if (!constr->height.GetDone())
-      wxDebugMsg("  unsatisfied 'height' constraint.\n");
-    wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
-  }
-
-  if (recurse)
-  {
-    wxNode *node = GetChildren().First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-        win->SetConstraintSizes();
-      node = node->Next();
-    }
-  }
-}
+        wxKeyEvent                  vEvent(CreateKeyEvent( wxEVT_CHAR
+                                                          ,vId
+                                                          ,lParam
+                                                         ));
 
-// This assumes that all sizers are 'on' the same
-// window, i.e. the parent of this window.
-void wxWindow::TransformSizerToActual(int *x, int *y) const
-{
-  if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
-                        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
-    return;
-    
-  int xp, yp;
-  m_sizerParent->GetPosition(&xp, &yp);
-  m_sizerParent->TransformSizerToActual(&xp, &yp);
-  *x += xp;
-  *y += yp;
-}
+        if (bCtrlDown)
+        {
+            vEvent.m_controlDown = TRUE;
+        }
 
-void wxWindow::SizerSetSize(int x, int y, int w, int h)
-{
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  SetSize(xx, yy, w, h);
+        if (GetEventHandler()->ProcessEvent(vEvent))
+            return TRUE;
+    }
+    return FALSE;
 }
 
-void wxWindow::SizerMove(int x, int y)
+bool wxWindowOS2::HandleKeyDown(
+  WXWORD                            wParam
+, WXLPARAM                          lParam
+)
 {
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
-}
+    int                             nId = wxCharCodeOS2ToWX(wParam);
 
-// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
-    {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-    if (w != -1)
+    if (!nId)
     {
-      constr->width.SetValue(w);
-      constr->width.SetDone(TRUE);
+        //
+        // Normal ASCII char
+        //
+        nId = wParam;
     }
-    if (h != -1)
+
+    if (nId != -1)
     {
-      constr->height.SetValue(h);
-      constr->height.SetDone(TRUE);
+        wxKeyEvent                  vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
+                                                          ,nId
+                                                          ,lParam
+                                                         ));
+
+        if (GetEventHandler()->ProcessEvent(vEvent))
+        {
+            return TRUE;
+        }
     }
-  }
-}
+    return FALSE;
+} // end of wxWindowOS2::HandleKeyDown
 
-void wxWindow::MoveConstraint(int x, int y)
+bool wxWindowOS2::HandleKeyUp(
+  WXDWORD                           wParam
+, WXLPARAM                          lParam
+)
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
+    int                             nId = wxCharCodeOS2ToWX(wParam);
+
+    if (!nId)
     {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
+        //
+        // Normal ASCII char
+        //
+        nId = wParam;
     }
-    if (y != -1)
+
+    if (nId != -1)
     {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-  }
-}
+        wxKeyEvent                  vEvent(CreateKeyEvent( wxEVT_KEY_UP
+                                                          ,nId
+                                                          ,lParam
+                                                         ));
 
-void wxWindow::GetSizeConstraint(int *w, int *h) const
+        if (GetEventHandler()->ProcessEvent(vEvent))
+            return TRUE;
+    }
+    return FALSE;
+} // end of wxWindowOS2::HandleKeyUp
+
+// ---------------------------------------------------------------------------
+// joystick
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------------------
+// scrolling
+// ---------------------------------------------------------------------------
+
+bool wxWindowOS2::OS2OnScroll(
+  int                               nOrientation
+, WXWORD                            wParam
+, WXWORD                            wPos
+, WXHWND                            hControl
+)
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
-}
+    if (hControl)
+    {
+        wxWindow*                   pChild = wxFindWinFromHandle(hControl);
+
+        if (pChild )
+            return pChild->OS2OnScroll( nOrientation
+                                       ,wParam
+                                       ,wPos
+                                       ,hControl
+                                      );
+    }
 
-void wxWindow::GetClientSizeConstraint(int *w, int *h) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
-}
+    wxScrollWinEvent                vEvent;
 
-void wxWindow::GetPositionConstraint(int *x, int *y) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
-}
+    vEvent.SetPosition(wPos);
+    vEvent.SetOrientation(nOrientation);
+    vEvent.m_eventObject = this;
 
-bool wxWindow::Close(bool force)
-{
-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-#if WXWIN_COMPATIBILITY
-  event.SetForce(force);
-#endif
-  event.SetCanVeto(!force);
+    switch (wParam)
+    {
+        case SB_LINEUP:
+            vEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+            break;
 
-  return GetEventHandler()->ProcessEvent(event);
-}
+        case SB_LINEDOWN:
+            vEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+            break;
 
-wxObject* wxWindow::GetChild(int number) const
-{
-  // Return a pointer to the Nth object in the window
-  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 ;
-}
+        case SB_PAGEUP:
+            vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+            break;
 
-void wxWindow::OnDefaultAction(wxControl *initiatingItem)
-{
-    // Obsolete function
-}
+        case SB_PAGEDOWN:
+            vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+            break;
 
-void wxWindow::Clear()
-{
-       wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
+        case SB_SLIDERPOSITION:
+            vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+            break;
 
-// Fits the panel around the items
-void wxWindow::Fit()
-{
-       int maxX = 0;
-       int maxY = 0;
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *win = (wxWindow *)node->Data();
-               int wx, wy, ww, wh;
-               win->GetPosition(&wx, &wy);
-               win->GetSize(&ww, &wh);
-               if ( wx + ww > maxX )
-                       maxX = wx + ww;
-               if ( wy + wh > maxY )
-                       maxY = wy + wh;
-
-               node = node->Next();
-       }
-       SetClientSize(maxX + 5, maxY + 5);
-}
+        case SB_SLIDERTRACK:
+            vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+            break;
 
-void wxWindow::SetValidator(const wxValidator& validator)
+        default:
+            return FALSE;
+    }
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxWindowOS2::OS2OnScroll
+
+// ===========================================================================
+// global functions
+// ===========================================================================
+
+void wxGetCharSize(
+  WXHWND                            hWnd
+, int*                              pX
+, int*                              pY
+,wxFont*                            WXUNUSED(pTheFont)
+)
 {
-       if ( m_windowValidator )
-               delete m_windowValidator;
-       m_windowValidator = validator.Clone();
+    FONTMETRICS                     vFM;
+    HPS                             hPS;
+    BOOL                            rc;
 
-       if ( m_windowValidator )
-               m_windowValidator->SetWindow(this) ;
-}
+    hPS =::WinGetPS(hWnd);
 
-void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
+    rc = ::GpiQueryFontMetrics(hPS, sizeof(FONTMETRICS), &vFM);
+    if (rc)
+    {
+        if (pX)
+            *pX = vFM.lAveCharWidth;
+        if (pY)
+            *pY = vFM.lEmHeight + vFM.lExternalLeading;
+    }
+    else
+    {
+        if (pX)
+            *pX = 10;
+        if (pY)
+            *pY = 15;
+    }
+    ::WinReleasePS(hPS);
+} // end of wxGetCharSize
+
+//
+// Returns 0 if was a normal ASCII value, not a special key. This indicates that
+// the key should be ignored by WM_KEYDOWN and processed by WM_CHAR instead.
+//
+int wxCharCodeOS2ToWX(
+  int                               nKeySym
+)
 {
-    m_acceleratorTable = accel;
-}
-
-// Find a window by id or name
-wxWindow *wxWindow::FindWindow(long id)
-{
-       if ( GetId() == id)
-               return this;
-
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(id);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
-}
+    int                             nId = 0;
 
-wxWindow *wxWindow::FindWindow(const wxString& name)
-{
-       if ( GetName() == name)
-               return this;
-
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(name);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
-}
+    switch (nKeySym)
+    {
+        case VK_BACKTAB:    nId = WXK_BACK; break;
+        case VK_TAB:        nId = WXK_TAB; break;
+        case VK_CLEAR:      nId = WXK_CLEAR; break;
+        case VK_ENTER:      nId = WXK_RETURN; break;
+        case VK_SHIFT:      nId = WXK_SHIFT; break;
+        case VK_CTRL:       nId = WXK_CONTROL; break;
+        case VK_PAUSE:      nId = WXK_PAUSE; break;
+        case VK_SPACE:      nId = WXK_SPACE; break;
+        case VK_ESC:        nId = WXK_ESCAPE; break;
+        case VK_END:        nId = WXK_END; break;
+        case VK_HOME :      nId = WXK_HOME; break;
+        case VK_LEFT :      nId = WXK_LEFT; break;
+        case VK_UP:         nId = WXK_UP; break;
+        case VK_RIGHT:      nId = WXK_RIGHT; break;
+        case VK_DOWN :      nId = WXK_DOWN; break;
+        case VK_PRINTSCRN:  nId = WXK_PRINT; break;
+        case VK_INSERT:     nId = WXK_INSERT; break;
+        case VK_DELETE:     nId = WXK_DELETE; break;
+        case VK_F1:         nId = WXK_F1; break;
+        case VK_F2:         nId = WXK_F2; break;
+        case VK_F3:         nId = WXK_F3; break;
+        case VK_F4:         nId = WXK_F4; break;
+        case VK_F5:         nId = WXK_F5; break;
+        case VK_F6:         nId = WXK_F6; break;
+        case VK_F7:         nId = WXK_F7; break;
+        case VK_F8:         nId = WXK_F8; break;
+        case VK_F9:         nId = WXK_F9; break;
+        case VK_F10:        nId = WXK_F10; break;
+        case VK_F11:        nId = WXK_F11; break;
+        case VK_F12:        nId = WXK_F12; break;
+        case VK_F13:        nId = WXK_F13; break;
+        case VK_F14:        nId = WXK_F14; break;
+        case VK_F15:        nId = WXK_F15; break;
+        case VK_F16:        nId = WXK_F16; break;
+        case VK_F17:        nId = WXK_F17; break;
+        case VK_F18:        nId = WXK_F18; break;
+        case VK_F19:        nId = WXK_F19; break;
+        case VK_F20:        nId = WXK_F20; break;
+        case VK_F21:        nId = WXK_F21; break;
+        case VK_F22:        nId = WXK_F22; break;
+        case VK_F23:        nId = WXK_F23; break;
+        case VK_F24:        nId = WXK_F24; break;
+        case VK_NUMLOCK:    nId = WXK_NUMLOCK; break;
+        case VK_SCRLLOCK:   nId = WXK_SCROLL; break;
+        default:
+        {
+            return 0;
+        }
+    }
+    return nId;
+} // end of wxCharCodeOS2ToWX
 
-void wxWindow::OnIdle(wxIdleEvent& event)
+int wxCharCodeWXToOS2(
+  int                               nId
+, bool*                             bIsVirtual
+)
 {
-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
+    int                             nKeySym = 0;
 
-    // Check if we need to send a LEAVE event
-    if (m_mouseInWindow)
+    *bIsVirtual = TRUE;
+    switch (nId)
     {
-        POINT pt;
-        ::GetCursorPos(&pt);
-        if (::WindowFromPoint(pt) != (HWND) GetHWND())
+        case WXK_CLEAR:     nKeySym = VK_CLEAR; break;
+        case WXK_SHIFT:     nKeySym = VK_SHIFT; break;
+        case WXK_CONTROL:   nKeySym = VK_CTRL; break;
+        case WXK_PAUSE:     nKeySym = VK_PAUSE; break;
+        case WXK_END:       nKeySym = VK_END; break;
+        case WXK_HOME :     nKeySym = VK_HOME; break;
+        case WXK_LEFT :     nKeySym = VK_LEFT; break;
+        case WXK_UP:        nKeySym = VK_UP; break;
+        case WXK_RIGHT:     nKeySym = VK_RIGHT; break;
+        case WXK_DOWN :     nKeySym = VK_DOWN; break;
+        case WXK_PRINT:     nKeySym = VK_PRINTSCRN; break;
+        case WXK_INSERT:    nKeySym = VK_INSERT; break;
+        case WXK_DELETE:    nKeySym = VK_DELETE; break;
+        case WXK_F1:        nKeySym = VK_F1; break;
+        case WXK_F2:        nKeySym = VK_F2; break;
+        case WXK_F3:        nKeySym = VK_F3; break;
+        case WXK_F4:        nKeySym = VK_F4; break;
+        case WXK_F5:        nKeySym = VK_F5; break;
+        case WXK_F6:        nKeySym = VK_F6; break;
+        case WXK_F7:        nKeySym = VK_F7; break;
+        case WXK_F8:        nKeySym = VK_F8; break;
+        case WXK_F9:        nKeySym = VK_F9; break;
+        case WXK_F10:       nKeySym = VK_F10; break;
+        case WXK_F11:       nKeySym = VK_F11; break;
+        case WXK_F12:       nKeySym = VK_F12; break;
+        case WXK_F13:       nKeySym = VK_F13; break;
+        case WXK_F14:       nKeySym = VK_F14; break;
+        case WXK_F15:       nKeySym = VK_F15; break;
+        case WXK_F16:       nKeySym = VK_F16; break;
+        case WXK_F17:       nKeySym = VK_F17; break;
+        case WXK_F18:       nKeySym = VK_F18; break;
+        case WXK_F19:       nKeySym = VK_F19; break;
+        case WXK_F20:       nKeySym = VK_F20; break;
+        case WXK_F21:       nKeySym = VK_F21; break;
+        case WXK_F22:       nKeySym = VK_F22; break;
+        case WXK_F23:       nKeySym = VK_F23; break;
+        case WXK_F24:       nKeySym = VK_F24; break;
+        case WXK_NUMLOCK:   nKeySym = VK_NUMLOCK; break;
+        case WXK_SCROLL:    nKeySym = VK_SCRLLOCK; break;
+        default:
         {
-            // Generate a LEAVE event
-            m_mouseInWindow = FALSE;
-            MSWOnMouseLeave(pt.x, pt.y, 0);
+            *bIsVirtual = FALSE;
+            nKeySym = nId;
+            break;
         }
     }
-*/
+    return nKeySym;
+} // end of wxCharCodeWXToOS2
 
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-       UpdateWindowUI();
-}
-
-// Raise the window to the top of the Z order
-void wxWindow::Raise()
+wxWindow* wxGetActiveWindow()
 {
-    // TODO
-}
+    HWND                            hWnd = ::WinQueryActiveWindow(HWND_DESKTOP);
 
-// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
-{
-    // TODO
-}
+    if (hWnd != 0)
+    {
+        return wxFindWinFromHandle((WXHWND)hWnd);
+    }
+    return NULL;
+} // end of wxGetActiveWindow
 
-bool wxWindow::AcceptsFocus() const
+#ifdef __WXDEBUG__
+const char* wxGetMessageName(
+  int                               nMessage)
 {
-  return IsShown() && IsEnabled();
-}
-
-// Update region access
-wxRegion wxWindow::GetUpdateRegion() const
+    switch (nMessage)
+    {
+        case 0x0000: return "WM_NULL";
+        case 0x0001: return "WM_CREATE";
+        case 0x0002: return "WM_DESTROY";
+        case 0x0004: return "WM_ENABLE";
+        case 0x0005: return "WM_SHOW";
+        case 0x0006: return "WM_MOVE";
+        case 0x0007: return "WM_SIZE";
+        case 0x0008: return "WM_ADJUSTWINDOWPOS";
+        case 0x0009: return "WM_CALCVALIDRECTS";
+        case 0x000A: return "WM_SETWINDOWPARAMS";
+        case 0x000B: return "WM_QUERYWINDOWPARAMS";
+        case 0x000C: return "WM_HITTEST";
+        case 0x000D: return "WM_ACTIVATE";
+        case 0x000F: return "WM_SETFOCUS";
+        case 0x0010: return "WM_SETSELECTION";
+        case 0x0011: return "WM_PPAINT";
+        case 0x0012: return "WM_PSETFOCUS";
+        case 0x0013: return "WM_PSYSCOLORCHANGE";
+        case 0x0014: return "WM_PSIZE";
+        case 0x0015: return "WM_PACTIVATE";
+        case 0x0016: return "WM_PCONTROL";
+        case 0x0020: return "WM_COMMAND";
+        case 0x0021: return "WM_SYSCOMMAND";
+        case 0x0022: return "WM_HELP";
+        case 0x0023: return "WM_PAINT";
+        case 0x0024: return "WM_TIMER";
+        case 0x0025: return "WM_SEM1";
+        case 0x0026: return "WM_SEM2";
+        case 0x0027: return "WM_SEM3";
+        case 0x0028: return "WM_SEM4";
+        case 0x0029: return "WM_CLOSE";
+        case 0x002A: return "WM_QUIT";
+        case 0x002B: return "WM_SYSCOLORCHANGE";
+        case 0x002D: return "WM_SYSVALUECHANGE";
+        case 0x002E: return "WM_APPTERMINATENOTIFY";
+        case 0x002F: return "WM_PRESPARAMCHANGED";
+        // Control notification messages
+        case 0x0030: return "WM_CONTROL";
+        case 0x0031: return "WM_VSCROLL";
+        case 0x0032: return "WM_HSCROLL";
+        case 0x0033: return "WM_INITMENU";
+        case 0x0034: return "WM_MENUSELECT";
+        case 0x0035: return "WM_MENUSEND";
+        case 0x0036: return "WM_DRAWITEM";
+        case 0x0037: return "WM_MEASUREITEM";
+        case 0x0038: return "WM_CONTROLPOINTER";
+        case 0x003A: return "WM_QUERYDLGCODE";
+        case 0x003B: return "WM_INITDLG";
+        case 0x003C: return "WM_SUBSTITUTESTRING";
+        case 0x003D: return "WM_MATCHMNEMONIC";
+        case 0x003E: return "WM_SAVEAPPLICATION";
+        case 0x0129: return "WM_CTLCOLORCHANGE";
+        case 0x0130: return "WM_QUERYCTLTYPE";
+        // Frame messages
+        case 0x0040: return "WM_FLASHWINDOW";
+        case 0x0041: return "WM_FORMATFRAME";
+        case 0x0042: return "WM_UPDATEFRAME";
+        case 0x0043: return "WM_FOCUSCHANGE";
+        case 0x0044: return "WM_SETBORDERSIZE";
+        case 0x0045: return "WM_TRACKFRAME";
+        case 0x0046: return "WM_MINMAXFRAME";
+        case 0x0047: return "WM_SETICON";
+        case 0x0048: return "WM_QUERYICON";
+        case 0x0049: return "WM_SETACCELTABLE";
+        case 0x004A: return "WM_QUERYACCELTABLE";
+        case 0x004B: return "WM_TRANSLATEACCEL";
+        case 0x004C: return "WM_QUERYTRACKINFO";
+        case 0x004D: return "WM_QUERYBORDERSIZE";
+        case 0x004E: return "WM_NEXTMENU";
+        case 0x004F: return "WM_ERASEBACKGROUND";
+        case 0x0050: return "WM_QUERYFRAMEINFO";
+        case 0x0051: return "WM_QUERYFOCUSCHAIN";
+        case 0x0052: return "WM_OWNERPOSCHANGE";
+        case 0x0053: return "WM_CACLFRAMERECT";
+        case 0x0055: return "WM_WINDOWPOSCHANGED";
+        case 0x0056: return "WM_ADJUSTFRAMEPOS";
+        case 0x0059: return "WM_QUERYFRAMECTLCOUNT";
+        case 0x005B: return "WM_QUERYHELPINFO";
+        case 0x005C: return "WM_SETHELPINFO";
+        case 0x005D: return "WM_ERROR";
+        case 0x005E: return "WM_REALIZEPALETTE";
+        // Clipboard messages
+        case 0x0060: return "WM_RENDERFMT";
+        case 0x0061: return "WM_RENDERALLFMTS";
+        case 0x0062: return "WM_DESTROYCLIPBOARD";
+        case 0x0063: return "WM_PAINTCLIPBOARD";
+        case 0x0064: return "WM_SIZECLIPBOARD";
+        case 0x0065: return "WM_HSCROLLCLIPBOARD";
+        case 0x0066: return "WM_VSCROLLCLIPBOARD";
+        case 0x0067: return "WM_DRAWCLIPBOARD";
+        // mouse messages
+        case 0x0070: return "WM_MOUSEMOVE";
+        case 0x0071: return "WM_BUTTON1DOWN";
+        case 0x0072: return "WM_BUTTON1UP";
+        case 0x0073: return "WM_BUTTON1DBLCLK";
+        case 0x0074: return "WM_BUTTON2DOWN";
+        case 0x0075: return "WM_BUTTON2UP";
+        case 0x0076: return "WM_BUTTON2DBLCLK";
+        case 0x0077: return "WM_BUTTON3DOWN";
+        case 0x0078: return "WM_BUTTON3UP";
+        case 0x0079: return "WM_BUTTON3DBLCLK";
+        case 0x007D: return "WM_MOUSEMAP";
+        case 0x007E: return "WM_VRNDISABLED";
+        case 0x007F: return "WM_VRNENABLED";
+        case 0x0410: return "WM_CHORD";
+        case 0x0411: return "WM_BUTTON1MOTIONSTART";
+        case 0x0412: return "WM_BUTTON1MOTIONEND";
+        case 0x0413: return "WM_BUTTON1CLICK";
+        case 0x0414: return "WM_BUTTON2MOTIONSTART";
+        case 0x0415: return "WM_BUTTON2MOTIONEND";
+        case 0x0416: return "WM_BUTTON2CLICK";
+        case 0x0417: return "WM_BUTTON3MOTIONSTART";
+        case 0x0418: return "WM_BUTTON3MOTIONEND";
+        case 0x0419: return "WM_BUTTON3CLICK";
+        case 0x0420: return "WM_BEGINDRAG";
+        case 0x0421: return "WM_ENDDRAG";
+        case 0x0422: return "WM_SINGLESELECT";
+        case 0x0423: return "WM_OPEN";
+        case 0x0424: return "WM_CONTEXTMENU";
+        case 0x0425: return "WM_CONTEXTHELP";
+        case 0x0426: return "WM_TEXTEDIT";
+        case 0x0427: return "WM_BEGINSELECT";
+        case 0x0228: return "WM_ENDSELECT";
+        case 0x0429: return "WM_PICKUP";
+        case 0x04C0: return "WM_PENFIRST";
+        case 0x04FF: return "WM_PENLAST";
+        case 0x0500: return "WM_MMPMFIRST";
+        case 0x05FF: return "WM_MMPMLAST";
+        case 0x0600: return "WM_STDDLGFIRST";
+        case 0x06FF: return "WM_STDDLGLAST";
+        case 0x0BD0: return "WM_BIDI_FIRST";
+        case 0x0BFF: return "WM_BIDI_LAST";
+        // keyboard input
+        case 0x007A: return "WM_CHAR";
+        case 0x007B: return "WM_VIOCHAR";
+        // DDE messages
+        case 0x00A0: return "WM_DDE_INITIATE";
+        case 0x00A1: return "WM_DDE_REQUEST";
+        case 0x00A2: return "WM_DDE_ACK";
+        case 0x00A3: return "WM_DDE_DATA";
+        case 0x00A4: return "WM_DDE_ADVISE";
+        case 0x00A5: return "WM_DDE_UNADVISE";
+        case 0x00A6: return "WM_DDE_POKE";
+        case 0x00A7: return "WM_DDE_EXECUTE";
+        case 0x00A8: return "WM_DDE_TERMINATE";
+        case 0x00A9: return "WM_DDE_INITIATEACK";
+        case 0x00AF: return "WM_DDE_LAST";
+        // Buttons
+        case 0x0120: return "BM_CLICK";
+        case 0x0121: return "BM_QUERYCHECKINDEX";
+        case 0x0122: return "BM_QUERYHILITE";
+        case 0x0123: return "BM_SETHILITE";
+        case 0x0124: return "BM_QUERYCHECK";
+        case 0x0125: return "BM_SETCHECK";
+        case 0x0126: return "BM_SETDEFAULT";
+        case 0x0128: return "BM_AUTOSIZE";
+        // Combo boxes
+        case 0x029A: return "CBID_LIST";
+        case 0x029B: return "CBID_EDIT";
+        case 0x0170: return "CBM_SHOWLIST";
+        case 0x0171: return "CBM_HILITE";
+        case 0x0172: return "CBM_ISLISTSHOWING";
+        // Edit fields
+        case 0x0140: return "EM_QUERYCHANGED";
+        case 0x0141: return "EM_QUERYSEL";
+        case 0x0142: return "EM_SETSEL";
+        case 0x0143: return "EM_SETTEXTLIMIT";
+        case 0x0144: return "EM_CUT";
+        case 0x0145: return "EM_COPY";
+        case 0x0146: return "EM_CLEAR";
+        case 0x0147: return "EM_PASTE";
+        case 0x0148: return "EM_QUERYFIRSTCHAR";
+        case 0x0149: return "EM_SETFIRSTCHAR";
+        case 0x014A: return "EM_QUERYREADONLY";
+        case 0x014B: return "EM_SETREADONLY";
+        case 0x014C: return "EM_SETINSERTMODE";
+        // Listboxes
+        case 0x0160: return "LM_QUERYITEMCOUNT";
+        case 0x0161: return "LM_INSERTITEM";
+        case 0x0162: return "LM_SETOPENINDEX";
+        case 0x0163: return "LM_DELETEITEM";
+        case 0x0164: return "LM_SELECTITEM";
+        case 0x0165: return "LM_QUERYSELECTION";
+        case 0x0166: return "LM_SETITEMTEXT";
+        case 0x0167: return "LM_QUERYITEMTEXTLENGTH";
+        case 0x0168: return "LM_QUERYITEMTEXT";
+        case 0x0169: return "LM_SETITEMHANDLE";
+        case 0x016A: return "LM_QUERYITEMHANDLE";
+        case 0x016B: return "LM_SEARCHSTRING";
+        case 0x016C: return "LM_SETITEMHEIGHT";
+        case 0x016D: return "LM_QUERYTOPINDEX";
+        case 0x016E: return "LM_DELETEALL";
+        case 0x016F: return "LM_INSERTMULITEMS";
+        case 0x0660: return "LM_SETITEMWIDTH";
+        // Menus
+        case 0x0180: return "MM_INSERTITEM";
+        case 0x0181: return "MM_DELETEITEM";
+        case 0x0182: return "MM_QUERYITEM";
+        case 0x0183: return "MM_SETITEM";
+        case 0x0184: return "MM_QUERYITEMCOUNT";
+        case 0x0185: return "MM_STARTMENUMODE";
+        case 0x0186: return "MM_ENDMENUMODE";
+        case 0x0188: return "MM_REMOVEITEM";
+        case 0x0189: return "MM_SELECTITEM";
+        case 0x018A: return "MM_QUERYSELITEMID";
+        case 0x018B: return "MM_QUERYITEMTEXT";
+        case 0x018C: return "MM_QUERYITEMTEXTLENGTH";
+        case 0x018D: return "MM_SETITEMHANDLE";
+        case 0x018E: return "MM_SETITEMTEXT";
+        case 0x018F: return "MM_ITEMPOSITIONFROMID";
+        case 0x0190: return "MM_ITEMIDFROMPOSITION";
+        case 0x0191: return "MM_QUERYITEMATTR";
+        case 0x0192: return "MM_SETITEMATTR";
+        case 0x0193: return "MM_ISITEMVALID";
+        case 0x0194: return "MM_QUERYITEMRECT";
+        case 0x0431: return "MM_QUERYDEFAULTITEMID";
+        case 0x0432: return "MM_SETDEFAULTITEMID";
+        // Scrollbars
+        case 0x01A0: return "SBM_SETSCROLLBAR";
+        case 0x01A1: return "SBM_SETPOS";
+        case 0x01A2: return "SBM_QUERYPOS";
+        case 0x01A3: return "SBM_QUERYRANGE";
+        case 0x01A6: return "SBM_SETTHUMBSIZE";
+
+        // Help messages
+        case 0x0F00: return "WM_HELPBASE";
+        case 0x0FFF: return "WM_HELPTOP";
+        // Beginning of user defined messages
+        case 0x1000: return "WM_USER";
+
+        // wxWindows user defined types
+
+        // listview
+        // case 0x1000 + 0: return "LVM_GETBKCOLOR";
+        case 0x1000 + 1: return "LVM_SETBKCOLOR";
+        case 0x1000 + 2: return "LVM_GETIMAGELIST";
+        case 0x1000 + 3: return "LVM_SETIMAGELIST";
+        case 0x1000 + 4: return "LVM_GETITEMCOUNT";
+        case 0x1000 + 5: return "LVM_GETITEMA";
+        case 0x1000 + 75: return "LVM_GETITEMW";
+        case 0x1000 + 6: return "LVM_SETITEMA";
+        case 0x1000 + 76: return "LVM_SETITEMW";
+        case 0x1000 + 7: return "LVM_INSERTITEMA";
+        case 0x1000 + 77: return "LVM_INSERTITEMW";
+        case 0x1000 + 8: return "LVM_DELETEITEM";
+        case 0x1000 + 9: return "LVM_DELETEALLITEMS";
+        case 0x1000 + 10: return "LVM_GETCALLBACKMASK";
+        case 0x1000 + 11: return "LVM_SETCALLBACKMASK";
+        case 0x1000 + 12: return "LVM_GETNEXTITEM";
+        case 0x1000 + 13: return "LVM_FINDITEMA";
+        case 0x1000 + 83: return "LVM_FINDITEMW";
+        case 0x1000 + 14: return "LVM_GETITEMRECT";
+        case 0x1000 + 15: return "LVM_SETITEMPOSITION";
+        case 0x1000 + 16: return "LVM_GETITEMPOSITION";
+        case 0x1000 + 17: return "LVM_GETSTRINGWIDTHA";
+        case 0x1000 + 87: return "LVM_GETSTRINGWIDTHW";
+        case 0x1000 + 18: return "LVM_HITTEST";
+        case 0x1000 + 19: return "LVM_ENSUREVISIBLE";
+        case 0x1000 + 20: return "LVM_SCROLL";
+        case 0x1000 + 21: return "LVM_REDRAWITEMS";
+        case 0x1000 + 22: return "LVM_ARRANGE";
+        case 0x1000 + 23: return "LVM_EDITLABELA";
+        case 0x1000 + 118: return "LVM_EDITLABELW";
+        case 0x1000 + 24: return "LVM_GETEDITCONTROL";
+        case 0x1000 + 25: return "LVM_GETCOLUMNA";
+        case 0x1000 + 95: return "LVM_GETCOLUMNW";
+        case 0x1000 + 26: return "LVM_SETCOLUMNA";
+        case 0x1000 + 96: return "LVM_SETCOLUMNW";
+        case 0x1000 + 27: return "LVM_INSERTCOLUMNA";
+        case 0x1000 + 97: return "LVM_INSERTCOLUMNW";
+        case 0x1000 + 28: return "LVM_DELETECOLUMN";
+        case 0x1000 + 29: return "LVM_GETCOLUMNWIDTH";
+        case 0x1000 + 30: return "LVM_SETCOLUMNWIDTH";
+        case 0x1000 + 31: return "LVM_GETHEADER";
+        case 0x1000 + 33: return "LVM_CREATEDRAGIMAGE";
+        case 0x1000 + 34: return "LVM_GETVIEWRECT";
+        case 0x1000 + 35: return "LVM_GETTEXTCOLOR";
+        case 0x1000 + 36: return "LVM_SETTEXTCOLOR";
+        case 0x1000 + 37: return "LVM_GETTEXTBKCOLOR";
+        case 0x1000 + 38: return "LVM_SETTEXTBKCOLOR";
+        case 0x1000 + 39: return "LVM_GETTOPINDEX";
+        case 0x1000 + 40: return "LVM_GETCOUNTPERPAGE";
+        case 0x1000 + 41: return "LVM_GETORIGIN";
+        case 0x1000 + 42: return "LVM_UPDATE";
+        case 0x1000 + 43: return "LVM_SETITEMSTATE";
+        case 0x1000 + 44: return "LVM_GETITEMSTATE";
+        case 0x1000 + 45: return "LVM_GETITEMTEXTA";
+        case 0x1000 + 115: return "LVM_GETITEMTEXTW";
+        case 0x1000 + 46: return "LVM_SETITEMTEXTA";
+        case 0x1000 + 116: return "LVM_SETITEMTEXTW";
+        case 0x1000 + 47: return "LVM_SETITEMCOUNT";
+        case 0x1000 + 48: return "LVM_SORTITEMS";
+        case 0x1000 + 49: return "LVM_SETITEMPOSITION32";
+        case 0x1000 + 50: return "LVM_GETSELECTEDCOUNT";
+        case 0x1000 + 51: return "LVM_GETITEMSPACING";
+        case 0x1000 + 52: return "LVM_GETISEARCHSTRINGA";
+        case 0x1000 + 117: return "LVM_GETISEARCHSTRINGW";
+        case 0x1000 + 53: return "LVM_SETICONSPACING";
+        case 0x1000 + 54: return "LVM_SETEXTENDEDLISTVIEWSTYLE";
+        case 0x1000 + 55: return "LVM_GETEXTENDEDLISTVIEWSTYLE";
+        case 0x1000 + 56: return "LVM_GETSUBITEMRECT";
+        case 0x1000 + 57: return "LVM_SUBITEMHITTEST";
+        case 0x1000 + 58: return "LVM_SETCOLUMNORDERARRAY";
+        case 0x1000 + 59: return "LVM_GETCOLUMNORDERARRAY";
+        case 0x1000 + 60: return "LVM_SETHOTITEM";
+        case 0x1000 + 61: return "LVM_GETHOTITEM";
+        case 0x1000 + 62: return "LVM_SETHOTCURSOR";
+        case 0x1000 + 63: return "LVM_GETHOTCURSOR";
+        case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT";
+        case 0x1000 + 65: return "LVM_SETWORKAREA";
+
+        // tree view
+        case 0x1100 + 0: return "TVM_INSERTITEMA";
+        case 0x1100 + 50: return "TVM_INSERTITEMW";
+        case 0x1100 + 1: return "TVM_DELETEITEM";
+        case 0x1100 + 2: return "TVM_EXPAND";
+        case 0x1100 + 4: return "TVM_GETITEMRECT";
+        case 0x1100 + 5: return "TVM_GETCOUNT";
+        case 0x1100 + 6: return "TVM_GETINDENT";
+        case 0x1100 + 7: return "TVM_SETINDENT";
+        case 0x1100 + 8: return "TVM_GETIMAGELIST";
+        case 0x1100 + 9: return "TVM_SETIMAGELIST";
+        case 0x1100 + 10: return "TVM_GETNEXTITEM";
+        case 0x1100 + 11: return "TVM_SELECTITEM";
+        case 0x1100 + 12: return "TVM_GETITEMA";
+        case 0x1100 + 62: return "TVM_GETITEMW";
+        case 0x1100 + 13: return "TVM_SETITEMA";
+        case 0x1100 + 63: return "TVM_SETITEMW";
+        case 0x1100 + 14: return "TVM_EDITLABELA";
+        case 0x1100 + 65: return "TVM_EDITLABELW";
+        case 0x1100 + 15: return "TVM_GETEDITCONTROL";
+        case 0x1100 + 16: return "TVM_GETVISIBLECOUNT";
+        case 0x1100 + 17: return "TVM_HITTEST";
+        case 0x1100 + 18: return "TVM_CREATEDRAGIMAGE";
+        case 0x1100 + 19: return "TVM_SORTCHILDREN";
+        case 0x1100 + 20: return "TVM_ENSUREVISIBLE";
+        case 0x1100 + 21: return "TVM_SORTCHILDRENCB";
+        case 0x1100 + 22: return "TVM_ENDEDITLABELNOW";
+        case 0x1100 + 23: return "TVM_GETISEARCHSTRINGA";
+        case 0x1100 + 64: return "TVM_GETISEARCHSTRINGW";
+        case 0x1100 + 24: return "TVM_SETTOOLTIPS";
+        case 0x1100 + 25: return "TVM_GETTOOLTIPS";
+
+        // header
+        case 0x1200 + 0: return "HDM_GETITEMCOUNT";
+        case 0x1200 + 1: return "HDM_INSERTITEMA";
+        case 0x1200 + 10: return "HDM_INSERTITEMW";
+        case 0x1200 + 2: return "HDM_DELETEITEM";
+        case 0x1200 + 3: return "HDM_GETITEMA";
+        case 0x1200 + 11: return "HDM_GETITEMW";
+        case 0x1200 + 4: return "HDM_SETITEMA";
+        case 0x1200 + 12: return "HDM_SETITEMW";
+        case 0x1200 + 5: return "HDM_LAYOUT";
+        case 0x1200 + 6: return "HDM_HITTEST";
+        case 0x1200 + 7: return "HDM_GETITEMRECT";
+        case 0x1200 + 8: return "HDM_SETIMAGELIST";
+        case 0x1200 + 9: return "HDM_GETIMAGELIST";
+        case 0x1200 + 15: return "HDM_ORDERTOINDEX";
+        case 0x1200 + 16: return "HDM_CREATEDRAGIMAGE";
+        case 0x1200 + 17: return "HDM_GETORDERARRAY";
+        case 0x1200 + 18: return "HDM_SETORDERARRAY";
+        case 0x1200 + 19: return "HDM_SETHOTDIVIDER";
+
+        // tab control
+        case 0x1300 + 2: return "TCM_GETIMAGELIST";
+        case 0x1300 + 3: return "TCM_SETIMAGELIST";
+        case 0x1300 + 4: return "TCM_GETITEMCOUNT";
+        case 0x1300 + 5: return "TCM_GETITEMA";
+        case 0x1300 + 60: return "TCM_GETITEMW";
+        case 0x1300 + 6: return "TCM_SETITEMA";
+        case 0x1300 + 61: return "TCM_SETITEMW";
+        case 0x1300 + 7: return "TCM_INSERTITEMA";
+        case 0x1300 + 62: return "TCM_INSERTITEMW";
+        case 0x1300 + 8: return "TCM_DELETEITEM";
+        case 0x1300 + 9: return "TCM_DELETEALLITEMS";
+        case 0x1300 + 10: return "TCM_GETITEMRECT";
+        case 0x1300 + 11: return "TCM_GETCURSEL";
+        case 0x1300 + 12: return "TCM_SETCURSEL";
+        case 0x1300 + 13: return "TCM_HITTEST";
+        case 0x1300 + 14: return "TCM_SETITEMEXTRA";
+        case 0x1300 + 40: return "TCM_ADJUSTRECT";
+        case 0x1300 + 41: return "TCM_SETITEMSIZE";
+        case 0x1300 + 42: return "TCM_REMOVEIMAGE";
+        case 0x1300 + 43: return "TCM_SETPADDING";
+        case 0x1300 + 44: return "TCM_GETROWCOUNT";
+        case 0x1300 + 45: return "TCM_GETTOOLTIPS";
+        case 0x1300 + 46: return "TCM_SETTOOLTIPS";
+        case 0x1300 + 47: return "TCM_GETCURFOCUS";
+        case 0x1300 + 48: return "TCM_SETCURFOCUS";
+        case 0x1300 + 49: return "TCM_SETMINTABWIDTH";
+        case 0x1300 + 50: return "TCM_DESELECTALL";
+
+        // toolbar
+        case WM_USER+1000+1: return "TB_ENABLEBUTTON";
+        case WM_USER+1000+2: return "TB_CHECKBUTTON";
+        case WM_USER+1000+3: return "TB_PRESSBUTTON";
+        case WM_USER+1000+4: return "TB_HIDEBUTTON";
+        case WM_USER+1000+5: return "TB_INDETERMINATE";
+        case WM_USER+1000+9: return "TB_ISBUTTONENABLED";
+        case WM_USER+1000+10: return "TB_ISBUTTONCHECKED";
+        case WM_USER+1000+11: return "TB_ISBUTTONPRESSED";
+        case WM_USER+1000+12: return "TB_ISBUTTONHIDDEN";
+        case WM_USER+1000+13: return "TB_ISBUTTONINDETERMINATE";
+        case WM_USER+1000+17: return "TB_SETSTATE";
+        case WM_USER+1000+18: return "TB_GETSTATE";
+        case WM_USER+1000+19: return "TB_ADDBITMAP";
+        case WM_USER+1000+20: return "TB_ADDBUTTONS";
+        case WM_USER+1000+21: return "TB_INSERTBUTTON";
+        case WM_USER+1000+22: return "TB_DELETEBUTTON";
+        case WM_USER+1000+23: return "TB_GETBUTTON";
+        case WM_USER+1000+24: return "TB_BUTTONCOUNT";
+        case WM_USER+1000+25: return "TB_COMMANDTOINDEX";
+        case WM_USER+1000+26: return "TB_SAVERESTOREA";
+        case WM_USER+1000+76: return "TB_SAVERESTOREW";
+        case WM_USER+1000+27: return "TB_CUSTOMIZE";
+        case WM_USER+1000+28: return "TB_ADDSTRINGA";
+        case WM_USER+1000+77: return "TB_ADDSTRINGW";
+        case WM_USER+1000+29: return "TB_GETITEMRECT";
+        case WM_USER+1000+30: return "TB_BUTTONSTRUCTSIZE";
+        case WM_USER+1000+31: return "TB_SETBUTTONSIZE";
+        case WM_USER+1000+32: return "TB_SETBITMAPSIZE";
+        case WM_USER+1000+33: return "TB_AUTOSIZE";
+        case WM_USER+1000+35: return "TB_GETTOOLTIPS";
+        case WM_USER+1000+36: return "TB_SETTOOLTIPS";
+        case WM_USER+1000+37: return "TB_SETPARENT";
+        case WM_USER+1000+39: return "TB_SETROWS";
+        case WM_USER+1000+40: return "TB_GETROWS";
+        case WM_USER+1000+42: return "TB_SETCMDID";
+        case WM_USER+1000+43: return "TB_CHANGEBITMAP";
+        case WM_USER+1000+44: return "TB_GETBITMAP";
+        case WM_USER+1000+45: return "TB_GETBUTTONTEXTA";
+        case WM_USER+1000+75: return "TB_GETBUTTONTEXTW";
+        case WM_USER+1000+46: return "TB_REPLACEBITMAP";
+        case WM_USER+1000+47: return "TB_SETINDENT";
+        case WM_USER+1000+48: return "TB_SETIMAGELIST";
+        case WM_USER+1000+49: return "TB_GETIMAGELIST";
+        case WM_USER+1000+50: return "TB_LOADIMAGES";
+        case WM_USER+1000+51: return "TB_GETRECT";
+        case WM_USER+1000+52: return "TB_SETHOTIMAGELIST";
+        case WM_USER+1000+53: return "TB_GETHOTIMAGELIST";
+        case WM_USER+1000+54: return "TB_SETDISABLEDIMAGELIST";
+        case WM_USER+1000+55: return "TB_GETDISABLEDIMAGELIST";
+        case WM_USER+1000+56: return "TB_SETSTYLE";
+        case WM_USER+1000+57: return "TB_GETSTYLE";
+        case WM_USER+1000+58: return "TB_GETBUTTONSIZE";
+        case WM_USER+1000+59: return "TB_SETBUTTONWIDTH";
+        case WM_USER+1000+60: return "TB_SETMAXTEXTROWS";
+        case WM_USER+1000+61: return "TB_GETTEXTROWS";
+        case WM_USER+1000+41: return "TB_GETBITMAPFLAGS";
+
+        default:
+            static char s_szBuf[128];
+            sprintf(s_szBuf, "<unknown message = %d>", nMessage);
+            return s_szBuf;
+    }
+   return NULL;
+} // end of wxGetMessageName
+
+#endif // __WXDEBUG__
+
+// Unused?
+#if 0
+static void TranslateKbdEventToMouse(
+  wxWindow*                         pWin
+, int*                              pX
+, int*                              pY
+, ULONG*                            pFlags
+)
 {
-    return m_updateRegion;
-}
+    //
+    // Construct the key mask
+    ULONG&                          fwKeys = *pFlags;
+
+    fwKeys = VK_BUTTON2;
+    if ((::WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x100) != 0)
+        fwKeys |= VK_CTRL;
+    if ((::WinGetKeyState(HWND_DESKTOP, VK_SHIFT) & 0x100) != 0)
+        fwKeys |= VK_SHIFT;
+
+    //
+    // Simulate right mouse button click
+    //
+    POINTL                          vPoint;
+
+    ::WinQueryMsgPos(vHabmain, &vPoint);
+    *pX = vPoint.x;
+    *pY = vPoint.y;
+
+    pWin->ScreenToClient(pX, pY);
+} // end of TranslateKbdEventToMouse
+#endif
 
-bool wxWindow::IsExposed(int x, int y, int w, int h) const
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(
+  wxPoint&                          WXUNUSED(rPt)
+)
 {
-    return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion);
+    return wxFindWindowAtPoint(wxGetMousePosition());
 }
 
-bool wxWindow::IsExposed(const wxPoint& pt) const
+wxWindow* wxFindWindowAtPoint(
+  const wxPoint&                    rPt
+)
 {
-    return (m_updateRegion.Contains(pt) != wxOutRegion);
-}
+    POINTL                          vPt2;
 
-bool wxWindow::IsExposed(const wxRect& rect) const
-{
-    return (m_updateRegion.Contains(rect) != wxOutRegion);
-}
+    vPt2.x = rPt.x;
+    vPt2.y = rPt.y;
 
-void wxWindow::SetToolTip(const wxString& tooltip)
-{
-    // TODO
-}
+    HWND                            hWndHit = ::WinWindowFromPoint(HWND_DESKTOP, &vPt2, FALSE);
+    wxWindow*                       pWin = wxFindWinFromHandle((WXHWND)hWndHit) ;
+    HWND                            hWnd = hWndHit;
 
-/*
- * Allocates control IDs
- */
+    //
+    // Try to find a window with a wxWindow associated with it
+    //
+    while (!pWin && (hWnd != 0))
+    {
+        hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
+        pWin = wxFindWinFromHandle((WXHWND)hWnd) ;
+    }
+    return pWin;
+}
 
-int wxWindow::NewControlId()
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
 {
-    static int s_controlId = 0;
-    s_controlId ++;
-    return s_controlId;
-}
+    POINTL                          vPt;
 
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPt);
+    return wxPoint(vPt.x, vPt.y);
+}