]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/window.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
adjusting to changed ownership (font is only created in the GetFont call of wxTextAttr)
[wxWidgets.git] / src / os2 / window.cpp
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index fb16810ccc1c0c9a823e9dfb72e730b4164fd4fd..4a631a84520a848d5b4aa7094c52b4ec9edeb564 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        windows.cpp
+// Name:        src/os2/window.cpp
 // Purpose:     wxWindow
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxWindow
 // Author:      David Webster
 // Modified by:
@@ -9,16 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+//
 // For compilers that support precompilation, includes "wx.h".
 // For compilers that support precompilation, includes "wx.h".
+//
 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 
+#include "wx/window.h"
+
 #ifndef WX_PRECOMP
     #define INCL_DOS
     #define INCL_PM
     #include <os2.h>
 #ifndef WX_PRECOMP
     #define INCL_DOS
     #define INCL_PM
     #include <os2.h>
-    #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/accel.h"
-    #include "wx/setup.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
@@ -26,16 +28,32 @@
     #include "wx/app.h"
     #include "wx/panel.h"
     #include "wx/layout.h"
     #include "wx/app.h"
     #include "wx/panel.h"
     #include "wx/layout.h"
+    #include "wx/checkbox.h"
+    #include "wx/combobox.h"
     #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/listbox.h"
     #include "wx/button.h"
     #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/listbox.h"
     #include "wx/button.h"
+    #include "wx/bmpbuttn.h"
     #include "wx/msgdlg.h"
     #include "wx/msgdlg.h"
-
+    #include "wx/scrolwin.h"
+    #include "wx/radiobox.h"
+    #include "wx/radiobut.h"
+    #include "wx/slider.h"
+    #include "wx/statbox.h"
+    #include "wx/statusbr.h"
+    #include "wx/toolbar.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/textctrl.h"
+    #include "wx/menuitem.h"
     #include <stdio.h>
 #endif
 
     #include <stdio.h>
 #endif
 
-#if     wxUSE_OWNER_DRAWN
+#include "wx/os2/dcclient.h"
+
+#if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif
 
     #include "wx/ownerdrw.h"
 #endif
 
@@ -43,141 +61,204 @@
     #include "wx/dnd.h"
 #endif
 
     #include "wx/dnd.h"
 #endif
 
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
 #include "wx/os2/private.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
 #include "wx/os2/private.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
+#if wxUSE_NOTEBOOK
+    #include "wx/notebook.h"
+#endif
+
 #if wxUSE_CARET
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
 #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>
 
 #include <string.h>
 
-// place compiler, OS specific includes here
-
+//
+// Place compiler, OS specific includes here
+//
 
 
-// standard macros -- these are for OS/2 PM, but most GUI's have something similar
+//
+// Standard macros -- these are for OS/2 PM, but most GUI's have something similar
+//
 #ifndef GET_X_LPARAM
 #ifndef GET_X_LPARAM
+//
 //  SHORT1FROMMP -- LOWORD
 //  SHORT1FROMMP -- LOWORD
+//
     #define GET_X_LPARAM(mp) ((unsigned short)(unsigned long)(mp))
     #define GET_X_LPARAM(mp) ((unsigned short)(unsigned long)(mp))
+//
 //  SHORT2FROMMP -- HIWORD
 //  SHORT2FROMMP -- HIWORD
+//
     #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16))
 #endif // GET_X_LPARAM
 
     #define GET_Y_LPARAM(mp) ((unsigned short)(unsigned long)(mp >> 16))
 #endif // GET_X_LPARAM
 
+#ifndef CW_USEDEFAULT
+#  define CW_USEDEFAULT    ((int)0x80000000)
+#endif
+
+#ifndef VK_OEM_1
+    #define VK_OEM_1        0xBA
+    #define VK_OEM_PLUS     0xBB
+    #define VK_OEM_COMMA    0xBC
+    #define VK_OEM_MINUS    0xBD
+    #define VK_OEM_PERIOD   0xBE
+    #define VK_OEM_2        0xBF
+    #define VK_OEM_3        0xC0
+    #define VK_OEM_4        0xDB
+    #define VK_OEM_5        0xDC
+    #define VK_OEM_6        0xDD
+    #define VK_OEM_7        0xDE
+#endif
+
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 
-// the last Windows message we got (MT-UNSAFE)
-extern WXMSGID s_currentMsg;
-extern wxList WXDLLEXPORT wxPendingDelete;
-extern wxChar wxCanvasClassName[];
+//
+// The last PM message we got (MT-UNSAFE)
+//
+QMSG                      s_currentMsg;
 
 
-wxMenu *wxCurrentPopupMenu = NULL;
-wxList *wxWinHandleList = NULL;
+#if wxUSE_MENUS_NATIVE
+extern wxMenu*            wxCurrentPopupMenu;
+#endif // wxUSE_MENUS_NATIVE
 
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
+
+//
 // the window proc for all our windows; most gui's have something similar
 // the window proc for all our windows; most gui's have something similar
-MRESULT wxWndProc( HWND hWnd
-                  ,ULONG message
-                  ,MPARAM mp1
-                  ,MPARAM mp2
-                 );
+//
+MRESULT EXPENTRY wxWndProc( HWND hWnd
+                           ,ULONG message
+                           ,MPARAM mp1
+                           ,MPARAM mp2
+                          );
 
 #ifdef  __WXDEBUG__
 
 #ifdef  __WXDEBUG__
-    const char *wxGetMessageName(int message);
+    const wxChar *wxGetMessageName(int message);
 #endif  //__WXDEBUG__
 
 #endif  //__WXDEBUG__
 
-void wxRemoveHandleAssociation(wxWindow *win);
-void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
-wxWindow *wxFindWinFromHandle(WXHWND hWnd);
+wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin
+                                     ,short*    pnX
+                                     ,short*    pnY
+                                    );
+void         wxRemoveHandleAssociation(wxWindowOS2* pWin);
+void         wxAssociateWinWithHandle( HWND         hWnd
+                                      ,wxWindowOS2* pWin
+                                     );
+wxWindow* wxFindWinFromHandle(WXHWND hWnd);
+
+//
+// get the current state of SHIFT/CTRL keys
+//
+static inline bool IsKeyDown(LONG key) {return (::WinGetKeyState(HWND_DESKTOP, key) & 0x8000) != 0; }
+static inline bool IsShiftDown() { return IsKeyDown(VK_SHIFT); }
+static inline bool IsCtrlDown() { return IsKeyDown(VK_CTRL); }
+
+static wxWindow*                    gpWinBeingCreated = NULL;
 
 // ---------------------------------------------------------------------------
 // event tables
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // event tables
 // ---------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
+// 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)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif
+#endif // __WXUNIVERSAL__/__WXPM__
 
 
-BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
-    EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-    EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-    EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-    EVT_IDLE(wxWindow::OnIdle)
+BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
+    EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
+    EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged)
+    EVT_IDLE(wxWindowOS2::OnIdle)
+    EVT_SET_FOCUS(wxWindowOS2::OnSetFocus)
 END_EVENT_TABLE()
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 END_EVENT_TABLE()
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
+// ---------------------------------------------------------------------------
+// wxWindow utility functions
+// ---------------------------------------------------------------------------
+
+//
 // Find an item given the PM Window id
 // Find an item given the PM Window id
-wxWindow* wxWindow::FindItem(
-  long                              ulId
+//
+wxWindow* wxWindowOS2::FindItem(
+  long                              lId
 ) const
 {
 ) const
 {
-    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+#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::compatibility_iterator  current = GetChildren().GetFirst();
 
 
-    while (pCurrent)
+    while (current)
     {
     {
-        wxWindow*                   pChildWin = pCurrent->GetData();
-        wxWindow*                   pWnd = pChildWin->FindItem(ulId);
+        wxWindow*                   pChildWin = current->GetData();
+        wxWindow*                   pWnd = pChildWin->FindItem(lId);
 
         if (pWnd)
             return pWnd;
 
 
         if (pWnd)
             return pWnd;
 
-        if (pChildWin->IsKindOf(CLASSINFO(wxControl)))
-        {
-            wxControl*              pItem = (wxControl *)pChildWin;
-
-            if (pItem->GetId() == ulId)
-                return(pItem);
-            else
-            {
-                // In case it's a 'virtual' control (e.g. radiobox)
-                if (pItem->GetSubcontrols().Member((wxObject *)ulId))
-                    return(pItem);
-            }
-        }
-        pCurrent = pCurrent->GetNext();
+        current = current->GetNext();
     }
     return(NULL);
     }
     return(NULL);
-}
+} // end of wxWindowOS2::FindItem
 
 
+//
 // Find an item given the PM Window handle
 // Find an item given the PM Window handle
-wxWindow* wxWindow::FindItemByHWND(
+//
+wxWindow* wxWindowOS2::FindItemByHWND(
   WXHWND                            hWnd
 , bool                              bControlOnly
 ) const
 {
   WXHWND                            hWnd
 , bool                              bControlOnly
 ) const
 {
-    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator current = GetChildren().GetFirst();
 
 
-    while (pCurrent)
+    while (current)
     {
     {
-        wxWindow*                   pParent = pCurrent->GetData();
+        wxWindow*                   pParent = current->GetData();
 
 
+        //
         // Do a recursive search.
         // Do a recursive search.
+        //
         wxWindow*                   pWnd = pParent->FindItemByHWND(hWnd);
 
         if (pWnd)
             return(pWnd);
 
         wxWindow*                   pWnd = pParent->FindItemByHWND(hWnd);
 
         if (pWnd)
             return(pWnd);
 
-        if (!bControlOnly || pParent->IsKindOf(CLASSINFO(wxControl)))
+        if (!bControlOnly
+#if wxUSE_CONTROLS
+            || pParent->IsKindOf(CLASSINFO(wxControl))
+#endif // wxUSE_CONTROLS
+            )
         {
         {
-            wxWindow*               pItem = pCurrent->GetData();
+            wxWindow*               pItem = current->GetData();
 
             if (pItem->GetHWND() == hWnd)
                 return(pItem);
 
             if (pItem->GetHWND() == hWnd)
                 return(pItem);
@@ -187,89 +268,128 @@ wxWindow* wxWindow::FindItemByHWND(
                     return(pItem);
             }
         }
                     return(pItem);
             }
         }
-        pCurrent = pCurrent->GetNext();
+        current = current->GetNext();
     }
     return(NULL);
     }
     return(NULL);
-}
+} // end of wxWindowOS2::FindItemByHWND
 
 
+//
 // Default command handler
 // Default command handler
-bool wxWindow::OS2Command(
-  WXUINT                            WXUNUSED(uParam)
-, WXWORD                            WXUNUSED(uId)
-)
+//
+bool wxWindowOS2::OS2Command( WXUINT WXUNUSED(uParam),
+                              WXWORD WXUNUSED(uId) )
 {
 {
-    return(FALSE);
+    return false;
 }
 
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------
 
-void wxWindow::Init()
+void wxWindowOS2::Init()
 {
 {
-    // generic
-    InitBase();
-
+    //
     // PM specific
     // PM specific
-    m_bDoubleClickAllowed = 0;
-    m_bWinCaptured = FALSE;
+    //
+    m_bWinCaptured = false;
 
 
-    m_isBeingDeleted = FALSE;
-    m_fnOldWndProc = 0;
-    m_bUseCtl3D = FALSE;
-    m_bMouseInWindow = FALSE;
+    m_fnOldWndProc          = NULL;
+    m_bUseCtl3D             = false;
+    m_bMouseInWindow        = false;
+    m_bLastKeydownProcessed = false;
 
 
+    //
     // wxWnd
     // wxWnd
-    m_hMenu = 0;
+    //
+    m_hMenu             = 0L;
+    m_hWnd              = 0L;
+    m_hWndScrollBarHorz = 0L;
+    m_hWndScrollBarVert = 0L;
 
 
-    m_hWnd = 0;
+    memset(&m_vWinSwp, '\0', sizeof (SWP));
 
 
-    // pass WM_GETDLGCODE to DefWindowProc()
+    //
+    // Pass WM_GETDLGCODE to DefWindowProc()
+    //
     m_lDlgCode = 0;
 
     m_nXThumbSize = 0;
     m_nYThumbSize = 0;
     m_lDlgCode = 0;
 
     m_nXThumbSize = 0;
     m_nYThumbSize = 0;
-    m_bBackgroundTransparent = FALSE;
+    m_bBackgroundTransparent = false;
 
 
-    // as all windows are created with WS_VISIBLE style...
-    m_isShown = TRUE;
+    //
+    // 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
 
 #if wxUSE_MOUSEEVENT_HACK
     m_lLastMouseX =
     m_lLastMouseY = -1;
     m_nLastMouseEvent = -1;
 #endif // wxUSE_MOUSEEVENT_HACK
-}
+} // wxWindowOS2::Init
 
 
+//
 // Destructor
 // Destructor
-wxWindow::~wxWindow()
+//
+wxWindowOS2::~wxWindowOS2()
 {
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
+
+    for (wxWindow* pWin = GetParent(); pWin; pWin = pWin->GetParent())
+    {
+        wxTopLevelWindow*           pFrame = wxDynamicCast(pWin, wxTopLevelWindow);
+
+        if (pFrame)
+        {
+            if (pFrame->GetLastFocus() == this)
+                pFrame->SetLastFocus(NULL);
+        }
+    }
 
 
-    OS2DetachWindowMenu();
-    // delete handlers?
-    if (m_parent)
-        m_parent->RemoveChild(this);
     DestroyChildren();
     DestroyChildren();
+
     if (m_hWnd)
     {
     if (m_hWnd)
     {
-        if(!WinDestroyWindow(GetHWND()))
+        if(!::WinDestroyWindow(GetHWND()))
             wxLogLastError(wxT("DestroyWindow"));
             wxLogLastError(wxT("DestroyWindow"));
+        //
         // remove hWnd <-> wxWindow association
         // remove hWnd <-> wxWindow association
+        //
         wxRemoveHandleAssociation(this);
     }
         wxRemoveHandleAssociation(this);
     }
-}
-
-bool wxWindow::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxString&                   rName
-)
-{
-    wxCHECK_MSG(pParent, FALSE, wxT("can't create wxWindow without parent"));
+} // 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;
+    ULONG ulCreateFlags = 0;
+    WXDWORD dwExStyle = 0;
+
+    wxCHECK_MSG(pParent, false, wxT("can't create wxWindow without parent"));
+
+#if wxUSE_STATBOX
+    //
+    // wxGTK doesn't allow to create controls with static box as the parent so
+    // this will result in a crash when the program is ported to wxGTK - warn
+    // about it
+    //
+    // the correct solution is to create the controls as siblings of the
+    // static box
+    //
+    wxASSERT_MSG( !wxDynamicCast(pParent, wxStaticBox),
+                  _T("wxStaticBox can't be used as a window parent!") );
+#endif // wxUSE_STATBOX
+
+     // Ensure groupbox backgrounds are painted
+     if (IsKindOf(CLASSINFO(wxPanel)))
+         lStyle &= ~wxCLIP_CHILDREN;
 
     if ( !CreateBase( pParent
                      ,vId
 
     if ( !CreateBase( pParent
                      ,vId
@@ -279,381 +399,790 @@ bool wxWindow::Create(
                      ,wxDefaultValidator
                      ,rName
                     ))
                      ,wxDefaultValidator
                      ,rName
                     ))
-        return(FALSE);
-
-    pParent->AddChild(this);
-
-    bool                            bWant3D;
-    WXDWORD                         dwExStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D);
-    DWORD                           ulFlags = 0L;
-
-    OS2Create( m_windowId
-              ,pParent
-              ,wxCanvasClassName
-              ,this
-              ,NULL
-              ,rPos.x
-              ,rPos.y
-              ,WidthDefault(rSize.x)
-              ,HeightDefault(rSize.y)
-              ,ulFlags
-              ,NULL
-              ,dwExStyle
-             );
-    return(TRUE);
-}
+        return false;
+
+    if (pParent)
+    {
+        pParent->AddChild(this);
+        hParent = GetWinHwnd(pParent);
+
+        if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)))
+            ulCreateFlags |= WS_CLIPSIBLINGS;
+    }
+
+    //
+    // 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 |=  OS2GetCreateWindowFlags(&dwExStyle);
+
+
+#ifdef __WXUNIVERSAL__
+    // no 3d effects, we draw them ourselves
+    WXDWORD exStyle = 0;
+#endif // !wxUniversal
+    if (lStyle & wxPOPUP_WINDOW)
+    {
+        ulCreateFlags &= ~WS_VISIBLE;
+        m_isShown = false;
+    }
+    else
+    {
+        ulCreateFlags |= WS_VISIBLE;
+    }
+
+    //
+    // Generic OS/2 Windows have no Control Data but other classes
+    // that call OS2Create may have some.
+    //
+    return(OS2Create( (PSZ)wxCanvasClassName
+                     ,rName.c_str()
+                     ,ulCreateFlags
+                     ,rPos
+                     ,rSize
+                     ,NULL         // Control Data
+                     ,dwExStyle
+                     ,true         // Child
+                    ));
+} // end of wxWindowOS2::Create
 
 // ---------------------------------------------------------------------------
 // basic operations
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // basic operations
 // ---------------------------------------------------------------------------
 
-void wxWindow::SetFocus()
+void wxWindowOS2::SetFocus()
 {
 {
-    // TODO:
-}
+    HWND                            hWnd = GetHwnd();
+    wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );
 
 
-wxWindow* wxWindowBase::FindFocus()
+    if (hWnd)
+        ::WinSetFocus(HWND_DESKTOP, hWnd);
+} // end of wxWindowOS2::SetFocus
+
+void wxWindowOS2::SetFocusFromKbd()
 {
 {
-    wxWindow*                       window = NULL;
-    // TODO:
-    return(window);
-}
+    //
+    // Nothing else to do under OS/2
+    //
+    wxWindowBase::SetFocusFromKbd();
+} // end of wxWindowOS2::SetFocus
 
 
-bool wxWindow::Enable(bool enable) // check if base implementation is OK
+wxWindow* wxWindowBase::DoFindFocus()
 {
 {
-    // TODO:
-    return(TRUE);
-}
+    HWND                            hWnd = ::WinQueryFocus(HWND_DESKTOP);
+
+    if (hWnd)
+    {
+        return wxFindWinFromHandle((WXHWND)hWnd);
+    }
+    return NULL;
+} // wxWindowBase::DoFindFocus
 
 
-bool wxWindow::Show(bool show) // check if base implementation is OK
+void wxWindowOS2::DoEnable( bool bEnable )
 {
 {
-    // TODO:
-    return(TRUE);
+    HWND                            hWnd = GetHwnd();
+    if ( hWnd )
+        ::WinEnableWindow(hWnd, (BOOL)bEnable);
 }
 
 }
 
-void wxWindow::Raise()
+bool wxWindowOS2::Show( bool bShow )
 {
 {
-    // TODO:
-}
+    if (!wxWindowBase::Show(bShow))
+        return false;
 
 
-void wxWindow::Lower()
+    HWND                            hWnd = GetHwnd();
+
+    ::WinShowWindow(hWnd, bShow);
+
+    if (bShow)
+    {
+        ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER);
+    }
+    return true;
+} // end of wxWindowOS2::Show
+
+void wxWindowOS2::Raise()
 {
 {
-    // TODO:
-}
+    ::WinSetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE);
+} // end of wxWindowOS2::Raise
 
 
-void wxWindow::SetTitle( const wxString& title)
+void wxWindowOS2::Lower()
 {
 {
-// TODO:    SetWindowText(GetHwnd(), title.c_str());
-}
+    ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE);
+} // end of wxWindowOS2::Lower
+
+void wxWindowOS2::SetLabel( const wxString& label )
+{
+    ::WinSetWindowText(GetHwnd(), label.c_str());
+} // end of wxWindowOS2::SetLabel
 
 
-wxString wxWindow::GetTitle() const
+wxString wxWindowOS2::GetLabel() const
 {
     return wxGetWindowText(GetHWND());
 {
     return wxGetWindowText(GetHWND());
-}
+} // end of wxWindowOS2::GetLabel
 
 
-void wxWindow::CaptureMouse()
+void wxWindowOS2::DoCaptureMouse()
 {
 {
-    // TODO:
-}
+    HWND hWnd = GetHwnd();
+
+    if (hWnd && !m_bWinCaptured)
+    {
+        ::WinSetCapture(HWND_DESKTOP, hWnd);
+        m_bWinCaptured = true;
+    }
+} // end of wxWindowOS2::DoCaptureMouse
 
 
-void wxWindow::ReleaseMouse()
+void wxWindowOS2::DoReleaseMouse()
 {
 {
-    // TODO:
-}
+    if (m_bWinCaptured)
+    {
+        ::WinSetCapture(HWND_DESKTOP, NULLHANDLE);
+        m_bWinCaptured = false;
+    }
+} // end of wxWindowOS2::ReleaseMouse
 
 
-bool wxWindow::SetFont(const wxFont& f)
+/* static */ wxWindow* wxWindowBase::GetCapture()
 {
 {
-    // TODO:
-    return(TRUE);
-}
+    HWND hwnd = ::WinQueryCapture(HWND_DESKTOP);
+    return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : (wxWindow *)NULL;
+} // end of wxWindowBase::GetCapture
 
 
-bool wxWindow::SetCursor(const wxCursor& cursor) // check if base implementation is OK
+bool wxWindowOS2::SetFont( const wxFont& rFont )
 {
 {
-    // TODO:
-    return(TRUE);
-}
+    if (!wxWindowBase::SetFont(rFont))
+    {
+        // nothing to do
+        return false;
+    }
+
+    HWND hWnd = GetHwnd();
 
 
-void wxWindow::WarpPointer(int x_pos, int y_pos)
+    wxOS2SetFont( hWnd, rFont );
+    return true;
+} // end of wxWindowOS2::SetFont
+
+// check if base implementation is OK
+bool wxWindowOS2::SetCursor( const wxCursor& rCursor)
 {
 {
-    // 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
 
 
-#if WXWIN_COMPATIBILITY
-void wxWindow::OS2DeviceToLogical (float *x, float *y) const
+void wxWindowOS2::WarpPointer(
+  int                               nXPos
+, int                               nYPos
+)
 {
 {
-}
-#endif // WXWIN_COMPATIBILITY
+    int                             nX = nXPos;
+    int                             nY = nYPos;
+    RECTL                           vRect;
+
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    nX += vRect.xLeft;
+    nY += vRect.yBottom;
+
+    ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
+} // end of wxWindowOS2::WarpPointer
+
 
 // ---------------------------------------------------------------------------
 // scrolling stuff
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // scrolling stuff
 // ---------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY
-void wxWindow::SetScrollRange(int orient, int range, bool refresh)
+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
 
 
-void wxWindow::SetScrollPage(int orient, int page, bool refresh)
+int wxWindowOS2::GetScrollRange(
+  int                               nOrient
+) const
 {
 {
-   // TODO:
-}
+    MRESULT                         mr;
 
 
-int wxWindow::OldGetScrollRange(int orient) const
-{
-   // TODO:
-   return 0;
-}
+    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  wxWindow::GetScrollPage(int orient) const
+int wxWindowOS2::GetScrollThumb(
+  int                               nOrient
+) const
 {
 {
-    // TODO:
-    return(1);
-}
-#endif // WXWIN_COMPATIBILITY
+    if (nOrient == wxHORIZONTAL )
+        return m_nXThumbSize;
+    else
+        return m_nYThumbSize;
+} // end of wxWindowOS2::GetScrollThumb
 
 
-int  wxWindow::GetScrollPos(int orient) const
+void wxWindowOS2::SetScrollPos(
+  int                               nOrient
+, int                               nPos
+, bool                              WXUNUSED(bRefresh)
+)
 {
 {
-    // TODO:
-    return(1);
-}
+    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) )
+{
+    HWND                            hWnd = GetHwnd();
+    int                             nOldRange = nRange - nThumbVisible;
+    int                             nRange1 = nOldRange;
+    int                             nPageSize = nThumbVisible;
+    int         nVSBWidth  = wxSystemSettingsNative::GetMetric(wxSYS_VSCROLL_X,
+                                                               this);
+    int         nHSBHeight = wxSystemSettingsNative::GetMetric(wxSYS_HSCROLL_Y,
+                                                               this);
+
+    SBCDATA                         vInfo;
+    ULONG                           ulStyle = WS_VISIBLE | WS_SYNCPAINT;
+    SWP                             vSwp;
+    SWP                             vSwpOwner;
+    HWND                            hWndParent;
+    HWND                            hWndClient;
+    wxWindow*                       pParent = GetParent();
+
+    if (pParent && pParent->IsKindOf(CLASSINFO(wxFrame)))
+    {
+        wxFrame*                    pFrame;
 
 
-int  wxWindow::GetScrollRange(int orient) const
-{
-    // TODO:
-    return(1);
-}
+        pFrame = wxDynamicCast(pParent, wxFrame);
+        hWndParent = pFrame->GetFrame();
+        hWndClient = GetHwndOf(pParent);
+    }
+    else
+    {
+        if (pParent)
+            hWndParent = GetHwndOf(pParent);
+        else
+            hWndParent = GetHwnd();
+        hWndClient = hWndParent;
+    }
+    ::WinQueryWindowPos(hWndClient, &vSwp);
+    ::WinQueryWindowPos(hWnd, &vSwpOwner);
 
 
-int  wxWindow::GetScrollThumb(int orient) const
-{
-    // TODO:
-    return(1);
-}
+    if (nPageSize > 1 && nRange > 0)
+    {
+        nRange1 += (nPageSize - 1);
+    }
 
 
-void wxWindow::SetScrollPos( int  orient
-                            ,int  pos
-                            ,bool refresh
-                           )
-{
-    // TODO:
-}
+    vInfo.cb = sizeof(SBCDATA);
+    vInfo.posFirst = 0;
+    vInfo.posLast = (SHORT)nRange1;
+    vInfo.posThumb = (SHORT)nPos;
 
 
-void wxWindow::SetScrollbar( int  orient
-                            ,int  pos
-                            ,int  thumbVisible
-                            ,int  range
-                            ,bool refresh
-                           )
-{
-    // TODO:
-}
+    if (nOrient == wxHORIZONTAL )
+    {
+        ulStyle |= SBS_HORZ;
+        if (m_hWndScrollBarHorz == 0L)
+        {
+            //
+            // Since the scrollbars are usually created before the owner is
+            // sized either via an OnSize event directly or via sizers or
+            // layout constraints, we will initially just use the coords of
+            // the parent window (this is usually a frame client window). But
+            // the bars themselves, are children of the parent frame (i.e
+            // siblings of the frame client.  The owner, however is the actual
+            // window being scrolled (or at least the one responsible for
+            // handling the scroll events). The owner will be resized later,
+            // as it is usually a child of a top level window, and when that
+            // is done its scrollbars will be resized and repositioned as well.
+            //
+            m_hWndScrollBarHorz = ::WinCreateWindow( hWndParent
+                                                    ,WC_SCROLLBAR
+                                                    ,(PSZ)NULL
+                                                    ,ulStyle
+                                                    ,vSwp.x
+                                                    ,vSwp.y
+                                                    ,vSwp.cx - nVSBWidth
+                                                    ,nHSBHeight
+                                                    ,hWnd
+                                                    ,HWND_TOP
+                                                    ,60000
+                                                    ,&vInfo
+                                                    ,NULL
+                                                   );
+        }
+        else
+        {
+            //
+            // The owner (the scrolled window) is a child of the Frame's
+            // client window, usually.  The scrollbars are children of the
+            // frame, itself, and thus are positioned relative to the frame's
+            // origin, not the frame's client window origin.
+            // The starting x position is the same as the starting x position
+            // of the owner, but in terms of the parent frame.
+            // The starting y position is wxSYS_HSCROLL_Y pels below the
+            // origin of the owner in terms of the parent frame.
+            // The horz bar is the same width as the owner and wxSYS_HSCROLL_Y
+            // pels high.
+            //
+            if (nRange1 >= nThumbVisible)
+            {
+                ::WinSetWindowPos( m_hWndScrollBarHorz
+                                  ,HWND_TOP
+                                  ,vSwp.x + vSwpOwner.x
+                                  ,(vSwp.y + vSwpOwner.y) - nHSBHeight
+                                  ,vSwpOwner.cx
+                                  ,nHSBHeight
+                                  ,SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER
+                                 );
+                ::WinSendMsg( m_hWndScrollBarHorz
+                             ,SBM_SETSCROLLBAR
+                             ,(MPARAM)nPos
+                             ,MPFROM2SHORT(0, (SHORT)nRange1)
+                            );
+                ::WinSendMsg( m_hWndScrollBarHorz
+                             ,SBM_SETTHUMBSIZE
+                             ,MPFROM2SHORT( (SHORT)nThumbVisible
+                                           ,(SHORT)nRange1
+                                          )
+                             ,(MPARAM)0
+                            );
+            }
+            else
+                ::WinShowWindow(m_hWndScrollBarHorz, FALSE);
+        }
+    }
+    else
+    {
+        ulStyle |= SBS_VERT;
+        if (m_hWndScrollBarVert == 0L)
+        {
+            //
+            // Since the scrollbars are usually created before the owner is
+            // sized either via an OnSize event directly or via sizers or
+            // layout constraints, we will initially just use the coords of
+            // the parent window (this is usually a frame client window). But
+            // the bars themselves, are children of the parent frame (i.e
+            // siblings of the frame client.  The owner, however is the actual
+            // window being scrolled (or at least the one responsible for
+            // handling the scroll events). The owner will be resized later,
+            // as it is usually a child of a top level window, and when that
+            // is done its scrollbars will be resized and repositioned as well.
+            //
+            m_hWndScrollBarVert = ::WinCreateWindow( hWndParent
+                                                    ,WC_SCROLLBAR
+                                                    ,(PSZ)NULL
+                                                    ,ulStyle
+                                                    ,vSwp.x + vSwp.cx - nVSBWidth
+                                                    ,vSwp.y + nHSBHeight
+                                                    ,nVSBWidth
+                                                    ,vSwp.cy - nHSBHeight
+                                                    ,hWnd
+                                                    ,HWND_TOP
+                                                    ,60001
+                                                    ,&vInfo
+                                                    ,NULL
+                                                   );
+        }
+        else
+        {
+            //
+            // The owner (the scrolled window) is a child of the Frame's
+            // client window, usually.  The scrollbars are children of the
+            // frame, itself and thus are positioned relative to the frame's
+            // origin, not the frame's client window's origin.
+            // Thus, the x position will be frame client's x (usually a few
+            // pels inside the parent frame, plus the width of the owner.
+            // Since we may be using sizers or layout constraints for multiple
+            // child scrolled windows, the y position will be the frame client's
+            // y pos plus the scrolled windows y position, yielding the y
+            // position of the scrollbar relative to the parent frame (the vert
+            // scrollbar is on the right and starts at the bottom of the
+            // owner window).
+            // It is wxSYS_VSCROLL_X pels wide and the same height as the owner.
+            //
+            if (nRange1 >= nThumbVisible)
+            {
+                ::WinSetWindowPos( m_hWndScrollBarVert
+                                  ,HWND_TOP
+                                  ,vSwp.x + vSwpOwner.x + vSwpOwner.cx
+                                  ,vSwp.y + vSwpOwner.y
+                                  ,nVSBWidth
+                                  ,vSwpOwner.cy
+                                  ,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
+                            );
+            }
+            else
+                ::WinShowWindow(m_hWndScrollBarVert, FALSE);
+        }
+        m_nYThumbSize = nThumbVisible;
+    }
+} // end of wxWindowOS2::SetScrollbar
 
 
-void wxWindow::ScrollWindow( int           dx
-                            ,int           dy
-                            ,const wxRect* rect
-                           )
+
+void wxWindowOS2::ScrollWindow( int nDx,
+                                int nDy,
+                                const wxRect* pRect )
 {
 {
-    // TODO:
-}
+    RECTL vRect;
+
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    int height = vRect.yTop;
+    if (pRect)
+    {
+        vRect.xLeft   = pRect->x;
+        vRect.yTop    = height - pRect->y;
+        vRect.xRight  = pRect->x + pRect->width;
+        vRect.yBottom = vRect.yTop - pRect->height;
+    }
+    nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows.
+    ::WinScrollWindow( GetHwnd()
+                      ,(LONG)nDx
+                      ,(LONG)nDy
+                      ,&vRect
+                      ,&vRect
+                      ,NULL
+                      ,NULL
+                      ,SW_SCROLLCHILDREN | SW_INVALIDATERGN
+                     );
+} // end of wxWindowOS2::ScrollWindow
 
 // ---------------------------------------------------------------------------
 // subclassing
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // subclassing
 // ---------------------------------------------------------------------------
 
-void wxWindow::SubclassWin(WXHWND hWnd)
+void wxWindowOS2::SubclassWin(
+  WXHWND                            hWnd
+)
 {
 {
-    wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") );
+    HWND                            hwnd = (HWND)hWnd;
 
 
-    HWND hwnd = (HWND)hWnd;
-/*
-* TODO: implement something like this:
-*   wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in SubclassWin") );
-*
-*   wxAssociateWinWithHandle(hwnd, this);
-*
-*   m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
-*   SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);
-*/
-}
+    wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") );
+    wxAssociateWinWithHandle( hWnd
+                             ,(wxWindow*)this
+                            );
+    if (!wxCheckWindowWndProc( hWnd
+                              ,(WXFARPROC)wxWndProc
+                             ))
+    {
+        m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc);
+    }
+    else
+    {
+        m_fnOldWndProc = (WXFARPROC)NULL;
+    }
+} // end of wxWindowOS2::SubclassWin
 
 
-void wxWindow::UnsubclassWin()
+void wxWindowOS2::UnsubclassWin()
 {
 {
-/*
-* TODO:
-
-    wxRemoveHandleAssociation(this);
-
+    //
     // Restore old Window proc
     // Restore old Window proc
-    HWND hwnd = GetHwnd();
-    if ( hwnd )
+    //
+    HWND                            hwnd = GetHWND();
+
+    if (m_hWnd)
     {
     {
-        m_hWnd = 0;
+        wxCHECK_RET( ::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in UnsubclassWin") );
 
 
-        wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in UnsubclassWin") );
+        PFNWP                       fnProc = (PFNWP)::WinQueryWindowPtr(hwnd, QWP_PFNWP);
 
 
-        FARPROC farProc = (FARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
-        if ( (m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc) )
+        if ( (m_fnOldWndProc != 0) && (fnProc != (PFNWP) m_fnOldWndProc))
         {
         {
-            SetWindowLong(hwnd, GWL_WNDPROC, (LONG) m_oldWndProc);
-            m_oldWndProc = 0;
+            WinSubclassWindow(hwnd, (PFNWP)m_fnOldWndProc);
+            m_fnOldWndProc = 0;
         }
     }
         }
     }
-*/
-}
-
-// Make a Windows extended style from the given wxWindows window style
-WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders)
-{
-   // TODO:
-    WXDWORD exStyle = 0;
-/*
-    if ( style & wxTRANSPARENT_WINDOW )
-        exStyle |= WS_EX_TRANSPARENT;
-
-    if ( !eliminateBorders )
-    {
-        if ( style & wxSUNKEN_BORDER )
-            exStyle |= WS_EX_CLIENTEDGE;
-        if ( style & wxDOUBLE_BORDER )
-            exStyle |= WS_EX_DLGMODALFRAME;
-        if ( style & wxRAISED_BORDER )
-            exStyle |= WS_EX_WINDOWEDGE;
-        if ( style & wxSTATIC_BORDER )
-            exStyle |= WS_EX_STATICEDGE;
-    }
-*/
-    return exStyle;
-}
+} // end of wxWindowOS2::UnsubclassWin
 
 
-// Determines whether native 3D effects or CTL3D should be used,
-// applying a default border style if required, and returning an extended
-// style to pass to CreateWindowEx.
-WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle,
-                                     bool *want3D) const
+bool wxCheckWindowWndProc(
+  WXHWND                            hWnd
+, WXFARPROC                         fnWndProc
+)
 {
 {
-   DWORD exStyle; // remove after implementation doe
-/* TODO:  this ought to be fun
-*
-    // 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) )
-    {
-        *want3D = FALSE;
-        return MakeExtendedStyle(m_windowStyle, FALSE);
-    }
-
-    // Determine whether we should be using 3D effects or not.
-    bool nativeBorder = FALSE; // by default, we don't want a Win95 effect
-
-    // 1) App can specify global 3D effects
-    *want3D = wxTheApp->GetAuto3D();
+    static char                     zBuffer[512];
+    CLASSINFO                       vCls;
 
 
-    // 2) If the parent is being drawn with user colours, or simple border specified,
-    // switch effects off. TODO: replace wxUSER_COLOURS with wxNO_3D
-    if ( GetParent() && (GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) || (m_windowStyle & wxSIMPLE_BORDER) )
-        *want3D = FALSE;
+    ::WinQueryClassName((HWND)hWnd, (LONG)512, (PCH)zBuffer);
+    ::WinQueryClassInfo(wxGetInstance(), (PSZ)zBuffer, &vCls);
+    return(fnWndProc == (WXFARPROC)vCls.pfnWindowProc);
+} // end of WinGuiBase_CheckWindowWndProc
 
 
-    // 3) Control can override this global setting by defining
-    // a border style, e.g. wxSUNKEN_BORDER
-    if ( m_windowStyle & wxSUNKEN_BORDER  )
-        *want3D = TRUE;
-
-    // 4) If it's a special border, CTL3D can't cope so we want a native border
-    if ( (m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-        (m_windowStyle & wxSTATIC_BORDER) )
+void wxWindowOS2::SetWindowStyleFlag(
+  long                              lFlags
+)
+{
+    long                            lFlagsOld = GetWindowStyleFlag();
+
+    if (lFlags == lFlagsOld)
+        return;
+
+    //
+    // Update the internal variable
+    //
+    wxWindowBase::SetWindowStyleFlag(lFlags);
+
+    //
+    // Now update the Windows style as well if needed - and if the window had
+    // been already created
+    //
+    if (!GetHwnd())
+        return;
+
+    WXDWORD                         dwExstyle;
+    WXDWORD                         dwExstyleOld;
+    long                            lStyle = OS2GetStyle( lFlags
+                                                         ,&dwExstyle
+                                                        );
+    long                            lStyleOld = OS2GetStyle( lFlagsOld
+                                                            ,&dwExstyleOld
+                                                           );
+
+    if (lStyle != lStyleOld)
     {
     {
-        *want3D = TRUE;
-        nativeBorder = TRUE;
+        //
+        // Some flags (e.g. WS_VISIBLE or WS_DISABLED) should not be changed by
+        // this function so instead of simply setting the style to the new
+        // value we clear the bits which were set in styleOld but are set in
+        // the new one and set the ones which were not set before
+        //
+        long                        lStyleReal = ::WinQueryWindowULong(GetHwnd(), QWL_STYLE);
+
+        lStyleReal &= ~lStyleOld;
+        lStyleReal |= lStyle;
+
+        ::WinSetWindowULong(GetHwnd(), QWL_STYLE, lStyleReal);
     }
     }
+} // end of wxWindowOS2::SetWindowStyleFlag
 
 
-    // 5) If this isn't a Win95 app, and we are using CTL3D, remove border
-    // effects from extended style
-#if wxUSE_CTL3D
-    if ( *want3D )
-        nativeBorder = FALSE;
-#endif
+WXDWORD wxWindowOS2::OS2GetStyle( long     lFlags,
+                                  WXDWORD* WXUNUSED(pdwExstyle) ) const
+{
+    WXDWORD                         dwStyle = 0L;
 
 
-    DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder);
+    if (lFlags & wxCLIP_CHILDREN )
+        dwStyle |= WS_CLIPCHILDREN;
 
 
-    // If we want 3D, but haven't specified a border here,
-    // apply the default border style specified.
-    // TODO what about non-Win95 WIN32? Does it have borders?
-#if defined(__WIN95__) && !wxUSE_CTL3D
-    if ( defaultBorderStyle && (*want3D) && ! ((m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) ||
-        (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) ))
-        exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE;
-#endif
-*/
-    return exStyle;
-}
+    if (lFlags & wxCLIP_SIBLINGS )
+        dwStyle |= WS_CLIPSIBLINGS;
 
 
-#if WXWIN_COMPATIBILITY
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-    // TODO:
-}
+    return dwStyle;
+} // end of wxWindowOS2::OS2GetStyle
 
 
-wxObject* wxWindow::GetChild(int number) const
+//
+// Make a Windows extended style from the given wxWidgets window style
+//
+WXDWORD wxWindowOS2::MakeExtendedStyle(
+  long                              lStyle
+, bool                              bEliminateBorders
+)
 {
 {
-    // TODO:
-    return((wxObject*)this);
-}
+   //
+   // Simply fill out with wxWindow extended styles.  We'll conjure
+   // something up in OS2Create and all window redrawing pieces later
+   //
+    WXDWORD                         dwStyle = 0;
 
 
-void wxWindow::OnDefaultAction(wxControl *initiatingItem)
-{
-    // TODO:
-}
+    if (lStyle & wxTRANSPARENT_WINDOW )
+        dwStyle |= wxTRANSPARENT_WINDOW;
 
 
-#endif // WXWIN_COMPATIBILITY
+    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
 
 
+//
 // Setup background and foreground colours correctly
 // Setup background and foreground colours correctly
-void wxWindow::SetupColours()
+//
+void wxWindowOS2::SetupColours()
 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
-}
+} // end of wxWindowOS2::SetupColours
 
 
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindowOS2::OnIdle(
+  wxIdleEvent&                      WXUNUSED(rEvent)
+)
 {
 {
-    // TODO:
-}
+    //
+    // 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 (IsShiftDown())
+                nState |= KC_SHIFT;
+            if (IsCtrlDown())
+                nState |= KC_CTRL;
+
+            wxMouseEvent            rEvent(wxEVT_LEAVE_WINDOW);
+
+            InitMouseEvent( rEvent
+                           ,vPoint.x
+                           ,vPoint.y
+                           ,nState
+                          );
+            (void)HandleWindowEvent(rEvent);
+        }
+    }
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+} // end of wxWindowOS2::OnIdle
 
 
+//
 // Set this window to be the child of 'parent'.
 // Set this window to be the child of 'parent'.
-bool wxWindow::Reparent(wxWindow *parent)
+//
+bool wxWindowOS2::Reparent( wxWindow* pParent)
 {
 {
-    if ( !wxWindowBase::Reparent(parent) )
-        return FALSE;
-   // TODO:
-    return FALSE;
-}
+    if (!wxWindowBase::Reparent(pParent))
+        return false;
 
 
-void wxWindow::Clear()
+    HWND hWndChild = GetHwnd();
+    HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0;
+
+    ::WinSetParent(hWndChild, hWndParent, TRUE);
+    return true;
+} // end of wxWindowOS2::Reparent
+
+void wxWindowOS2::Update()
 {
 {
-    // TODO:
-}
+    ::WinUpdateWindow(GetHwnd());
+} // end of wxWindowOS2::Update
 
 
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowOS2::DoFreeze()
 {
 {
-    // TODO:
-}
+   ::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0);
+} // end of wxWindowOS2::Freeze
+
+void wxWindowOS2::DoThaw()
+{
+   ::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0);
+
+    //
+    // We need to refresh everything or otherwise he invalidated area is not
+    // repainted.
+    //
+    Refresh();
+} // end of wxWindowOS2::Thaw
+
+void wxWindowOS2::Refresh( bool bEraseBack,
+                           const wxRect* pRect )
+{
+    HWND hWnd = GetHwnd();
+
+    if (hWnd)
+    {
+        if (pRect)
+        {
+            RECTL vOs2Rect;
+            int   height;
+
+            ::WinQueryWindowRect(GetHwnd(), &vOs2Rect);
+            height = vOs2Rect.yTop;
+            vOs2Rect.xLeft   = pRect->x;
+            vOs2Rect.yTop    = height - pRect->y;
+            vOs2Rect.xRight  = pRect->x + pRect->width;
+            vOs2Rect.yBottom = vOs2Rect.yTop - pRect->height;
+
+            ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
+        }
+        else
+            ::WinInvalidateRect(hWnd, NULL, bEraseBack);
+        if (m_hWndScrollBarHorz != NULLHANDLE)
+            ::WinInvalidateRect(m_hWndScrollBarHorz, NULL, TRUE);
+        if (m_hWndScrollBarVert != NULLHANDLE)
+            ::WinInvalidateRect(m_hWndScrollBarVert, NULL, TRUE);
+    }
+} // end of wxWindowOS2::Refresh
 
 // ---------------------------------------------------------------------------
 // drag and drop
 // ---------------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
 
 // ---------------------------------------------------------------------------
 // drag and drop
 // ---------------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowOS2::SetDropTarget(
+  wxDropTarget*                     pDropTarget
+)
 {
 {
-    // TODO:
-}
+    m_dropTarget = pDropTarget;
+} // end of wxWindowOS2::SetDropTarget
 #endif
 
 #endif
 
+//
 // old style file-manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.
 // old style file-manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.
-void wxWindow::DragAcceptFiles(bool accept)
+//
+void wxWindowOS2::DragAcceptFiles(
+  bool                              bAccept
+)
 {
 {
-    // TODO:
-}
+    HWND                            hWnd = GetHwnd();
+
+    if (hWnd && bAccept)
+        ::DrgAcceptDroppedFiles(hWnd, NULL, NULL, DO_COPY, 0L);
+} // end of wxWindowOS2::DragAcceptFiles
 
 // ----------------------------------------------------------------------------
 // tooltips
 
 // ----------------------------------------------------------------------------
 // tooltips
@@ -661,13 +1190,15 @@ void wxWindow::DragAcceptFiles(bool accept)
 
 #if wxUSE_TOOLTIPS
 
 
 #if wxUSE_TOOLTIPS
 
-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowOS2::DoSetToolTip(
+  wxToolTip*                        pTooltip
+)
 {
 {
-    wxWindowBase::DoSetToolTip(tooltip);
+    wxWindowBase::DoSetToolTip(pTooltip);
 
 
-    if ( m_tooltip )
+    if (m_tooltip)
         m_tooltip->SetWindow(this);
         m_tooltip->SetWindow(this);
-}
+} // end of wxWindowOS2::DoSetToolTip
 
 #endif // wxUSE_TOOLTIPS
 
 
 #endif // wxUSE_TOOLTIPS
 
@@ -676,38 +1207,323 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip)
 // ---------------------------------------------------------------------------
 
 // Get total size
 // ---------------------------------------------------------------------------
 
 // Get total size
-void wxWindow::DoGetSize( int *width, int *height ) const
+void wxWindowOS2::DoGetSize(
+  int*                              pWidth
+, int*                              pHeight
+) const
 {
 {
-    // TODO:
-}
+    HWND                            hWnd;
+    RECTL                           vRect;
+
+    if (IsKindOf(CLASSINFO(wxFrame)))
+    {
+        wxFrame*                    pFrame = wxDynamicCast(this, wxFrame);
+        hWnd = pFrame->GetFrame();
+    }
+    else
+        hWnd = GetHwnd();
 
 
-void wxWindow::DoGetPosition( int *x, int *y ) const
+    ::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
 {
 {
-    // TODO:
-}
+    //
+    // Return parameters assume wxWidgets coordinate system
+    //
+    HWND                            hWnd;
+    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
+    // use 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.
+    //
+    if (IsKindOf(CLASSINFO(wxFrame)))
+    {
+        wxFrame*                    pFrame = wxDynamicCast(this, wxFrame);
+        hWnd = pFrame->GetFrame();
+    }
+    else
+        hWnd = GetHwnd();
+
+    ::WinQueryWindowPos(hWnd, &vSwp);
 
 
-void wxWindow::DoScreenToClient( int *x, int *y ) const
+    vPoint.x = vSwp.x;
+    vPoint.y = vSwp.y;
+
+    // We need to convert to wxWidgets coordinates
+    int vHeight;
+    DoGetSize(NULL,&vHeight);
+    wxWindow* pWindow = wxDynamicCast(this,wxWindow);
+    vPoint.y = pWindow->GetOS2ParentHeight(pParent) - vPoint.y - vHeight;
+
+    //
+    // 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
 {
 {
-    // TODO:
-}
+    HWND                            hWnd = GetHwnd();
+    SWP                             vSwp;
+
+    ::WinQueryWindowPos(hWnd, &vSwp);
+
+    if (pX)
+        *pX += vSwp.x;
+    if (pY)
+        *pY += vSwp.y;
+} // end of wxWindowOS2::DoScreenToClient
 
 
-void wxWindow::DoClientToScreen( int *x, int *y ) const
+void wxWindowOS2::DoClientToScreen(
+  int*                              pX
+, int*                              pY
+) const
 {
 {
-    // TODO:
-}
+    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.
 // Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize( int *width, int *height ) const
+// Must be a frame type window
+//
+void wxWindowOS2::DoGetClientSize(
+  int*                              pWidth
+, int*                              pHeight
+) const
 {
 {
-    // TODO:
-}
+    HWND                            hWnd = GetHwnd();
+    RECTL                           vRect;
 
 
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+   ::WinQueryWindowRect(hWnd, &vRect);
+    if (IsKindOf(CLASSINFO(wxDialog)))
+    {
+        RECTL                       vTitle;
+        HWND                        hWndTitle;
+        //
+        // For a Dialog we have to explicitly request the client portion.
+        // For a Frame the hWnd IS the client window
+        //
+        hWndTitle = ::WinWindowFromID(hWnd, FID_TITLEBAR);
+        if (::WinQueryWindowRect(hWndTitle, &vTitle))
+        {
+            if (vTitle.yTop - vTitle.yBottom == 0)
+            {
+                //
+                // Dialog has not been created yet, use a default
+                //
+                vTitle.yTop = 20;
+            }
+            vRect.yTop -= (vTitle.yTop - vTitle.yBottom);
+        }
+
+        ULONG                       uStyle = ::WinQueryWindowULong(hWnd, QWL_STYLE);
+
+        //
+        // Deal with borders
+        //
+        if (uStyle & FCF_DLGBORDER)
+        {
+            vRect.xLeft += 4;
+            vRect.xRight -= 4;
+            vRect.yTop -= 4;
+            vRect.yBottom += 4;
+        }
+        else if (uStyle & FCF_SIZEBORDER)
+        {
+            vRect.xLeft += 4;
+            vRect.xRight -= 4;
+            vRect.yTop -= 4;
+            vRect.yBottom += 4;
+        }
+        else if (uStyle & FCF_BORDER)
+        {
+            vRect.xLeft += 2;
+            vRect.xRight -= 2;
+            vRect.yTop -= 2;
+            vRect.yBottom += 2;
+        }
+        else // make some kind of adjustment or top sizers ram into the titlebar!
+        {
+            vRect.xLeft += 3;
+            vRect.xRight -= 3;
+            vRect.yTop -= 3;
+            vRect.yBottom += 3;
+        }
+    }
+    if (pWidth)
+        *pWidth  = vRect.xRight - vRect.xLeft;
+    if (pHeight)
+        *pHeight = vRect.yTop - vRect.yBottom;
+} // end of wxWindowOS2::DoGetClientSize
+
+void wxWindowOS2::DoMoveWindow(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+)
 {
 {
-   // TODO:
-}
+    //
+    // Input parameters assume wxWidgets coordinate system
+    //
+    RECTL                           vRect;
+    wxWindow*                       pParent = GetParent();
+    HWND                            hWnd = GetHwnd();
+
+    if (pParent && !IsKindOf(CLASSINFO(wxDialog)))
+    {
+        int                         nOS2Height = GetOS2ParentHeight(pParent);
+
+        nY = nOS2Height - (nY + nHeight);
+    }
+    else
+    {
+        RECTL                       vRect;
+
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nY = vRect.yTop - (nY + nHeight);
+    }
+
+    //
+    // In the case of a frame whose client is sized, the client cannot be
+    // large than its parent frame minus its borders! This usually happens
+    // when using an autosizer to size a frame to precisely hold client
+    // controls as in the notebook sample.
+    //
+    // In this case, we may need to resize both a frame and its client so we
+    // need a quick calc of the frame border size, then if the frame
+    // (less its borders) is smaller than the client, size the frame to
+    // encompass the client with the appropriate border size.
+    //
+    if (IsKindOf(CLASSINFO(wxFrame)))
+    {
+        RECTL                       vFRect;
+        int                         nWidthFrameDelta = 0;
+        int                         nHeightFrameDelta = 0;
+        wxFrame*                    pFrame;
+
+        pFrame = wxDynamicCast(this, wxFrame);
+        hWnd = pFrame->GetFrame();
+        ::WinQueryWindowRect(hWnd, &vRect);
+        ::WinMapWindowPoints(hWnd, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+        vFRect = vRect;
+        ::WinCalcFrameRect(hWnd, &vRect, TRUE);
+        nWidthFrameDelta = ((vRect.xLeft - vFRect.xLeft) + (vFRect.xRight - vRect.xRight));
+        nHeightFrameDelta = ((vRect.yBottom - vFRect.yBottom) + (vFRect.yTop - vRect.yTop));
+        // Input values refer to the window position relative to its parent
+        // which may be the Desktop so we need to calculate
+        // the new frame values to keep the wxWidgets frame origin constant
+        nY -= nHeightFrameDelta;
+        nWidth += nWidthFrameDelta;
+        nHeight += nHeightFrameDelta;
+    }
+    ::WinSetWindowPos( hWnd
+                      ,HWND_TOP
+                      ,(LONG)nX
+                      ,(LONG)nY
+                      ,(LONG)nWidth
+                      ,(LONG)nHeight
+                      ,SWP_SIZE | SWP_MOVE
+                     );
+    if (m_vWinSwp.cx == 0 && m_vWinSwp.cy == 0 && m_vWinSwp.fl == 0)
+        //
+        // Uninitialized
+        //
+        ::WinQueryWindowPos(hWnd, &m_vWinSwp);
+    else
+    {
+        //
+        // Handle resizing of scrolled windows.  The target or window to
+        // be scrolled is the owner (gets the scroll notifications).  The
+        // parent is usually the parent frame of the scrolled panel window.
+        // In order to show the scrollbars the target window will be shrunk
+        // by the size of the scroll bar widths and moved in the X and Y
+        // directon.  That value will be computed as part of the diff for
+        // moving the children.  Everytime the window is sized the
+        // toplevel OnSize is going to resize the panel to fit the client
+        // or the whole sizer and will need to me resized. This will send
+        // a WM_SIZE out which will be intercepted by the ScrollHelper
+        // which will cause the scrollbars to be displayed via the SetScrollbar
+        // call in CWindow.
+        //
+        if (IsKindOf(CLASSINFO(wxScrolledWindow)))
+        {
+            int                     nAdjustWidth  = 0;
+            int                     nAdjustHeight = 0;
+            int nHSBHeight = wxSystemSettingsNative::GetMetric(wxSYS_HSCROLL_Y,
+                                                               this);
+            int nVSBWidth  = wxSystemSettingsNative::GetMetric(wxSYS_VSCROLL_X,
+                                                               this);
+            SWP                     vSwpScroll;
+
+            if (GetScrollBarHorz() == NULLHANDLE ||
+                !WinIsWindowShowing(GetScrollBarHorz()))
+                nAdjustHeight = 0L;
+            else
+                nAdjustHeight = nHSBHeight;
+            if (GetScrollBarVert() == NULLHANDLE ||
+                !WinIsWindowShowing(GetScrollBarVert()))
+                nAdjustWidth = 0L;
+            else
+                nAdjustWidth = nVSBWidth;
+            ::WinQueryWindowPos(hWnd, &vSwpScroll);
+            ::WinSetWindowPos( hWnd
+                              ,HWND_TOP
+                              ,vSwpScroll.x
+                              ,vSwpScroll.y + nAdjustHeight
+                              ,vSwpScroll.cx - nAdjustWidth
+                              ,vSwpScroll.cy - nAdjustHeight
+                              ,SWP_MOVE | SWP_SIZE
+                             );
+        }
+        ::WinQueryWindowPos(hWnd, &m_vWinSwp);
+    }
+} // end of wxWindowOS2::DoMoveWindow
 
 
-// set the size of the window: if the dimensions are positive, just use them,
+//
+// Set the size of the window: if the dimensions are positive, just use them,
 // 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)
 // 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)
@@ -715,342 +1531,840 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height)
 // 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
 // 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 wxWindow::DoSetSize(int x, int y,
-                         int width, int height,
-                         int sizeFlags)
-{
-    // TODO:
-}
+//
+void wxWindowOS2::DoSetSize( int nX,
+                             int nY,
+                             int nWidth,
+                             int nHeight,
+                             int nSizeFlags )
+{
+    //
+    // Input & output parameters assume wxWidgets coordinate system
+    //
+
+    //
+    // Get the current size and position...
+    //
+    int    nCurrentX;
+    int    nCurrentY;
+    int    nCurrentWidth;
+    int    nCurrentHeight;
+    wxSize vSize = wxDefaultSize;
+
+    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;
+    }
 
 
-// for a generic window there is no natural best size - just use the current one
-wxSize wxWindow::DoGetBestSize()
-{
-    return GetSize();
-}
+    if (nX == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        nX = nCurrentX;
+    if (nY == wxDefaultCoord && !(nSizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        nY = nCurrentY;
 
 
-void wxWindow::DoSetClientSize(int width, int height)
-{
-    // TODO:
-}
+    AdjustForParentClientOrigin(nX, nY, nSizeFlags);
 
 
-wxPoint wxWindow::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);
-}
+    if (nWidth == wxDefaultCoord)
+    {
+        if (nSizeFlags & wxSIZE_AUTO_WIDTH)
+        {
+            vSize  = DoGetBestSize();
+            nWidth = vSize.x;
+        }
+        else
+        {
+            //
+            // Just take the current one
+            //
+            nWidth = nCurrentWidth;
+        }
+    }
+
+    if (nHeight == wxDefaultCoord)
+    {
+        if (nSizeFlags & wxSIZE_AUTO_HEIGHT)
+        {
+            if (vSize.x == wxDefaultCoord)
+            {
+                vSize = DoGetBestSize();
+            }
+            nHeight = vSize.y;
+        }
+        else
+        {
+            // just take the current one
+            nHeight = nCurrentHeight;
+        }
+    }
 
 
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+    DoMoveWindow( nX, nY, nWidth, nHeight );
+} // end of wxWindowOS2::DoSetSize
+
+void wxWindowOS2::DoSetClientSize( int nWidth,
+                                   int nHeight )
 {
 {
-    // TODO:
-}
+    //
+    // nX & nY assume wxWidgets coordinate system
+    //
+    int nX;
+    int nY;
+
+    GetPosition(&nX, &nY);
+
+    DoMoveWindow( nX, nY, nWidth, nHeight );
+
+    wxSize size( nWidth, nHeight );
+    wxSizeEvent vEvent( size, m_windowId );
+    vEvent.SetEventObject(this);
+    HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::DoSetClientSize
 
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 
-int  wxWindow::GetCharHeight() const
+int wxWindowOS2::GetCharHeight() const
 {
 {
-    // TODO:
-    return(1);
-}
+    HPS                             hPs;
+    FONTMETRICS                     vFontMetrics;
 
 
-int  wxWindow::GetCharWidth() const
-{
-    // TODO:
-    return(1);
-}
+    hPs = ::WinGetPS(GetHwnd());
+
+    if(!GpiQueryFontMetrics(hPs, sizeof(FONTMETRICS), &vFontMetrics))
+    {
+        ::WinReleasePS(hPs);
+        return (0);
+    }
+    ::WinReleasePS(hPs);
+    return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender);
+} // end of wxWindowOS2::GetCharHeight
 
 
-void wxWindow::GetTextExtent( const wxString& string
-                             ,int*            x
-                             ,int*            y
-                             ,int*            descent
-                             ,int*            externalLeading
-                             ,const wxFont*   theFont
-                            ) const
+int wxWindowOS2::GetCharWidth() const
 {
 {
-    // TODO:
-}
+    HPS                             hPs;
+    FONTMETRICS                     vFontMetrics;
 
 
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
+    hPs = ::WinGetPS(GetHwnd());
 
 
-void wxWindow::CreateCaret(int w, int h)
-{
-    // TODO:
-}
+    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* WXUNUSED(pTheFont) ) const
+{
+    POINTL      avPoint[TXTBOX_COUNT];
+    POINTL      vPtMin;
+    POINTL      vPtMax;
+    int         i;
+    int         l;
+    FONTMETRICS vFM; // metrics structure
+    BOOL        bRc = FALSE;
+    HPS         hPS;
+
+    hPS = ::WinGetPS(GetHwnd());
+
+    l = rString.length();
+    if (l > 0L)
+    {
+        //
+        // In world coordinates.
+        //
+        bRc = ::GpiQueryTextBox( hPS,
+                                 l,
+                                 (char*) rString.wx_str(),
+                                 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
 
 
-void wxWindow::CreateCaret(const wxBitmap *bitmap)
+bool wxWindowOS2::IsMouseInWindow() const
 {
 {
-    // TODO:
-}
+    //
+    // Get the mouse position
+    POINTL vPt;
 
 
-void wxWindow::ShowCaret(bool show)
-{
-    // TODO:
-}
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPt);
 
 
-void wxWindow::DestroyCaret()
-{
-    // TODO:
-}
+    //
+    // Find the window which currently has the cursor and go up the window
+    // chain until we find this window - or exhaust it
+    //
+    HWND hWnd = ::WinWindowFromPoint(HWND_DESKTOP, &vPt, TRUE);
 
 
-void wxWindow::SetCaretPos(int x, int y)
-{
-    // TODO:
-}
+    while (hWnd && (hWnd != GetHwnd()))
+        hWnd = ::WinQueryWindow(hWnd, QW_PARENT);
 
 
-void wxWindow::GetCaretPos(int *x, int *y) const
-{
-    // TODO:
-}
+    return hWnd != NULL;
+} // end of wxWindowOS2::IsMouseInWindow
 
 
-#endif //wxUSE_CARET
 
 // ---------------------------------------------------------------------------
 // popup menu
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // popup menu
 // ---------------------------------------------------------------------------
-
-bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y )
+//
+#if wxUSE_MENUS_NATIVE
+bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
 {
 {
-    // TODO:
-    return(TRUE);
-}
+    HWND hWndOwner = GetHwnd();
+    HWND hWndParent = GetHwnd();
+    HWND hMenu = GetHmenuOf(pMenu);
+    bool bIsWaiting = true;
+    int nHeight;
+
+    pMenu->SetInvokingWindow(this);
+    pMenu->UpdateUI();
+
+    if ( nX == -1 && nY == -1 )
+    {
+        wxPoint mouse = wxGetMousePosition();
+        nX = mouse.x; nY = mouse.y;
+    }
+    else
+    {
+        DoClientToScreen( &nX
+                         ,&nY
+                        );
+        DoGetSize(0,&nHeight);
+        nY = nHeight - nY;
+    }
+
+    ::WinPopupMenu( hWndParent
+                   ,hWndOwner
+                   ,hMenu
+                   ,nX
+                   ,nY
+                   ,0L
+                   ,PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_KEYBOARD
+                  );
+
+    while(bIsWaiting)
+    {
+        QMSG                            vMsg;
+
+        ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0);
+        if (vMsg.msg == WM_COMMAND)
+            bIsWaiting = false;
+        ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
+    }
+
+    pMenu->SetInvokingWindow(NULL);
+    return true;
+} // end of wxWindowOS2::DoPopupMenu
+#endif // wxUSE_MENUS_NATIVE
 
 // ===========================================================================
 // pre/post message processing
 // ===========================================================================
 
 
 // ===========================================================================
 // pre/post message processing
 // ===========================================================================
 
-MRESULT wxWindow::OS2DefWindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+MRESULT wxWindowOS2::OS2DefWindowProc( WXUINT uMsg,
+                                       WXWPARAM wParam,
+                                       WXLPARAM lParam )
 {
 {
-   // TODO:
-   return (MRESULT)0;
-}
+    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 wxWindow::OS2ProcessMessage(WXMSG* pMsg)
+bool wxWindowOS2::OS2ProcessMessage( WXMSG* pMsg )
 {
 {
-   // TODO:
-    return FALSE;
-}
+// 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;
 
 
-bool wxWindow::OS2TranslateMessage(WXMSG* pMsg)
+                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
+                        {
+                            wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                            wxButton*   pBtn = NULL;
+
+                            if (tlw)
+                            {
+                                pBtn = wxDynamicCast(tlw->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 if (!IsTopLevel())
+                            {
+                                //
+                                // if not a top level window, let parent
+                                // handle it
+                                //
+                                return false;
+                            }
+                            // 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 (HandleWindowEvent(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__
+
+    return false;
+} // end of wxWindowOS2::OS2ProcessMessage
+
+bool wxWindowOS2::OS2TranslateMessage( WXMSG* pMsg )
 {
 {
-    return m_acceleratorTable.Translate(this, 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
+
+bool wxWindowOS2::OS2ShouldPreProcessMessage( WXMSG* WXUNUSED(pMsg) )
+{
+    // preprocess all messages by default
+    return true;
+} // end of wxWindowOS2::OS2ShouldPreProcessMessage
 
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
-// message params unpackers (different for Win16 and Win32)
+// message params unpackers
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 
-void wxWindow::UnpackCommand(WXWPARAM wParam, WXLPARAM lParam,
-                             WORD *id, WXHWND *hwnd, WORD *cmd)
-{
-    *id = LOWORD(wParam);
-    *hwnd = (WXHWND)lParam;
-    *cmd = HIWORD(wParam);
-}
-
-void wxWindow::UnpackActivate(WXWPARAM wParam, WXLPARAM lParam,
-                              WXWORD *state, WXWORD *minimized, WXHWND *hwnd)
+void wxWindowOS2::UnpackCommand(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WORD*                             pId
+, WXHWND*                           phWnd
+, WORD*                             pCmd
+)
 {
 {
-    *state = LOWORD(wParam);
-    *minimized = HIWORD(wParam);
-    *hwnd = (WXHWND)lParam;
-}
+    *pId = LOWORD(wParam);
+    *phWnd = NULL;  // or may be GetHWND() ?
+    *pCmd = LOWORD(lParam);
+} // end of wxWindowOS2::UnpackCommand
 
 
-void wxWindow::UnpackScroll(WXWPARAM wParam, WXLPARAM lParam,
-                            WXWORD *code, WXWORD *pos, WXHWND *hwnd)
+void wxWindowOS2::UnpackActivate(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WXWORD*                           pState
+, WXHWND*                           phWnd
+)
 {
 {
-    *code = LOWORD(wParam);
-    *pos = HIWORD(wParam);
-    *hwnd = (WXHWND)lParam;
-}
+    *pState     = LOWORD(wParam);
+    *phWnd      = (WXHWND)lParam;
+} // end of wxWindowOS2::UnpackActivate
 
 
-void wxWindow::UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam,
-                              WXWORD *nCtlColor, WXHDC *hdc, WXHWND *hwnd)
+void wxWindowOS2::UnpackScroll(
+  WXWPARAM                          wParam
+, WXLPARAM                          lParam
+, WXWORD*                           pCode
+, WXWORD*                           pPos
+, WXHWND*                           phWnd
+)
 {
 {
-    *nCtlColor = 0; // TODO: CTLCOLOR_BTN;
-    *hwnd = (WXHWND)lParam;
-    *hdc = (WXHDC)wParam;
-}
+    ULONG                           ulId;
+    HWND                            hWnd;
 
 
-void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
-                                WXWORD *item, WXWORD *flags, WXHMENU *hmenu)
+    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
+)
 {
 {
-    *item = (WXWORD)LOWORD(wParam);
-    *flags = HIWORD(wParam);
-    *hmenu = (WXHMENU)lParam;
-}
+    *pItem = (WXWORD)LOWORD(wParam);
+    *pFlags = HIWORD(wParam);
+    *phMenu = (WXHMENU)lParam;
+} // end of wxWindowOS2::UnpackMenuSelect
 
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
-// Main wxWindows window proc and the window proc for wxWindow
+// Main wxWidgets 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
 // Hook for new window just as it's being created, when the window isn't yet
 // associated with the handle
-wxWindow *wxWndHook = NULL;
+//
+wxWindowOS2*                         wxWndHook = NULL;
 
 
+//
 // Main window proc
 // Main window proc
-MRESULT wxWndProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam)
+//
+MRESULT EXPENTRY wxWndProc(
+  HWND                              hWnd
+, ULONG                             ulMsg
+, MPARAM                            wParam
+, MPARAM                            lParam
+)
 {
 {
-    // trace all messages - useful for the debugging
-#ifdef __WXDEBUG__
-    wxLogTrace(wxTraceMessages, wxT("Processing %s(wParam=%8lx, lParam=%8lx)"),
-               wxGetMessageName(message), wParam, lParam);
-#endif // __WXDEBUG__
-
-    wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
+    wxWindowOS2*                    pWnd = wxFindWinFromHandle((WXHWND)hWnd);
 
 
-    // when we get the first message for the HWND we just created, we associate
+    //
+    // When we get the first message for the HWND we just created, we associate
     // it with wxWindow stored in wxWndHook
     // it with wxWindow stored in wxWndHook
-    if ( !wnd && wxWndHook )
+    //
+    if (!pWnd && wxWndHook)
     {
     {
-#if 0 // def __WXDEBUG__
-        char buf[512];
-        ::GetClassNameA((HWND) hWnd, buf, 512);
-        wxString className(buf);
-#endif
-
         wxAssociateWinWithHandle(hWnd, wxWndHook);
         wxAssociateWinWithHandle(hWnd, wxWndHook);
-        wnd = wxWndHook;
+        pWnd = wxWndHook;
         wxWndHook = NULL;
         wxWndHook = NULL;
-        wnd->SetHWND((WXHWND)hWnd);
+        pWnd->SetHWND((WXHWND)hWnd);
     }
 
     }
 
-    MRESULT rc;
+    MRESULT                         rc = (MRESULT)0;
+
 
 
+    //
     // Stop right here if we don't have a valid handle in our wxWindow object.
     // Stop right here if we don't have a valid handle in our wxWindow object.
-    if ( wnd && !wnd->GetHWND() )
+    //
+    if (pWnd && !pWnd->GetHWND())
     {
     {
-        // FIXME: why do we do this?
-        wnd->SetHWND((WXHWND) hWnd);
-        rc = wnd->OS2DefWindowProc(hWnd, message, wParam, lParam );
-        wnd->SetHWND(0);
+        pWnd->SetHWND((WXHWND) hWnd);
+        rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam );
+        pWnd->SetHWND(0);
     }
     else
     {
     }
     else
     {
-        if ( wnd )
-            rc = wnd->OS2WindowProc(hWnd, message, wParam, lParam);
+        if (pWnd)
+        {
+            rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+            if ( (pWnd->GetScrollBarHorz() != NULLHANDLE ||
+                  pWnd->GetScrollBarVert() != NULLHANDLE) &&
+                  ulMsg == WM_PAINT)
+            {
+                if (pWnd->GetScrollBarHorz() != NULLHANDLE)
+                    ::WinInvalidateRect(pWnd->GetScrollBarHorz(), NULL, TRUE);
+                if (pWnd->GetScrollBarVert() != NULLHANDLE)
+                    ::WinInvalidateRect(pWnd->GetScrollBarVert(), NULL, TRUE);
+            }
+        }
         else
         else
-            rc = 0; //TODO: DefWindowProc( hWnd, message, wParam, lParam );
+            rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
     }
 
     return rc;
     }
 
     return rc;
-}
+} // end of wxWndProc
 
 
-MRESULT wxWindow::OS2WindowProc(HWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-    // did we process the message?
-    bool processed = FALSE;
-
-    // the return value
-    union
-    {
-        bool        allow;
-        long        result;
-        WXHICON     hIcon;
-        WXHBRUSH    hBrush;
-    } rc;
-
-    // for most messages we should return 0 when we do process the message
-    rc.result = 0;
-    // TODO:
-/*
-    switch ( message )
+//
+// 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:
             {
     {
         case WM_CREATE:
             {
-                bool mayCreate;
-                processed = HandleCreate((WXLPCREATESTRUCT)lParam, &mayCreate);
-                if ( processed )
+                bool                bMayCreate;
+
+                bProcessed = HandleCreate( (WXLPCREATESTRUCT)lParam
+                                          ,&bMayCreate
+                                         );
+                if (bProcessed)
                 {
                 {
-                    // return 0 to allow window creation
-                    rc.result = mayCreate ? 0 : -1;
+                    //
+                    // Return 0 to bAllow window creation
+                    //
+                    mResult = (MRESULT)(bMayCreate ? 0 : -1);
                 }
             }
             break;
 
         case WM_DESTROY:
                 }
             }
             break;
 
         case WM_DESTROY:
-            processed = HandleDestroy();
-            break;
+             HandleDestroy();
+             bProcessed = true;
+             break;
 
         case WM_MOVE:
 
         case WM_MOVE:
-            processed = HandleMove(LOWORD(lParam), HIWORD(lParam));
+            bProcessed = HandleMove( LOWORD(lParam)
+                                    ,HIWORD(lParam)
+                                   );
             break;
 
         case WM_SIZE:
             break;
 
         case WM_SIZE:
-            processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
+            bProcessed = HandleSize( LOWORD(lParam)
+                                    ,HIWORD(lParam)
+                                    ,(WXUINT)wParam
+                                   );
             break;
 
             break;
 
-        case WM_ACTIVATE:
+        case WM_WINDOWPOSCHANGED:
+
+            //
+            // Dialogs under OS/2 do not get WM_SIZE events at all.
+            // Instead they get this, which can function much like WM_SIZE
+            // PSWP contains the new sizes and positioning, PSWP+1 the old
+            // We use this because ADJUSTWINDOWPOS comes BEFORE the new
+            // position is added and our auto layout does a WinQueryWindowRect
+            // to get the CURRENT client size.  That is the size used to position
+            // child controls, so we need to already be sized
+            // in order to get the child controls positoned properly.
+            //
+            if (IsKindOf(CLASSINFO(wxDialog)) || IsKindOf(CLASSINFO(wxFrame)))
             {
             {
-                WXWORD state, minimized;
-                WXHWND hwnd;
-                UnpackActivate(wParam, lParam, &state, &minimized, &hwnd);
+                PSWP                pSwp = (PSWP)PVOIDFROMMP(wParam);
+                PSWP                pSwp2 = pSwp++;
+
+                if (!(pSwp->cx == pSwp2->cx &&
+                      pSwp->cy == pSwp2->cy))
+                    bProcessed = HandleSize( pSwp->cx
+                                            ,pSwp->cy
+                                            ,(WXUINT)lParam
+                                           );
+                if (IsKindOf(CLASSINFO(wxFrame)))
+                {
+                    wxFrame*            pFrame = wxDynamicCast(this, wxFrame);
 
 
-                processed = HandleActivate(state, minimized != 0, (WXHWND)hwnd);
+                    if (pFrame)
+                    {
+                        if (pFrame->GetStatusBar())
+                            pFrame->PositionStatusBar();
+                        if (pFrame->GetToolBar())
+                            pFrame->PositionToolBar();
+                    }
+                }
             }
             break;
 
             }
             break;
 
-        case WM_SETFOCUS:
-            processed = HandleSetFocus((WXHWND)(HWND)wParam);
+        case WM_ACTIVATE:
+            {
+                WXWORD              wState;
+                WXHWND              hWnd;
+
+                UnpackActivate( wParam
+                               ,lParam
+                               ,&wState
+                               ,&hWnd
+                              );
+
+                bProcessed = HandleActivate( wState
+                                            ,(WXHWND)hWnd
+                                           );
+                bProcessed = false;
+            }
             break;
 
             break;
 
-        case WM_KILLFOCUS:
-            processed = HandleKillFocus((WXHWND)(HWND)wParam);
+        case WM_SETFOCUS:
+            if (SHORT1FROMMP((MPARAM)lParam) == TRUE)
+                bProcessed = HandleSetFocus((WXHWND)(HWND)wParam);
+            else
+                bProcessed = HandleKillFocus((WXHWND)(HWND)wParam);
             break;
 
         case WM_PAINT:
             break;
 
         case WM_PAINT:
-            processed = HandlePaint();
+            bProcessed = HandlePaint();
             break;
 
         case WM_CLOSE:
             break;
 
         case WM_CLOSE:
-            // don't let the DefWindowProc() destroy our window - we'll do it
+            //
+            // Don't let the DefWindowProc() destroy our window - we'll do it
             // ourselves in ~wxWindow
             // ourselves in ~wxWindow
-            processed = TRUE;
-            rc.result = TRUE;
+            //
+            bProcessed = true;
+            mResult = (MRESULT)TRUE;
             break;
 
             break;
 
-        case WM_SHOWWINDOW:
-            processed = HandleShow(wParam != 0, (int)lParam);
+        case WM_SHOW:
+            bProcessed = HandleShow(wParam != 0, (int)lParam);
             break;
 
             break;
 
+        //
+        // Under OS2 PM Joysticks are treated just like mouse events
+        // The "Motion" events will be prevelent in joysticks
+        //
         case WM_MOUSEMOVE:
         case WM_MOUSEMOVE:
-        case WM_LBUTTONDOWN:
-        case WM_LBUTTONUP:
-        case WM_LBUTTONDBLCLK:
-        case WM_RBUTTONDOWN:
-        case WM_RBUTTONUP:
-        case WM_RBUTTONDBLCLK:
-        case WM_MBUTTONDOWN:
-        case WM_MBUTTONUP:
-        case WM_MBUTTONDBLCLK:
+        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);
+                short               nX = LOWORD(wParam);
+                short               nY = HIWORD(wParam);
 
 
-                processed = HandleMouseEvent(message, x, y, wParam);
-            }
-            break;
-
-        case MM_JOY1MOVE:
-        case MM_JOY2MOVE:
-        case MM_JOY1ZMOVE:
-        case MM_JOY2ZMOVE:
-        case MM_JOY1BUTTONDOWN:
-        case MM_JOY2BUTTONDOWN:
-        case MM_JOY1BUTTONUP:
-        case MM_JOY2BUTTONUP:
-            {
-                int x = LOWORD(lParam);
-                int y = HIWORD(lParam);
-
-                processed = HandleJoystickEvent(message, x, y, wParam);
+                //
+                // Redirect the event to a static control if necessary
+                //
+                if (this == GetCapture())
+                {
+                    bProcessed = HandleMouseEvent( uMsg
+                                                  ,nX
+                                                  ,nY
+                                                  ,(WXUINT)SHORT2FROMMP(lParam)
+                                                 );
+                }
+                else
+                {
+                    wxWindow*       pWin = FindWindowForMouseEvent( this
+                                                                   ,&nX
+                                                                   ,&nY
+                                                                  );
+                    if (!pWin->IsOfStandardClass())
+                    {
+                        if (uMsg == WM_BUTTON1DOWN && pWin->CanAcceptFocus() )
+                            pWin->SetFocus();
+                    }
+                    bProcessed = pWin->HandleMouseEvent( uMsg
+                                                        ,nX
+                                                        ,nY
+                                                        ,(WXUINT)SHORT2FROMMP(lParam)
+                                                       );
+                }
             }
             break;
 
         case WM_SYSCOMMAND:
             }
             break;
 
         case WM_SYSCOMMAND:
-            processed = HandleSysCommand(wParam, lParam);
+            bProcessed = HandleSysCommand(wParam, lParam);
             break;
 
         case WM_COMMAND:
             break;
 
         case WM_COMMAND:
@@ -1059,756 +2373,1035 @@ MRESULT wxWindow::OS2WindowProc(HWND hWnd, WXUINT message, WXWPARAM wParam, WXLP
                 WXHWND hwnd;
                 UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
 
                 WXHWND hwnd;
                 UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
 
-                processed = HandleCommand(id, cmd, hwnd);
+                bProcessed = HandleCommand(id, cmd, hwnd);
             }
             break;
 
             }
             break;
 
-#ifdef __WIN95__
-        case WM_NOTIFY:
-            processed = HandleNotify((int)wParam, lParam, &rc.result);
-            break;
-#endif  // Win95
-
-            // for these messages we must return TRUE if process the message
+            //
+            // For these messages we must return TRUE if process the message
+            //
         case WM_DRAWITEM:
         case WM_MEASUREITEM:
             {
         case WM_DRAWITEM:
         case WM_MEASUREITEM:
             {
-                int idCtrl = (UINT)wParam;
-                if ( message == WM_DRAWITEM )
+                int                 nIdCtrl = (UINT)wParam;
+
+                if ( uMsg == WM_DRAWITEM )
                 {
                 {
-                    processed = MSWOnDrawItem(idCtrl,
+                    bProcessed = OS2OnDrawItem(nIdCtrl,
                                               (WXDRAWITEMSTRUCT *)lParam);
                 }
                 else
                 {
                                               (WXDRAWITEMSTRUCT *)lParam);
                 }
                 else
                 {
-                    processed = MSWOnMeasureItem(idCtrl,
-                                                 (WXMEASUREITEMSTRUCT *)lParam);
+                    return MRFROMLONG(OS2OnMeasureItem( nIdCtrl
+                                                       ,(WXMEASUREITEMSTRUCT *)lParam
+                                                      ));
                 }
 
                 }
 
-                if ( processed )
-                    rc.result = TRUE;
+                if ( bProcessed )
+                    mResult = (MRESULT)TRUE;
             }
             break;
 
             }
             break;
 
-        case WM_GETDLGCODE:
-            if ( m_lDlgCode )
+        case WM_QUERYDLGCODE:
+            if (!IsOfStandardClass())
             {
             {
-                rc.result = m_lDlgCode;
-                processed = TRUE;
+                if ( m_lDlgCode )
+                {
+                    mResult = (MRESULT)m_lDlgCode;
+                    bProcessed = true;
+                }
             }
             }
+            //
             //else: get the dlg code from the DefWindowProc()
             //else: get the dlg code from the DefWindowProc()
+            //
             break;
 
             break;
 
-        case WM_KEYDOWN:
-            // If this has been processed by an event handler,
-            // return 0 now (we've handled it).
-            if ( HandleKeyDown((WORD) wParam, lParam) )
+        //
+        // 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:
             {
             {
-                processed = TRUE;
+                USHORT                  uKeyFlags = SHORT1FROMMP((MPARAM)wParam);
 
 
-                break;
+                if (uKeyFlags & KC_KEYUP)
+                {
+                    //TODO: check if the cast to WXWORD isn't causing trouble
+                    bProcessed = HandleKeyUp(wParam, lParam);
+                    break;
+                }
+                else // keydown event
+                {
+                    m_bLastKeydownProcessed = false;
+                    //
+                    // 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
+                    //
+                    m_bLastKeydownProcessed = HandleKeyDown(wParam, lParam);
+                    if (uKeyFlags & KC_VIRTUALKEY)
+                    {
+                        USHORT          uVk = SHORT2FROMMP((MPARAM)lParam);
+
+                        //
+                        // We consider these message "not interesting" to OnChar
+                        //
+                        switch(uVk)
+                        {
+                            case VK_SHIFT:
+                            case VK_CTRL:
+                            case VK_MENU:
+                            case VK_CAPSLOCK:
+                            case VK_NUMLOCK:
+                            case VK_SCRLLOCK:
+                                bProcessed = true;
+                                break;
+
+                            // 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_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;
+
+                            default:
+                                bProcessed = HandleChar(wParam, lParam);
+                         }
+                         break;
+                    }
+                    else // WM_CHAR -- Always an ASCII character
+                    {
+                        if (m_bLastKeydownProcessed)
+                        {
+                            //
+                            // The key was handled in the EVT_KEY_DOWN and handling
+                            // a key in an EVT_KEY_DOWN handler is meant, by
+                            // design, to prevent EVT_CHARs from happening
+                            //
+                            m_bLastKeydownProcessed = false;
+                            bProcessed = true;
+                        }
+                        else // do generate a CHAR event
+                        {
+                            bProcessed = HandleChar(wParam, lParam, true);
+                            break;
+                        }
+                    }
+                }
             }
 
             }
 
-            // we consider these message "not interesting" to OnChar
-            if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
+        case WM_HSCROLL:
+        case WM_VSCROLL:
             {
             {
-                processed = TRUE;
-
-                break;
+                WXWORD              wCode;
+                WXWORD              wPos;
+                WXHWND              hWnd;
+                UnpackScroll( wParam
+                             ,lParam
+                             ,&wCode
+                             ,&wPos
+                             ,&hWnd
+                            );
+
+                bProcessed = OS2OnScroll( uMsg == WM_HSCROLL ? wxHORIZONTAL
+                                                             : wxVERTICAL
+                                         ,wCode
+                                         ,wPos
+                                         ,hWnd
+                                        );
             }
             }
+            break;
 
 
-            switch ( wParam )
+        case WM_CONTROL:
+            switch(SHORT2FROMMP(wParam))
             {
             {
-                // avoid duplicate messages to OnChar for these ASCII keys: they
-                // will be translated by TranslateMessage() and received in WM_CHAR
-                case VK_ESCAPE:
-                case VK_SPACE:
-                case VK_RETURN:
-                case VK_BACK:
-                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
-                    processed = FALSE;
-
-                    break;
+                case BN_PAINT:
+                    {
+                        HWND                hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));
+                        wxWindowOS2*        pWin = wxFindWinFromHandle(hWnd);
+
+                        if (!pWin)
+                        {
+                            bProcessed = false;
+                            break;
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxBitmapButton)))
+                        {
+                            wxBitmapButton*     pBitmapButton = wxDynamicCast(pWin, wxBitmapButton);
+
+                            pBitmapButton->OS2OnDraw((WXDRAWITEMSTRUCT *)lParam);
+                        }
+                        return 0;
+                    }
+                    // break;
 
 
-#ifdef VK_APPS
-                // special case of VK_APPS: treat it the same as right mouse
-                // click because both usually pop up a context menu
-                case VK_APPS:
+                case BKN_PAGESELECTEDPENDING:
                     {
                     {
-                        // construct the key mask
-                        WPARAM fwKeys = MK_RBUTTON;
-                        if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
-                            fwKeys |= MK_CONTROL;
-                        if ( (::GetKeyState(VK_SHIFT) & 0x100) != 0 )
-                            fwKeys |= MK_SHIFT;
-
-                        // simulate right mouse button click
-                        DWORD dwPos = ::GetMessagePos();
-                        int x = GET_X_LPARAM(dwPos),
-                            y = GET_Y_LPARAM(dwPos);
-
-                        ScreenToClient(&x, &y);
-                        processed = HandleMouseEvent(WM_RBUTTONDOWN, x, y, fwKeys);
+                        PPAGESELECTNOTIFY  pPage = (PPAGESELECTNOTIFY)lParam;
+
+                        if ((pPage->ulPageIdNew != pPage->ulPageIdCur) &&
+                            (pPage->ulPageIdNew > 0L && pPage->ulPageIdCur > 0L))
+                        {
+                            wxWindowOS2*        pWin = wxFindWinFromHandle(pPage->hwndBook);
+                            wxNotebookEvent     vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
+                                                       ,(int)SHORT1FROMMP(wParam)
+                                                       ,(int)pPage->ulPageIdNew
+                                                       ,(int)pPage->ulPageIdCur
+                                                      );
+                            if (!pWin)
+                            {
+                                bProcessed = false;
+                                break;
+                            }
+                            if (pWin->IsKindOf(CLASSINFO(wxNotebook)))
+                            {
+                                wxNotebook*         pNotebook = wxDynamicCast(pWin, wxNotebook);
+
+                                vEvent.SetEventObject(pWin);
+                                pNotebook->OnSelChange(vEvent);
+                                bProcessed = true;
+                            }
+                            else
+                                bProcessed = false;
+                        }
+                        else
+                            bProcessed = false;
                     }
                     break;
                     }
                     break;
-#endif // VK_APPS
 
 
-                case VK_LEFT:
-                case VK_RIGHT:
-                case VK_DOWN:
-                case VK_UP:
-                default:
-                    processed = HandleChar((WORD)wParam, lParam);
-            }
-            break;
-
-        case WM_KEYUP:
-            processed = HandleKeyUp((WORD) wParam, lParam);
-            break;
+                case CBN_LBSELECT:
+                case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT
+                    {
+                        HWND                hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));
+                        wxWindowOS2*        pWin = wxFindWinFromHandle(hWnd);
+
+                        if (!pWin)
+                        {
+                            bProcessed = false;
+                            break;
+                        }
+                        //
+                        // Simulate a WM_COMMAND here, as wxWidgets expects all control
+                        // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
+                        //
+                        if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))
+                        {
+                            wxRadioBox*         pRadioBox = wxDynamicCast(pWin, wxRadioBox);
+
+                            pRadioBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                  ,(WXWORD)SHORT1FROMMP(wParam)
+                                                 );
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxRadioButton)))
+                        {
+                            wxRadioButton*      pRadioButton = wxDynamicCast(pWin, wxRadioButton);
+
+                            pRadioButton->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                     ,(WXWORD)SHORT1FROMMP(wParam)
+                                                    );
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxCheckBox)))
+                        {
+                            wxCheckBox*         pCheckBox = wxDynamicCast(pWin, wxCheckBox);
+
+                            pCheckBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                  ,(WXWORD)SHORT1FROMMP(wParam)
+                                                 );
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxListBox)))
+                        {
+                            wxListBox*          pListBox = wxDynamicCast(pWin, wxListBox);
+
+                            pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                 ,(WXWORD)SHORT1FROMMP(wParam)
+                                                );
+                            if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW)
+                                Refresh();
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxComboBox)))
+                        {
+                            wxComboBox*          pComboBox = wxDynamicCast(pWin, wxComboBox);
+
+                            pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                  ,(WXWORD)SHORT1FROMMP(wParam)
+                                                 );
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxChoice)))
+                        {
+                            wxChoice*           pChoice = wxDynamicCast(pWin, wxChoice);
+
+                            pChoice->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                ,(WXWORD)SHORT1FROMMP(wParam)
+                                               );
+                        }
+                        return 0;
+                    }
+                    // break;
 
 
-        case WM_CHAR: // Always an ASCII character
-            processed = HandleChar((WORD)wParam, lParam, TRUE);
-            break;
+                case LN_ENTER:
+                    {
+                        HWND                hWnd = HWNDFROMMP(lParam);
+                        wxWindowOS2*        pWin = wxFindWinFromHandle(hWnd);
+
+                        if (!pWin)
+                        {
+                            bProcessed = false;
+                            break;
+                        }
+                        //
+                        // Simulate a WM_COMMAND here, as wxWidgets expects all control
+                        // button clicks to generate WM_COMMAND msgs, not WM_CONTROL
+                        //
+                        if (pWin->IsKindOf(CLASSINFO(wxListBox)))
+                        {
+                            wxListBox*          pListBox = wxDynamicCast(pWin, wxListBox);
+
+                            pListBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                 ,(WXWORD)SHORT1FROMMP(wParam)
+                                                );
+                            if (pListBox->GetWindowStyle() & wxLB_OWNERDRAW)
+                                Refresh();
+
+                        }
+                        if (pWin->IsKindOf(CLASSINFO(wxComboBox)))
+                        {
+                            wxComboBox*          pComboBox = wxDynamicCast(pWin, wxComboBox);
+
+                            pComboBox->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                  ,(WXWORD)SHORT1FROMMP(wParam)
+                                                 );
+                        }
+                        return 0;
+                    }
+                    // break;
 
 
-        case WM_HSCROLL:
-        case WM_VSCROLL:
-            {
-                WXWORD code, pos;
-                WXHWND hwnd;
-                UnpackScroll(wParam, lParam, &code, &pos, &hwnd);
+                case SPBN_UPARROW:
+                case SPBN_DOWNARROW:
+                case SPBN_CHANGE:
+                    {
+                        char zVal[10];
+                        long lVal;
+
+                        ::WinSendMsg( HWNDFROMMP(lParam)
+                                     ,SPBM_QUERYVALUE
+                                     ,&zVal[0]
+                                     ,MPFROM2SHORT( (USHORT)10
+                                                   ,(USHORT)SPBQ_UPDATEIFVALID
+                                                  )
+                                    );
+                        lVal = atol(zVal);
+                        bProcessed = OS2OnScroll( wxVERTICAL
+                                                 ,(WXWORD)SHORT2FROMMP(wParam)
+                                                 ,(WXWORD)lVal
+                                                 ,HWNDFROMMP(lParam)
+                                                );
+                    }
+                    break;
 
 
-                processed = MSWOnScroll(message == WM_HSCROLL ? wxHORIZONTAL
-                                                              : wxVERTICAL,
-                                        code, pos, hwnd);
+                case SLN_SLIDERTRACK:
+                    {
+                        HWND         hWnd = ::WinWindowFromID(GetHWND(), SHORT1FROMMP(wParam));
+                        wxWindowOS2* pChild = wxFindWinFromHandle(hWnd);
+
+                        if (!pChild)
+                        {
+                            bProcessed = false;
+                            break;
+                        }
+                        if (pChild->IsKindOf(CLASSINFO(wxSlider)))
+                            bProcessed = OS2OnScroll( wxVERTICAL
+                                                     ,(WXWORD)SHORT2FROMMP(wParam)
+                                                     ,(WXWORD)LONGFROMMP(lParam)
+                                                     ,hWnd
+                                                    );
+                    }
+                    break;
             }
             break;
 
             }
             break;
 
-        // CTLCOLOR messages are sent by children to query the parent for their
-        // colors
-#ifdef __WIN32__
-        case WM_CTLCOLORMSGBOX:
-        case WM_CTLCOLOREDIT:
-        case WM_CTLCOLORLISTBOX:
-        case WM_CTLCOLORBTN:
-        case WM_CTLCOLORDLG:
-        case WM_CTLCOLORSCROLLBAR:
-        case WM_CTLCOLORSTATIC:
-#else // Win16
-        case WM_CTLCOLOR:
-#endif // Win32/16
+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+        case WM_CTLCOLORCHANGE:
             {
             {
-                WXWORD nCtlColor;
-                WXHDC hdc;
-                WXHWND hwnd;
-                UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
-
-                processed = HandleCtlColor(&rc.hBrush,
-                                           (WXHDC)hdc,
-                                           (WXHWND)hwnd,
-                                           nCtlColor,
-                                           message,
-                                           wParam,
-                                           lParam);
+                bProcessed = HandleCtlColor(&hBrush);
             }
             break;
             }
             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:
 
             // the return value for this message is ignored
         case WM_SYSCOLORCHANGE:
-            processed = HandleSysColorChange();
-            break;
-
-        case WM_PALETTECHANGED:
-            processed = HandlePaletteChanged((WXHWND) (HWND) wParam);
+            bProcessed = HandleSysColorChange();
             break;
 
             break;
 
-        case WM_QUERYNEWPALETTE:
-            processed = HandleQueryNewPalette();
-            break;
-
-        case WM_ERASEBKGND:
-            processed = HandleEraseBkgnd((WXHDC)(HDC)wParam);
-            if ( processed )
-            {
-                // we processed the message, i.e. erased the background
-                rc.result = TRUE;
-            }
+        case WM_REALIZEPALETTE:
+            bProcessed = HandlePaletteChanged();
             break;
 
             break;
 
-        case WM_DROPFILES:
-            processed = HandleDropFiles(wParam);
+        // move all drag and drops to wxDrg
+        case WM_ENDDRAG:
+            bProcessed = HandleEndDrag(wParam);
             break;
 
             break;
 
-        case WM_INITDIALOG:
-            processed = HandleInitDialog((WXHWND)(HWND)wParam);
+        case WM_INITDLG:
+            bProcessed = HandleInitDialog((WXHWND)(HWND)wParam);
 
 
-            if ( processed )
+            if ( bProcessed )
             {
                 // we never set focus from here
             {
                 // we never set focus from here
-                rc.result = FALSE;
+                mResult = (MRESULT)FALSE;
             }
             break;
 
             }
             break;
 
-        case WM_QUERYENDSESSION:
-            processed = HandleQueryEndSession(lParam, &rc.allow);
+        // wxFrame specific message
+        case WM_MINMAXFRAME:
+            bProcessed = HandleGetMinMaxInfo((PSWP)wParam);
             break;
 
             break;
 
-        case WM_ENDSESSION:
-            processed = HandleEndSession(wParam != 0, lParam);
+        case WM_SYSVALUECHANGED:
+            // TODO: do something
+            mResult = (MRESULT)TRUE;
             break;
 
             break;
 
-        case WM_GETMINMAXINFO:
-            processed = HandleGetMinMaxInfo((MINMAXINFO*)lParam);
-            break;
-
-        case WM_SETCURSOR:
-            processed = HandleSetCursor((WXHWND)(HWND)wParam,
-                                        LOWORD(lParam),     // hit test
-                                        HIWORD(lParam));    // mouse msg
-
-            if ( processed )
+        //
+        // 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
+                //
+                // Returning TRUE stops the DefWindowProc() from further
                 // processing this message - exactly what we need because we've
                 // just set the cursor.
                 // processing this message - exactly what we need because we've
                 // just set the cursor.
-                rc.result = TRUE;
+                //
+                mResult = (MRESULT)TRUE;
             }
             break;
             }
             break;
-    }
 
 
-    if ( !processed )
+#if wxUSE_MENUS_NATIVE
+         case WM_MENUEND:
+            if (wxCurrentPopupMenu)
+            {
+                if (GetHmenuOf(wxCurrentPopupMenu) == (HWND)lParam)
+                {
+                    // Break out of msg loop in DoPopupMenu
+                    ::WinPostMsg((HWND)lParam,WM_COMMAND,wParam,0);
+                }
+            }
+            break;
+#endif // wxUSE_MENUS_NATIVE
+
+    }
+    if (!bProcessed)
     {
 #ifdef __WXDEBUG__
         wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
     {
 #ifdef __WXDEBUG__
         wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
-                   wxGetMessageName(message));
+                   wxGetMessageName(uMsg));
 #endif // __WXDEBUG__
 #endif // __WXDEBUG__
-        rc.result = MSWDefWindowProc(message, wParam, lParam);
+        if (IsKindOf(CLASSINFO(wxFrame)))
+            mResult = ::WinDefWindowProc(m_hWnd, uMsg, wParam, lParam);
+        else if (IsKindOf(CLASSINFO(wxDialog)))
+            mResult = ::WinDefDlgProc( m_hWnd, uMsg, wParam, lParam);
+        else
+            mResult = OS2DefWindowProc(uMsg, wParam, lParam);
     }
     }
-*/
-    return (MRESULT)0;
-}
+    return mResult;
+} // end of wxWindowOS2::OS2WindowProc
 
 
-// Dialog window proc
-MRESULT wxDlgProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam)
-{
-   // TODO:
-/*
-    if ( message == WM_INITDIALOG )
-    {
-        // for this message, returning TRUE tells system to set focus to the
-        // first control in the dialog box
-        return TRUE;
-    }
-    else
-    {
-        // for all the other ones, FALSE means that we didn't process the
-        // message
-        return 0;
-    }
-*/
-    return (MRESULT)0;
-}
+// ----------------------------------------------------------------------------
+// wxWindow <-> HWND map
+// ----------------------------------------------------------------------------
 
 
-wxWindow *wxFindWinFromHandle(WXHWND hWnd)
+wxWinHashTable *wxWinHandleHash = NULL;
+
+wxWindow* wxFindWinFromHandle(
+  WXHWND                            hWnd
+)
 {
 {
-    wxNode *node = wxWinHandleList->Find((long)hWnd);
-    if ( !node )
-        return NULL;
-    return (wxWindow *)node->Data();
-}
+    return (wxWindow *)wxWinHandleHash->Get((long)hWnd);
+} // end of wxFindWinFromHandle
 
 
-void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
+void wxAssociateWinWithHandle(
+  HWND                              hWnd
+, wxWindowOS2*                      pWin
+)
 {
 {
-    // adding NULL hWnd is (first) surely a result of an error and
+    //
+    // Adding NULL hWnd is (first) surely a result of an error and
     // (secondly) breaks menu command processing
     // (secondly) breaks menu command processing
+    //
     wxCHECK_RET( hWnd != (HWND)NULL,
                  wxT("attempt to add a NULL hWnd to window list ignored") );
 
     wxCHECK_RET( hWnd != (HWND)NULL,
                  wxT("attempt to add a NULL hWnd to window list ignored") );
 
+    wxWindow*                       pOldWin = wxFindWinFromHandle((WXHWND) hWnd);
 
 
-    wxWindow *oldWin = wxFindWinFromHandle((WXHWND) hWnd);
-    if ( oldWin && (oldWin != win) )
+    if (pOldWin && (pOldWin != pWin))
     {
     {
-        wxString str(win->GetClassInfo()->GetClassName());
-        wxLogError("Bug! Found existing HWND %X for new window of class %s", (int) hWnd, (const char*) str);
+        wxString  Newstr(pWin->GetClassInfo()->GetClassName());
+        wxString Oldstr(pOldWin->GetClassInfo()->GetClassName());
+        wxLogError( _T("Bug! New window of class %s has same HWND %X as old window of class %s"),
+                    Newstr.c_str(),
+                    (int)hWnd,
+                    Oldstr.c_str()
+                  );
     }
     }
-    else if (!oldWin)
+    else if (!pOldWin)
     {
     {
-        wxWinHandleList->Append((long)hWnd, win);
+        wxWinHandleHash->Put( (long)hWnd
+                             ,(wxWindow *)pWin
+                            );
     }
     }
-}
+} // end of wxAssociateWinWithHandle
 
 
-void wxRemoveHandleAssociation(wxWindow *win)
+void wxRemoveHandleAssociation( wxWindowOS2* pWin )
 {
 {
-    wxWinHandleList->DeleteObject(win);
-}
+    wxWinHandleHash->Delete((long)pWin->GetHWND());
+} // end of wxRemoveHandleAssociation
 
 
+//
 // Default destroyer - override if you destroy it in some other way
 // (e.g. with MDI child windows)
 // Default destroyer - override if you destroy it in some other way
 // (e.g. with MDI child windows)
-void wxWindow::OS2DestroyWindow()
+//
+void wxWindowOS2::OS2DestroyWindow()
 {
 }
 
 {
 }
 
-void wxWindow::OS2DetachWindowMenu()
+bool wxWindowOS2::OS2GetCreateWindowCoords( const wxPoint& rPos,
+                                            const wxSize&  rSize,
+                                            int& rnX,
+                                            int& rnY,
+                                            int& rnWidth,
+                                            int& rnHeight ) const
 {
 {
-    if ( m_hMenu )
-    {
-        HMENU hMenu = (HMENU)m_hMenu;
+    bool bNonDefault = false;
+    static const int DEFAULT_Y = 200;
+    static const int DEFAULT_H = 250;
 
 
-        int N = (int)WinSendMsg(hMenu, MM_QUERYITEMCOUNT, 0, 0);
-        int i;
-        for (i = 0; i < N; i++)
-        {
-            wxChar buf[100];
-            int chars = (int)WinSendMsg(hMenu, MM_QUERYITEMTEXT, MPFROM2SHORT(i, N), buf);
-            if ( !chars )
-            {
-                wxLogLastError(wxT("GetMenuString"));
-
-                continue;
-            }
-
-            if ( wxStrcmp(buf, wxT("&Window")) == 0 )
-            {
-                WinSendMsg(hMenu, MM_DELETEITEM, MPFROM2SHORT(i, TRUE), 0);
-                break;
-            }
-        }
+    if (rPos.x == wxDefaultCoord)
+    {
+        rnX = rnY = CW_USEDEFAULT;
     }
     }
-}
-
-bool wxWindow::OS2Create(int id,
-                         wxWindow *parent,
-                         const wxChar *wclass,
-                         wxWindow *wx_win,
-                         const wxChar *title,
-                         int x,
-                         int y,
-                         int width,
-                         int height,
-                         WXDWORD style,
-                         const wxChar *dialog_template,
-                         WXDWORD extendedStyle)
-{
-   // TODO:
-/*
-    int x1 = CW_USEDEFAULT;
-    int y1 = 0;
-    int width1 = CW_USEDEFAULT;
-    int height1 = 100;
-
-    // Find parent's size, if it exists, to set up a possible default
-    // panel size the size of the parent window
-    RECT parent_rect;
-    if ( parent )
+    else
     {
     {
-        ::GetClientRect((HWND) parent->GetHWND(), &parent_rect);
-
-        width1 = parent_rect.right - parent_rect.left;
-        height1 = parent_rect.bottom - parent_rect.top;
+        rnX = rPos.x;
+        rnY = rPos.y == wxDefaultCoord ? DEFAULT_Y : rPos.y;
+        bNonDefault = true;
     }
     }
-
-    if ( x > -1 ) x1 = x;
-    if ( y > -1 ) y1 = y;
-    if ( width > -1 ) width1 = width;
-    if ( height > -1 ) height1 = height;
-
-    HWND hParent = (HWND)NULL;
-    if ( parent )
-        hParent = (HWND) parent->GetHWND();
-
-    wxWndHook = this;
-
-    if ( dialog_template )
+    if (rSize.x == wxDefaultCoord)
     {
     {
-        m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(),
-                                        dialog_template,
-                                        hParent,
-                                        (DLGPROC)wxDlgProc);
-
-        if ( m_hWnd == 0 )
-        {
-            wxLogError(_("Can't find dummy dialog template!\n"
-                         "Check resource include path for finding wx.rc."));
-
-            return FALSE;
-        }
-
-        // ::SetWindowLong(GWL_EXSTYLE) doesn't work for the dialogs, so try
-        // to take care of (at least some) extended style flags ourselves
-        if ( extendedStyle & WS_EX_TOPMOST )
-        {
-            if ( !::SetWindowPos(GetHwnd(), HWND_TOPMOST, 0, 0, 0, 0,
-                                 SWP_NOSIZE | SWP_NOMOVE) )
-            {
-                wxLogLastError(wxT("SetWindowPos"));
-            }
-        }
-
-        // move the dialog to its initial position without forcing repainting
-        if ( !::MoveWindow(GetHwnd(), x1, y1, width1, height1, FALSE) )
-        {
-            wxLogLastError(wxT("MoveWindow"));
-        }
+        rnWidth = rnHeight = CW_USEDEFAULT;
     }
     else
     {
     }
     else
     {
-        int controlId = 0;
-        if ( style & WS_CHILD )
-            controlId = id;
-
-        wxString className(wclass);
-        if ( GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE )
-        {
-            className += wxT("NR");
-        }
-
-        m_hWnd = (WXHWND)CreateWindowEx(extendedStyle,
-                                        className,
-                                        title ? title : wxT(""),
-                                        style,
-                                        x1, y1,
-                                        width1, height1,
-                                        hParent, (HMENU)controlId,
-                                        wxGetInstance(),
-                                        NULL);
-
-        if ( !m_hWnd )
-        {
-            wxLogError(_("Can't create window of class %s!\n"
-                         "Possible Windows 3.x compatibility problem?"),
-                       wclass);
-
-            return FALSE;
-        }
+        rnWidth  = rSize.x;
+        rnHeight = rSize.y == wxDefaultCoord ? DEFAULT_H : rSize.y;
+        bNonDefault = true;
     }
     }
-
-    wxWndHook = NULL;
-#ifdef __WXDEBUG__
-    wxNode* node = wxWinHandleList->Member(this);
-    if (node)
+    return bNonDefault;
+} // end of wxWindowOS2::OS2GetCreateWindowCoords
+
+WXHWND wxWindowOS2::OS2GetParent() const
+{
+    return m_parent ? m_parent->GetHWND() : NULL;
+}
+
+bool wxWindowOS2::OS2Create( PSZ            zClass,
+                             const wxChar*  zTitle,
+                             WXDWORD        dwStyle,
+                             const wxPoint& rPos,
+                             const wxSize&  rSize,
+                             void*          pCtlData,
+                             WXDWORD        WXUNUSED(dwExStyle),
+                             bool           bIsChild )
+{
+    ERRORID              vError;
+    wxString             sError;
+    int                  nX      = 0L;
+    int                  nY      = 0L;
+    int                  nWidth  = 0L;
+    int                  nHeight = 0L;
+    long                 lControlId = 0L;
+    wxWindowCreationHook vHook(this);
+    wxString             sClassName((wxChar*)zClass);
+    wxString             sTitle(zTitle ? zTitle : wxEmptyString);
+
+    OS2GetCreateWindowCoords( rPos
+                             ,rSize
+                             ,nX
+                             ,nY
+                             ,nWidth
+                             ,nHeight
+                            );
+
+    if (bIsChild)
     {
     {
-        HWND hWnd = (HWND) node->GetKeyInteger();
-        if (hWnd != (HWND) m_hWnd)
+        lControlId = GetId();
+        if (GetWindowStyleFlag() & wxCLIP_SIBLINGS)
         {
         {
-            wxLogError("A second HWND association is being added for the same window!");
+            dwStyle |= WS_CLIPSIBLINGS;
         }
     }
         }
     }
-#endif
-*/
-    wxAssociateWinWithHandle((HWND) m_hWnd, this);
-
-    return TRUE;
-}
-
-// ===========================================================================
-// OS2 PM message handlers
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// WM_NOTIFY
-// ---------------------------------------------------------------------------
-
-bool wxWindow::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
-{
-   // TODO:
-   return FALSE;
-}
-
-bool wxWindow::OS2OnNotify(int WXUNUSED(idCtrl),
-                           WXLPARAM lParam,
-                           WXLPARAM* WXUNUSED(result))
-{
-    // TODO:
-    return FALSE;
-}
-
-// ---------------------------------------------------------------------------
-// end session messages
-// ---------------------------------------------------------------------------
-
-bool wxWindow::HandleQueryEndSession(long logOff, bool *mayEnd)
-{
-    wxCloseEvent event(wxEVT_QUERY_END_SESSION, -1);
-    event.SetEventObject(wxTheApp);
-    event.SetCanVeto(TRUE);
-    event.SetLoggingOff(logOff == ENDSESSION_LOGOFF);
-
-    bool rc = wxTheApp->ProcessEvent(event);
-
-    if ( rc )
+    //
+    // For each class "Foo" we have we also have "FooNR" ("no repaint") class
+    // which is the same but without CS_[HV]REDRAW class styles so using it
+    // ensures that the window is not fully repainted on each resize
+    //
+    if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))
     {
     {
-        // we may end only if the app didn't veto session closing (double
-        // negation...)
-        *mayEnd = !event.GetVeto();
+        sClassName += wxT("NR");
     }
     }
+    m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
+                                       ,sClassName.c_str()
+                                       ,sTitle.c_str()
+                                       ,(ULONG)dwStyle
+                                       ,(LONG)0L
+                                       ,(LONG)0L
+                                       ,(LONG)0L
+                                       ,(LONG)0L
+                                       ,NULLHANDLE
+                                       ,HWND_TOP
+                                       ,(ULONG)lControlId
+                                       ,pCtlData
+                                       ,NULL
+                                      );
+    if (!m_hWnd)
+    {
+        vError = ::WinGetLastError(wxGetInstance());
+        sError = wxPMErrorToStr(vError);
+        return false;
+    }
+    SubclassWin(m_hWnd);
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
 
-    return rc;
-}
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
-bool wxWindow::HandleEndSession(bool endSession, long logOff)
-{
-    // do nothing if the session isn't ending
-    if ( !endSession )
-        return FALSE;
+    LONG lColor = (LONG)m_backgroundColour.GetPixel();
 
 
-    wxCloseEvent event(wxEVT_END_SESSION, -1);
-    event.SetEventObject(wxTheApp);
-    event.SetCanVeto(FALSE);
-    event.SetLoggingOff( (logOff == ENDSESSION_LOGOFF) );
-    if ( (this == wxTheApp->GetTopWindow()) && // Only send once
-        wxTheApp->ProcessEvent(event))
+    if (!::WinSetPresParam( m_hWnd
+                           ,PP_BACKGROUNDCOLOR
+                           ,sizeof(LONG)
+                           ,(PVOID)&lColor
+                          ))
     {
     {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
+        return false;
     }
     }
-    return TRUE;
-}
+    SetSize( nX
+            ,nY
+            ,nWidth
+            ,nHeight
+           );
+    return true;
+} // end of wxWindowOS2::OS2Create
+
+// ===========================================================================
+// OS2 PM message handlers
+// ===========================================================================
 
 // ---------------------------------------------------------------------------
 // window creation/destruction
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // window creation/destruction
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleCreate(WXLPCREATESTRUCT cs, bool *mayCreate)
+bool wxWindowOS2::HandleCreate( WXLPCREATESTRUCT WXUNUSED(vCs),
+                                bool* pbMayCreate )
 {
 {
-    // TODO: should generate this event from WM_NCCREATE
-    wxWindowCreateEvent event(this);
-    (void)GetEventHandler()->ProcessEvent(event);
+    wxWindowCreateEvent             vEvent((wxWindow*)this);
 
 
-    *mayCreate = TRUE;
-
-    return TRUE;
-}
+    (void)HandleWindowEvent(vEvent);
+    *pbMayCreate = true;
+    return true;
+} // end of wxWindowOS2::HandleCreate
 
 
-bool wxWindow::HandleDestroy()
+bool wxWindowOS2::HandleDestroy()
 {
 {
-    wxWindowDestroyEvent event(this);
-    (void)GetEventHandler()->ProcessEvent(event);
+    wxWindowDestroyEvent            vEvent((wxWindow*)this);
+    vEvent.SetId(GetId());
+    (void)HandleWindowEvent(vEvent);
 
 
-    // delete our drop target if we've got one
+    //
+    // Delete our drop target if we've got one
+    //
 #if wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP
-    if ( m_dropTarget != NULL )
+    if (m_dropTarget != NULL)
     {
     {
-//        m_dropTarget->Revoke(m_hWnd);
-
         delete m_dropTarget;
         m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP
 
         delete m_dropTarget;
         m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP
 
+    //
     // WM_DESTROY handled
     // WM_DESTROY handled
-    return TRUE;
-}
+    //
+    return true;
+} // end of wxWindowOS2::HandleDestroy
 
 // ---------------------------------------------------------------------------
 // activation/focus
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // activation/focus
 // ---------------------------------------------------------------------------
-
-bool wxWindow::HandleActivate(int state,
-                              bool WXUNUSED(minimized),
-                              WXHWND WXUNUSED(activate))
+void wxWindowOS2::OnSetFocus(
+  wxFocusEvent&                     rEvent
+)
 {
 {
-    // TODO:
-    /*
-    wxActivateEvent event(wxEVT_ACTIVATE,
-                          (state == WA_ACTIVE) || (state == WA_CLICKACTIVE),
-                          m_windowId);
-    event.SetEventObject(this);
+    rEvent.Skip();
+} // end of wxWindowOS2::OnSetFocus
 
 
-    return GetEventHandler()->ProcessEvent(event);
-    */
-    return FALSE;
-}
+bool wxWindowOS2::HandleActivate(
+  int                               nState
+, WXHWND                            WXUNUSED(hActivate)
+)
+{
+    wxActivateEvent                 vEvent( wxEVT_ACTIVATE
+                                           ,(bool)nState
+                                           ,m_windowId
+                                          );
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleActivate
 
 
-bool wxWindow::HandleSetFocus(WXHWND WXUNUSED(hwnd))
+bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
 {
 {
+    //
+    // Notify the parent keeping track of focus for the kbd navigation
+    // purposes that we got it
+    //
+    wxChildFocusEvent               vEventFocus((wxWindow *)this);
+    (void)HandleWindowEvent(vEventFocus);
+
 #if wxUSE_CARET
 #if wxUSE_CARET
+    //
     // Deal with caret
     // Deal with caret
-    if ( m_caret )
+    //
+    if (m_caret)
     {
         m_caret->OnSetFocus();
     }
 #endif // wxUSE_CARET
 
     {
         m_caret->OnSetFocus();
     }
 #endif // wxUSE_CARET
 
-    // panel wants to track the window which was the last to have focus in it
-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    if ( panel )
+#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) )
     {
     {
-        panel->SetLastFocus(this);
+        return false;
     }
     }
+#endif // wxUSE_TEXTCTRL
 
 
-    wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
-    event.SetEventObject(this);
+    wxFocusEvent                    vEvent(wxEVT_SET_FOCUS, m_windowId);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleSetFocus
 
 
-bool wxWindow::HandleKillFocus(WXHWND WXUNUSED(hwnd))
+bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
 {
 #if wxUSE_CARET
 {
 #if wxUSE_CARET
+    //
     // Deal with caret
     // Deal with caret
-    if ( m_caret )
+    //
+    if (m_caret)
     {
         m_caret->OnKillFocus();
     }
 #endif // wxUSE_CARET
 
     {
         m_caret->OnKillFocus();
     }
 #endif // wxUSE_CARET
 
-    wxFocusEvent event(wxEVT_KILL_FOCUS, m_windowId);
-    event.SetEventObject(this);
+#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.
+    //
+    wxTextCtrl*                     pCtrl = wxDynamicCastThis(wxTextCtrl);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    if (pCtrl)
+    {
+        return false;
+    }
+#endif
+
+    //
+    // Don't send the event when in the process of being deleted.  This can
+    // only cause problems if the event handler tries to access the object.
+    //
+    if ( m_isBeingDeleted )
+    {
+        return false;
+    }
+
+    wxFocusEvent                    vEvent( wxEVT_KILL_FOCUS
+                                           ,m_windowId
+                                          );
+
+    vEvent.SetEventObject(this);
+
+    //
+    // wxFindWinFromHandle() may return NULL, it is ok
+    //
+    vEvent.SetWindow(wxFindWinFromHandle(hWnd));
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleKillFocus
 
 // ---------------------------------------------------------------------------
 // miscellaneous
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // miscellaneous
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleShow(bool show, int status)
+bool wxWindowOS2::HandleShow(
+  bool                              bShow
+, int                               WXUNUSED(nStatus)
+)
 {
 {
-    wxShowEvent event(GetId(), show);
-    event.m_eventObject = this;
+    wxShowEvent                     vEvent(GetId(), bShow);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleShow
 
 
-bool wxWindow::HandleInitDialog(WXHWND WXUNUSED(hWndFocus))
+bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
 {
 {
-    wxInitDialogEvent event(GetId());
-    event.m_eventObject = this;
+    wxInitDialogEvent               vEvent(GetId());
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleInitDialog
 
 
-bool wxWindow::HandleDropFiles(WXWPARAM wParam)
+bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
 {
 {
-   // TODO:
-    return FALSE;
+   // TODO: We'll handle drag and drop later
+    return false;
 }
 
 }
 
-bool wxWindow::HandleSetCursor(WXHWND hWnd,
-                               short nHitTest,
-                               int WXUNUSED(mouseMsg))
+bool wxWindowOS2::HandleSetCursor( USHORT WXUNUSED(vId),
+                                   WXHWND hPointer )
+{
+    //
+    // 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 )
 {
 {
-    // don't set cursor for other windows, only for this one: this prevents
-    // children of this window from getting the same cursor as the parent has
-    // (don't forget that this message is propagated by default up the window
-    // parent-child hierarchy)
-    if ( GetHWND() == hWnd )
+#if wxUSE_OWNER_DRAWN
+    wxClientDC                      vDc(this);
+
+#if wxUSE_MENUS_NATIVE
+    //
+    // Is it a menu item?
+    //
+    if (vId == 0)
     {
     {
-        // don't set cursor when the mouse is not in the client part
-// TODO
-/*
-        if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
+        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
+                                         );
+
+       wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+        impl->SetHDC( hDC, false );
+        impl->SetHPS( pMeasureStruct->hps );
+        //
+        // Load the wxWidgets Pallete and set to RGB mode
+        //
+        if (!::GpiCreateLogColorTable( pMeasureStruct->hps
+                                      ,0L
+                                      ,LCOLF_CONSECRGB
+                                      ,0L
+                                      ,(LONG)wxTheColourDatabase->m_nSize
+                                      ,(PLONG)wxTheColourDatabase->m_palTable
+                                     ))
         {
         {
-            HCURSOR hcursor = 0;
-            if ( wxIsBusy() )
-            {
-                // from msw\utils.cpp
-                extern HCURSOR gs_wxBusyCursor;
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError(_T("Unable to set current color table (1). Error: %s\n"), sError.c_str());
+        }
+        //
+        // Set the color table to RGB mode
+        //
+        if (!::GpiCreateLogColorTable( pMeasureStruct->hps
+                                      ,0L
+                                      ,LCOLF_RGB
+                                      ,0L
+                                      ,0L
+                                      ,NULL
+                                     ))
+        {
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError(_T("Unable to set current color table (2). Error: %s\n"), sError.c_str());
+        }
 
 
-                hcursor = gs_wxBusyCursor;
-            }
-            else
-            {
-                wxCursor *cursor = NULL;
+        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
 
 
-                if ( m_cursor.Ok() )
-                {
-                    cursor = &m_cursor;
-                }
-                else
-                {
-                    // from msw\data.cpp
-                    extern wxCursor *g_globalCursor;
+        int eAction = 0;
+        int eStatus = 0;
 
 
-                    if ( g_globalCursor && g_globalCursor->Ok() )
-                        cursor = g_globalCursor;
-                }
+        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;
 
 
-                if ( cursor )
-                    hcursor = (HCURSOR)cursor->GetHCURSOR();
+            if (pMeasureStruct->fsAttribute & MIA_HILITED)
+            {
+                //
+                // If it is currently selected we let the system handle it
+                //
+                eStatus |= wxOwnerDrawn::wxODSelected;
             }
             }
-
-            if ( hcursor )
+            if (pMeasureStruct->fsAttribute & MIA_CHECKED)
             {
             {
-//                ::SetCursor(hcursor);
-
-                return TRUE;
+                //
+                // 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
 
 
-    return FALSE;
-}
-
-// ---------------------------------------------------------------------------
-// owner drawn stuff
-// ---------------------------------------------------------------------------
-
-bool wxWindow::OS2OnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
-{
-   // TODO:
-/*
-#if wxUSE_OWNER_DRAWN
-    // is it a menu item?
-    if ( id == 0 )
-    {
-        DRAWITEMSTRUCT *pDrawStruct = (DRAWITEMSTRUCT *)itemStruct;
-        wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
-
-        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
+    wxWindow*                       pItem = FindItem(vId);
 
 
-        // prepare to call OnDrawItem()
-        wxDC dc;
-        dc.SetHDC((WXHDC)pDrawStruct->hDC, FALSE);
-        wxRect rect(pDrawStruct->rcItem.left, pDrawStruct->rcItem.top,
-                    pDrawStruct->rcItem.right - pDrawStruct->rcItem.left,
-                    pDrawStruct->rcItem.bottom - pDrawStruct->rcItem.top);
-
-        return pMenuItem->OnDrawItem
-                          (
-                            dc, rect,
-                            (wxOwnerDrawn::wxODAction)pDrawStruct->itemAction,
-                            (wxOwnerDrawn::wxODStatus)pDrawStruct->itemState
-                          );
-    }
-
-    wxWindow *item = FindItem(id);
-    if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
+    if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
     {
     {
-        return ((wxControl *)item)->MSWOnDraw(itemStruct);
+        return ((wxControl *)pItem)->OS2OnDraw(pItemStruct);
     }
     }
-    else
+#else
+    vId = vId;
+    pItemStruct = pItemStruct;
 #endif
 #endif
-        return FALSE;
-*/
-    return FALSE;
-}
+    return false;
+} // end of wxWindowOS2::OS2OnDrawItem
 
 
-bool wxWindow::OS2OnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
+long wxWindowOS2::OS2OnMeasureItem( int lId,
+                                    WXMEASUREITEMSTRUCT* pItemStruct )
 {
 {
-   // TODO:
-/*
 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN
-    // is it a menu item?
-    if ( id == 0 )
+    //
+    // Is it a menu item?
+    //
+    if (lId == 65536) // I really don't like this...has to be a better indicator
     {
     {
-        MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct;
-        wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);
-
-        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
-
-        return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth,
-                                        &pMeasureStruct->itemHeight);
+        if (IsKindOf(CLASSINFO(wxFrame))) // we'll assume if Frame then a menu
+        {
+            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
+                                        ))
+            {
+                MRESULT             mRc;
+
+                pMeasureStruct->rclItem.xRight  = nWidth;
+                pMeasureStruct->rclItem.xLeft   = 0L;
+                pMeasureStruct->rclItem.yTop    = nHeight;
+                pMeasureStruct->rclItem.yBottom = 0L;
+                mRc = MRFROM2SHORT(nHeight, nWidth);
+                return LONGFROMMR(mRc);
+            }
+            return 0L;
+        }
     }
     }
+    wxWindow*                      pItem = FindItem(lId);
 
 
-    wxWindow *item = FindItem(id);
-    if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
+    if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
     {
     {
-        return ((wxControl *)item)->MSWOnMeasure(itemStruct);
+        OWNERITEM                   vItem;
+
+        vItem.idItem = (LONG)pItemStruct;
+        return ((wxControl *)pItem)->OS2OnMeasure((WXMEASUREITEMSTRUCT*)&vItem);
     }
     }
-#endif  // owner-drawn menus
-*/
+#else
+    lId = lId;
+    pItemStruct = pItemStruct;
+#endif // wxUSE_OWNER_DRAWN
     return FALSE;
 }
 
     return FALSE;
 }
 
@@ -1816,266 +3409,451 @@ bool wxWindow::OS2OnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
 // colours and palettes
 // ---------------------------------------------------------------------------
 
 // colours and palettes
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleSysColorChange()
+bool wxWindowOS2::HandleSysColorChange()
 {
 {
-    wxSysColourChangedEvent event;
-    event.SetEventObject(this);
+    wxSysColourChangedEvent         vEvent;
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleSysColorChange
 
 
-bool wxWindow::HandleCtlColor(WXHBRUSH *brush,
-                              WXHDC pDC,
-                              WXHWND pWnd,
-                              WXUINT nCtlColor,
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam)
+bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) )
 {
 {
-    WXHBRUSH hBrush = 0;
-// TODO:
-/*
-    if ( nCtlColor == CTLCOLOR_DLG )
-    {
-        hBrush = OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
-    }
-    else
-    {
-        wxControl *item = (wxControl *)FindItemByHWND(pWnd, TRUE);
-        if ( item )
-            hBrush = item->OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
-    }
+    //
+    // Not much provided with message. So not sure I can do anything with it
+    //
+    return true;
+} // end of wxWindowOS2::HandleCtlColor
 
 
-    if ( hBrush )
-        *brush = hBrush;
-
-    return hBrush != 0;
-*/
-    return FALSE;
-}
 
 // Define for each class of dialog and control
 
 // Define for each class of dialog and control
-WXHBRUSH wxWindow::OnCtlColor(WXHDC hDC,
-                              WXHWND hWnd,
-                              WXUINT nCtlColor,
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam)
+WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC WXUNUSED(hDC),
+                                 WXHWND WXUNUSED(hWnd),
+                                 WXUINT WXUNUSED(nCtlColor),
+                                 WXUINT WXUNUSED(message),
+                                 WXWPARAM WXUNUSED(wParam),
+                                 WXLPARAM WXUNUSED(lParam))
 {
     return (WXHBRUSH)0;
 }
 
 {
     return (WXHBRUSH)0;
 }
 
-bool wxWindow::HandlePaletteChanged(WXHWND hWndPalChange)
+bool wxWindowOS2::HandlePaletteChanged()
 {
 {
-    wxPaletteChangedEvent event(GetId());
-    event.SetEventObject(this);
-    event.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
+    // need to set this to something first
+    WXHWND                          hWndPalChange = NULLHANDLE;
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    wxPaletteChangedEvent           vEvent(GetId());
 
 
-bool wxWindow::HandleQueryNewPalette()
-{
-    wxQueryNewPaletteEvent event(GetId());
-    event.SetEventObject(this);
+    vEvent.SetEventObject(this);
+    vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
 
 
-    return GetEventHandler()->ProcessEvent(event) && event.GetPaletteRealized();
-}
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandlePaletteChanged
 
 
+//
 // Responds to colour changes: passes event on to children.
 // Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+//
+void wxWindowOS2::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)
+{
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+
+    while (node)
+    {
+        //
+        // Only propagate to non-top-level windows
+        //
+        wxWindow*                   pWin = (wxWindow *)node->GetData();
+
+        if (pWin->GetParent())
+        {
+            wxSysColourChangedEvent vEvent;
+
+            rEvent.SetEventObject(pWin);
+            pWin->HandleWindowEvent(vEvent);
+        }
+        node = node->GetNext();
+    }
+} // end of wxWindowOS2::OnSysColourChanged
+
+// ---------------------------------------------------------------------------
+// painting
+// ---------------------------------------------------------------------------
+
+void wxWindow::OnPaint (
+  wxPaintEvent&                     rEvent
+)
 {
 {
-    wxNode *node = GetChildren().First();
-    while ( node )
+    HDC                             hDC = (HDC)wxPaintDCImpl::FindDCInCache((wxWindow*) rEvent.GetEventObject());
+
+    if (hDC != 0)
+    {
+        OS2DefWindowProc( (WXUINT)WM_PAINT
+                         ,(WXWPARAM)hDC
+                         ,(WXLPARAM)0
+                        );
+    }
+} // end of wxWindow::OnPaint
+
+bool wxWindowOS2::HandlePaint()
+{
+    HRGN                            hRgn;
+    wxPaintEvent                    vEvent(m_windowId);
+    HPS                             hPS;
+    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(wxT("CreateRectRgn"));
+         return false;
+    }
+    // Get all the rectangles from the region, convert the individual
+    // rectangles to "the other" coordinate system and reassemble a
+    // region from the rectangles, to be feed into m_updateRegion.
+    //
+    RGNRECT                     vRgnData;
+    PRECTL                      pUpdateRects = NULL;
+    vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
+    if (::GpiQueryRegionRects( hPS          // Pres space
+                              ,hRgn         // Handle of region to query
+                              ,NULL         // Return all RECTs
+                              ,&vRgnData    // Will contain number or RECTs in region
+                              ,NULL         // NULL to return number of RECTs
+                             ))
+    {
+        pUpdateRects = new RECTL[vRgnData.crcReturned];
+        vRgnData.crc = vRgnData.crcReturned;
+        vRgnData.ircStart = 1;
+        if (::GpiQueryRegionRects( hPS      // Pres space of source
+                                  ,hRgn     // Handle of source region
+                                  ,NULL     // Return all RECTs
+                                  ,&vRgnData // Operations set to return rects
+                                  ,pUpdateRects // Will contain the actual RECTS
+                                 ))
+        {
+            int                     height;
+            RECT                    vRect;
+            ::WinQueryWindowRect(GetHwnd(), &vRect);
+            height = vRect.yTop;
+
+            for(size_t i = 0; i < vRgnData.crc; i++)
+            {
+                int                 rectHeight;
+                rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom;
+                pUpdateRects[i].yBottom = height - pUpdateRects[i].yTop;
+                pUpdateRects[i].yTop = pUpdateRects[i].yBottom + rectHeight;
+            }
+            ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects);
+            delete [] pUpdateRects;
+        }
+    }
+    m_updateRegion = wxRegion(hRgn, hPS);
+
+    vEvent.SetEventObject(this);
+    bProcessed = HandleWindowEvent(vEvent);
+
+    if (!bProcessed &&
+         IsKindOf(CLASSINFO(wxPanel)) &&
+         GetChildren().GetCount() == 0
+       )
+    {
+        //
+        // OS/2 needs to process this right here, not by the default proc
+        // Window's default proc correctly paints everything, OS/2 does not.
+        // For decorative panels that typically have no children, we draw
+        // borders.
+        //
+        HPS                         hPS;
+        RECTL                       vRect;
+
+        hPS = ::WinBeginPaint( GetHwnd()
+                              ,NULLHANDLE
+                              ,&vRect
+                             );
+        if(hPS)
+        {
+            ::GpiCreateLogColorTable( hPS
+                                     ,0L
+                                     ,LCOLF_CONSECRGB
+                                     ,0L
+                                     ,(LONG)wxTheColourDatabase->m_nSize
+                                     ,(PLONG)wxTheColourDatabase->m_palTable
+                                    );
+            ::GpiCreateLogColorTable( hPS
+                                     ,0L
+                                     ,LCOLF_RGB
+                                     ,0L
+                                     ,0L
+                                     ,NULL
+                                    );
+            if (::WinIsWindowVisible(GetHWND()))
+                ::WinFillRect(hPS, &vRect,  GetBackgroundColour().GetPixel());
+            if (m_dwExStyle)
+            {
+                LINEBUNDLE      vLineBundle;
+
+                vLineBundle.lColor     = 0x00000000; // Black
+                vLineBundle.usMixMode  = FM_OVERPAINT;
+                vLineBundle.fxWidth    = 1;
+                vLineBundle.lGeomWidth = 1;
+                vLineBundle.usType     = LINETYPE_SOLID;
+                vLineBundle.usEnd      = 0;
+                vLineBundle.usJoin     = 0;
+                ::GpiSetAttrs( hPS
+                              ,PRIM_LINE
+                              ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+                              ,0L
+                              ,&vLineBundle
+                             );
+                ::WinQueryWindowRect(GetHwnd(), &vRect);
+                wxDrawBorder( hPS
+                             ,vRect
+                             ,m_dwExStyle
+                            );
+            }
+        }
+        ::WinEndPaint(hPS);
+        bProcessed = true;
+    }
+    else if (!bProcessed &&
+             IsKindOf(CLASSINFO(wxPanel))
+            )
     {
     {
-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
+        //
+        // Panel with children, usually fills a frame client so no borders.
+        //
+        HPS hPS;
+        RECTL vRect;
+
+        hPS = ::WinBeginPaint( GetHwnd()
+                              ,NULLHANDLE
+                              ,&vRect
+                             );
+        if(hPS)
         {
         {
-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
+            ::GpiCreateLogColorTable( hPS
+                                     ,0L
+                                     ,LCOLF_CONSECRGB
+                                     ,0L
+                                     ,(LONG)wxTheColourDatabase->m_nSize
+                                     ,(PLONG)wxTheColourDatabase->m_palTable
+                                    );
+            ::GpiCreateLogColorTable( hPS
+                                     ,0L
+                                     ,LCOLF_RGB
+                                     ,0L
+                                     ,0L
+                                     ,NULL
+                                    );
+
+            if (::WinIsWindowVisible(GetHWND()))
+                ::WinFillRect(hPS, &vRect,  GetBackgroundColour().GetPixel());
         }
         }
-
-        node = node->Next();
+        ::WinEndPaint(hPS);
+        bProcessed = true;
     }
     }
-}
-
-// ---------------------------------------------------------------------------
-// painting
-// ---------------------------------------------------------------------------
+    return bProcessed;
+} // end of wxWindowOS2::HandlePaint
 
 
-bool wxWindow::HandlePaint()
+bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
 {
 {
-   // TODO:
-   return FALSE;
-}
+    SWP vSwp;
+    bool rc;
 
 
-bool wxWindow::HandleEraseBkgnd(WXHDC hdc)
-{
-    // Prevents flicker when dragging
-//  if ( ::IsIconic(GetHwnd()) )
-//      return TRUE;
+    ::WinQueryWindowPos(GetHwnd(), &vSwp);
+    if (vSwp.fl & SWP_MINIMIZE)
+        return true;
 
 
-    wxDC dc;
+    wxClientDC vDC(this);
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDC.GetImpl();
+    impl->SetHDC(hDC);
+    impl->SetHPS((HPS)hDC); // this is really a PS
 
 
-    dc.SetHDC(hdc);
-    dc.SetWindow(this);
-    dc.BeginDrawing();
+    wxEraseEvent vEvent(m_windowId, &vDC);
 
 
-    wxEraseEvent event(m_windowId, &dc);
-    event.SetEventObject(this);
-    bool rc = GetEventHandler()->ProcessEvent(event);
+    vEvent.SetEventObject(this);
 
 
-    dc.EndDrawing();
-    dc.SelectOldObjects(hdc);
-    dc.SetHDC((WXHDC) NULL);
+    rc = HandleWindowEvent(vEvent);
 
 
-    return rc;
-}
+    impl->SetHPS(NULLHANDLE);
+    return true;
+} // end of wxWindowOS2::HandleEraseBkgnd
 
 
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
 {
 {
-    // TODO:
-}
+    RECTL   vRect;
+    wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+    HPS     hPS = impl->GetHPS();
+    APIRET  rc;
+    LONG    lColor = m_backgroundColour.GetPixel();
+
+    rc = ::WinQueryWindowRect(GetHwnd(), &vRect);
+    rc = ::WinFillRect(hPS, &vRect, lColor);
+}  // end of wxWindowOS2::OnEraseBackground
 
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleMinimize()
+bool wxWindowOS2::HandleMinimize()
 {
 {
-    wxIconizeEvent event(m_windowId);
-    event.SetEventObject(this);
+    wxIconizeEvent                  vEvent(m_windowId);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleMinimize
 
 
-bool wxWindow::HandleMaximize()
+bool wxWindowOS2::HandleMaximize()
 {
 {
-    wxMaximizeEvent event(m_windowId);
-    event.SetEventObject(this);
+    wxMaximizeEvent                 vEvent(m_windowId);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleMaximize
 
 
-bool wxWindow::HandleMove(int x, int y)
+bool wxWindowOS2::HandleMove( int nX, int nY )
 {
 {
-    wxMoveEvent event(wxPoint(x, y), m_windowId);
-    event.SetEventObject(this);
+    wxPoint pt(nX, nY);
+    wxMoveEvent vEvent(pt, m_windowId);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+}  // end of wxWindowOS2::HandleMove
 
 
-bool wxWindow::HandleSize(int w, int h, WXUINT WXUNUSED(flag))
+bool wxWindowOS2::HandleSize( int    nWidth,
+                              int    nHeight,
+                              WXUINT WXUNUSED(nFlag) )
 {
 {
-    wxSizeEvent event(wxSize(w, h), m_windowId);
-    event.SetEventObject(this);
+    wxSize sz(nWidth, nHeight);
+    wxSizeEvent vEvent(sz, m_windowId);
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+    vEvent.SetEventObject(this);
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::HandleSize
 
 
-bool wxWindow::HandleGetMinMaxInfo(void *mmInfo)
+bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp )
 {
 {
-// TODO:
-/*
-    MINMAXINFO *info = (MINMAXINFO *)mmInfo;
-
-    bool rc = FALSE;
-
-    if ( m_minWidth != -1 )
-    {
-        info->ptMinTrackSize.x = m_minWidth;
-        rc = TRUE;
-    }
+    POINTL                          vPoint;
 
 
-    if ( m_minHeight != -1 )
+    switch(pSwp->fl)
     {
     {
-        info->ptMinTrackSize.y = m_minHeight;
-        rc = TRUE;
-    }
+        case SWP_MAXIMIZE:
+            ::WinGetMaxPosition(GetHwnd(), pSwp);
+            m_maxWidth = pSwp->cx;
+            m_maxHeight = pSwp->cy;
+            break;
 
 
-    if ( m_maxWidth != -1 )
-    {
-        info->ptMaxTrackSize.x = m_maxWidth;
-        rc = TRUE;
-    }
+        case SWP_MINIMIZE:
+            ::WinGetMinPosition(GetHwnd(), pSwp, &vPoint);
+            m_minWidth = pSwp->cx;
+            m_minHeight = pSwp->cy;
+            break;
 
 
-    if ( m_maxHeight != -1 )
-    {
-        info->ptMaxTrackSize.y = m_maxHeight;
-        rc = TRUE;
+        default:
+            return false;
     }
     }
-
-    return rc;
-*/
-    return FALSE;
-}
+    return true;
+} // end of wxWindowOS2::HandleGetMinMaxInfo
 
 // ---------------------------------------------------------------------------
 // command messages
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // command messages
 // ---------------------------------------------------------------------------
-
-bool wxWindow::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
+bool wxWindowOS2::HandleCommand( WXWORD wId,
+                                 WXWORD wCmd,
+                                 WXHWND hControl )
 {
 {
-    if ( wxCurrentPopupMenu )
+#if wxUSE_MENUS_NATIVE
+    if (wxCurrentPopupMenu)
     {
     {
-        wxMenu *popupMenu = wxCurrentPopupMenu;
-        wxCurrentPopupMenu = NULL;
+        wxMenu*                     pPopupMenu = wxCurrentPopupMenu;
 
 
-        return popupMenu->OS2Command(cmd, id);
+        wxCurrentPopupMenu = NULL;
+        return pPopupMenu->OS2Command(wCmd, wId);
     }
     }
+#endif // wxUSE_MENUS_NATIVE
+
+    wxWindow*                       pWin = FindItem(wId);
 
 
-    wxWindow *win = FindItem(id);
-    if ( !win )
+    if (!pWin)
     {
     {
-        win = wxFindWinFromHandle(control);
+        pWin = wxFindWinFromHandle(hControl);
     }
 
     }
 
-    if ( win )
-        return win->OS2Command(cmd, id);
+    if (pWin)
+        return pWin->OS2Command(wCmd, wId);
 
 
-    return FALSE;
-}
+    return false;
+} // end of wxWindowOS2::HandleCommand
 
 
-bool wxWindow::HandleSysCommand(WXWPARAM wParam, WXLPARAM lParam)
+bool wxWindowOS2::HandleSysCommand( WXWPARAM wParam,
+                                    WXLPARAM WXUNUSED(lParam) )
 {
 {
-   // TODO:
-    return FALSE;
-}
+    //
+    // 4 bits are reserved
+    //
+    switch (SHORT1FROMMP(wParam))
+    {
+        case SC_MAXIMIZE:
+            return HandleMaximize();
+
+        case SC_MINIMIZE:
+            return HandleMinimize();
+    }
+    return false;
+} // end of wxWindowOS2::HandleSysCommand
 
 // ---------------------------------------------------------------------------
 // mouse events
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // mouse events
 // ---------------------------------------------------------------------------
-
-void wxWindow::InitMouseEvent(wxMouseEvent& event, int x, int y, WXUINT flags)
+//TODO: check against MSW
+void wxWindowOS2::InitMouseEvent(
+  wxMouseEvent&                     rEvent
+, int                               nX
+, int                               nY
+, WXUINT                            uFlags
+)
 {
 {
-// TODO:
-/*
-    event.m_x = x;
-    event.m_y = y;
-    event.m_shiftDown = ((flags & MK_SHIFT) != 0);
-    event.m_controlDown = ((flags & MK_CONTROL) != 0);
-    event.m_leftDown = ((flags & MK_LBUTTON) != 0);
-    event.m_middleDown = ((flags & MK_MBUTTON) != 0);
-    event.m_rightDown = ((flags & MK_RBUTTON) != 0);
-    event.SetTimestamp(s_currentMsg.time);
-    event.m_eventObject = this;
+    int                                 nHeight;
+    DoGetSize(0, &nHeight);
+    rEvent.m_x           = nX;
+    // Convert to wxWidgets standard coordinate system!
+    rEvent.m_y           = nHeight - nY;
+    rEvent.m_shiftDown   = ((uFlags & KC_SHIFT) != 0);
+    rEvent.m_controlDown = ((uFlags & KC_CTRL) != 0);
+    rEvent.m_altDown     = ((uFlags & KC_ALT) != 0);
+    rEvent.m_leftDown    = IsKeyDown(VK_BUTTON1);
+    rEvent.m_middleDown  = IsKeyDown(VK_BUTTON3);
+    rEvent.m_rightDown   = IsKeyDown(VK_BUTTON2);
+    rEvent.SetTimestamp(s_currentMsg.time);
+    rEvent.SetEventObject(this);
+    rEvent.SetId(GetId());
 
 #if wxUSE_MOUSEEVENT_HACK
 
 #if wxUSE_MOUSEEVENT_HACK
-    m_lastMouseX = x;
-    m_lastMouseY = y;
-    m_lastMouseEvent = event.GetEventType();
+    m_lastMouseX = nX;
+    m_lastMouseY = nY;
+    m_lastMouseEvent = rEvent.GetEventType();
 #endif // wxUSE_MOUSEEVENT_HACK
 #endif // wxUSE_MOUSEEVENT_HACK
-*/
-}
+} // end of wxWindowOS2::InitMouseEvent
 
 
-bool wxWindow::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)
+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
+    bool bProcessed = false;
+
+    //
+    // The mouse events take consecutive IDs from WM_MOUSEFIRST to
+    // WM_MOUSELAST, so it's enough to subtract WM_MOUSEMOVE == WM_MOUSEFIRST
     // from the message id and take the value in the table to get wxWin event
     // id
     // from the message id and take the value in the table to get wxWin event
     // id
+    //
     static const wxEventType eventsMouse[] =
     {
         wxEVT_MOTION,
     static const wxEventType eventsMouse[] =
     {
         wxEVT_MOTION,
@@ -2090,717 +3868,1253 @@ bool wxWindow::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)
         wxEVT_MIDDLE_DCLICK
     };
 
         wxEVT_MIDDLE_DCLICK
     };
 
-    wxMouseEvent event(eventsMouse[msg - WM_MOUSEMOVE]);
-    InitMouseEvent(event, x, y, flags);
+    // Bounds check
+    if ((uMsg >= WM_MOUSEMOVE) && (uMsg <= WM_BUTTON3DBLCLK))
+    {
+        wxMouseEvent vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]);
+
+        InitMouseEvent( vEvent
+                       ,nX
+                       ,nY
+                       ,uFlags
+                       );
 
 
-    return GetEventHandler()->ProcessEvent(event);
-}
+        bProcessed = HandleWindowEvent(vEvent);
+        if (!bProcessed)
+        {
+            HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();
+
+            if (hCursor != NULLHANDLE)
+            {
+                ::WinSetPointer(HWND_DESKTOP, hCursor);
+                bProcessed = true;
+            }
+        }
+    }
+    return bProcessed;
+} // end of wxWindowOS2::HandleMouseEvent
 
 
-bool wxWindow::HandleMouseMove(int x, int y, WXUINT flags)
+bool wxWindowOS2::HandleMouseMove( int nX,
+                                   int nY,
+                                   WXUINT uFlags )
 {
 {
-    if ( !m_bMouseInWindow )
+    if (!m_bMouseInWindow)
     {
     {
+        //
         // Generate an ENTER event
         // Generate an ENTER event
-        m_bMouseInWindow = TRUE;
+        //
+        m_bMouseInWindow = true;
 
 
-        wxMouseEvent event(wxEVT_ENTER_WINDOW);
-        InitMouseEvent(event, x, y, flags);
+        wxMouseEvent vEvent(wxEVT_ENTER_WINDOW);
 
 
-        (void)GetEventHandler()->ProcessEvent(event);
-    }
-
-#if wxUSE_MOUSEEVENT_HACK
-    // Window gets a click down message followed by a mouse move message even
-    // if position isn't changed!  We want to discard the trailing move event
-    // if x and y are the same.
-    if ( (m_lastMouseEvent == wxEVT_RIGHT_DOWN ||
-          m_lastMouseEvent == wxEVT_LEFT_DOWN ||
-          m_lastMouseEvent == wxEVT_MIDDLE_DOWN) &&
-         (m_lastMouseX == event.m_x && m_lastMouseY == event.m_y) )
-    {
-        m_lastMouseEvent = wxEVT_MOTION;
+        InitMouseEvent( vEvent
+                       ,nX
+                       ,nY
+                       ,uFlags
+                      );
 
 
-        return FALSE;
+        (void)HandleWindowEvent(vEvent);
     }
     }
-#endif // wxUSE_MOUSEEVENT_HACK
-
-    return HandleMouseEvent(WM_MOUSEMOVE, x, y, flags);
-}
+    return HandleMouseEvent( WM_MOUSEMOVE
+                            ,nX
+                            ,nY
+                            ,uFlags
+                           );
+} // end of wxWindowOS2::HandleMouseMove
 
 // ---------------------------------------------------------------------------
 // keyboard handling
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // keyboard handling
 // ---------------------------------------------------------------------------
 
-// isASCII is TRUE only when we're called from WM_CHAR handler and not from
+//
+// 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
+, WXWPARAM                          wParam
+) const
+{
+    wxKeyEvent                      vEvent(eType);
+
+    vEvent.SetId(GetId());
+    vEvent.m_shiftDown   = IsShiftDown();
+    vEvent.m_controlDown = IsCtrlDown();
+    vEvent.m_altDown     = (HIWORD(lParam) & KC_ALT) == KC_ALT;
+
+    vEvent.SetEventObject((wxWindow *)this); // const_cast
+    vEvent.m_keyCode     = nId;
+    vEvent.m_rawCode = (wxUint32)wParam;
+    vEvent.m_rawFlags = (wxUint32)lParam;
+    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
 // WM_KEYDOWN one
-bool wxWindow::HandleChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
+//
+bool wxWindowOS2::HandleChar( WXWPARAM WXUNUSED(wParam),
+                              WXLPARAM lParam,
+                              bool     isASCII )
 {
 {
-   // TODO:
-   return FALSE;
+    bool bCtrlDown = false;
+    int  vId;
+
+    if (m_bLastKeydownProcessed)
+    {
+        //
+        // The key was handled in the EVT_KEY_DOWN.  Handling a key in an
+        // EVT_KEY_DOWN handler is meant, by design, to prevent EVT_CHARs
+        // from happening, so just bail out at this point.
+        //
+        m_bLastKeydownProcessed = false;
+        return true;
+    }
+    if (isASCII)
+    {
+        //
+        // If 1 -> 26, translate to either special keycode or just set
+        // ctrlDown.  IOW, Ctrl-C should result in keycode == 3 and
+        // ControlDown() == true.
+        //
+        vId = SHORT1FROMMP(lParam);
+        if ((vId > 0) && (vId < 27))
+        {
+            switch (vId)
+            {
+                case 13:
+                    vId = WXK_RETURN;
+                    break;
+
+                case 8:
+                    vId = WXK_BACK;
+                    break;
+
+                case 9:
+                    vId = WXK_TAB;
+                    break;
+
+                default:
+                    bCtrlDown = true;
+                    break;
+            }
+        }
+    }
+    else  // we're called from WM_KEYDOWN
+    {
+        vId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
+        if (vId == 0)
+            return false;
+    }
+
+    wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR, vId, lParam ));
+
+    if (bCtrlDown)
+    {
+        vEvent.m_controlDown = true;
+    }
+
+    return (HandleWindowEvent(vEvent));
 }
 
 }
 
-bool wxWindow::HandleKeyDown(WXWORD wParam, WXLPARAM lParam)
+bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
+                                 WXLPARAM lParam )
 {
 {
-   // TODO:
-   return FALSE;
-}
+    int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
+
+    if (!nId)
+    {
+        //
+        // Normal ASCII char
+        //
+        nId = SHORT1FROMMP(lParam);
+    }
+
+    if (nId != -1)
+    {
+        wxKeyEvent  vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
+                                          ,nId
+                                          ,(MPARAM)lParam
+                                          ,(MPARAM)wParam
+                                         ));
+
+        if (HandleWindowEvent(vEvent))
+        {
+            return true;
+        }
+    }
+    return false;
+} // end of wxWindowOS2::HandleKeyDown
 
 
-bool wxWindow::HandleKeyUp(WXWORD wParam, WXLPARAM lParam)
+bool wxWindowOS2::HandleKeyUp( WXWPARAM wParam,
+                               WXLPARAM lParam )
 {
 {
-   // TODO:
-   return FALSE;
-}
+    int nId = wxCharCodeOS2ToWX((int)SHORT2FROMMP(lParam));
+
+    if (!nId)
+    {
+        //
+        // Normal ASCII char
+        //
+        nId = CHAR1FROMMP(lParam);
+    }
+
+    if (nId != -1)
+    {
+        wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP
+                                         ,nId
+                                         ,(MPARAM)lParam
+                                         ,(MPARAM)wParam
+                                        ));
+
+        if (HandleWindowEvent(vEvent))
+            return true;
+    }
+    return false;
+} // end of wxWindowOS2::HandleKeyUp
 
 // ---------------------------------------------------------------------------
 // joystick
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // joystick
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags)
-{
-   // TODO:
-   return FALSE;
-}
-
 // ---------------------------------------------------------------------------
 // scrolling
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // scrolling
 // ---------------------------------------------------------------------------
 
-bool wxWindow::OS2OnScroll(int orientation, WXWORD wParam,
-                           WXWORD pos, WXHWND control)
+bool wxWindowOS2::OS2OnScroll( int nOrientation,
+                               WXWORD wParam,
+                               WXWORD wPos,
+                               WXHWND hControl )
 {
 {
-    if ( control )
+    if (hControl)
     {
     {
-        wxWindow *child = wxFindWinFromHandle(control);
-        if ( child )
-            return child->OS2OnScroll(orientation, wParam, pos, control);
+        wxWindow*                   pChild = wxFindWinFromHandle(hControl);
+
+        if (pChild )
+            return pChild->OS2OnScroll( nOrientation
+                                       ,wParam
+                                       ,wPos
+                                       ,hControl
+                                      );
     }
 
     }
 
-    wxScrollWinEvent event;
-    event.SetPosition(pos);
-    event.SetOrientation(orientation);
-    event.m_eventObject = this;
-   // TODO:
-   return FALSE;
-}
+    wxScrollWinEvent                vEvent;
+
+    vEvent.SetPosition(wPos);
+    vEvent.SetOrientation(nOrientation);
+    vEvent.SetEventObject(this);
+
+    switch (wParam)
+    {
+        case SB_LINEUP:
+            vEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP);
+            break;
+
+        case SB_LINEDOWN:
+            vEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN);
+            break;
+
+        case SB_PAGEUP:
+            vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP);
+            break;
+
+        case SB_PAGEDOWN:
+            vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN);
+            break;
+
+        case SB_SLIDERPOSITION:
+            vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBRELEASE);
+            break;
+
+        case SB_SLIDERTRACK:
+            vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBTRACK);
+            break;
+
+        default:
+            return false;
+    }
+    return HandleWindowEvent(vEvent);
+} // end of wxWindowOS2::OS2OnScroll
+
+//
+//  Getting the Y position for a window, like a control, is a real
+//  pain.  There are three situations we must deal with in determining
+//  the OS2 to wxWidgets Y coordinate.
+//
+//  1)  The controls are created in a dialog.
+//      This is the easiest since a dialog is created with its original
+//      size so the standard: Y = ParentHeight - (Y + ControlHeight);
+//
+//  2)  The controls are direct children of a frame
+//      In this instance the controls are actually children of the Frame's
+//      client.  During creation the frame's client resizes several times
+//      during creation of the status bar and toolbars.  The CFrame class
+//      will take care of this using its AlterChildPos proc.
+//
+//  3)  The controls are children of a panel, which in turn is a child of
+//      a frame.
+//      The panel may be one of many, in which case the same treatment
+//      as 1 applies. It may be the only child, though.
+//      This is the nastiest case.  A panel is created as the only child of
+//      the frame and as such, when a frame has only one child, the child is
+//      expanded to fit the entire client area of the frame.  Because the
+//      controls are created BEFORE this occurs their positions are totally
+//      whacked and any call to WinQueryWindowPos will return invalid
+//      coordinates.  So for this situation we have to compare the size of
+//      the panel at control creation time with that of the frame client.  If
+//      they are the same we can use the standard Y position equation.  If
+//      not, then we must use the Frame Client's dimensions to position them
+//      as that will be the eventual size of the panel after the frame resizes
+//      it!
+//
+int wxWindowOS2::GetOS2ParentHeight( wxWindowOS2* pParent )
+{
+    if (pParent)
+    {
+    //
+    // Case 1
+    //
+        if (pParent->IsKindOf(CLASSINFO(wxDialog)))
+            return(pParent->GetClientSize().y);
+
+    //
+    // Case 2 -- if we are one of the separately built standard Frame
+    //           children, like a statusbar, menubar, or toolbar we want to
+    //           use the frame, itself, for positioning.  Otherwise we are
+    //           child window and want to use the Frame's client.
+    //
+        else if (pParent->IsKindOf(CLASSINFO(wxFrame)))
+        {
+            if (IsKindOf(CLASSINFO(wxStatusBar)) ||
+                IsKindOf(CLASSINFO(wxMenuBar))   ||
+                IsKindOf(CLASSINFO(wxToolBar))
+               )
+            {
+                if (IsKindOf(CLASSINFO(wxToolBar)))
+                {
+                    wxFrame*        pFrame = wxDynamicCast(GetParent(), wxFrame);
+
+                    if (pFrame->GetToolBar() == this)
+                        return(pParent->GetSize().y);
+                    else
+                        return(pParent->GetClientSize().y);
+                }
+                else
+                    return(pParent->GetSize().y);
+            }
+            else
+                return(pParent->GetClientSize().y);
+        }
+        //
+        // Case -- this is for any window that is the sole child of a Frame.
+        //         The grandparent must exist and it must be of type CFrame
+        //         and it's height must be different. Otherwise the standard
+        //         applies.
+        //
+        else
+            return(pParent->GetClientSize().y);
+    }
+    else // We must be a child of the screen
+    {
+        int nHeight;
+        wxDisplaySize(NULL,&nHeight);
+        return(nHeight);
+    }
+} // end of wxWindowOS2::GetOS2ParentHeight
+
+//
+// OS/2 needs a lot extra manipulation to deal with layouts
+// for canvas windows, particularly scrolled ones.
+//
+wxWindowCreationHook::wxWindowCreationHook(
+  wxWindow*                         pWinBeingCreated
+)
+{
+    gpWinBeingCreated = pWinBeingCreated;
+} // end of wxWindowCreationHook::wxWindowCreationHook
+
+wxWindowCreationHook::~wxWindowCreationHook()
+{
+    gpWinBeingCreated = NULL;
+} // end of wxWindowCreationHook::~wxWindowCreationHook
 
 // ===========================================================================
 // global functions
 // ===========================================================================
 
 
 // ===========================================================================
 // global functions
 // ===========================================================================
 
-void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font)
+void wxGetCharSize(
+  WXHWND                            hWnd
+, int*                              pX
+, int*                              pY
+,wxFont*                            WXUNUSED(pTheFont)
+)
 {
 {
-   // TODO:
-}
+    FONTMETRICS                     vFM;
+    HPS                             hPS;
+    BOOL                            rc;
+
+    hPS =::WinGetPS(hWnd);
+
+    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.
 // 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 keySym)
-{
-    int id = 0;
-   // TODO:
-/*
-    switch (keySym)
-    {
-    case VK_CANCEL:     id = WXK_CANCEL; break;
-    case VK_BACK:       id = WXK_BACK; break;
-    case VK_TAB:        id = WXK_TAB; break;
-    case VK_CLEAR:      id = WXK_CLEAR; break;
-    case VK_RETURN:     id = WXK_RETURN; break;
-    case VK_SHIFT:      id = WXK_SHIFT; break;
-    case VK_CONTROL:    id = WXK_CONTROL; break;
-    case VK_MENU :      id = WXK_MENU; break;
-    case VK_PAUSE:      id = WXK_PAUSE; break;
-    case VK_SPACE:      id = WXK_SPACE; break;
-    case VK_ESCAPE:     id = WXK_ESCAPE; break;
-    case VK_PRIOR:      id = WXK_PRIOR; break;
-    case VK_NEXT :      id = WXK_NEXT; break;
-    case VK_END:        id = WXK_END; break;
-    case VK_HOME :      id = WXK_HOME; break;
-    case VK_LEFT :      id = WXK_LEFT; break;
-    case VK_UP:         id = WXK_UP; break;
-    case VK_RIGHT:      id = WXK_RIGHT; break;
-    case VK_DOWN :      id = WXK_DOWN; break;
-    case VK_SELECT:     id = WXK_SELECT; break;
-    case VK_PRINT:      id = WXK_PRINT; break;
-    case VK_EXECUTE:    id = WXK_EXECUTE; break;
-    case VK_INSERT:     id = WXK_INSERT; break;
-    case VK_DELETE:     id = WXK_DELETE; break;
-    case VK_HELP :      id = WXK_HELP; break;
-    case VK_NUMPAD0:    id = WXK_NUMPAD0; break;
-    case VK_NUMPAD1:    id = WXK_NUMPAD1; break;
-    case VK_NUMPAD2:    id = WXK_NUMPAD2; break;
-    case VK_NUMPAD3:    id = WXK_NUMPAD3; break;
-    case VK_NUMPAD4:    id = WXK_NUMPAD4; break;
-    case VK_NUMPAD5:    id = WXK_NUMPAD5; break;
-    case VK_NUMPAD6:    id = WXK_NUMPAD6; break;
-    case VK_NUMPAD7:    id = WXK_NUMPAD7; break;
-    case VK_NUMPAD8:    id = WXK_NUMPAD8; break;
-    case VK_NUMPAD9:    id = WXK_NUMPAD9; break;
-    case VK_MULTIPLY:   id = WXK_MULTIPLY; break;
-    case VK_ADD:        id = WXK_ADD; break;
-    case VK_SUBTRACT:   id = WXK_SUBTRACT; break;
-    case VK_DECIMAL:    id = WXK_DECIMAL; break;
-    case VK_DIVIDE:     id = WXK_DIVIDE; break;
-    case VK_F1:         id = WXK_F1; break;
-    case VK_F2:         id = WXK_F2; break;
-    case VK_F3:         id = WXK_F3; break;
-    case VK_F4:         id = WXK_F4; break;
-    case VK_F5:         id = WXK_F5; break;
-    case VK_F6:         id = WXK_F6; break;
-    case VK_F7:         id = WXK_F7; break;
-    case VK_F8:         id = WXK_F8; break;
-    case VK_F9:         id = WXK_F9; break;
-    case VK_F10:        id = WXK_F10; break;
-    case VK_F11:        id = WXK_F11; break;
-    case VK_F12:        id = WXK_F12; break;
-    case VK_F13:        id = WXK_F13; break;
-    case VK_F14:        id = WXK_F14; break;
-    case VK_F15:        id = WXK_F15; break;
-    case VK_F16:        id = WXK_F16; break;
-    case VK_F17:        id = WXK_F17; break;
-    case VK_F18:        id = WXK_F18; break;
-    case VK_F19:        id = WXK_F19; break;
-    case VK_F20:        id = WXK_F20; break;
-    case VK_F21:        id = WXK_F21; break;
-    case VK_F22:        id = WXK_F22; break;
-    case VK_F23:        id = WXK_F23; break;
-    case VK_F24:        id = WXK_F24; break;
-    case VK_NUMLOCK:    id = WXK_NUMLOCK; break;
-    case VK_SCROLL:     id = WXK_SCROLL; break;
-    default:
+//
+int wxCharCodeOS2ToWX(
+  int                               nKeySym
+)
+{
+    int                             nId = 0;
+
+    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_PAGEUP:     nId = WXK_PAGEUP; break;
+        case VK_PAGEDOWN:   nId = WXK_PAGEDOWN; 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_CAPSLOCK:   nId = WXK_CAPITAL; 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_OEM_1:      nId = ';'; break;
+        case VK_OEM_PLUS:   nId = '+'; break;
+        case VK_OEM_COMMA:  nId = ','; break;
+        case VK_OEM_MINUS:  nId = '-'; break;
+        case VK_OEM_PERIOD: nId = '.'; break;
+        case VK_OEM_2:      nId = '/'; break;
+        case VK_OEM_3:      nId = '~'; break;
+        case VK_OEM_4:      nId = '['; break;
+        case VK_OEM_5:      nId = '\\'; break;
+        case VK_OEM_6:      nId = ']'; break;
+        case VK_OEM_7:      nId = '\''; break;
+        case VK_NUMLOCK:    nId = WXK_NUMLOCK; break;
+        case VK_SCRLLOCK:   nId = WXK_SCROLL; break;
+        default:
         {
             return 0;
         }
     }
         {
             return 0;
         }
     }
-*/
-    return id;
-}
+    return nId;
+} // end of wxCharCodeOS2ToWX
+
+int wxCharCodeWXToOS2( int nId,
+                       bool* bIsVirtual)
+{
+    int nKeySym = 0;
 
 
-int wxCharCodeWXToOS2(int id, bool *isVirtual)
-{
-    *isVirtual = TRUE;
-    int keySym = 0;
-    // TODO
-/*
-    switch (id)
-    {
-    case WXK_CANCEL:    keySym = VK_CANCEL; break;
-    case WXK_CLEAR:     keySym = VK_CLEAR; break;
-    case WXK_SHIFT:     keySym = VK_SHIFT; break;
-    case WXK_CONTROL:   keySym = VK_CONTROL; break;
-    case WXK_MENU :     keySym = VK_MENU; break;
-    case WXK_PAUSE:     keySym = VK_PAUSE; break;
-    case WXK_PRIOR:     keySym = VK_PRIOR; break;
-    case WXK_NEXT :     keySym = VK_NEXT; break;
-    case WXK_END:       keySym = VK_END; break;
-    case WXK_HOME :     keySym = VK_HOME; break;
-    case WXK_LEFT :     keySym = VK_LEFT; break;
-    case WXK_UP:        keySym = VK_UP; break;
-    case WXK_RIGHT:     keySym = VK_RIGHT; break;
-    case WXK_DOWN :     keySym = VK_DOWN; break;
-    case WXK_SELECT:    keySym = VK_SELECT; break;
-    case WXK_PRINT:     keySym = VK_PRINT; break;
-    case WXK_EXECUTE:   keySym = VK_EXECUTE; break;
-    case WXK_INSERT:    keySym = VK_INSERT; break;
-    case WXK_DELETE:    keySym = VK_DELETE; break;
-    case WXK_HELP :     keySym = VK_HELP; break;
-    case WXK_NUMPAD0:   keySym = VK_NUMPAD0; break;
-    case WXK_NUMPAD1:   keySym = VK_NUMPAD1; break;
-    case WXK_NUMPAD2:   keySym = VK_NUMPAD2; break;
-    case WXK_NUMPAD3:   keySym = VK_NUMPAD3; break;
-    case WXK_NUMPAD4:   keySym = VK_NUMPAD4; break;
-    case WXK_NUMPAD5:   keySym = VK_NUMPAD5; break;
-    case WXK_NUMPAD6:   keySym = VK_NUMPAD6; break;
-    case WXK_NUMPAD7:   keySym = VK_NUMPAD7; break;
-    case WXK_NUMPAD8:   keySym = VK_NUMPAD8; break;
-    case WXK_NUMPAD9:   keySym = VK_NUMPAD9; break;
-    case WXK_MULTIPLY:  keySym = VK_MULTIPLY; break;
-    case WXK_ADD:       keySym = VK_ADD; break;
-    case WXK_SUBTRACT:  keySym = VK_SUBTRACT; break;
-    case WXK_DECIMAL:   keySym = VK_DECIMAL; break;
-    case WXK_DIVIDE:    keySym = VK_DIVIDE; break;
-    case WXK_F1:        keySym = VK_F1; break;
-    case WXK_F2:        keySym = VK_F2; break;
-    case WXK_F3:        keySym = VK_F3; break;
-    case WXK_F4:        keySym = VK_F4; break;
-    case WXK_F5:        keySym = VK_F5; break;
-    case WXK_F6:        keySym = VK_F6; break;
-    case WXK_F7:        keySym = VK_F7; break;
-    case WXK_F8:        keySym = VK_F8; break;
-    case WXK_F9:        keySym = VK_F9; break;
-    case WXK_F10:       keySym = VK_F10; break;
-    case WXK_F11:       keySym = VK_F11; break;
-    case WXK_F12:       keySym = VK_F12; break;
-    case WXK_F13:       keySym = VK_F13; break;
-    case WXK_F14:       keySym = VK_F14; break;
-    case WXK_F15:       keySym = VK_F15; break;
-    case WXK_F16:       keySym = VK_F16; break;
-    case WXK_F17:       keySym = VK_F17; break;
-    case WXK_F18:       keySym = VK_F18; break;
-    case WXK_F19:       keySym = VK_F19; break;
-    case WXK_F20:       keySym = VK_F20; break;
-    case WXK_F21:       keySym = VK_F21; break;
-    case WXK_F22:       keySym = VK_F22; break;
-    case WXK_F23:       keySym = VK_F23; break;
-    case WXK_F24:       keySym = VK_F24; break;
-    case WXK_NUMLOCK:   keySym = VK_NUMLOCK; break;
-    case WXK_SCROLL:    keySym = VK_SCROLL; break;
-    default:
+    if ( bIsVirtual )
+        *bIsVirtual = true;
+    switch (nId)
+    {
+        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_PAGEUP:    nKeySym = VK_PAGEUP; break;
+        case WXK_PAGEDOWN:  nKeySym = VK_PAGEDOWN; 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:
         {
         {
-            *isVirtual = FALSE;
-            keySym = id;
+            if ( bIsVirtual )
+                *bIsVirtual = false;
+            nKeySym = nId;
             break;
         }
     }
             break;
         }
     }
-*/
-    return keySym;
-}
+    return nKeySym;
+} // end of wxCharCodeWXToOS2
 
 
-wxWindow *wxGetActiveWindow()
+
+bool wxGetKeyState(wxKeyCode key)
 {
 {
-   // TODO
-    return NULL;
-}
+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
 
 
-// Windows keyboard hook. Allows interception of e.g. F1, ESCAPE
-// in active frames and dialogs, regardless of where the focus is.
-//static HHOOK wxTheKeyboardHook = 0;
-//static FARPROC wxTheKeyboardHookProc = 0;
-int wxKeyboardHook(int nCode, WORD wParam, DWORD lParam);
+    const LONG vk = wxCharCodeWXToOS2(key);
+    // if the requested key is a LED key, return true if the led is pressed
+    if ( key == WXK_NUMLOCK || key == WXK_CAPITAL || key == WXK_SCROLL )
+    {
+        // low order bit means LED is highlighted and high order one means the
+        // key is down; for compatibility with the other ports return true if
+        // either one is set
+        return ::WinGetKeyState(HWND_DESKTOP, vk) != 0;
 
 
-void wxSetKeyboardHook(bool doIt)
-{
-   // TODO:
+    }
+    else // normal key
+    {
+        return IsKeyDown(vk);
+    }
 }
 
 }
 
-int wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
+
+wxWindow* wxGetActiveWindow()
 {
 {
-   // TODO:
+    HWND                            hWnd = ::WinQueryActiveWindow(HWND_DESKTOP);
 
 
-    return 0;
-}
+    if (hWnd != 0)
+    {
+        return wxFindWinFromHandle((WXHWND)hWnd);
+    }
+    return NULL;
+} // end of wxGetActiveWindow
 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__
-const char *wxGetMessageName(int message)
-{
-   // TODO
-/*
-    switch ( message )
-    {
-        case 0x0000: return "WM_NULL";
-        case 0x0001: return "WM_CREATE";
-        case 0x0002: return "WM_DESTROY";
-        case 0x0003: return "WM_MOVE";
-        case 0x0005: return "WM_SIZE";
-        case 0x0006: return "WM_ACTIVATE";
-        case 0x0007: return "WM_SETFOCUS";
-        case 0x0008: return "WM_KILLFOCUS";
-        case 0x000A: return "WM_ENABLE";
-        case 0x000B: return "WM_SETREDRAW";
-        case 0x000C: return "WM_SETTEXT";
-        case 0x000D: return "WM_GETTEXT";
-        case 0x000E: return "WM_GETTEXTLENGTH";
-        case 0x000F: return "WM_PAINT";
-        case 0x0010: return "WM_CLOSE";
-        case 0x0011: return "WM_QUERYENDSESSION";
-        case 0x0012: return "WM_QUIT";
-        case 0x0013: return "WM_QUERYOPEN";
-        case 0x0014: return "WM_ERASEBKGND";
-        case 0x0015: return "WM_SYSCOLORCHANGE";
-        case 0x0016: return "WM_ENDSESSION";
-        case 0x0017: return "WM_SYSTEMERROR";
-        case 0x0018: return "WM_SHOWWINDOW";
-        case 0x0019: return "WM_CTLCOLOR";
-        case 0x001A: return "WM_WININICHANGE";
-        case 0x001B: return "WM_DEVMODECHANGE";
-        case 0x001C: return "WM_ACTIVATEAPP";
-        case 0x001D: return "WM_FONTCHANGE";
-        case 0x001E: return "WM_TIMECHANGE";
-        case 0x001F: return "WM_CANCELMODE";
-        case 0x0020: return "WM_SETCURSOR";
-        case 0x0021: return "WM_MOUSEACTIVATE";
-        case 0x0022: return "WM_CHILDACTIVATE";
-        case 0x0023: return "WM_QUEUESYNC";
-        case 0x0024: return "WM_GETMINMAXINFO";
-        case 0x0026: return "WM_PAINTICON";
-        case 0x0027: return "WM_ICONERASEBKGND";
-        case 0x0028: return "WM_NEXTDLGCTL";
-        case 0x002A: return "WM_SPOOLERSTATUS";
-        case 0x002B: return "WM_DRAWITEM";
-        case 0x002C: return "WM_MEASUREITEM";
-        case 0x002D: return "WM_DELETEITEM";
-        case 0x002E: return "WM_VKEYTOITEM";
-        case 0x002F: return "WM_CHARTOITEM";
-        case 0x0030: return "WM_SETFONT";
-        case 0x0031: return "WM_GETFONT";
-        case 0x0037: return "WM_QUERYDRAGICON";
-        case 0x0039: return "WM_COMPAREITEM";
-        case 0x0041: return "WM_COMPACTING";
-        case 0x0044: return "WM_COMMNOTIFY";
-        case 0x0046: return "WM_WINDOWPOSCHANGING";
-        case 0x0047: return "WM_WINDOWPOSCHANGED";
-        case 0x0048: return "WM_POWER";
-
-#ifdef  __WIN32__
-        case 0x004A: return "WM_COPYDATA";
-        case 0x004B: return "WM_CANCELJOURNAL";
-        case 0x004E: return "WM_NOTIFY";
-        case 0x0050: return "WM_INPUTLANGCHANGEREQUEST";
-        case 0x0051: return "WM_INPUTLANGCHANGE";
-        case 0x0052: return "WM_TCARD";
-        case 0x0053: return "WM_HELP";
-        case 0x0054: return "WM_USERCHANGED";
-        case 0x0055: return "WM_NOTIFYFORMAT";
-        case 0x007B: return "WM_CONTEXTMENU";
-        case 0x007C: return "WM_STYLECHANGING";
-        case 0x007D: return "WM_STYLECHANGED";
-        case 0x007E: return "WM_DISPLAYCHANGE";
-        case 0x007F: return "WM_GETICON";
-        case 0x0080: return "WM_SETICON";
-#endif  //WIN32
-
-        case 0x0081: return "WM_NCCREATE";
-        case 0x0082: return "WM_NCDESTROY";
-        case 0x0083: return "WM_NCCALCSIZE";
-        case 0x0084: return "WM_NCHITTEST";
-        case 0x0085: return "WM_NCPAINT";
-        case 0x0086: return "WM_NCACTIVATE";
-        case 0x0087: return "WM_GETDLGCODE";
-        case 0x00A0: return "WM_NCMOUSEMOVE";
-        case 0x00A1: return "WM_NCLBUTTONDOWN";
-        case 0x00A2: return "WM_NCLBUTTONUP";
-        case 0x00A3: return "WM_NCLBUTTONDBLCLK";
-        case 0x00A4: return "WM_NCRBUTTONDOWN";
-        case 0x00A5: return "WM_NCRBUTTONUP";
-        case 0x00A6: return "WM_NCRBUTTONDBLCLK";
-        case 0x00A7: return "WM_NCMBUTTONDOWN";
-        case 0x00A8: return "WM_NCMBUTTONUP";
-        case 0x00A9: return "WM_NCMBUTTONDBLCLK";
-        case 0x0100: return "WM_KEYDOWN";
-        case 0x0101: return "WM_KEYUP";
-        case 0x0102: return "WM_CHAR";
-        case 0x0103: return "WM_DEADCHAR";
-        case 0x0104: return "WM_SYSKEYDOWN";
-        case 0x0105: return "WM_SYSKEYUP";
-        case 0x0106: return "WM_SYSCHAR";
-        case 0x0107: return "WM_SYSDEADCHAR";
-        case 0x0108: return "WM_KEYLAST";
-
-#ifdef  __WIN32__
-        case 0x010D: return "WM_IME_STARTCOMPOSITION";
-        case 0x010E: return "WM_IME_ENDCOMPOSITION";
-        case 0x010F: return "WM_IME_COMPOSITION";
-#endif  //WIN32
-
-        case 0x0110: return "WM_INITDIALOG";
-        case 0x0111: return "WM_COMMAND";
-        case 0x0112: return "WM_SYSCOMMAND";
-        case 0x0113: return "WM_TIMER";
-        case 0x0114: return "WM_HSCROLL";
-        case 0x0115: return "WM_VSCROLL";
-        case 0x0116: return "WM_INITMENU";
-        case 0x0117: return "WM_INITMENUPOPUP";
-        case 0x011F: return "WM_MENUSELECT";
-        case 0x0120: return "WM_MENUCHAR";
-        case 0x0121: return "WM_ENTERIDLE";
-        case 0x0200: return "WM_MOUSEMOVE";
-        case 0x0201: return "WM_LBUTTONDOWN";
-        case 0x0202: return "WM_LBUTTONUP";
-        case 0x0203: return "WM_LBUTTONDBLCLK";
-        case 0x0204: return "WM_RBUTTONDOWN";
-        case 0x0205: return "WM_RBUTTONUP";
-        case 0x0206: return "WM_RBUTTONDBLCLK";
-        case 0x0207: return "WM_MBUTTONDOWN";
-        case 0x0208: return "WM_MBUTTONUP";
-        case 0x0209: return "WM_MBUTTONDBLCLK";
-        case 0x0210: return "WM_PARENTNOTIFY";
-        case 0x0211: return "WM_ENTERMENULOOP";
-        case 0x0212: return "WM_EXITMENULOOP";
-
-#ifdef  __WIN32__
-        case 0x0213: return "WM_NEXTMENU";
-        case 0x0214: return "WM_SIZING";
-        case 0x0215: return "WM_CAPTURECHANGED";
-        case 0x0216: return "WM_MOVING";
-        case 0x0218: return "WM_POWERBROADCAST";
-        case 0x0219: return "WM_DEVICECHANGE";
-#endif  //WIN32
-
-        case 0x0220: return "WM_MDICREATE";
-        case 0x0221: return "WM_MDIDESTROY";
-        case 0x0222: return "WM_MDIACTIVATE";
-        case 0x0223: return "WM_MDIRESTORE";
-        case 0x0224: return "WM_MDINEXT";
-        case 0x0225: return "WM_MDIMAXIMIZE";
-        case 0x0226: return "WM_MDITILE";
-        case 0x0227: return "WM_MDICASCADE";
-        case 0x0228: return "WM_MDIICONARRANGE";
-        case 0x0229: return "WM_MDIGETACTIVE";
-        case 0x0230: return "WM_MDISETMENU";
-        case 0x0233: return "WM_DROPFILES";
-
-#ifdef  __WIN32__
-        case 0x0281: return "WM_IME_SETCONTEXT";
-        case 0x0282: return "WM_IME_NOTIFY";
-        case 0x0283: return "WM_IME_CONTROL";
-        case 0x0284: return "WM_IME_COMPOSITIONFULL";
-        case 0x0285: return "WM_IME_SELECT";
-        case 0x0286: return "WM_IME_CHAR";
-        case 0x0290: return "WM_IME_KEYDOWN";
-        case 0x0291: return "WM_IME_KEYUP";
-#endif  //WIN32
-
-        case 0x0300: return "WM_CUT";
-        case 0x0301: return "WM_COPY";
-        case 0x0302: return "WM_PASTE";
-        case 0x0303: return "WM_CLEAR";
-        case 0x0304: return "WM_UNDO";
-        case 0x0305: return "WM_RENDERFORMAT";
-        case 0x0306: return "WM_RENDERALLFORMATS";
-        case 0x0307: return "WM_DESTROYCLIPBOARD";
-        case 0x0308: return "WM_DRAWCLIPBOARD";
-        case 0x0309: return "WM_PAINTCLIPBOARD";
-        case 0x030A: return "WM_VSCROLLCLIPBOARD";
-        case 0x030B: return "WM_SIZECLIPBOARD";
-        case 0x030C: return "WM_ASKCBFORMATNAME";
-        case 0x030D: return "WM_CHANGECBCHAIN";
-        case 0x030E: return "WM_HSCROLLCLIPBOARD";
-        case 0x030F: return "WM_QUERYNEWPALETTE";
-        case 0x0310: return "WM_PALETTEISCHANGING";
-        case 0x0311: return "WM_PALETTECHANGED";
-
-#ifdef __WIN32__
-        // common controls messages - although they're not strictly speaking
-        // standard, it's nice to decode them nevertheless
+const wxChar* wxGetMessageName( int nMessage )
+{
+    switch (nMessage)
+    {
+        case 0x0000: return wxT("WM_NULL");
+        case 0x0001: return wxT("WM_CREATE");
+        case 0x0002: return wxT("WM_DESTROY");
+        case 0x0004: return wxT("WM_ENABLE");
+        case 0x0005: return wxT("WM_SHOW");
+        case 0x0006: return wxT("WM_MOVE");
+        case 0x0007: return wxT("WM_SIZE");
+        case 0x0008: return wxT("WM_ADJUSTWINDOWPOS");
+        case 0x0009: return wxT("WM_CALCVALIDRECTS");
+        case 0x000A: return wxT("WM_SETWINDOWPARAMS");
+        case 0x000B: return wxT("WM_QUERYWINDOWPARAMS");
+        case 0x000C: return wxT("WM_HITTEST");
+        case 0x000D: return wxT("WM_ACTIVATE");
+        case 0x000F: return wxT("WM_SETFOCUS");
+        case 0x0010: return wxT("WM_SETSELECTION");
+        case 0x0011: return wxT("WM_PPAINT");
+        case 0x0012: return wxT("WM_PSETFOCUS");
+        case 0x0013: return wxT("WM_PSYSCOLORCHANGE");
+        case 0x0014: return wxT("WM_PSIZE");
+        case 0x0015: return wxT("WM_PACTIVATE");
+        case 0x0016: return wxT("WM_PCONTROL");
+        case 0x0020: return wxT("WM_COMMAND");
+        case 0x0021: return wxT("WM_SYSCOMMAND");
+        case 0x0022: return wxT("WM_HELP");
+        case 0x0023: return wxT("WM_PAINT");
+        case 0x0024: return wxT("WM_TIMER");
+        case 0x0025: return wxT("WM_SEM1");
+        case 0x0026: return wxT("WM_SEM2");
+        case 0x0027: return wxT("WM_SEM3");
+        case 0x0028: return wxT("WM_SEM4");
+        case 0x0029: return wxT("WM_CLOSE");
+        case 0x002A: return wxT("WM_QUIT");
+        case 0x002B: return wxT("WM_SYSCOLORCHANGE");
+        case 0x002D: return wxT("WM_SYSVALUECHANGE");
+        case 0x002E: return wxT("WM_APPTERMINATENOTIFY");
+        case 0x002F: return wxT("WM_PRESPARAMCHANGED");
+        // Control notification messages
+        case 0x0030: return wxT("WM_CONTROL");
+        case 0x0031: return wxT("WM_VSCROLL");
+        case 0x0032: return wxT("WM_HSCROLL");
+        case 0x0033: return wxT("WM_INITMENU");
+        case 0x0034: return wxT("WM_MENUSELECT");
+        case 0x0035: return wxT("WM_MENUSEND");
+        case 0x0036: return wxT("WM_DRAWITEM");
+        case 0x0037: return wxT("WM_MEASUREITEM");
+        case 0x0038: return wxT("WM_CONTROLPOINTER");
+        case 0x003A: return wxT("WM_QUERYDLGCODE");
+        case 0x003B: return wxT("WM_INITDLG");
+        case 0x003C: return wxT("WM_SUBSTITUTESTRING");
+        case 0x003D: return wxT("WM_MATCHMNEMONIC");
+        case 0x003E: return wxT("WM_SAVEAPPLICATION");
+        case 0x0129: return wxT("WM_CTLCOLORCHANGE");
+        case 0x0130: return wxT("WM_QUERYCTLTYPE");
+        // Frame messages
+        case 0x0040: return wxT("WM_FLASHWINDOW");
+        case 0x0041: return wxT("WM_FORMATFRAME");
+        case 0x0042: return wxT("WM_UPDATEFRAME");
+        case 0x0043: return wxT("WM_FOCUSCHANGE");
+        case 0x0044: return wxT("WM_SETBORDERSIZE");
+        case 0x0045: return wxT("WM_TRACKFRAME");
+        case 0x0046: return wxT("WM_MINMAXFRAME");
+        case 0x0047: return wxT("WM_SETICON");
+        case 0x0048: return wxT("WM_QUERYICON");
+        case 0x0049: return wxT("WM_SETACCELTABLE");
+        case 0x004A: return wxT("WM_QUERYACCELTABLE");
+        case 0x004B: return wxT("WM_TRANSLATEACCEL");
+        case 0x004C: return wxT("WM_QUERYTRACKINFO");
+        case 0x004D: return wxT("WM_QUERYBORDERSIZE");
+        case 0x004E: return wxT("WM_NEXTMENU");
+        case 0x004F: return wxT("WM_ERASEBACKGROUND");
+        case 0x0050: return wxT("WM_QUERYFRAMEINFO");
+        case 0x0051: return wxT("WM_QUERYFOCUSCHAIN");
+        case 0x0052: return wxT("WM_OWNERPOSCHANGE");
+        case 0x0053: return wxT("WM_CACLFRAMERECT");
+        case 0x0055: return wxT("WM_WINDOWPOSCHANGED");
+        case 0x0056: return wxT("WM_ADJUSTFRAMEPOS");
+        case 0x0059: return wxT("WM_QUERYFRAMECTLCOUNT");
+        case 0x005B: return wxT("WM_QUERYHELPINFO");
+        case 0x005C: return wxT("WM_SETHELPINFO");
+        case 0x005D: return wxT("WM_ERROR");
+        case 0x005E: return wxT("WM_REALIZEPALETTE");
+        // Clipboard messages
+        case 0x0060: return wxT("WM_RENDERFMT");
+        case 0x0061: return wxT("WM_RENDERALLFMTS");
+        case 0x0062: return wxT("WM_DESTROYCLIPBOARD");
+        case 0x0063: return wxT("WM_PAINTCLIPBOARD");
+        case 0x0064: return wxT("WM_SIZECLIPBOARD");
+        case 0x0065: return wxT("WM_HSCROLLCLIPBOARD");
+        case 0x0066: return wxT("WM_VSCROLLCLIPBOARD");
+        case 0x0067: return wxT("WM_DRAWCLIPBOARD");
+        // mouse messages
+        case 0x0070: return wxT("WM_MOUSEMOVE");
+        case 0x0071: return wxT("WM_BUTTON1DOWN");
+        case 0x0072: return wxT("WM_BUTTON1UP");
+        case 0x0073: return wxT("WM_BUTTON1DBLCLK");
+        case 0x0074: return wxT("WM_BUTTON2DOWN");
+        case 0x0075: return wxT("WM_BUTTON2UP");
+        case 0x0076: return wxT("WM_BUTTON2DBLCLK");
+        case 0x0077: return wxT("WM_BUTTON3DOWN");
+        case 0x0078: return wxT("WM_BUTTON3UP");
+        case 0x0079: return wxT("WM_BUTTON3DBLCLK");
+        case 0x007D: return wxT("WM_MOUSEMAP");
+        case 0x007E: return wxT("WM_VRNDISABLED");
+        case 0x007F: return wxT("WM_VRNENABLED");
+        case 0x0410: return wxT("WM_CHORD");
+        case 0x0411: return wxT("WM_BUTTON1MOTIONSTART");
+        case 0x0412: return wxT("WM_BUTTON1MOTIONEND");
+        case 0x0413: return wxT("WM_BUTTON1CLICK");
+        case 0x0414: return wxT("WM_BUTTON2MOTIONSTART");
+        case 0x0415: return wxT("WM_BUTTON2MOTIONEND");
+        case 0x0416: return wxT("WM_BUTTON2CLICK");
+        case 0x0417: return wxT("WM_BUTTON3MOTIONSTART");
+        case 0x0418: return wxT("WM_BUTTON3MOTIONEND");
+        case 0x0419: return wxT("WM_BUTTON3CLICK");
+        case 0x0420: return wxT("WM_BEGINDRAG");
+        case 0x0421: return wxT("WM_ENDDRAG");
+        case 0x0422: return wxT("WM_SINGLESELECT");
+        case 0x0423: return wxT("WM_OPEN");
+        case 0x0424: return wxT("WM_CONTEXTMENU");
+        case 0x0425: return wxT("WM_CONTEXTHELP");
+        case 0x0426: return wxT("WM_TEXTEDIT");
+        case 0x0427: return wxT("WM_BEGINSELECT");
+        case 0x0228: return wxT("WM_ENDSELECT");
+        case 0x0429: return wxT("WM_PICKUP");
+        case 0x04C0: return wxT("WM_PENFIRST");
+        case 0x04FF: return wxT("WM_PENLAST");
+        case 0x0500: return wxT("WM_MMPMFIRST");
+        case 0x05FF: return wxT("WM_MMPMLAST");
+        case 0x0600: return wxT("WM_STDDLGFIRST");
+        case 0x06FF: return wxT("WM_STDDLGLAST");
+        case 0x0BD0: return wxT("WM_BIDI_FIRST");
+        case 0x0BFF: return wxT("WM_BIDI_LAST");
+        // keyboard input
+        case 0x007A: return wxT("WM_CHAR");
+        case 0x007B: return wxT("WM_VIOCHAR");
+        // DDE messages
+        case 0x00A0: return wxT("WM_DDE_INITIATE");
+        case 0x00A1: return wxT("WM_DDE_REQUEST");
+        case 0x00A2: return wxT("WM_DDE_ACK");
+        case 0x00A3: return wxT("WM_DDE_DATA");
+        case 0x00A4: return wxT("WM_DDE_ADVISE");
+        case 0x00A5: return wxT("WM_DDE_UNADVISE");
+        case 0x00A6: return wxT("WM_DDE_POKE");
+        case 0x00A7: return wxT("WM_DDE_EXECUTE");
+        case 0x00A8: return wxT("WM_DDE_TERMINATE");
+        case 0x00A9: return wxT("WM_DDE_INITIATEACK");
+        case 0x00AF: return wxT("WM_DDE_LAST");
+        // Buttons
+        case 0x0120: return wxT("BM_CLICK");
+        case 0x0121: return wxT("BM_QUERYCHECKINDEX");
+        case 0x0122: return wxT("BM_QUERYHILITE");
+        case 0x0123: return wxT("BM_SETHILITE");
+        case 0x0124: return wxT("BM_QUERYCHECK");
+        case 0x0125: return wxT("BM_SETCHECK");
+        case 0x0126: return wxT("BM_SETDEFAULT");
+        case 0x0128: return wxT("BM_AUTOSIZE");
+        // Combo boxes
+        case 0x029A: return wxT("CBID_LIST");
+        case 0x029B: return wxT("CBID_EDIT");
+        case 0x0170: return wxT("CBM_SHOWLIST");
+        case 0x0171: return wxT("CBM_HILITE");
+        case 0x0172: return wxT("CBM_ISLISTSHOWING");
+        // Edit fields
+        case 0x0140: return wxT("EM_QUERYCHANGED");
+        case 0x0141: return wxT("EM_QUERYSEL");
+        case 0x0142: return wxT("EM_SETSEL");
+        case 0x0143: return wxT("EM_SETTEXTLIMIT");
+        case 0x0144: return wxT("EM_CUT");
+        case 0x0145: return wxT("EM_COPY");
+        case 0x0146: return wxT("EM_CLEAR");
+        case 0x0147: return wxT("EM_PASTE");
+        case 0x0148: return wxT("EM_QUERYFIRSTCHAR");
+        case 0x0149: return wxT("EM_SETFIRSTCHAR");
+        case 0x014A: return wxT("EM_QUERYREADONLY");
+        case 0x014B: return wxT("EM_SETREADONLY");
+        case 0x014C: return wxT("EM_SETINSERTMODE");
+        // Listboxes
+        case 0x0160: return wxT("LM_QUERYITEMCOUNT");
+        case 0x0161: return wxT("LM_INSERTITEM");
+        case 0x0162: return wxT("LM_SETOPENINDEX");
+        case 0x0163: return wxT("LM_DELETEITEM");
+        case 0x0164: return wxT("LM_SELECTITEM");
+        case 0x0165: return wxT("LM_QUERYSELECTION");
+        case 0x0166: return wxT("LM_SETITEMTEXT");
+        case 0x0167: return wxT("LM_QUERYITEMTEXTLENGTH");
+        case 0x0168: return wxT("LM_QUERYITEMTEXT");
+        case 0x0169: return wxT("LM_SETITEMHANDLE");
+        case 0x016A: return wxT("LM_QUERYITEMHANDLE");
+        case 0x016B: return wxT("LM_SEARCHSTRING");
+        case 0x016C: return wxT("LM_SETITEMHEIGHT");
+        case 0x016D: return wxT("LM_QUERYTOPINDEX");
+        case 0x016E: return wxT("LM_DELETEALL");
+        case 0x016F: return wxT("LM_INSERTMULITEMS");
+        case 0x0660: return wxT("LM_SETITEMWIDTH");
+        // Menus
+        case 0x0180: return wxT("MM_INSERTITEM");
+        case 0x0181: return wxT("MM_DELETEITEM");
+        case 0x0182: return wxT("MM_QUERYITEM");
+        case 0x0183: return wxT("MM_SETITEM");
+        case 0x0184: return wxT("MM_QUERYITEMCOUNT");
+        case 0x0185: return wxT("MM_STARTMENUMODE");
+        case 0x0186: return wxT("MM_ENDMENUMODE");
+        case 0x0188: return wxT("MM_REMOVEITEM");
+        case 0x0189: return wxT("MM_SELECTITEM");
+        case 0x018A: return wxT("MM_QUERYSELITEMID");
+        case 0x018B: return wxT("MM_QUERYITEMTEXT");
+        case 0x018C: return wxT("MM_QUERYITEMTEXTLENGTH");
+        case 0x018D: return wxT("MM_SETITEMHANDLE");
+        case 0x018E: return wxT("MM_SETITEMTEXT");
+        case 0x018F: return wxT("MM_ITEMPOSITIONFROMID");
+        case 0x0190: return wxT("MM_ITEMIDFROMPOSITION");
+        case 0x0191: return wxT("MM_QUERYITEMATTR");
+        case 0x0192: return wxT("MM_SETITEMATTR");
+        case 0x0193: return wxT("MM_ISITEMVALID");
+        case 0x0194: return wxT("MM_QUERYITEMRECT");
+        case 0x0431: return wxT("MM_QUERYDEFAULTITEMID");
+        case 0x0432: return wxT("MM_SETDEFAULTITEMID");
+        // Scrollbars
+        case 0x01A0: return wxT("SBM_SETSCROLLBAR");
+        case 0x01A1: return wxT("SBM_SETPOS");
+        case 0x01A2: return wxT("SBM_QUERYPOS");
+        case 0x01A3: return wxT("SBM_QUERYRANGE");
+        case 0x01A6: return wxT("SBM_SETTHUMBSIZE");
+
+        // Help messages
+        case 0x0F00: return wxT("WM_HELPBASE");
+        case 0x0FFF: return wxT("WM_HELPTOP");
+        // Beginning of user defined messages
+        case 0x1000: return wxT("WM_USER");
+
+        // wxWidgets user defined types
 
         // listview
 
         // 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";
+        // case 0x1000 + 0: return wxT("LVM_GETBKCOLOR");
+        case 0x1000 + 1: return wxT("LVM_SETBKCOLOR");
+        case 0x1000 + 2: return wxT("LVM_GETIMAGELIST");
+        case 0x1000 + 3: return wxT("LVM_SETIMAGELIST");
+        case 0x1000 + 4: return wxT("LVM_GETITEMCOUNT");
+        case 0x1000 + 5: return wxT("LVM_GETITEMA");
+        case 0x1000 + 75: return wxT("LVM_GETITEMW");
+        case 0x1000 + 6: return wxT("LVM_SETITEMA");
+        case 0x1000 + 76: return wxT("LVM_SETITEMW");
+        case 0x1000 + 7: return wxT("LVM_INSERTITEMA");
+        case 0x1000 + 77: return wxT("LVM_INSERTITEMW");
+        case 0x1000 + 8: return wxT("LVM_DELETEITEM");
+        case 0x1000 + 9: return wxT("LVM_DELETEALLITEMS");
+        case 0x1000 + 10: return wxT("LVM_GETCALLBACKMASK");
+        case 0x1000 + 11: return wxT("LVM_SETCALLBACKMASK");
+        case 0x1000 + 12: return wxT("LVM_GETNEXTITEM");
+        case 0x1000 + 13: return wxT("LVM_FINDITEMA");
+        case 0x1000 + 83: return wxT("LVM_FINDITEMW");
+        case 0x1000 + 14: return wxT("LVM_GETITEMRECT");
+        case 0x1000 + 15: return wxT("LVM_SETITEMPOSITION");
+        case 0x1000 + 16: return wxT("LVM_GETITEMPOSITION");
+        case 0x1000 + 17: return wxT("LVM_GETSTRINGWIDTHA");
+        case 0x1000 + 87: return wxT("LVM_GETSTRINGWIDTHW");
+        case 0x1000 + 18: return wxT("LVM_HITTEST");
+        case 0x1000 + 19: return wxT("LVM_ENSUREVISIBLE");
+        case 0x1000 + 20: return wxT("LVM_SCROLL");
+        case 0x1000 + 21: return wxT("LVM_REDRAWITEMS");
+        case 0x1000 + 22: return wxT("LVM_ARRANGE");
+        case 0x1000 + 23: return wxT("LVM_EDITLABELA");
+        case 0x1000 + 118: return wxT("LVM_EDITLABELW");
+        case 0x1000 + 24: return wxT("LVM_GETEDITCONTROL");
+        case 0x1000 + 25: return wxT("LVM_GETCOLUMNA");
+        case 0x1000 + 95: return wxT("LVM_GETCOLUMNW");
+        case 0x1000 + 26: return wxT("LVM_SETCOLUMNA");
+        case 0x1000 + 96: return wxT("LVM_SETCOLUMNW");
+        case 0x1000 + 27: return wxT("LVM_INSERTCOLUMNA");
+        case 0x1000 + 97: return wxT("LVM_INSERTCOLUMNW");
+        case 0x1000 + 28: return wxT("LVM_DELETECOLUMN");
+        case 0x1000 + 29: return wxT("LVM_GETCOLUMNWIDTH");
+        case 0x1000 + 30: return wxT("LVM_SETCOLUMNWIDTH");
+        case 0x1000 + 31: return wxT("LVM_GETHEADER");
+        case 0x1000 + 33: return wxT("LVM_CREATEDRAGIMAGE");
+        case 0x1000 + 34: return wxT("LVM_GETVIEWRECT");
+        case 0x1000 + 35: return wxT("LVM_GETTEXTCOLOR");
+        case 0x1000 + 36: return wxT("LVM_SETTEXTCOLOR");
+        case 0x1000 + 37: return wxT("LVM_GETTEXTBKCOLOR");
+        case 0x1000 + 38: return wxT("LVM_SETTEXTBKCOLOR");
+        case 0x1000 + 39: return wxT("LVM_GETTOPINDEX");
+        case 0x1000 + 40: return wxT("LVM_GETCOUNTPERPAGE");
+        case 0x1000 + 41: return wxT("LVM_GETORIGIN");
+        case 0x1000 + 42: return wxT("LVM_UPDATE");
+        case 0x1000 + 43: return wxT("LVM_SETITEMSTATE");
+        case 0x1000 + 44: return wxT("LVM_GETITEMSTATE");
+        case 0x1000 + 45: return wxT("LVM_GETITEMTEXTA");
+        case 0x1000 + 115: return wxT("LVM_GETITEMTEXTW");
+        case 0x1000 + 46: return wxT("LVM_SETITEMTEXTA");
+        case 0x1000 + 116: return wxT("LVM_SETITEMTEXTW");
+        case 0x1000 + 47: return wxT("LVM_SETITEMCOUNT");
+        case 0x1000 + 48: return wxT("LVM_SORTITEMS");
+        case 0x1000 + 49: return wxT("LVM_SETITEMPOSITION32");
+        case 0x1000 + 50: return wxT("LVM_GETSELECTEDCOUNT");
+        case 0x1000 + 51: return wxT("LVM_GETITEMSPACING");
+        case 0x1000 + 52: return wxT("LVM_GETISEARCHSTRINGA");
+        case 0x1000 + 117: return wxT("LVM_GETISEARCHSTRINGW");
+        case 0x1000 + 53: return wxT("LVM_SETICONSPACING");
+        case 0x1000 + 54: return wxT("LVM_SETEXTENDEDLISTVIEWSTYLE");
+        case 0x1000 + 55: return wxT("LVM_GETEXTENDEDLISTVIEWSTYLE");
+        case 0x1000 + 56: return wxT("LVM_GETSUBITEMRECT");
+        case 0x1000 + 57: return wxT("LVM_SUBITEMHITTEST");
+        case 0x1000 + 58: return wxT("LVM_SETCOLUMNORDERARRAY");
+        case 0x1000 + 59: return wxT("LVM_GETCOLUMNORDERARRAY");
+        case 0x1000 + 60: return wxT("LVM_SETHOTITEM");
+        case 0x1000 + 61: return wxT("LVM_GETHOTITEM");
+        case 0x1000 + 62: return wxT("LVM_SETHOTCURSOR");
+        case 0x1000 + 63: return wxT("LVM_GETHOTCURSOR");
+        case 0x1000 + 64: return wxT("LVM_APPROXIMATEVIEWRECT");
+        case 0x1000 + 65: return wxT("LVM_SETWORKAREA");
 
         // tree view
 
         // 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";
+        case 0x1100 + 0: return wxT("TVM_INSERTITEMA");
+        case 0x1100 + 50: return wxT("TVM_INSERTITEMW");
+        case 0x1100 + 1: return wxT("TVM_DELETEITEM");
+        case 0x1100 + 2: return wxT("TVM_EXPAND");
+        case 0x1100 + 4: return wxT("TVM_GETITEMRECT");
+        case 0x1100 + 5: return wxT("TVM_GETCOUNT");
+        case 0x1100 + 6: return wxT("TVM_GETINDENT");
+        case 0x1100 + 7: return wxT("TVM_SETINDENT");
+        case 0x1100 + 8: return wxT("TVM_GETIMAGELIST");
+        case 0x1100 + 9: return wxT("TVM_SETIMAGELIST");
+        case 0x1100 + 10: return wxT("TVM_GETNEXTITEM");
+        case 0x1100 + 11: return wxT("TVM_SELECTITEM");
+        case 0x1100 + 12: return wxT("TVM_GETITEMA");
+        case 0x1100 + 62: return wxT("TVM_GETITEMW");
+        case 0x1100 + 13: return wxT("TVM_SETITEMA");
+        case 0x1100 + 63: return wxT("TVM_SETITEMW");
+        case 0x1100 + 14: return wxT("TVM_EDITLABELA");
+        case 0x1100 + 65: return wxT("TVM_EDITLABELW");
+        case 0x1100 + 15: return wxT("TVM_GETEDITCONTROL");
+        case 0x1100 + 16: return wxT("TVM_GETVISIBLECOUNT");
+        case 0x1100 + 17: return wxT("TVM_HITTEST");
+        case 0x1100 + 18: return wxT("TVM_CREATEDRAGIMAGE");
+        case 0x1100 + 19: return wxT("TVM_SORTCHILDREN");
+        case 0x1100 + 20: return wxT("TVM_ENSUREVISIBLE");
+        case 0x1100 + 21: return wxT("TVM_SORTCHILDRENCB");
+        case 0x1100 + 22: return wxT("TVM_ENDEDITLABELNOW");
+        case 0x1100 + 23: return wxT("TVM_GETISEARCHSTRINGA");
+        case 0x1100 + 64: return wxT("TVM_GETISEARCHSTRINGW");
+        case 0x1100 + 24: return wxT("TVM_SETTOOLTIPS");
+        case 0x1100 + 25: return wxT("TVM_GETTOOLTIPS");
 
         // header
 
         // 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";
+        case 0x1200 + 0: return wxT("HDM_GETITEMCOUNT");
+        case 0x1200 + 1: return wxT("HDM_INSERTITEMA");
+        case 0x1200 + 10: return wxT("HDM_INSERTITEMW");
+        case 0x1200 + 2: return wxT("HDM_DELETEITEM");
+        case 0x1200 + 3: return wxT("HDM_GETITEMA");
+        case 0x1200 + 11: return wxT("HDM_GETITEMW");
+        case 0x1200 + 4: return wxT("HDM_SETITEMA");
+        case 0x1200 + 12: return wxT("HDM_SETITEMW");
+        case 0x1200 + 5: return wxT("HDM_LAYOUT");
+        case 0x1200 + 6: return wxT("HDM_HITTEST");
+        case 0x1200 + 7: return wxT("HDM_GETITEMRECT");
+        case 0x1200 + 8: return wxT("HDM_SETIMAGELIST");
+        case 0x1200 + 9: return wxT("HDM_GETIMAGELIST");
+        case 0x1200 + 15: return wxT("HDM_ORDERTOINDEX");
+        case 0x1200 + 16: return wxT("HDM_CREATEDRAGIMAGE");
+        case 0x1200 + 17: return wxT("HDM_GETORDERARRAY");
+        case 0x1200 + 18: return wxT("HDM_SETORDERARRAY");
+        case 0x1200 + 19: return wxT("HDM_SETHOTDIVIDER");
 
         // tab control
 
         // 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";
+        case 0x1300 + 2: return wxT("TCM_GETIMAGELIST");
+        case 0x1300 + 3: return wxT("TCM_SETIMAGELIST");
+        case 0x1300 + 4: return wxT("TCM_GETITEMCOUNT");
+        case 0x1300 + 5: return wxT("TCM_GETITEMA");
+        case 0x1300 + 60: return wxT("TCM_GETITEMW");
+        case 0x1300 + 6: return wxT("TCM_SETITEMA");
+        case 0x1300 + 61: return wxT("TCM_SETITEMW");
+        case 0x1300 + 7: return wxT("TCM_INSERTITEMA");
+        case 0x1300 + 62: return wxT("TCM_INSERTITEMW");
+        case 0x1300 + 8: return wxT("TCM_DELETEITEM");
+        case 0x1300 + 9: return wxT("TCM_DELETEALLITEMS");
+        case 0x1300 + 10: return wxT("TCM_GETITEMRECT");
+        case 0x1300 + 11: return wxT("TCM_GETCURSEL");
+        case 0x1300 + 12: return wxT("TCM_SETCURSEL");
+        case 0x1300 + 13: return wxT("TCM_HITTEST");
+        case 0x1300 + 14: return wxT("TCM_SETITEMEXTRA");
+        case 0x1300 + 40: return wxT("TCM_ADJUSTRECT");
+        case 0x1300 + 41: return wxT("TCM_SETITEMSIZE");
+        case 0x1300 + 42: return wxT("TCM_REMOVEIMAGE");
+        case 0x1300 + 43: return wxT("TCM_SETPADDING");
+        case 0x1300 + 44: return wxT("TCM_GETROWCOUNT");
+        case 0x1300 + 45: return wxT("TCM_GETTOOLTIPS");
+        case 0x1300 + 46: return wxT("TCM_SETTOOLTIPS");
+        case 0x1300 + 47: return wxT("TCM_GETCURFOCUS");
+        case 0x1300 + 48: return wxT("TCM_SETCURFOCUS");
+        case 0x1300 + 49: return wxT("TCM_SETMINTABWIDTH");
+        case 0x1300 + 50: return wxT("TCM_DESELECTALL");
 
         // toolbar
 
         // toolbar
-        case WM_USER+1: return "TB_ENABLEBUTTON";
-        case WM_USER+2: return "TB_CHECKBUTTON";
-        case WM_USER+3: return "TB_PRESSBUTTON";
-        case WM_USER+4: return "TB_HIDEBUTTON";
-        case WM_USER+5: return "TB_INDETERMINATE";
-        case WM_USER+9: return "TB_ISBUTTONENABLED";
-        case WM_USER+10: return "TB_ISBUTTONCHECKED";
-        case WM_USER+11: return "TB_ISBUTTONPRESSED";
-        case WM_USER+12: return "TB_ISBUTTONHIDDEN";
-        case WM_USER+13: return "TB_ISBUTTONINDETERMINATE";
-        case WM_USER+17: return "TB_SETSTATE";
-        case WM_USER+18: return "TB_GETSTATE";
-        case WM_USER+19: return "TB_ADDBITMAP";
-        case WM_USER+20: return "TB_ADDBUTTONS";
-        case WM_USER+21: return "TB_INSERTBUTTON";
-        case WM_USER+22: return "TB_DELETEBUTTON";
-        case WM_USER+23: return "TB_GETBUTTON";
-        case WM_USER+24: return "TB_BUTTONCOUNT";
-        case WM_USER+25: return "TB_COMMANDTOINDEX";
-        case WM_USER+26: return "TB_SAVERESTOREA";
-        case WM_USER+76: return "TB_SAVERESTOREW";
-        case WM_USER+27: return "TB_CUSTOMIZE";
-        case WM_USER+28: return "TB_ADDSTRINGA";
-        case WM_USER+77: return "TB_ADDSTRINGW";
-        case WM_USER+29: return "TB_GETITEMRECT";
-        case WM_USER+30: return "TB_BUTTONSTRUCTSIZE";
-        case WM_USER+31: return "TB_SETBUTTONSIZE";
-        case WM_USER+32: return "TB_SETBITMAPSIZE";
-        case WM_USER+33: return "TB_AUTOSIZE";
-        case WM_USER+35: return "TB_GETTOOLTIPS";
-        case WM_USER+36: return "TB_SETTOOLTIPS";
-        case WM_USER+37: return "TB_SETPARENT";
-        case WM_USER+39: return "TB_SETROWS";
-        case WM_USER+40: return "TB_GETROWS";
-        case WM_USER+42: return "TB_SETCMDID";
-        case WM_USER+43: return "TB_CHANGEBITMAP";
-        case WM_USER+44: return "TB_GETBITMAP";
-        case WM_USER+45: return "TB_GETBUTTONTEXTA";
-        case WM_USER+75: return "TB_GETBUTTONTEXTW";
-        case WM_USER+46: return "TB_REPLACEBITMAP";
-        case WM_USER+47: return "TB_SETINDENT";
-        case WM_USER+48: return "TB_SETIMAGELIST";
-        case WM_USER+49: return "TB_GETIMAGELIST";
-        case WM_USER+50: return "TB_LOADIMAGES";
-        case WM_USER+51: return "TB_GETRECT";
-        case WM_USER+52: return "TB_SETHOTIMAGELIST";
-        case WM_USER+53: return "TB_GETHOTIMAGELIST";
-        case WM_USER+54: return "TB_SETDISABLEDIMAGELIST";
-        case WM_USER+55: return "TB_GETDISABLEDIMAGELIST";
-        case WM_USER+56: return "TB_SETSTYLE";
-        case WM_USER+57: return "TB_GETSTYLE";
-        case WM_USER+58: return "TB_GETBUTTONSIZE";
-        case WM_USER+59: return "TB_SETBUTTONWIDTH";
-        case WM_USER+60: return "TB_SETMAXTEXTROWS";
-        case WM_USER+61: return "TB_GETTEXTROWS";
-        case WM_USER+41: return "TB_GETBITMAPFLAGS";
-
-#endif //WIN32
+        case WM_USER+1000+1: return wxT("TB_ENABLEBUTTON");
+        case WM_USER+1000+2: return wxT("TB_CHECKBUTTON");
+        case WM_USER+1000+3: return wxT("TB_PRESSBUTTON");
+        case WM_USER+1000+4: return wxT("TB_HIDEBUTTON");
+        case WM_USER+1000+5: return wxT("TB_INDETERMINATE");
+        case WM_USER+1000+9: return wxT("TB_ISBUTTONENABLED");
+        case WM_USER+1000+10: return wxT("TB_ISBUTTONCHECKED");
+        case WM_USER+1000+11: return wxT("TB_ISBUTTONPRESSED");
+        case WM_USER+1000+12: return wxT("TB_ISBUTTONHIDDEN");
+        case WM_USER+1000+13: return wxT("TB_ISBUTTONINDETERMINATE");
+        case WM_USER+1000+17: return wxT("TB_SETSTATE");
+        case WM_USER+1000+18: return wxT("TB_GETSTATE");
+        case WM_USER+1000+19: return wxT("TB_ADDBITMAP");
+        case WM_USER+1000+20: return wxT("TB_ADDBUTTONS");
+        case WM_USER+1000+21: return wxT("TB_INSERTBUTTON");
+        case WM_USER+1000+22: return wxT("TB_DELETEBUTTON");
+        case WM_USER+1000+23: return wxT("TB_GETBUTTON");
+        case WM_USER+1000+24: return wxT("TB_BUTTONCOUNT");
+        case WM_USER+1000+25: return wxT("TB_COMMANDTOINDEX");
+        case WM_USER+1000+26: return wxT("TB_SAVERESTOREA");
+        case WM_USER+1000+76: return wxT("TB_SAVERESTOREW");
+        case WM_USER+1000+27: return wxT("TB_CUSTOMIZE");
+        case WM_USER+1000+28: return wxT("TB_ADDSTRINGA");
+        case WM_USER+1000+77: return wxT("TB_ADDSTRINGW");
+        case WM_USER+1000+29: return wxT("TB_GETITEMRECT");
+        case WM_USER+1000+30: return wxT("TB_BUTTONSTRUCTSIZE");
+        case WM_USER+1000+31: return wxT("TB_SETBUTTONSIZE");
+        case WM_USER+1000+32: return wxT("TB_SETBITMAPSIZE");
+        case WM_USER+1000+33: return wxT("TB_AUTOSIZE");
+        case WM_USER+1000+35: return wxT("TB_GETTOOLTIPS");
+        case WM_USER+1000+36: return wxT("TB_SETTOOLTIPS");
+        case WM_USER+1000+37: return wxT("TB_SETPARENT");
+        case WM_USER+1000+39: return wxT("TB_SETROWS");
+        case WM_USER+1000+40: return wxT("TB_GETROWS");
+        case WM_USER+1000+42: return wxT("TB_SETCMDID");
+        case WM_USER+1000+43: return wxT("TB_CHANGEBITMAP");
+        case WM_USER+1000+44: return wxT("TB_GETBITMAP");
+        case WM_USER+1000+45: return wxT("TB_GETBUTTONTEXTA");
+        case WM_USER+1000+75: return wxT("TB_GETBUTTONTEXTW");
+        case WM_USER+1000+46: return wxT("TB_REPLACEBITMAP");
+        case WM_USER+1000+47: return wxT("TB_SETINDENT");
+        case WM_USER+1000+48: return wxT("TB_SETIMAGELIST");
+        case WM_USER+1000+49: return wxT("TB_GETIMAGELIST");
+        case WM_USER+1000+50: return wxT("TB_LOADIMAGES");
+        case WM_USER+1000+51: return wxT("TB_GETRECT");
+        case WM_USER+1000+52: return wxT("TB_SETHOTIMAGELIST");
+        case WM_USER+1000+53: return wxT("TB_GETHOTIMAGELIST");
+        case WM_USER+1000+54: return wxT("TB_SETDISABLEDIMAGELIST");
+        case WM_USER+1000+55: return wxT("TB_GETDISABLEDIMAGELIST");
+        case WM_USER+1000+56: return wxT("TB_SETSTYLE");
+        case WM_USER+1000+57: return wxT("TB_GETSTYLE");
+        case WM_USER+1000+58: return wxT("TB_GETBUTTONSIZE");
+        case WM_USER+1000+59: return wxT("TB_SETBUTTONWIDTH");
+        case WM_USER+1000+60: return wxT("TB_SETMAXTEXTROWS");
+        case WM_USER+1000+61: return wxT("TB_GETTEXTROWS");
+        case WM_USER+1000+41: return wxT("TB_GETBITMAPFLAGS");
+    }
 
 
-        default:
-            static char s_szBuf[128];
-            sprintf(s_szBuf, "<unknown message = %d>", message);
-            return s_szBuf;
+    static wxString s_szBuf;
+    s_szBuf.Printf(wxT("<unknown message = %d>"), nMessage);
+    return s_szBuf.c_str();
+
+} // end of wxGetMessageName
+
+#endif // __WXDEBUG__
+
+// Unused?
+#if 0
+static void TranslateKbdEventToMouse(
+  wxWindow*                         pWin
+, int*                              pX
+, int*                              pY
+, ULONG*                            pFlags
+)
+{
+    //
+    // 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
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& WXUNUSED(rPt))
+{
+    return wxFindWindowAtPoint(wxGetMousePosition());
+}
+
+wxWindow* wxFindWindowAtPoint(const wxPoint& rPt)
+{
+    POINTL vPt2;
+
+    vPt2.x = rPt.x;
+    vPt2.y = rPt.y;
+
+    HWND      hWndHit = ::WinWindowFromPoint(HWND_DESKTOP, &vPt2, FALSE);
+    wxWindow* pWin = wxFindWinFromHandle((WXHWND)hWndHit) ;
+    HWND      hWnd = hWndHit;
+
+    //
+    // 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 NULL;
+    return pWin;
 }
 
 }
 
-#endif // __WXDEBUG__
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    POINTL vPt;
+
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPt);
+    return wxPoint(vPt.x, vPt.y);
+}
+
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    wxPoint pt = wxGetMousePosition();
+    ms.SetX(pt.x);
+    ms.SetY(pt.y);
+    ms.SetLeftDown(IsKeyDown(VK_BUTTON1));
+    ms.SetMiddleDown(IsKeyDown(VK_BUTTON3));
+    ms.SetRightDown(IsKeyDown(VK_BUTTON2));
+    ms.SetControlDown(IsCtrlDown());
+    ms.SetShiftDown(IsShiftDown());
+    ms.SetAltDown(IsKeyDown(VK_ALT)|IsKeyDown(VK_ALTGRAF));
+    ms.SetMetaDown(IsKeyDown(VK_ALTGRAF));
+    return ms;
+}
+
+
+wxWindowOS2* FindWindowForMouseEvent( wxWindow* pWin,
+                                      short*    WXUNUSED(pnX),
+                                      short*    WXUNUSED(pnY) )
+{
+    HWND   hWnd = GetHwndOf(pWin);
+    HWND   hWndUnderMouse;
+    POINTL vPoint;
+    BOOL   rcEnabled = FALSE;
+    BOOL   rcVisible = FALSE;
+
+    ::WinQueryPointerPos(HWND_DESKTOP, &vPoint);
+    hWndUnderMouse = ::WinWindowFromPoint(HWND_DESKTOP, &vPoint, TRUE);
+    if (hWndUnderMouse != HWND_DESKTOP)
+    {
+        wxWindow*                   pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse);
+
+        if (pWinUnderMouse)
+        {
+            wxWindowList::compatibility_iterator current = pWinUnderMouse->GetChildren().GetFirst();
+            wxWindow*               pGrandChild = NULL;
+            RECTL                   vRect;
+            POINTL                  vPoint2;
+
+            ::WinMapWindowPoints(HWND_DESKTOP, hWndUnderMouse, &vPoint, 1);
+            //
+            // Find a child window mouse might be under
+            //
+            while (current)
+            {
+                wxWindow*                   pChild = current->GetData();
+
+                vPoint2.x = vPoint.x;
+                vPoint2.y = vPoint.y;
+                ::WinMapWindowPoints(hWndUnderMouse, pChild->GetHWND(), &vPoint2, 1);
+                ::WinQueryWindowRect(pChild->GetHWND(), &vRect);
+                if (::WinPtInRect(vHabmain, &vRect, &vPoint2))
+                {
+                    if (pChild->IsTopLevel())
+                    {
+                        POINTL                  vPoint3;
+                        wxWindowList::compatibility_iterator current2 =pChild->GetChildren().GetFirst();
+
+                        while (current2)
+                        {
+                            wxWindow*           pGrandChild = current2->GetData();
+
+                            vPoint3.x = vPoint2.x;
+                            vPoint3.y = vPoint2.y;
+                            ::WinMapWindowPoints( pChild->GetHWND()
+                                                 ,pGrandChild->GetHWND()
+                                                 ,&vPoint3
+                                                 ,1
+                                                );
+                            ::WinQueryWindowRect(pGrandChild->GetHWND(), &vRect);
+                            if (::WinPtInRect(vHabmain, &vRect, &vPoint3))
+                            {
+                                hWndUnderMouse = GetHwndOf(pGrandChild);
+                                pWinUnderMouse = pGrandChild;
+                                break;
+                            }
+                            current2 = current2->GetNext();
+                        }
+                        if (pGrandChild)
+                            break;
+                    }
+                    hWndUnderMouse = GetHwndOf(pChild);
+                    pWinUnderMouse = pChild;
+                    rcVisible = ::WinIsWindowVisible(hWndUnderMouse);
+                    rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse);
+                    if (rcVisible && rcEnabled)
+                        break;
+                }
+                current = current->GetNext();
+            }
+        }
+    }
+    rcVisible = ::WinIsWindowVisible(hWndUnderMouse);
+    rcEnabled = ::WinIsWindowEnabled(hWndUnderMouse);
+
+
+    //
+    // Check that we have a child window which is susceptible to receive mouse
+    // events: for this it must be shown and enabled
+    //
+    if ( hWndUnderMouse &&
+         hWndUnderMouse != hWnd &&
+         rcVisible && rcEnabled)
+    {
+        wxWindow*                       pWinUnderMouse = wxFindWinFromHandle((WXHWND)hWndUnderMouse);
 
 
+        if (pWinUnderMouse)
+        {
+            //
+            // Translate the mouse coords to the other window coords
+            //
+            pWin = pWinUnderMouse;
+        }
+    }
+    return pWin;
+} // end of FindWindowForMouseEvent
wxWidgets (Impactor)