added wxListView class: this is going to be a wxListCtrl with human (inter)face

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 38fb38c0ef4359ca77c7a67b06c2b839c4bffec4..5b07081f99cfaedefa4c32f5444a4340cbef3ca0 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1,4614 +1,4932 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        windows.cpp
+// Name:        src/msw/windows.cpp

 // Purpose:     wxWindow
 // Author:      Julian Smart
 // Purpose:     wxWindow
 // Author:      Julian Smart

-// Modified by:
+// Modified by: VZ on 13.05.99: no more Default(), MSWOnXXX() reorganisation

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "window.h"
+    #pragma implementation "window.h"

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/menu.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/panel.h"
-#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+    #include "wx/window.h"
+    #include "wx/accel.h"
+    #include "wx/setup.h"
+    #include "wx/menu.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/panel.h"
+    #include "wx/layout.h"
+    #include "wx/dialog.h"
+    #include "wx/frame.h"
+    #include "wx/listbox.h"
+    #include "wx/button.h"
+    #include "wx/msgdlg.h"
+    #include "wx/settings.h"
+
+    #include <stdio.h>

 #endif
 
 #endif
 

-#if     USE_OWNER_DRAWN
-#include "wx/ownerdrw.h"
+#if wxUSE_OWNER_DRAWN
+    #include "wx/ownerdrw.h"

 #endif
 
 #endif
 

-#if     USE_DRAG_AND_DROP
-#include "wx/msw/ole/droptgt.h"
+#if wxUSE_DRAG_AND_DROP
+    #include "wx/dnd.h"

 #endif
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 #endif
 
 #include "wx/menuitem.h"
 #include "wx/log.h"

+

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
+
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET
+
+#if wxUSE_SPINCTRL
+    #include "wx/spinctrl.h"
+#endif // wxUSE_SPINCTRL
+
+#include "wx/intl.h"
+#include "wx/log.h"
+
+#include "wx/textctrl.h"
+#include "wx/notebook.h"
+

 #include <string.h>
 
 #include <string.h>
 

-#ifndef __GNUWIN32__
-#include <shellapi.h>
-#include <mmsystem.h>
+#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__)
+    #include <shellapi.h>
+    #include <mmsystem.h>

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-#include <windowsx.h>
-#endif
-
-#ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
+    #include <windowsx.h>

 #endif
 
 #endif
 

-#ifdef GetCharWidth
-#undef GetCharWidth
+#if (!defined(__GNUWIN32_OLD__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__)
+    #ifdef __WIN95__
+        #include <commctrl.h>
+    #endif
+#elif !defined(__WXMICROWIN__) // broken compiler
+    #ifndef __TWIN32__
+        #include "wx/msw/gnuwin32/extra.h"
+    #endif

 #endif
 
 #endif
 

-#ifdef FindWindow
-#undef FindWindow
+// This didn't appear in mingw until 2.95.2
+#ifndef SIF_TRACKPOS
+#define SIF_TRACKPOS 16

 #endif
 
 #endif
 

-#ifdef GetClassName
-#undef GetClassName
+#if wxUSE_MOUSEWHEEL
+    #ifndef WM_MOUSEWHEEL
+        #define WM_MOUSEWHEEL           0x020A
+    #endif
+    #ifndef WHEEL_DELTA
+        #define WHEEL_DELTA             120
+    #endif
+    #ifndef SPI_GETWHEELSCROLLLINES
+        #define SPI_GETWHEELSCROLLLINES 104
+    #endif

 #endif
 
 #endif
 

-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif

 
 

-#ifdef  __WXDEBUG__
-  static const char *GetMessageName(int message);
-#endif  //WXDEBUG
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------

 
 

-#define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
+// the last Windows message we got (MT-UNSAFE)
+extern MSG s_currentMsg;

 
 

+#if wxUSE_MENUS_NATIVE

 wxMenu *wxCurrentPopupMenu = NULL;
 wxMenu *wxCurrentPopupMenu = NULL;

-extern wxList wxPendingDelete;
+#endif // wxUSE_MENUS_NATIVE

 
 

-void wxRemoveHandleAssociation(wxWindow *win);
-void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
-wxWindow *wxFindWinFromHandle(WXHWND hWnd);
+extern wxList WXDLLEXPORT wxPendingDelete;
+extern const wxChar *wxCanvasClassName;
+
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+// the window proc for all our windows
+LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
+                                   WPARAM wParam, LPARAM lParam);

 
 

-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_CHAR(wxWindow::OnChar)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
+#ifdef  __WXDEBUG__
+    const char *wxGetMessageName(int message);
+#endif  //__WXDEBUG__
+
+void wxRemoveHandleAssociation(wxWindowMSW *win);
+void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win);
+wxWindow *wxFindWinFromHandle(WXHWND hWnd);
+
+// this magical function is used to translate VK_APPS key presses to right
+// mouse clicks
+static void TranslateKbdEventToMouse(wxWindowMSW *win,
+                                     int *x, int *y, WPARAM *flags);
+
+// get the text metrics for the current font
+static TEXTMETRIC wxGetTextMetrics(const wxWindowMSW *win);
+
+// check if the mouse is in the window or its child
+//static bool IsMouseInWindow(HWND hwnd);
+
+// ---------------------------------------------------------------------------
+// event tables
+// ---------------------------------------------------------------------------
+
+// in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
+// method
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowMSW, wxWindowBase)
+#else // __WXMSW__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMSW__
+
+BEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)
+    EVT_ERASE_BACKGROUND(wxWindowMSW::OnEraseBackground)
+    EVT_SYS_COLOUR_CHANGED(wxWindowMSW::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindowMSW::OnInitDialog)
+    EVT_IDLE(wxWindowMSW::OnIdle)
+    EVT_SET_FOCUS(wxWindowMSW::OnSetFocus)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxWindow utility functions
+// ---------------------------------------------------------------------------

 
 // Find an item given the MS Windows id
 
 // Find an item given the MS Windows id

-wxWindow *wxWindow::FindItem(int id) const
+wxWindow *wxWindowMSW::FindItem(long id) const

 {
 {

-  if (!GetChildren())
-    return NULL;
-  wxNode *current = GetChildren()->First();
-  while (current)
-  {
-    wxWindow *childWin = (wxWindow *)current->Data();
-
-    wxWindow *wnd = childWin->FindItem(id) ;
-    if (wnd)
-      return wnd ;
+#if wxUSE_CONTROLS
+    wxControl *item = wxDynamicThisCast(this, wxControl);
+    if ( item )
+    {
+        // is it we or one of our "internal" children?
+        if ( item->GetId() == id
+#ifndef __WXUNIVERSAL__
+                || (item->GetSubcontrols().Index(id) != wxNOT_FOUND)
+#endif // __WXUNIVERSAL__
+           )
+        {
+            return item;
+        }
+    }
+#endif // wxUSE_CONTROLS

 
 

-    if (childWin->IsKindOf(CLASSINFO(wxControl)))
+    wxWindowList::Node *current = GetChildren().GetFirst();
+    while (current)

     {
     {

-      wxControl *item = (wxControl *)childWin;
-      if (item->m_windowId == id)
-        return item;
-      else
-      {
-        // In case it's a 'virtual' control (e.g. radiobox)
-        if (item->GetSubcontrols().Member((wxObject *)id))
-          return item;
-      }
+        wxWindow *childWin = current->GetData();
+
+        wxWindow *wnd = childWin->FindItem(id);
+        if ( wnd )
+            return wnd;
+
+        current = current->GetNext();

     }
     }

-    current = current->Next();
-  }
-  return NULL;
-}

 
 

-// Find an item given the MS Windows handle
-wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
-{
-  if (!GetChildren())

     return NULL;
     return NULL;

-  wxNode *current = GetChildren()->First();
-  while (current)
-  {
-    wxObject *obj = (wxObject *)current->Data() ;
-    // Do a recursive search.
-    wxWindow *parent = (wxWindow *)obj ;
-    wxWindow *wnd = parent->FindItemByHWND(hWnd) ;
-    if (wnd)
-      return wnd ;
-
-    if ((!controlOnly) || obj->IsKindOf(CLASSINFO(wxControl)))
-    {
-      wxWindow *item = (wxWindow *)current->Data();
-      if ((HWND)(item->GetHWND()) == (HWND) hWnd)
-        return item;
-      else
-      {
-               if ( item->ContainsHWND(hWnd) )
-                       return item;
-      }
-    }
-    current = current->Next();
-  }
-  return NULL;
-}
-
-// Default command handler
-bool wxWindow::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
-{
-  return FALSE;

 }
 
 }
 

-bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
+// Find an item given the MS Windows handle
+wxWindow *wxWindowMSW::FindItemByHWND(WXHWND hWnd, bool controlOnly) const

 {
 {

-  return FALSE;
-}
+    wxWindowList::Node *current = GetChildren().GetFirst();
+    while (current)
+    {
+        wxWindow *parent = current->GetData();
+
+        // Do a recursive search.
+        wxWindow *wnd = parent->FindItemByHWND(hWnd);
+        if ( wnd )
+            return wnd;
+
+        if ( !controlOnly
+#if wxUSE_CONTROLS
+                || parent->IsKindOf(CLASSINFO(wxControl))
+#endif // wxUSE_CONTROLS
+           )
+        {
+            wxWindow *item = current->GetData();
+            if ( item->GetHWND() == hWnd )
+                return item;
+            else
+            {
+                if ( item->ContainsHWND(hWnd) )
+                    return item;
+            }
+        }

 
 

-void wxWindow::PreDelete(WXHDC WXUNUSED(dc))
-{
+        current = current->GetNext();
+    }
+    return NULL;

 }
 
 }
 

-WXHWND wxWindow::GetHWND(void) const
+// Default command handler
+bool wxWindowMSW::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))

 {
 {

-  return (WXHWND) m_hWnd;
+    return FALSE;

 }
 
 }
 

-void wxWindow::SetHWND(WXHWND hWnd)
-{
-       m_hWnd = hWnd;
-}
+// ----------------------------------------------------------------------------
+// constructors and such
+// ----------------------------------------------------------------------------

 
 

-// Constructor
-wxWindow::wxWindow(void)
+void wxWindowMSW::Init()

 {
 {

-  // Generic
-  m_windowId = 0;
-  m_isShown = TRUE;
-  m_windowStyle = 0;
-  m_windowParent = NULL;
-  m_windowEventHandler = this;
-  m_windowName = "";
-  m_windowCursor = *wxSTANDARD_CURSOR;
-  m_children = new wxList;
-  m_doubleClickAllowed = 0 ;
-  m_winCaptured = FALSE;
-  m_constraints = NULL;
-  m_constraintsInvolvedIn = NULL;
-  m_windowSizer = NULL;
-  m_sizerParent = NULL;
-  m_autoLayout = FALSE;
-  m_windowValidator = NULL;
-
-  // MSW-specific
-  m_hWnd = 0;
-  m_winEnabled = TRUE;
-  m_caretWidth = 0; m_caretHeight = 0;
-  m_caretEnabled = FALSE;
-  m_caretShown = FALSE;
-  m_inOnSize = FALSE;
-  m_minSizeX = -1;
-  m_minSizeY = -1;
-  m_maxSizeX = -1;
-  m_maxSizeY = -1;
-//  m_paintHDC = 0;
-//  m_tempHDC = 0;
-  m_isBeingDeleted = FALSE;
-  m_oldWndProc = 0;
-#ifndef __WIN32__
-  m_globalHandle = 0;
-#endif
-  m_useCtl3D = FALSE;
+    // generic
+    InitBase();

 
 

-  m_defaultItem = NULL;
+    // MSW specific
+    m_doubleClickAllowed = 0;

 
 

-  wxSystemSettings settings;
+    m_isBeingDeleted = FALSE;
+    m_oldWndProc = 0;
+    m_useCtl3D = FALSE;
+    m_mouseInWindow = FALSE;

 
 

-  m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-  m_foregroundColour = *wxBLACK;
-  m_defaultForegroundColour = *wxBLACK ;
-  m_defaultBackgroundColour = settings.GetSystemColour(wxSYS_COLOUR_3DFACE) ;
+    // wxWnd
+    m_hMenu = 0;

 
 

-/*
-    wxColour(GetRValue(GetSysColor(COLOR_WINDOW)),
-       GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
-*/
+    m_hWnd = 0;

 
 

-  // wxWnd
-  m_lastMsg = 0;
-  m_lastWParam = 0;
-  m_lastLParam = 0;
-  m_acceleratorTable = 0;
-  m_hMenu = 0;
+    // pass WM_GETDLGCODE to DefWindowProc()
+    m_lDlgCode = 0;

 
 

-  m_xThumbSize = 0;
-  m_yThumbSize = 0;
-  m_backgroundTransparent = FALSE;
+    m_xThumbSize = 0;
+    m_yThumbSize = 0;
+    m_backgroundTransparent = FALSE;

 
 

-  m_lastXPos = (float)-1.0;
-  m_lastYPos = (float)-1.0;
-  m_lastEvent = -1;
-  m_returnCode = 0;
+    // as all windows are created with WS_VISIBLE style...
+    m_isShown = TRUE;

 
 

-#if  USE_DRAG_AND_DROP
-  m_pDropTarget = NULL;
-#endif
+#if wxUSE_MOUSEEVENT_HACK
+    m_lastMouseX =
+    m_lastMouseY = -1;
+    m_lastMouseEvent = -1;
+#endif // wxUSE_MOUSEEVENT_HACK

 }
 
 // Destructor
 }
 
 // Destructor

-wxWindow::~wxWindow(void)
-{
-  m_isBeingDeleted = TRUE;
-
-  // JACS - if behaviour is odd, restore this
-  // to the start of ~wxWindow. Vadim has changed
-  // it to nearer the end. Unsure of side-effects
-  // e.g. when deleting associated global data.
-  // Restore old Window proc, if required
-//  UnsubclassWin();
-
-       // Have to delete constraints/sizer FIRST otherwise
-       // sizers may try to look at deleted windows as they
-       // delete themselves.
-#if USE_CONSTRAINTS
-  DeleteRelatedConstraints();
-  if (m_constraints)
-  {
-    // This removes any dangling pointers to this window
-    // in other windows' constraintsInvolvedIn lists.
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-    m_constraints = NULL;
-  }
-  if (m_windowSizer)
-  {
-    delete m_windowSizer;
-    m_windowSizer = NULL;
-  }
-  // If this is a child of a sizer, remove self from parent
-  if (m_sizerParent)
-    m_sizerParent->RemoveChild((wxWindow *)this);
-#endif
+wxWindowMSW::~wxWindowMSW()
+{
+    m_isBeingDeleted = TRUE;

 
 

-  // wxWnd
-  MSWDetachWindowMenu();
+    MSWDetachWindowMenu();

 
 

-  // TODO for backward compatibility
-#if 0
-  // WX_CANVAS
-  if (m_windowDC)
-  {
-    HWND hWnd = (HWND) GetHWND();
-    HDC dc = ::GetDC(hWnd);
-    m_windowDC->SelectOldObjects (dc);
-    ReleaseDC(hWnd, dc);
-    delete m_windowDC;
-  }
-#endif
+    // VS: make sure there's no wxFrame with last focus set to us:
+    for (wxWindow *win = GetParent(); win; win = win->GetParent())
+    {
+        wxFrame *frame = wxDynamicCast(win, wxFrame);
+        if ( frame )
+        {
+            if ( frame->GetLastFocus() == this )
+                frame->SetLastFocus((wxWindow*)NULL);
+            break;
+        }
+    }
+
+    // VS: destroy children first and _then_ detach *this from its parent.
+    //     If we'd do it the other way around, children wouldn't be able
+    //     find their parent frame (see above).
+    DestroyChildren();

 
 

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

 
 

-  DestroyChildren();
+    if ( m_hWnd )
+    {
+        // VZ: test temp removed to understand what really happens here
+        //if (::IsWindow(GetHwnd()))
+        {
+            if ( !::DestroyWindow(GetHwnd()) )
+                wxLogLastError(wxT("DestroyWindow"));
+        }

 
 

-  if (m_hWnd)
-    ::DestroyWindow((HWND)m_hWnd);
+        // remove hWnd <-> wxWindow association
+        wxRemoveHandleAssociation(this);
+    }
+}

 
 

-  wxRemoveHandleAssociation(this);
-  m_hWnd = 0;
-#ifndef __WIN32__
-  if (m_globalHandle)
-  {
-    GlobalFree((HGLOBAL) m_globalHandle);
-    m_globalHandle = 0;
-  }
-#endif
+// real construction (Init() must have been called before!)
+bool wxWindowMSW::Create(wxWindow *parent,
+                         wxWindowID id,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxString& name)
+{
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );

 
 

-  delete m_children;
-  m_children = NULL;
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return FALSE;

 
 

-  // Just in case the window has been Closed, but
-  // we're then deleting immediately: don't leave
-  // dangling pointers.
-  wxPendingDelete.DeleteObject(this);
+    parent->AddChild(this);
+
+    // all windows are created visible
+    DWORD msflags = WS_CHILD | WS_VISIBLE;
+
+#ifdef __WXUNIVERSAL__
+    // no 3d effects, we draw them ourselves
+    WXDWORD exStyle = 0;
+#else // !wxUniversal
+    if ( style & wxCLIP_CHILDREN )
+        msflags |= WS_CLIPCHILDREN;
+    if ( style & wxCLIP_SIBLINGS )
+        msflags |= WS_CLIPSIBLINGS;
+
+    bool want3D;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+
+    // Even with extended styles, need to combine with WS_BORDER
+    // for them to look right.
+    if ( want3D ||
+        (m_windowStyle & (wxBORDER |
+                          wxSIMPLE_BORDER |
+                          wxRAISED_BORDER |
+                          wxSUNKEN_BORDER |
+                          wxDOUBLE_BORDER)) )
+    {
+        msflags |= WS_BORDER;
+    }

 
 

-  // Just in case we've loaded a top-level window via
-  // wxWindow::LoadNativeDialog but we weren't a dialog
-  // class
-  wxTopLevelWindows.DeleteObject(this);
+    // calculate the value to return from WM_GETDLGCODE handler
+    if ( GetWindowStyleFlag() & wxWANTS_CHARS )
+    {
+        // want everything: i.e. all keys and WM_CHAR message
+        m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS |
+                     DLGC_WANTTAB | DLGC_WANTMESSAGE;
+    }
+#endif // wxUniversal/!wxUniversal

 
 

-//  if (GetFont() && GetFont()->Ok())
-//    GetFont()->ReleaseResource();
+    if ( style & wxPOPUP_WINDOW )
+    {
+        // a popup window floats on top of everything
+        exStyle |= WS_EX_TOPMOST | WS_EX_TOOLWINDOW;

 
 

-  if ( m_windowValidator )
-       delete m_windowValidator;
+        // it is also created hidden as other top level windows
+        msflags &= ~WS_VISIBLE;
+        m_isShown = FALSE;
+    }

 
 

-  // Restore old Window proc, if required 
-  // and remove hWnd <-> wxWindow association
-  UnsubclassWin();
+    return MSWCreate(m_windowId, parent, wxCanvasClassName,
+                     (wxWindow *)this, NULL,
+                     pos.x, pos.y,
+                     WidthDefault(size.x), HeightDefault(size.y),
+                     msflags, NULL, exStyle);

 }
 
 }
 

-// Destroy the window (delayed, if a managed window)
-bool wxWindow::Destroy(void)
+// ---------------------------------------------------------------------------
+// basic operations
+// ---------------------------------------------------------------------------
+
+void wxWindowMSW::SetFocus()

 {
 {

-    delete this;
-    return TRUE;
-}
+    HWND hWnd = GetHwnd();
+    wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );

 
 

-extern char wxCanvasClassName[];
-
-// Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-  // Generic
-  m_isBeingDeleted = FALSE;
-  m_windowId = 0;
-  m_isShown = TRUE;
-  m_windowStyle = 0;
-  m_windowParent = NULL;
-  m_windowEventHandler = this;
-//  m_windowFont = NULL;
-  // We don't wish internal (potentially transient) fonts to be found
-  // by FindOrCreate
-//  wxTheFontList->RemoveFont(& m_windowFont);
-  m_windowName = "";
-  m_windowCursor = *wxSTANDARD_CURSOR;
-  m_doubleClickAllowed = 0 ;
-  m_winCaptured = FALSE;
-  m_constraints = NULL;
-  m_constraintsInvolvedIn = NULL;
-  m_windowSizer = NULL;
-  m_sizerParent = NULL;
-  m_autoLayout = FALSE;
-  m_windowValidator = NULL;
-#if  USE_DRAG_AND_DROP
-  m_pDropTarget = NULL;
+#ifndef __WXMICROWIN__
+    ::SetLastError(0);

 #endif
 
 #endif
 

-  // MSW-specific
-  m_hWnd = 0;
-  m_winEnabled = TRUE;
-  m_caretWidth = 0; m_caretHeight = 0;
-  m_caretEnabled = FALSE;
-  m_caretShown = FALSE;
-  m_inOnSize = FALSE;
-  m_minSizeX = -1;
-  m_minSizeY = -1;
-  m_maxSizeX = -1;
-  m_maxSizeY = -1;
-//  m_paintHDC = 0;
-//  m_tempHDC = 0;
-  m_oldWndProc = 0;
-#ifndef __WIN32__
-  m_globalHandle = 0;
-#endif
-  m_useCtl3D = FALSE;
-  m_defaultItem = NULL;
-  m_windowParent = NULL;
-//  m_windowDC = NULL;
-  m_mouseInWindow = FALSE;
-  if (!parent)
-    return FALSE;
+    if ( !::SetFocus(hWnd) )
+    {
+        // was there really an error?
+#ifndef __WXMICROWIN__
+        DWORD dwRes = ::GetLastError();
+#else

 
 

-  if (parent) parent->AddChild(this);
+        DWORD dwRes = 0;
+#endif
+        if ( dwRes )
+        {
+            wxLogApiError(_T("SetFocus"), dwRes);
+        }

 
 

-  // wxWnd
-  m_lastMsg = 0;
-  m_lastWParam = 0;
-  m_lastLParam = 0;
-  m_acceleratorTable = 0;
-  m_hMenu = 0;
+        // VZ: just why does this happen sometimes?? any idea?
+#if 0
+        HWND hwndFocus = ::GetFocus();
+        wxASSERT_MSG( hwndFocus == hWnd, _T("SetFocus() didn't work?") );
+#endif // 0
+    }
+}

 
 

-  m_xThumbSize = 0;
-  m_yThumbSize = 0;
-  m_backgroundTransparent = FALSE;
+// Get the window with the focus
+wxWindow *wxWindowBase::FindFocus()
+{
+    HWND hWnd = ::GetFocus();
+    if ( hWnd )
+    {
+        return wxGetWindowFromHWND((WXHWND)hWnd);
+    }

 
 

-  m_lastXPos = (float)-1.0;
-  m_lastYPos = (float)-1.0;
-  m_lastEvent = -1;
-  m_returnCode = 0;
+    return NULL;
+}

 
 

-  SetName(name);
+bool wxWindowMSW::Enable(bool enable)
+{
+    if ( !wxWindowBase::Enable(enable) )
+        return FALSE;

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::EnableWindow(hWnd, (BOOL)enable);

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    // VZ: no, this is a bad idea: imagine that you have a dialog with some
+    //     disabled controls and disable it - you really wouldn't like the
+    //     disabled controls be reenabled too when you reenable the dialog!
+#if 0
+    wxWindowList::Node *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        child->Enable(enable);

 
 

-  wxSystemSettings settings;
+        node = node->GetNext();
+    }
+#endif // 0

 
 

-  m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-  m_foregroundColour = *wxBLACK;
-  m_defaultForegroundColour = *wxBLACK ;
-  m_defaultBackgroundColour = settings.GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-/*
-  m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
-       GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
-*/
+    return TRUE;
+}

 
 

-  m_windowStyle = style;
+bool wxWindowMSW::Show(bool show)
+{
+    if ( !wxWindowBase::Show(show) )
+        return FALSE;

 
 

-  DWORD msflags = 0;
-  if (style & wxBORDER)
-    msflags |= WS_BORDER;
-  if (style & wxTHICK_FRAME)
-    msflags |= WS_THICKFRAME;
+    HWND hWnd = GetHwnd();
+    int cshow = show ? SW_SHOW : SW_HIDE;
+    ::ShowWindow(hWnd, cshow);

 
 

-  msflags |= WS_CHILD | WS_VISIBLE;
-  if (style & wxCLIP_CHILDREN)
-    msflags |= WS_CLIPCHILDREN;
+    if ( show )
+    {
+#ifdef __WXMICROWIN__
+        // It seems that MicroWindows brings the _parent_ of the
+        // window to the top, which can be the wrong one.

 
 

-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+        // activate (set focus to) specified window
+        ::SetFocus(hWnd);

 
 

-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
-    msflags |= WS_BORDER;
+        // raise top level parent to top of z order
+        ::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0,
+                SWP_NOMOVE|SWP_NOSIZE);
+#else
+        BringWindowToTop(hWnd);
+#endif
+    }

 
 

-  m_mouseInWindow = FALSE ;
+    return TRUE;
+}

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+// Raise the window to the top of the Z order
+void wxWindowMSW::Raise()
+{
+#ifdef __WIN16__
+    ::BringWindowToTop(GetHwnd());
+#else // Win32
+#ifdef __WXMICROWIN__
+    // It seems that MicroWindows brings the _parent_ of the
+    // window to the top, which can be the wrong one.

 
 

-  MSWCreate(m_windowId, (wxWindow *)parent, wxCanvasClassName, this, NULL, x, y, width, height, msflags,
-    NULL, exStyle);
+    // activate (set focus to) specified window
+    ::SetFocus(GetHwnd());

 
 

-  return TRUE;
+    // raise top level parent to top of z order
+    ::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+#else
+    ::SetForegroundWindow(GetHwnd());
+#endif
+#endif

 }
 
 }
 

-void wxWindow::SetFocus(void)
+// Lower the window to the bottom of the Z order
+void wxWindowMSW::Lower()

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetFocus(hWnd);
+    ::SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0,
+                   SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);

 }
 
 }
 

-void wxWindow::Enable(bool enable)
+void wxWindowMSW::SetTitle( const wxString& title)

 {
 {

-  m_winEnabled = enable;
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::EnableWindow(hWnd, (BOOL)enable);
+    SetWindowText(GetHwnd(), title.c_str());

 }
 
 }
 

-void wxWindow::CaptureMouse(void)
+wxString wxWindowMSW::GetTitle() const

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd && !m_winCaptured)
-  {
-    SetCapture(hWnd);
-    m_winCaptured = TRUE;
-  }
+    return wxGetWindowText(GetHWND());

 }
 
 }
 

-void wxWindow::ReleaseMouse(void)
+void wxWindowMSW::CaptureMouse()

 {
 {

-  if (m_winCaptured)
-  {
-    ReleaseCapture();
-    m_winCaptured = FALSE;
-  }
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+        ::SetCapture(hWnd);
+    }

 }
 
 }
 

-// Push/pop event handler (i.e. allow a chain of event handlers
-// be searched)
-void wxWindow::PushEventHandler(wxEvtHandler *handler)
+void wxWindowMSW::ReleaseMouse()

 {
 {

-       handler->SetNextHandler(GetEventHandler());
-       SetEventHandler(handler);
+    if ( !::ReleaseCapture() )
+    {
+        wxLogLastError(_T("ReleaseCapture"));
+    }

 }
 
 }
 

-wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
+/* static */ wxWindow *wxWindowBase::GetCapture()

 {
 {

-       if ( GetEventHandler() )
-       {
-               wxEvtHandler *handlerA = GetEventHandler();
-               wxEvtHandler *handlerB = handlerA->GetNextHandler();
-               handlerA->SetNextHandler(NULL);
-               SetEventHandler(handlerB);
-               if ( deleteHandler )
-               {
-                       delete handlerA;
-                       return NULL;
-               }
-               else
-                       return handlerA;
-       }
-       else
-               return NULL;
+    HWND hwnd = ::GetCapture();
+    return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : (wxWindow *)NULL;

 }
 
 }
 

-#if    USE_DRAG_AND_DROP
-
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+bool wxWindowMSW::SetFont(const wxFont& font)

 {
 {

-  if ( m_pDropTarget != 0 ) {
-    m_pDropTarget->Revoke(m_hWnd);
-    delete m_pDropTarget;
-  }
+    if ( !wxWindowBase::SetFont(font) )
+    {
+        // nothing to do
+        return FALSE;
+    }

 
 

-  m_pDropTarget = pDropTarget;
-  if ( m_pDropTarget != 0 )
-    m_pDropTarget->Register(m_hWnd);
-}
+    HWND hWnd = GetHwnd();
+    if ( hWnd != 0 )
+    {
+        WXHANDLE hFont = m_font.GetResourceHandle();

 
 

-#endif
+        wxASSERT_MSG( hFont, wxT("should have valid font") );

 
 

-//old style file-manager drag&drop support
-// I think we should retain the old-style
-// DragAcceptFiles in parallel with SetDropTarget.
-// JACS
-void wxWindow::DragAcceptFiles(bool accept)
-{
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::DragAcceptFiles(hWnd, (BOOL)accept);
-}
+        ::SendMessage(hWnd, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(TRUE, 0));
+    }

 
 

-// Get total size
-void wxWindow::GetSize(int *x, int *y) const
-{
-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetWindowRect(hWnd, &rect);
-  *x = rect.right - rect.left;
-  *y = rect.bottom - rect.top;
+    return TRUE;

 }
 }

-
-void wxWindow::GetPosition(int *x, int *y) const
+bool wxWindowMSW::SetCursor(const wxCursor& cursor)

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  HWND hParentWnd = 0;
-  if (GetParent())
-    hParentWnd = (HWND) GetParent()->GetHWND();
-  
-  RECT rect;
-  GetWindowRect(hWnd, &rect);
+    if ( !wxWindowBase::SetCursor(cursor) )
+    {
+        // no change
+        return FALSE;
+    }

 
 

-  // Since we now have the absolute screen coords,
-  // if there's a parent we must subtract its top left corner
-  POINT point;
-  point.x = rect.left;
-  point.y = rect.top;
-  if (hParentWnd)
-  {
-    ::ScreenToClient(hParentWnd, &point);
-  }
-  *x = point.x;
-  *y = point.y;
-}
+    if ( m_cursor.Ok() )
+    {
+        HWND hWnd = GetHwnd();

 
 

-void wxWindow::ScreenToClient(int *x, int *y) const
-{
-  HWND hWnd = (HWND) GetHWND();
-  POINT pt;
-  pt.x = *x;
-  pt.y = *y;
-  ::ScreenToClient(hWnd, &pt);
+        // Change the cursor NOW if we're within the correct window
+        POINT point;
+        ::GetCursorPos(&point);

 
 

-  *x = pt.x;
-  *y = pt.y;
-}
+        RECT rect;
+        ::GetWindowRect(hWnd, &rect);

 
 

-void wxWindow::ClientToScreen(int *x, int *y) const
-{
-  HWND hWnd = (HWND) GetHWND();
-  POINT pt;
-  pt.x = *x;
-  pt.y = *y;
-  ::ClientToScreen(hWnd, &pt);
+        if ( ::PtInRect(&rect, point) && !wxIsBusy() )
+            ::SetCursor(GetHcursorOf(m_cursor));
+    }

 
 

-  *x = pt.x;
-  *y = pt.y;
+    return TRUE;

 }
 
 }
 

-void wxWindow::SetCursor(const wxCursor& cursor)
+void wxWindowMSW::WarpPointer (int x, int y)

 {
 {

-  m_windowCursor = cursor;
-  if (m_windowCursor.Ok())
-  {
-    HWND hWnd = (HWND) GetHWND();
-
-    // Change the cursor NOW if we're within the correct window
-    POINT point;
-    ::GetCursorPos(&point);
+    ClientToScreen(&x, &y);

 
 

-    RECT rect;
-    ::GetWindowRect(hWnd, &rect);
-
-    if (::PtInRect(&rect, point) && !wxIsBusy())
-      ::SetCursor((HCURSOR) m_windowCursor.GetHCURSOR());
-  }
-
-  // This will cause big reentrancy problems if wxFlushEvents is implemented.
-//  wxFlushEvents();
-//  return old_cursor;
+    if ( !::SetCursorPos(x, y) )
+    {
+        wxLogLastError(_T("SetCursorPos"));
+    }

 }
 
 }
 

-
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-// For XView, this is the same as GetSize
-void wxWindow::GetClientSize(int *x, int *y) const
+#if WXWIN_COMPATIBILITY
+void wxWindowMSW::MSWDeviceToLogical (float *x, float *y) const

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  RECT rect;
-  GetClientRect(hWnd, &rect);
-  *x = rect.right;
-  *y = rect.bottom;

 }
 }

+#endif // WXWIN_COMPATIBILITY

 
 

-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int actualWidth = width;
-  int actualHeight = height;
-  int actualX = x;
-  int actualY = y;
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    actualX = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    actualY = currentY;
-
-  int currentW,currentH;
-  GetSize(&currentW, &currentH);
-  if (width == -1)
-    actualWidth = currentW ;
-  if (height == -1)
-    actualHeight = currentH ;
-
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE);
-}
+// ---------------------------------------------------------------------------
+// scrolling stuff
+// ---------------------------------------------------------------------------

 
 

-void wxWindow::SetClientSize(int width, int height)
+#if WXWIN_COMPATIBILITY
+void wxWindowMSW::SetScrollRange(int orient, int range, bool refresh)

 {
 {

-  wxWindow *parent = GetParent();
-  HWND hWnd = (HWND) GetHWND();
-  HWND hParentWnd = (HWND) (HWND) parent->GetHWND();
+#if defined(__WIN95__)

 
 

-  RECT rect;
-  GetClientRect(hWnd, &rect);
+    int range1 = range;

 
 

-  RECT rect2;
-  GetWindowRect(hWnd, &rect2);
+    // Try to adjust the range to cope with page size > 1
+    // - a Windows API quirk
+    int pageSize = GetScrollPage(orient);
+    if ( pageSize > 1 && range > 0)
+    {
+        range1 += (pageSize - 1);
+    }

 
 

-  // Find the difference between the entire window (title bar and all)
-  // and the client area; add this to the new client size to move the
-  // window
-  int actual_width = rect2.right - rect2.left - rect.right + width;
-  int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
+    SCROLLINFO info;
+    int dir;

 
 

-  // If there's a parent, must subtract the parent's top left corner
-  // since MoveWindow moves relative to the parent
+    if ( orient == wxHORIZONTAL ) {
+        dir = SB_HORZ;
+    } else {
+        dir = SB_VERT;
+    }

 
 

-  POINT point;
-  point.x = rect2.left;
-  point.y = rect2.top;
-  if (parent)
-  {
-    ::ScreenToClient(hParentWnd, &point);
-  }
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = pageSize; // Have to set this, or scrollbar goes awry
+    info.nMin = 0;
+    info.nMax = range1;
+    info.nPos = 0;
+    info.fMask = SIF_RANGE | SIF_PAGE;

 
 

-  MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::SetScrollInfo(hWnd, dir, &info, refresh);
+#else
+    int wOrient;
+    if ( orient == wxHORIZONTAL )
+        wOrient = SB_HORZ;
+    else
+        wOrient = SB_VERT;

 
 

-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.SetEventObject(this);
-  GetEventHandler()->ProcessEvent(event);
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::SetScrollRange(hWnd, wOrient, 0, range, refresh);
+#endif

 }
 
 }
 

-bool wxWindow::Show(bool show)
+void wxWindowMSW::SetScrollPage(int orient, int page, bool refresh)

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  int cshow;
-  if (show)
-    cshow = SW_SHOW;
-  else
-    cshow = SW_HIDE;
-  ShowWindow(hWnd, (BOOL)cshow);
-  if (show)
-  {
-    BringWindowToTop(hWnd);
-    // Next line causes a crash on NT, apparently.
-//    UpdateWindow(hWnd); // Should this be here or will it cause inefficiency?
-  }
-  return TRUE;
-}
+#if defined(__WIN95__)
+    SCROLLINFO info;
+    int dir;
+
+    if ( orient == wxHORIZONTAL ) {
+        dir = SB_HORZ;
+        m_xThumbSize = page;
+    } else {
+        dir = SB_VERT;
+        m_yThumbSize = page;
+    }

 
 

-bool wxWindow::IsShown(void) const
-{
-  return (::IsWindowVisible((HWND) GetHWND()) != 0);
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = page;
+    info.nMin = 0;
+    info.fMask = SIF_PAGE;
+
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::SetScrollInfo(hWnd, dir, &info, refresh);
+#else
+    if ( orient == wxHORIZONTAL )
+        m_xThumbSize = page;
+    else
+        m_yThumbSize = page;
+#endif

 }
 
 }
 

-int wxWindow::GetCharHeight(void) const
+int wxWindowMSW::OldGetScrollRange(int orient) const

 {
 {

-  TEXTMETRIC lpTextMetric;
-  HWND hWnd = (HWND) GetHWND();
-  HDC dc = ::GetDC(hWnd);
-
-  GetTextMetrics(dc, &lpTextMetric);
-  ::ReleaseDC(hWnd, dc);
+    int wOrient;
+    if ( orient == wxHORIZONTAL )
+        wOrient = SB_HORZ;
+    else
+        wOrient = SB_VERT;

 
 

-  return lpTextMetric.tmHeight;
+#if __WATCOMC__ && defined(__WINDOWS_386__)
+    short minPos, maxPos;
+#else
+    int minPos, maxPos;
+#endif
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+        ::GetScrollRange(hWnd, wOrient, &minPos, &maxPos);
+#if defined(__WIN95__)
+        // Try to adjust the range to cope with page size > 1
+        // - a Windows API quirk
+        int pageSize = GetScrollPage(orient);
+        if ( pageSize > 1 )
+        {
+            maxPos -= (pageSize - 1);
+        }
+#endif
+        return maxPos;
+    }
+    else
+        return 0;

 }
 
 }
 

-int wxWindow::GetCharWidth(void) const
+int wxWindowMSW::GetScrollPage(int orient) const

 {
 {

-  TEXTMETRIC lpTextMetric;
-  HWND hWnd = (HWND) GetHWND();
-  HDC dc = ::GetDC(hWnd);
+    if ( orient == wxHORIZONTAL )
+        return m_xThumbSize;
+    else
+        return m_yThumbSize;
+}

 
 

-  GetTextMetrics(dc, &lpTextMetric);
-  ::ReleaseDC(hWnd, dc);
+#endif // WXWIN_COMPATIBILITY

 
 

-  return lpTextMetric.tmAveCharWidth;
+int wxWindowMSW::GetScrollPos(int orient) const
+{
+    int wOrient;
+    if ( orient == wxHORIZONTAL )
+        wOrient = SB_HORZ;
+    else
+        wOrient = SB_VERT;
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+#ifdef __WXMICROWIN__
+        return ::GetScrollPosWX(hWnd, wOrient);
+#else
+        return ::GetScrollPos(hWnd, wOrient);
+#endif
+    }
+    else
+        return 0;

 }
 
 }
 

-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
+// This now returns the whole range, not just the number
+// of positions that we can scroll.
+int wxWindowMSW::GetScrollRange(int orient) const

 {
 {

-  wxFont *fontToUse = (wxFont *)theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont *) & m_windowFont;
-
-  HWND hWnd = (HWND) GetHWND();
-  HDC dc = ::GetDC(hWnd);
-
-  HFONT fnt = 0; 
-  HFONT was = 0;
-  if (fontToUse && fontToUse->Ok())
-  {
-    if ((fnt=(HFONT) fontToUse->GetResourceHandle()))
-      was = (HFONT) SelectObject(dc,fnt) ;
-  }
-
-  SIZE sizeRect;
-  TEXTMETRIC tm;
-  GetTextExtentPoint(dc, (const char *)string, (int)string.Length(), &sizeRect);
-  GetTextMetrics(dc, &tm);
-
-  if (fontToUse && fnt && was) 
-    SelectObject(dc,was) ; 
-
-  ReleaseDC(hWnd, dc);
+    int wOrient;
+    if ( orient == wxHORIZONTAL )
+        wOrient = SB_HORZ;
+    else
+        wOrient = SB_VERT;

 
 

-  *x = sizeRect.cx;
-  *y = sizeRect.cy;
-  if (descent) *descent = tm.tmDescent;
-  if (externalLeading) *externalLeading = tm.tmExternalLeading;
+#if __WATCOMC__ && defined(__WINDOWS_386__)
+    short minPos, maxPos;
+#else
+    int minPos, maxPos;
+#endif
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+        ::GetScrollRange(hWnd, wOrient, &minPos, &maxPos);
+#if defined(__WIN95__)
+        // Try to adjust the range to cope with page size > 1
+        // - a Windows API quirk
+        int pageSize = GetScrollThumb(orient);
+        if ( pageSize > 1 )
+        {
+            maxPos -= (pageSize - 1);
+        }
+        // October 10th: new range concept.
+        maxPos += pageSize;
+#endif

 
 

-//  if (fontToUse)
-//    fontToUse->ReleaseResource();
+        return maxPos;
+    }
+    else
+        return 0;

 }
 
 }
 

-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+int wxWindowMSW::GetScrollThumb(int orient) const

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-  {
-    if (rect)
-    {
-      RECT mswRect;
-      mswRect.left = rect->x;
-      mswRect.top = rect->y;
-      mswRect.right = rect->x + rect->width;
-      mswRect.bottom = rect->y + rect->height;
-      
-      ::InvalidateRect(hWnd, &mswRect, eraseBack);
-    }
+    if ( orient == wxHORIZONTAL )
+        return m_xThumbSize;

     else
     else

-      ::InvalidateRect(hWnd, NULL, eraseBack);
-  }
+        return m_yThumbSize;

 }
 
 }
 

-// Hook for new window just as it's being created,
-// when the window isn't yet associated with the handle
-wxWindow *wxWndHook = NULL;
+void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh)
+{
+#if defined(__WIN95__)
+    SCROLLINFO info;
+    int dir;
+
+    if ( orient == wxHORIZONTAL ) {
+        dir = SB_HORZ;
+    } else {
+        dir = SB_VERT;
+    }

 
 

-// Main window proc
-LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
-
-  if (!wnd && wxWndHook)
-  {
-       wxAssociateWinWithHandle(hWnd, wxWndHook);
-    wnd = wxWndHook;
-       wxWndHook = NULL;
-    wnd->m_hWnd = (WXHWND) hWnd;
-  }
-#if (WXDEBUG > 1)
-  wxDebugMsg("hWnd = %d, m_hWnd = %d, msg = %d\n", hWnd, m_hWnd, message);
-#endif
-  // Stop right here if we don't have a valid handle
-  // in our wxWnd object.
-  if (wnd && !wnd->m_hWnd) {
-//    wxDebugMsg("Warning: could not find a valid handle, wx_win.cc/wxWndProc.\n");
-    wnd->m_hWnd = (WXHWND) hWnd;
-    long res = wnd->MSWDefWindowProc(message, wParam, lParam );
-    wnd->m_hWnd = 0;
-    return res;
-  }
-
-  if (wnd) {
-    wnd->m_lastMsg = message;
-    wnd->m_lastWParam = wParam;
-    wnd->m_lastLParam = lParam;
-  }
-  if (wnd)
-    return wnd->MSWWindowProc(message, wParam, lParam);
-  else
-    return DefWindowProc( hWnd, message, wParam, lParam );
-}
-
-// Should probably have a test for 'genuine' NT
-#if defined(__WIN32__)
-#define DIMENSION_TYPE short
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = 0;
+    info.nMin = 0;
+    info.nPos = pos;
+    info.fMask = SIF_POS;
+
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::SetScrollInfo(hWnd, dir, &info, refresh);

 #else
 #else

-#define DIMENSION_TYPE int
+    int wOrient;
+    if ( orient == wxHORIZONTAL )
+        wOrient = SB_HORZ;
+    else
+        wOrient = SB_VERT;
+
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::SetScrollPos(hWnd, wOrient, pos, refresh);

 #endif
 #endif

+}

 
 

-// Main Windows 3 window proc
-long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+// New function that will replace some of the above.
+void wxWindowMSW::SetScrollbar(int orient, int pos, int thumbVisible,
+                            int range, bool refresh)

 {
 {

-  #ifdef __WXDEBUG__
-    wxLogTrace(wxTraceMessages, "Processing %s", GetMessageName(message));
-  #endif // WXDEBUG
+#if defined(__WIN95__)
+    int oldRange = range - thumbVisible;

 
 

-  HWND hWnd = (HWND)m_hWnd;
+    int range1 = oldRange;

 
 

-  switch (message)
-  {
-        case WM_ACTIVATE:
-        {
-#ifdef __WIN32__
-            WORD state = LOWORD(wParam);
-            WORD minimized = HIWORD(wParam);
-            HWND hwnd = (HWND)lParam;
+    // Try to adjust the range to cope with page size > 1
+    // - a Windows API quirk
+    int pageSize = thumbVisible;
+    if ( pageSize > 1 && range > 0)
+    {
+        range1 += (pageSize - 1);
+    }
+
+    SCROLLINFO info;
+    int dir;
+
+    if ( orient == wxHORIZONTAL ) {
+        dir = SB_HORZ;
+    } else {
+        dir = SB_VERT;
+    }
+
+    info.cbSize = sizeof(SCROLLINFO);
+    info.nPage = pageSize; // Have to set this, or scrollbar goes awry
+    info.nMin = 0;
+    info.nMax = range1;
+    info.nPos = pos;
+    info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS;
+
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::SetScrollInfo(hWnd, dir, &info, refresh);

 #else
 #else

-            WORD state = (WORD)wParam;
-            WORD minimized = LOWORD(lParam);
-            HWND hwnd = (HWND)HIWORD(lParam);
+    int wOrient;
+    if ( orient == wxHORIZONTAL )
+        wOrient = SB_HORZ;
+    else
+        wOrient = SB_VERT;
+
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+        ::SetScrollRange(hWnd, wOrient, 0, range, FALSE);
+        ::SetScrollPos(hWnd, wOrient, pos, refresh);
+    }

 #endif
 #endif

-            MSWOnActivate(state, (minimized != 0), (WXHWND) hwnd);
-            return 0;
-            break;
+    if ( orient == wxHORIZONTAL ) {
+        m_xThumbSize = thumbVisible;
+    } else {
+        m_yThumbSize = thumbVisible;
+    }
+}
+
+void wxWindowMSW::ScrollWindow(int dx, int dy, const wxRect *prect)
+{
+    RECT rect;
+    if ( prect )
+    {
+        rect.left = prect->x;
+        rect.top = prect->y;
+        rect.right = prect->x + prect->width;
+        rect.bottom = prect->y + prect->height;
+    }
+
+    ::ScrollWindow(GetHwnd(), dx, dy, prect ? &rect : NULL, NULL);
+}
+
+// ---------------------------------------------------------------------------
+// subclassing
+// ---------------------------------------------------------------------------
+
+void wxWindowMSW::SubclassWin(WXHWND hWnd)
+{
+    wxASSERT_MSG( !m_oldWndProc, wxT("subclassing window twice?") );
+
+    HWND hwnd = (HWND)hWnd;
+    wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in SubclassWin") );
+
+    wxAssociateWinWithHandle(hwnd, this);
+
+    m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+
+    wxASSERT( (WXFARPROC) m_oldWndProc != (WXFARPROC) wxWndProc );
+
+    SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);
+}
+
+void wxWindowMSW::UnsubclassWin()
+{
+    wxRemoveHandleAssociation(this);
+
+    // Restore old Window proc
+    HWND hwnd = GetHwnd();
+    if ( hwnd )
+    {
+        m_hWnd = 0;
+
+        wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in UnsubclassWin") );
+
+        FARPROC farProc = (FARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+        if ( (m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc) )
+        {
+            SetWindowLong(hwnd, GWL_WNDPROC, (LONG) m_oldWndProc);
+            m_oldWndProc = 0;

         }
         }

-        case WM_SETFOCUS:
+    }
+}
+
+// Make a Windows extended style from the given wxWindows window style
+WXDWORD wxWindowMSW::MakeExtendedStyle(long style, bool eliminateBorders)
+{
+    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 defined(__WIN95__)
+        if ( style & wxRAISED_BORDER )
+            // It seems that WS_EX_WINDOWEDGE doesn't work, but WS_EX_DLGMODALFRAME does
+            exStyle |= WS_EX_DLGMODALFRAME; /* WS_EX_WINDOWEDGE */;
+        if ( style & wxSTATIC_BORDER )
+            exStyle |= WS_EX_STATICEDGE;
+#endif
+    }
+    return exStyle;
+}
+
+// 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 wxWindowMSW::Determine3DEffects(WXDWORD defaultBorderStyle,
+                                     bool *want3D) const
+{
+    // If matches certain criteria, then assume no 3D effects
+    // unless specifically requested (dealt with in MakeExtendedStyle)
+    if ( !GetParent()
+#if wxUSE_CONTROLS
+            || !IsKindOf(CLASSINFO(wxControl))
+#endif // wxUSE_CONTROLS
+            || (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();
+
+    // 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;
+
+    // 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) )
+    {
+        *want3D = TRUE;
+        nativeBorder = TRUE;
+    }
+
+    // 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
+
+    DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder);
+
+    // 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 WXWIN_COMPATIBILITY
+// If nothing defined for this, try the parent.
+// E.g. we may be a button loaded from a resource, with no callback function
+// defined.
+void wxWindowMSW::OnCommand(wxWindow& win, wxCommandEvent& event)
+{
+    if ( GetEventHandler()->ProcessEvent(event)  )
+        return;
+    if ( m_parent )
+        m_parent->GetEventHandler()->OnCommand(win, event);
+}
+#endif // WXWIN_COMPATIBILITY_2
+
+#if WXWIN_COMPATIBILITY
+wxObject* wxWindowMSW::GetChild(int number) const
+{
+    // Return a pointer to the Nth object in the Panel
+    wxNode *node = GetChildren().First();
+    int n = number;
+    while (node && n--)
+        node = node->Next();
+    if ( node )
+    {
+        wxObject *obj = (wxObject *)node->Data();
+        return(obj);
+    }
+    else
+        return NULL;
+}
+#endif // WXWIN_COMPATIBILITY
+
+// Setup background and foreground colours correctly
+void wxWindowMSW::SetupColours()
+{
+    if ( GetParent() )
+        SetBackgroundColour(GetParent()->GetBackgroundColour());
+}
+
+bool wxWindowMSW::IsMouseInWindow() const
+{
+    // get the mouse position
+    POINT pt;
+    ::GetCursorPos(&pt);
+
+    // find the window which currently has the cursor and go up the window
+    // chain until we find this window - or exhaust it
+    HWND hwnd = ::WindowFromPoint(pt);
+    while ( hwnd && (hwnd != GetHwnd()) )
+        hwnd = ::GetParent(hwnd);
+
+    return hwnd != NULL;
+}
+
+void wxWindowMSW::OnIdle(wxIdleEvent& WXUNUSED(event))
+{
+    // Check if we need to send a LEAVE event
+    if ( m_mouseInWindow )
+    {
+        if ( !IsMouseInWindow() )

         {
         {

-            HWND hwnd = (HWND)wParam;
-//            return OnSetFocus(hwnd);
+            // Generate a LEAVE event
+            m_mouseInWindow = FALSE;

 
 

-            if (MSWOnSetFocus((WXHWND) hwnd))
-              return 0;
-            else return MSWDefWindowProc(message, wParam, lParam );
-            break;
+            // Unfortunately the mouse button and keyboard state may have
+            // changed by the time the OnIdle function is called, so 'state'
+            // may be meaningless.
+            int state = 0;
+            if ( wxIsShiftDown() )
+                state |= MK_SHIFT;
+            if ( wxIsCtrlDown() )
+                state |= MK_CONTROL;
+            if ( GetKeyState( VK_LBUTTON ) )
+                state |= MK_LBUTTON;
+            if ( GetKeyState( VK_MBUTTON ) )
+                state |= MK_MBUTTON;
+            if ( GetKeyState( VK_RBUTTON ) )
+                state |= MK_RBUTTON;
+
+            POINT pt;
+            if ( !::GetCursorPos(&pt) )
+            {
+                wxLogLastError(_T("GetCursorPos"));
+            }
+
+            // we need to have client coordinates here for symmetry with
+            // wxEVT_ENTER_WINDOW
+            RECT rect;
+            if ( !::GetWindowRect(GetHwnd(), &rect) )
+            {
+                wxLogLastError(_T("GetWindowRect"));
+            }
+            pt.x -= rect.left;
+            pt.y -= rect.top;
+
+            wxMouseEvent event2(wxEVT_LEAVE_WINDOW);
+            InitMouseEvent(event2, pt.x, pt.y, state);
+
+            (void)GetEventHandler()->ProcessEvent(event2);

         }
         }

-        case WM_KILLFOCUS:
+    }
+
+    UpdateWindowUI();
+}
+
+// Set this window to be the child of 'parent'.
+bool wxWindowMSW::Reparent(wxWindowBase *parent)
+{
+    if ( !wxWindowBase::Reparent(parent) )
+        return FALSE;
+
+    HWND hWndChild = GetHwnd();
+    HWND hWndParent = GetParent() ? GetWinHwnd(GetParent()) : (HWND)0;
+
+    ::SetParent(hWndChild, hWndParent);
+
+    return TRUE;
+}
+
+void wxWindowMSW::Clear()
+{
+    wxClientDC dc((wxWindow *)this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();
+}
+
+void wxWindowMSW::Refresh(bool eraseBack, const wxRect *rect)
+{
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+        if ( rect )

         {
         {

-            HWND hwnd = (HWND)lParam;
-//            return OnKillFocus(hwnd);
-            if (MSWOnKillFocus((WXHWND) hwnd))
-              return 0;
-            else
-              return MSWDefWindowProc(message, wParam, lParam );
-            break;
+            RECT mswRect;
+            mswRect.left = rect->x;
+            mswRect.top = rect->y;
+            mswRect.right = rect->x + rect->width;
+            mswRect.bottom = rect->y + rect->height;
+
+            ::InvalidateRect(hWnd, &mswRect, eraseBack);

         }
         }

-        case WM_CREATE:
+        else
+            ::InvalidateRect(hWnd, NULL, eraseBack);
+    }
+}
+
+void wxWindowMSW::Update()
+{
+    if ( !::UpdateWindow(GetHwnd()) )
+    {
+        wxLogLastError(_T("UpdateWindow"));
+    }
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // just calling UpdateWindow() is not enough, what we did in our WM_PAINT
+    // handler needs to be really drawn right now
+    (void)::GdiFlush();
+#endif // __WIN32__
+}
+
+// ---------------------------------------------------------------------------
+// drag and drop
+// ---------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP
+
+void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
+{
+    if ( m_dropTarget != 0 ) {
+        m_dropTarget->Revoke(m_hWnd);
+        delete m_dropTarget;
+    }
+
+    m_dropTarget = pDropTarget;
+    if ( m_dropTarget != 0 )
+        m_dropTarget->Register(m_hWnd);
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+
+// old style file-manager drag&drop support: we retain the old-style
+// DragAcceptFiles in parallel with SetDropTarget.
+void wxWindowMSW::DragAcceptFiles(bool accept)
+{
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::DragAcceptFiles(hWnd, (BOOL)accept);
+}
+
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS
+
+void wxWindowMSW::DoSetToolTip(wxToolTip *tooltip)
+{
+    wxWindowBase::DoSetToolTip(tooltip);
+
+    if ( m_tooltip )
+        m_tooltip->SetWindow(this);
+}
+
+#endif // wxUSE_TOOLTIPS
+
+// ---------------------------------------------------------------------------
+// moving and resizing
+// ---------------------------------------------------------------------------
+
+// Get total size
+void wxWindowMSW::DoGetSize(int *x, int *y) const
+{
+    HWND hWnd = GetHwnd();
+    RECT rect;
+#ifdef __WIN16__
+    ::GetWindowRect(hWnd, &rect);
+#else
+    if ( !::GetWindowRect(hWnd, &rect) )
+    {
+        wxLogLastError(_T("GetWindowRect"));
+    }
+#endif
+    if ( x )
+        *x = rect.right - rect.left;
+    if ( y )
+        *y = rect.bottom - rect.top;
+}
+
+void wxWindowMSW::DoGetPosition(int *x, int *y) const
+{
+    HWND hWnd = GetHwnd();
+
+    RECT rect;
+    GetWindowRect(hWnd, &rect);
+
+    POINT point;
+    point.x = rect.left;
+    point.y = rect.top;
+
+    // we do the adjustments with respect to the parent only for the "real"
+    // children, not for the dialogs/frames
+    if ( !IsTopLevel() )
+    {
+        HWND hParentWnd = 0;
+        wxWindow *parent = GetParent();
+        if ( parent )
+            hParentWnd = GetWinHwnd(parent);
+
+        // Since we now have the absolute screen coords, if there's a parent we
+        // must subtract its top left corner
+        if ( hParentWnd )

         {
         {

-                MSWOnCreate((WXLPCREATESTRUCT) (LPCREATESTRUCT)lParam);
-                return 0;
-                break;
+            ::ScreenToClient(hParentWnd, &point);

         }
         }

-        case WM_SHOWWINDOW:
+
+        if ( parent )

         {
         {

-                MSWOnShow((wParam != 0), (int) lParam);
-                break;
+            // 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).
+            wxPoint pt(parent->GetClientAreaOrigin());
+            point.x -= pt.x;
+            point.y -= pt.y;

         }
         }

-        case WM_PAINT:
+    }
+
+    if ( x )
+        *x = point.x;
+    if ( y )
+        *y = point.y;
+}
+
+void wxWindowMSW::DoScreenToClient(int *x, int *y) const
+{
+    POINT pt;
+    if ( x )
+        pt.x = *x;
+    if ( y )
+        pt.y = *y;
+
+    HWND hWnd = GetHwnd();
+    ::ScreenToClient(hWnd, &pt);
+
+    if ( x )
+        *x = pt.x;
+    if ( y )
+        *y = pt.y;
+}
+
+void wxWindowMSW::DoClientToScreen(int *x, int *y) const
+{
+    POINT pt;
+    if ( x )
+        pt.x = *x;
+    if ( y )
+        pt.y = *y;
+
+    HWND hWnd = GetHwnd();
+    ::ClientToScreen(hWnd, &pt);
+
+    if ( x )
+        *x = pt.x;
+    if ( y )
+        *y = pt.y;
+}
+
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindowMSW::DoGetClientSize(int *x, int *y) const
+{
+    HWND hWnd = GetHwnd();
+    RECT rect;
+    ::GetClientRect(hWnd, &rect);
+    if ( x )
+        *x = rect.right;
+    if ( y )
+        *y = rect.bottom;
+}
+
+void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
+{
+    if ( !::MoveWindow(GetHwnd(), x, y, width, height, TRUE) )
+    {
+        wxLogLastError(wxT("MoveWindow"));
+    }
+}
+
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
+    {
+        return;
+    }
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
+    wxSize size(-1, -1);
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )

         {
         {

-          if (MSWOnPaint())
-            return 0;
-          else return MSWDefWindowProc(message, wParam, lParam );
-          break;
+            size = DoGetBestSize();
+            width = size.x;

         }
         }

-        case WM_QUERYDRAGICON:
+        else

         {
         {

-          HICON hIcon = 0;
-          if ((hIcon = (HICON) MSWOnQueryDragIcon()))
-            return (long)hIcon;
-          else return MSWDefWindowProc(message, wParam, lParam );
-          break;
+            // just take the current one
+            width = currentW;

         }
         }

+    }

 
 

-        case WM_SIZE:
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )

         {
         {

-          int width = LOWORD(lParam);
-          int height = HIWORD(lParam);
-          MSWOnSize(width, height, wParam);
-          break;
-        }
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above

 
 

-        case WM_WINDOWPOSCHANGING:
+            height = size.y;
+        }
+        else

         {
         {

-          WINDOWPOS *pos = (WINDOWPOS *)lParam;
-          MSWOnWindowPosChanging((void *)pos);
-          break;
+            // just take the current one
+            height = currentH;

         }
         }

+    }

 
 

-        case WM_RBUTTONDOWN:
+    DoMoveWindow(x, y, width, height);
+}
+
+void wxWindowMSW::DoSetClientSize(int width, int height)
+{
+    wxWindow *parent = GetParent();
+    HWND hWnd = GetHwnd();
+    HWND hParentWnd = (HWND) 0;
+    if ( parent )
+        hParentWnd = (HWND) parent->GetHWND();
+
+    RECT rect;
+    ::GetClientRect(hWnd, &rect);
+
+    RECT rect2;
+    GetWindowRect(hWnd, &rect2);
+
+    // Find the difference between the entire window (title bar and all)
+    // and the client area; add this to the new client size to move the
+    // window
+    int actual_width = rect2.right - rect2.left - rect.right + width;
+    int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
+
+    // If there's a parent, must subtract the parent's top left corner
+    // since MoveWindow moves relative to the parent
+
+    POINT point;
+    point.x = rect2.left;
+    point.y = rect2.top;
+    if ( parent )
+    {
+        ::ScreenToClient(hParentWnd, &point);
+    }
+
+    DoMoveWindow(point.x, point.y, actual_width, actual_height);
+
+    wxSizeEvent event(wxSize(width, height), m_windowId);
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+// For implementation purposes - sometimes decorations make the client area
+// smaller
+wxPoint wxWindowMSW::GetClientAreaOrigin() const
+{
+    return wxPoint(0, 0);
+}
+
+// Makes an adjustment to the window position (for example, a frame that has
+// a toolbar that it manages itself).
+void wxWindowMSW::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+{
+    // don't do it for the dialogs/frames - they float independently of their
+    // parent
+    if ( !IsTopLevel() )
+    {
+        wxWindow *parent = GetParent();
+        if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )

         {
         {

-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnRButtonDown(x, y, wParam);
-            break;
+            wxPoint pt(parent->GetClientAreaOrigin());
+            x += pt.x;
+            y += pt.y;

         }
         }

-        case WM_RBUTTONUP:
+    }
+}
+
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------
+
+int wxWindowMSW::GetCharHeight() const
+{
+    return wxGetTextMetrics(this).tmHeight;
+}
+
+int wxWindowMSW::GetCharWidth() const
+{
+    // +1 is needed because Windows apparently adds it when calculating the
+    // dialog units size in pixels
+#if wxDIALOG_UNIT_COMPATIBILITY
+    return wxGetTextMetrics(this).tmAveCharWidth;
+#else
+    return wxGetTextMetrics(this).tmAveCharWidth + 1;
+#endif
+}
+
+void wxWindowMSW::GetTextExtent(const wxString& string,
+                             int *x, int *y,
+                             int *descent, int *externalLeading,
+                             const wxFont *theFont) const
+{
+    const wxFont *fontToUse = theFont;
+    if ( !fontToUse )
+        fontToUse = &m_font;
+
+    HWND hWnd = GetHwnd();
+    HDC dc = ::GetDC(hWnd);
+
+    HFONT fnt = 0;
+    HFONT hfontOld = 0;
+    if ( fontToUse && fontToUse->Ok() )
+    {
+        fnt = (HFONT)((wxFont *)fontToUse)->GetResourceHandle(); // const_cast
+        if ( fnt )
+            hfontOld = (HFONT)SelectObject(dc,fnt);
+    }
+
+    SIZE sizeRect;
+    TEXTMETRIC tm;
+    GetTextExtentPoint(dc, string, (int)string.Length(), &sizeRect);
+    GetTextMetrics(dc, &tm);
+
+    if ( fontToUse && fnt && hfontOld )
+        SelectObject(dc, hfontOld);
+
+    ReleaseDC(hWnd, dc);
+
+    if ( x )
+        *x = sizeRect.cx;
+    if ( y )
+        *y = sizeRect.cy;
+    if ( descent )
+        *descent = tm.tmDescent;
+    if ( externalLeading )
+        *externalLeading = tm.tmExternalLeading;
+}
+
+#if wxUSE_CARET && WXWIN_COMPATIBILITY
+// ---------------------------------------------------------------------------
+// Caret manipulation
+// ---------------------------------------------------------------------------
+
+void wxWindowMSW::CreateCaret(int w, int h)
+{
+    SetCaret(new wxCaret(this, w, h));
+}
+
+void wxWindowMSW::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+{
+    wxFAIL_MSG("not implemented");
+}
+
+void wxWindowMSW::ShowCaret(bool show)
+{
+    wxCHECK_RET( m_caret, "no caret to show" );
+
+    m_caret->Show(show);
+}
+
+void wxWindowMSW::DestroyCaret()
+{
+    SetCaret(NULL);
+}
+
+void wxWindowMSW::SetCaretPos(int x, int y)
+{
+    wxCHECK_RET( m_caret, "no caret to move" );
+
+    m_caret->Move(x, y);
+}
+
+void wxWindowMSW::GetCaretPos(int *x, int *y) const
+{
+    wxCHECK_RET( m_caret, "no caret to get position of" );
+
+    m_caret->GetPosition(x, y);
+}
+#endif // wxUSE_CARET
+
+// ---------------------------------------------------------------------------
+// popup menu
+// ---------------------------------------------------------------------------
+
+// yield for WM_COMMAND events only, i.e. process all WM_COMMANDs in the queue
+// immediately, without waiting for the next event loop iteration
+//
+// NB: this function should probably be made public later as it can almost
+//     surely replace wxYield() elsewhere as well
+static void wxYieldForCommandsOnly()
+{
+    // peek all WM_COMMANDs (it will always return WM_QUIT too but we don't
+    // want to process it here)
+    MSG msg;
+    while ( ::PeekMessage(&msg, (HWND)0, WM_COMMAND, WM_COMMAND, PM_REMOVE)
+                && msg.message != WM_QUIT )
+    {
+        wxTheApp->DoMessage((WXMSG *)&msg);
+    }
+}
+
+#if wxUSE_MENUS_NATIVE
+
+bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+    menu->SetInvokingWindow(this);
+    menu->UpdateUI();
+
+    HWND hWnd = GetHwnd();
+    HMENU hMenu = GetHmenuOf(menu);
+    POINT point;
+    point.x = x;
+    point.y = y;
+    ::ClientToScreen(hWnd, &point);
+    wxCurrentPopupMenu = menu;
+    ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL);
+
+    // we need to do it righ now as otherwise the events are never going to be
+    // sent to wxCurrentPopupMenu from HandleCommand()
+    //
+    // note that even eliminating (ugly) wxCurrentPopupMenu global wouldn't
+    // help and we'd still need wxYieldForCommandsOnly() as the menu may be
+    // destroyed as soon as we return (it can be a local variable in the caller
+    // for example) and so we do need to process the event immediately
+    wxYieldForCommandsOnly();
+
+    wxCurrentPopupMenu = NULL;
+
+    menu->SetInvokingWindow(NULL);
+
+    return TRUE;
+}
+
+#endif // wxUSE_MENUS_NATIVE
+
+// ===========================================================================
+// pre/post message processing
+// ===========================================================================
+
+long wxWindowMSW::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    if ( m_oldWndProc )
+        return ::CallWindowProc(CASTWNDPROC m_oldWndProc, GetHwnd(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+    else
+        return ::DefWindowProc(GetHwnd(), nMsg, wParam, lParam);
+}
+
+bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
+{
+    // wxUniversal implements tab traversal itself
+#ifndef __WXUNIVERSAL__
+    if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) )
+    {
+        // intercept dialog navigation keys
+        MSG *msg = (MSG *)pMsg;
+
+        // here we try to do all the job which ::IsDialogMessage() usually does
+        // internally
+#if 1
+        bool bProcess = TRUE;
+        if ( msg->message != WM_KEYDOWN )
+            bProcess = FALSE;
+
+        if ( bProcess && (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN )
+            bProcess = FALSE;
+
+        if ( bProcess )

         {
         {

-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnRButtonUp(x, y, wParam);
-            break;
+            bool bCtrlDown = wxIsCtrlDown();
+            bool bShiftDown = wxIsShiftDown();
+
+            // WM_GETDLGCODE: 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)
+            LONG lDlgCode = 0;
+            if ( !bCtrlDown )
+            {
+                lDlgCode = ::SendMessage(msg->hwnd, WM_GETDLGCODE, 0, 0);
+            }
+
+            bool bForward = TRUE,
+                 bWindowChange = FALSE;
+
+            switch ( msg->wParam )
+            {
+                case VK_TAB:
+                    // assume that nobody wants Shift-TAB for himself - if we
+                    // don't do it there is no easy way for a control to grab
+                    // TABs but still let Shift-TAB work as navugation key
+                    if ( (lDlgCode & DLGC_WANTTAB) && !bShiftDown ) {
+                        bProcess = FALSE;
+                    }
+                    else {
+                        // Ctrl-Tab cycles thru notebook pages
+                        bWindowChange = bCtrlDown;
+                        bForward = !bShiftDown;
+                    }
+                    break;
+
+                case VK_UP:
+                case VK_LEFT:
+                    if ( (lDlgCode & DLGC_WANTARROWS) || bCtrlDown )
+                        bProcess = FALSE;
+                    else
+                        bForward = FALSE;
+                    break;
+
+                case VK_DOWN:
+                case VK_RIGHT:
+                    if ( (lDlgCode & DLGC_WANTARROWS) || bCtrlDown )
+                        bProcess = FALSE;
+                    break;
+
+                case VK_RETURN:
+                    {
+                        if ( (lDlgCode & DLGC_WANTMESSAGE) && !bCtrlDown )
+                        {
+                            // control wants to process Enter itself, don't
+                            // call IsDialogMessage() which would interpret
+                            // it
+                            return FALSE;
+                        }
+                        else if ( lDlgCode & DLGC_BUTTON )
+                        {
+                            // let IsDialogMessage() handle this for all
+                            // buttons except the owner-drawn ones which it
+                            // just seems to ignore
+                            long style = ::GetWindowLong(msg->hwnd, GWL_STYLE);
+                            if ( (style & BS_OWNERDRAW) == BS_OWNERDRAW )
+                            {
+                                // emulate the button click
+                                wxWindow *btn = wxFindWinFromHandle((WXHWND)msg->hwnd);
+                                if ( btn )
+                                    btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+                            }
+
+                            bProcess = FALSE;
+                        }
+#if wxUSE_BUTTON
+                        else
+                        {
+                            wxPanel *panel = wxDynamicThisCast(this, wxPanel);
+                            wxButton *btn = NULL;
+                            if ( panel )
+                            {
+                                // panel may have a default button which should
+                                // be activated by Enter
+                                btn = panel->GetDefaultItem();
+                            }
+
+                            if ( btn && btn->IsEnabled() )
+                            {
+                                // if we do have a default button, do press it
+                                btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+
+                                return TRUE;
+                            }
+                            // else: but if it does not it makes sense to make
+                            //       it work like a TAB - and that's what we do.
+                            //       Note that Ctrl-Enter always works this way.
+                        }
+#endif // wxUSE_BUTTON
+                    }
+                    break;
+
+                default:
+                    bProcess = FALSE;
+            }
+
+            if ( bProcess )
+            {
+                wxNavigationKeyEvent event;
+                event.SetDirection(bForward);
+                event.SetWindowChange(bWindowChange);
+                event.SetEventObject(this);
+
+                if ( GetEventHandler()->ProcessEvent(event) )
+                {
+#if wxUSE_BUTTON
+                    wxButton *btn = wxDynamicCast(FindFocus(), wxButton);
+                    if ( btn )
+                    {
+                        // the button which has focus should be default
+                        btn->SetDefault();
+                    }
+#endif // wxUSE_BUTTON
+
+                    return TRUE;
+                }
+            }

         }
         }

-        case WM_RBUTTONDBLCLK:
+#else
+        // let ::IsDialogMessage() do almost everything and handle just the
+        // things it doesn't here: Ctrl-TAB for switching notebook pages
+        if ( msg->message == WM_KEYDOWN )

         {
         {

-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnRButtonDClick(x, y, wParam);
-            break;
+            // don't process system keys here
+            if ( !(HIWORD(msg->lParam) & KF_ALTDOWN) )
+            {
+                if ( (msg->wParam == VK_TAB) && wxIsCtrlDown() )
+                {
+                    // find the first notebook parent and change its page
+                    wxWindow *win = this;
+                    wxNotebook *nbook = NULL;
+                    while ( win && !nbook )
+                    {
+                        nbook = wxDynamicCast(win, wxNotebook);
+                        win = win->GetParent();
+                    }
+
+                    if ( nbook )
+                    {
+                        bool forward = !wxIsShiftDown();
+
+                        nbook->AdvanceSelection(forward);
+                    }
+                }
+            }

         }
         }

-        case WM_MBUTTONDOWN:
+#endif // 0
+
+        if ( ::IsDialogMessage(GetHwnd(), msg) )

         {
         {

-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnMButtonDown(x, y, wParam);
-            break;
+            // IsDialogMessage() did something...
+            return TRUE;

         }
         }

-        case WM_MBUTTONUP:
-        {
-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnMButtonUp(x, y, wParam);
+    }
+#endif // __WXUNIVERSAL__
+
+#if wxUSE_TOOLTIPS
+    if ( m_tooltip )
+    {
+        // relay mouse move events to the tooltip control
+        MSG *msg = (MSG *)pMsg;
+        if ( msg->message == WM_MOUSEMOVE )
+            m_tooltip->RelayEvent(pMsg);
+    }
+#endif // wxUSE_TOOLTIPS
+
+    return FALSE;
+}
+
+bool wxWindowMSW::MSWTranslateMessage(WXMSG* pMsg)
+{
+#if wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
+    return m_acceleratorTable.Translate(this, pMsg);
+#else
+    return FALSE;
+#endif // wxUSE_ACCEL
+}
+
+// ---------------------------------------------------------------------------
+// message params unpackers (different for Win16 and Win32)
+// ---------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+void wxWindowMSW::UnpackCommand(WXWPARAM wParam, WXLPARAM lParam,
+                             WORD *id, WXHWND *hwnd, WORD *cmd)
+{
+    *id = LOWORD(wParam);
+    *hwnd = (WXHWND)lParam;
+    *cmd = HIWORD(wParam);
+}
+
+void wxWindowMSW::UnpackActivate(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *state, WXWORD *minimized, WXHWND *hwnd)
+{
+    *state = LOWORD(wParam);
+    *minimized = HIWORD(wParam);
+    *hwnd = (WXHWND)lParam;
+}
+
+void wxWindowMSW::UnpackScroll(WXWPARAM wParam, WXLPARAM lParam,
+                            WXWORD *code, WXWORD *pos, WXHWND *hwnd)
+{
+    *code = LOWORD(wParam);
+    *pos = HIWORD(wParam);
+    *hwnd = (WXHWND)lParam;
+}
+
+void wxWindowMSW::UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *nCtlColor, WXHDC *hdc, WXHWND *hwnd)
+{
+#ifndef __WXMICROWIN__
+    *nCtlColor = CTLCOLOR_BTN;
+    *hwnd = (WXHWND)lParam;
+    *hdc = (WXHDC)wParam;
+#endif
+}
+
+void wxWindowMSW::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
+                                WXWORD *item, WXWORD *flags, WXHMENU *hmenu)
+{
+    *item = (WXWORD)wParam;
+    *flags = HIWORD(wParam);
+    *hmenu = (WXHMENU)lParam;
+}
+
+#else // Win16
+
+void wxWindowMSW::UnpackCommand(WXWPARAM wParam, WXLPARAM lParam,
+                             WXWORD *id, WXHWND *hwnd, WXWORD *cmd)
+{
+    *id = (WXWORD)wParam;
+    *hwnd = (WXHWND)LOWORD(lParam);
+    *cmd = HIWORD(lParam);
+}
+
+void wxWindowMSW::UnpackActivate(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *state, WXWORD *minimized, WXHWND *hwnd)
+{
+    *state = (WXWORD)wParam;
+    *minimized = LOWORD(lParam);
+    *hwnd = (WXHWND)HIWORD(lParam);
+}
+
+void wxWindowMSW::UnpackScroll(WXWPARAM wParam, WXLPARAM lParam,
+                            WXWORD *code, WXWORD *pos, WXHWND *hwnd)
+{
+    *code = (WXWORD)wParam;
+    *pos = LOWORD(lParam);
+    *hwnd = (WXHWND)HIWORD(lParam);
+}
+
+void wxWindowMSW::UnpackCtlColor(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *nCtlColor, WXHDC *hdc, WXHWND *hwnd)
+{
+    *hwnd = (WXHWND)LOWORD(lParam);
+    *nCtlColor = (int)HIWORD(lParam);
+    *hdc = (WXHDC)wParam;
+}
+
+void wxWindowMSW::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
+                                WXWORD *item, WXWORD *flags, WXHMENU *hmenu)
+{
+    *item = (WXWORD)wParam;
+    *flags = LOWORD(lParam);
+    *hmenu = (WXHMENU)HIWORD(lParam);
+}
+
+#endif // Win32/16
+
+// ---------------------------------------------------------------------------
+// Main wxWindows window proc and the window proc for wxWindow
+// ---------------------------------------------------------------------------
+
+// Hook for new window just as it's being created, when the window isn't yet
+// associated with the handle
+wxWindowMSW *wxWndHook = NULL;
+
+// Main window proc
+LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM 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__
+
+    wxWindowMSW *wnd = wxFindWinFromHandle((WXHWND) hWnd);
+
+    // when we get the first message for the HWND we just created, we associate
+    // it with wxWindow stored in wxWndHook
+    if ( !wnd && wxWndHook )
+    {
+#if 0 // def __WXDEBUG__
+        char buf[512];
+        ::GetClassNameA((HWND) hWnd, buf, 512);
+        wxString className(buf);
+#endif
+
+        wxAssociateWinWithHandle(hWnd, wxWndHook);
+        wnd = wxWndHook;
+        wxWndHook = NULL;
+        wnd->SetHWND((WXHWND)hWnd);
+    }
+
+    LRESULT rc;
+
+    // Stop right here if we don't have a valid handle in our wxWindow object.
+    if ( wnd && !wnd->GetHWND() )
+    {
+        // FIXME: why do we do this?
+        wnd->SetHWND((WXHWND) hWnd);
+        rc = wnd->MSWDefWindowProc(message, wParam, lParam );
+        wnd->SetHWND(0);
+    }
+    else
+    {
+        if ( wnd )
+            rc = wnd->MSWWindowProc(message, wParam, lParam);
+        else
+            rc = DefWindowProc( hWnd, message, wParam, lParam );
+    }
+
+    return rc;
+}
+
+long wxWindowMSW::MSWWindowProc(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;
+
+    switch ( message )
+    {
+        case WM_CREATE:
+            {
+                bool mayCreate;
+                processed = HandleCreate((WXLPCREATESTRUCT)lParam, &mayCreate);
+                if ( processed )
+                {
+                    // return 0 to allow window creation
+                    rc.result = mayCreate ? 0 : -1;
+                }
+            }

             break;
             break;

-        }
-        case WM_MBUTTONDBLCLK:
-        {
-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnMButtonDClick(x, y, wParam);
+
+        case WM_DESTROY:
+            processed = HandleDestroy();

             break;
             break;

-        }
-        case WM_LBUTTONDOWN:
-        {
-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnLButtonDown(x, y, wParam);
+
+        case WM_MOVE:
+            processed = HandleMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));

             break;
             break;

-        }
-        case WM_LBUTTONUP:
-        {
-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnLButtonUp(x, y, wParam);
+
+        case WM_SIZE:
+            switch ( wParam )
+            {
+                case SIZE_MAXHIDE:
+                case SIZE_MAXSHOW:
+                    // we're not interested in these messages at all
+                    break;
+
+                case SIZE_MINIMIZED:
+                    // we shouldn't send sizev events for these messages as the
+                    // client size may be negative which breaks existing code
+                    //
+                    // OTOH we might send another (wxMinimizedEvent?) one or
+                    // add an additional parameter to wxSizeEvent if this is
+                    // useful to anybody
+                    break;
+
+                default:
+                    wxFAIL_MSG( _T("unexpected WM_SIZE parameter") );
+                    // fall through nevertheless
+
+                case SIZE_MAXIMIZED:
+                case SIZE_RESTORED:
+                    processed = HandleSize(LOWORD(lParam), HIWORD(lParam),
+                                           wParam);
+            }

             break;
             break;

-        }
-        case WM_LBUTTONDBLCLK:
-        {
-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnLButtonDClick(x, y, wParam);
+
+#ifndef __WXMICROWIN__
+        case WM_ACTIVATEAPP:
+            wxTheApp->SetActive(wParam != 0, FindFocus());

             break;
             break;

-        }
-        case WM_MOUSEMOVE:
-        {
-            int x = (DIMENSION_TYPE) LOWORD(lParam);
-            int y = (DIMENSION_TYPE) HIWORD(lParam);
-            MSWOnMouseMove(x, y, wParam);
+#endif
+
+        case WM_ACTIVATE:
+            {
+                WXWORD state, minimized;
+                WXHWND hwnd;
+                UnpackActivate(wParam, lParam, &state, &minimized, &hwnd);
+
+                processed = HandleActivate(state, minimized != 0, (WXHWND)hwnd);
+            }

             break;
             break;

-        }
-        case MM_JOY1BUTTONDOWN:
-        {
-            int x = LOWORD(lParam);
-            int y = HIWORD(lParam);
-            MSWOnJoyDown(wxJOYSTICK1, x, y, wParam);
+
+        case WM_SETFOCUS:
+            processed = HandleSetFocus((WXHWND)(HWND)wParam);

             break;
             break;

-        }
-        case MM_JOY2BUTTONDOWN:
-        {
-            int x = LOWORD(lParam);
-            int y = HIWORD(lParam);
-            MSWOnJoyDown(wxJOYSTICK2, x, y, wParam);
+
+        case WM_KILLFOCUS:
+            processed = HandleKillFocus((WXHWND)(HWND)wParam);

             break;
             break;

-        }
-        case MM_JOY1BUTTONUP:
-        {
-            int x = LOWORD(lParam);
-            int y = HIWORD(lParam);
-            MSWOnJoyUp(wxJOYSTICK1, x, y, wParam);
+
+        case WM_PAINT:
+            processed = HandlePaint();

             break;
             break;

-        }
-        case MM_JOY2BUTTONUP:
-        {
-            int x = LOWORD(lParam);
-            int y = HIWORD(lParam);
-            MSWOnJoyUp(wxJOYSTICK2, x, y, wParam);
+
+        case WM_CLOSE:
+            // don't let the DefWindowProc() destroy our window - we'll do it
+            // ourselves in ~wxWindow
+            processed = TRUE;
+            rc.result = TRUE;

             break;
             break;

-        }
+
+        case WM_SHOWWINDOW:
+            processed = HandleShow(wParam != 0, (int)lParam);
+            break;
+
+        case WM_MOUSEMOVE:
+            processed = HandleMouseMove(GET_X_LPARAM(lParam),
+                                        GET_Y_LPARAM(lParam),
+                                        wParam);
+            break;
+
+#if wxUSE_MOUSEWHEEL
+        case WM_MOUSEWHEEL:
+            processed = HandleMouseWheel(wParam, lParam);
+            break;
+#endif
+
+        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:
+         {
+                processed = FALSE;
+#ifdef __WXMICROWIN__
+                // MicroWindows seems to ignore the fact that a window is
+                // disabled. So catch mouse events and throw them away if
+                // necessary.
+                wxWindowMSW* win = this;
+                while (win)
+                {
+                    if (!win->IsEnabled())
+                    {
+                        processed = TRUE;
+                        break;
+                    }
+                    win = win->GetParent();
+                    if (win && win->IsTopLevel())
+                        break;
+                }
+#endif // __WXMICROWIN__
+                if (!processed)
+                {
+                    if (message == WM_LBUTTONDOWN && AcceptsFocus())
+                        SetFocus();
+                     processed = HandleMouseEvent(message,
+                                         GET_X_LPARAM(lParam),
+                                         GET_Y_LPARAM(lParam),
+                                                  wParam);
+                }
+                break;
+         }
+
+#ifdef __WXMICROWIN__
+        case WM_NCLBUTTONDOWN:
+        case WM_NCLBUTTONUP:
+        case WM_NCLBUTTONDBLCLK:
+        case WM_NCRBUTTONDOWN:
+        case WM_NCRBUTTONUP:
+        case WM_NCRBUTTONDBLCLK:
+#if 0
+        case WM_NCMBUTTONDOWN:
+        case WM_NCMBUTTONUP:
+        case WM_NCMBUTTONDBLCLK:
+#endif
+            {
+                // MicroWindows seems to ignore the fact that a window
+                // is disabled. So catch mouse events and throw them away if necessary.
+                processed = FALSE;
+                wxWindowMSW* win = this;
+                while (win)
+                {
+                    if (!win->IsEnabled())
+                    {
+                        processed = TRUE;
+                        break;
+                    }
+                    win = win->GetParent();
+                    if (win && win->IsTopLevel())
+                        break;
+                }
+                break;
+            }
+#endif // __WXMICROWIN__
+
+#ifdef MM_JOY1MOVE

         case MM_JOY1MOVE:
         case MM_JOY1MOVE:

-        {
-            int x = LOWORD(lParam);
-            int y = HIWORD(lParam);
-            MSWOnJoyMove(wxJOYSTICK1, x, y, wParam);
-            break;
-        }

         case MM_JOY2MOVE:
         case MM_JOY2MOVE:

-        {
-            int x = LOWORD(lParam);
-            int y = HIWORD(lParam);
-            MSWOnJoyMove(wxJOYSTICK2, x, y, wParam);
-            break;
-        }

         case MM_JOY1ZMOVE:
         case MM_JOY1ZMOVE:

-        {
-            int z = LOWORD(lParam);
-            MSWOnJoyZMove(wxJOYSTICK1, z, wParam);
-            break;
-        }

         case MM_JOY2ZMOVE:
         case MM_JOY2ZMOVE:

-        {
-            int z = LOWORD(lParam);
-            MSWOnJoyZMove(wxJOYSTICK2, z, wParam);
+        case MM_JOY1BUTTONDOWN:
+        case MM_JOY2BUTTONDOWN:
+        case MM_JOY1BUTTONUP:
+        case MM_JOY2BUTTONUP:
+            processed = HandleJoystickEvent(message,
+                                            GET_X_LPARAM(lParam),
+                                            GET_Y_LPARAM(lParam),
+                                            wParam);

             break;
             break;

-        }
-        case WM_DESTROY:
-        {
-          if (MSWOnDestroy())
-            return 0;
-          else return MSWDefWindowProc(message, wParam, lParam );
-          break;
-        }
+#endif // __WXMICROWIN__
+

         case WM_SYSCOMMAND:
         case WM_SYSCOMMAND:

-        {
-            return MSWOnSysCommand(wParam, lParam);
+            processed = HandleSysCommand(wParam, lParam);

             break;
             break;

-        }
+

         case WM_COMMAND:
         case WM_COMMAND:

-        {
-#ifdef __WIN32__
-            WORD id = LOWORD(wParam);
-            HWND hwnd = (HWND)lParam;
-            WORD cmd = HIWORD(wParam);
-#else
-            WORD id = (WORD)wParam;
-            HWND hwnd = (HWND)LOWORD(lParam) ;
-            WORD cmd = HIWORD(lParam);
-#endif
-            if (!MSWOnCommand(id, cmd, (WXHWND) hwnd))
-              return MSWDefWindowProc(message, wParam, lParam );
+            {
+                WORD id, cmd;
+                WXHWND hwnd;
+                UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
+
+                processed = HandleCommand(id, cmd, hwnd);
+            }

             break;
             break;

-        }
-#if defined(__WIN95__)
+
+#ifdef __WIN95__

         case WM_NOTIFY:
         case WM_NOTIFY:

-        {
-          if (!MSWOnNotify(wParam, lParam))
-            return MSWDefWindowProc(message, wParam, lParam );
-          break;
-        }
-#endif
-        case WM_MENUSELECT:
-        {
-#ifdef __WIN32__
-            WORD flags = HIWORD(wParam);
-            HMENU sysmenu = (HMENU)lParam;
-#else
-            WORD flags = LOWORD(lParam);
-            HMENU sysmenu = (HMENU)HIWORD(lParam);
-#endif
-            MSWOnMenuHighlight((WORD)wParam, flags, (WXHMENU) sysmenu);
-            break;
-        }
-        case WM_INITMENUPOPUP:
-        {
-            MSWOnInitMenuPopup((WXHMENU) (HMENU)wParam, (int)LOWORD(lParam), (HIWORD(lParam) != 0));
+            processed = HandleNotify((int)wParam, lParam, &rc.result);

             break;
             break;

-        }
+#endif  // Win95
+
+            // for these messages we must return TRUE if process the message
+#ifdef WM_DRAWITEM

         case WM_DRAWITEM:
         case WM_DRAWITEM:

-        {
-          return MSWOnDrawItem((int)wParam, (WXDRAWITEMSTRUCT *)lParam);
-          break;
-        }

         case WM_MEASUREITEM:
         case WM_MEASUREITEM:

-        {
-          return MSWOnMeasureItem((int)wParam, (WXMEASUREITEMSTRUCT *)lParam);
-          break;
-        }
+            {
+                int idCtrl = (UINT)wParam;
+                if ( message == WM_DRAWITEM )
+                {
+                    processed = MSWOnDrawItem(idCtrl,
+                                              (WXDRAWITEMSTRUCT *)lParam);
+                }
+                else
+                {
+                    processed = MSWOnMeasureItem(idCtrl,
+                                                 (WXMEASUREITEMSTRUCT *)lParam);
+                }
+
+                if ( processed )
+                    rc.result = TRUE;
+            }
+            break;
+#endif // defined(WM_DRAWITEM)
+
+        case WM_GETDLGCODE:
+            if ( m_lDlgCode )
+            {
+                rc.result = m_lDlgCode;
+                processed = TRUE;
+            }
+            //else: get the dlg code from the DefWindowProc()
+            break;

 
 

+        case WM_SYSKEYDOWN:

         case WM_KEYDOWN:
         case WM_KEYDOWN:

-            // we consider these message "not interesting"
+            // If this has been processed by an event handler,
+            // return 0 now (we've handled it).
+            if ( HandleKeyDown((WORD) wParam, lParam) )
+            {
+                processed = TRUE;
+
+                break;
+            }
+
+            // we consider these message "not interesting" to OnChar

             if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
             if ( wParam == VK_SHIFT || wParam == VK_CONTROL )

-              return Default();
-        
-            // Avoid duplicate messages to OnChar
-            if ( (wParam != VK_ESCAPE) && (wParam != VK_SPACE) &&
-                 (wParam != VK_RETURN) && (wParam != VK_BACK) &&
-                 (wParam != VK_TAB) )

             {
             {

-              MSWOnChar((WORD)wParam, lParam);
-              if ( ::GetKeyState(VK_CONTROL) & 0x100 )
-                return Default();
+                processed = TRUE;
+
+                break;
+            }
+
+            switch ( 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:
+                case VK_ADD:
+                case VK_SUBTRACT:
+                    // 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;
+
+#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:
+                    {
+                        WPARAM flags;
+                        int x, y;
+
+                        TranslateKbdEventToMouse(this, &x, &y, &flags);
+                        processed = HandleMouseEvent(WM_RBUTTONDOWN, x, y, flags);
+                    }
+                    break;
+#endif // VK_APPS
+
+                case VK_LEFT:
+                case VK_RIGHT:
+                case VK_DOWN:
+                case VK_UP:
+                default:
+                    processed = HandleChar((WORD)wParam, lParam);

             }
             }

-            else if ( ::GetKeyState(VK_CONTROL) & 0x100 )
-              MSWOnChar((WORD)wParam, lParam);
-            else
-              return Default();

             break;
 
             break;
 

+        case WM_SYSKEYUP:

         case WM_KEYUP:
         case WM_KEYUP:

+#ifdef VK_APPS
+            // special case of VK_APPS: treat it the same as right mouse button
+            if ( wParam == VK_APPS )
+            {
+                WPARAM flags;
+                int x, y;
+
+                TranslateKbdEventToMouse(this, &x, &y, &flags);
+                processed = HandleMouseEvent(WM_RBUTTONUP, x, y, flags);
+            }
+            else
+#endif // VK_APPS
+            {
+                processed = HandleKeyUp((WORD) wParam, lParam);
+            }

             break;
 
             break;
 

+        case WM_SYSCHAR:

         case WM_CHAR: // Always an ASCII character
         case WM_CHAR: // Always an ASCII character

-          {
-            MSWOnChar((WORD)wParam, lParam, TRUE);
+            processed = HandleChar((WORD)wParam, lParam, TRUE);

             break;
             break;

-          }

 
         case WM_HSCROLL:
 
         case WM_HSCROLL:

-        {
-#ifdef __WIN32__
-            WORD code = LOWORD(wParam);
-            WORD pos = HIWORD(wParam);
-            HWND control = (HWND)lParam;
-#else
-            WORD code = (WORD)wParam;
-            WORD pos = LOWORD(lParam);
-            HWND control = (HWND)HIWORD(lParam);
-#endif
-            MSWOnHScroll(code, pos, (WXHWND) control);
-            break;
-        }

         case WM_VSCROLL:
         case WM_VSCROLL:

-        {
-#ifdef __WIN32__
-            WORD code = LOWORD(wParam);
-            WORD pos = HIWORD(wParam);
-            HWND control = (HWND)lParam;
-#else
-            WORD code = (WORD)wParam;
-            WORD pos = LOWORD(lParam);
-            HWND control = (HWND)HIWORD(lParam);
-#endif
-            MSWOnVScroll(code, pos, (WXHWND) control);
+            {
+                WXWORD code, pos;
+                WXHWND hwnd;
+                UnpackScroll(wParam, lParam, &code, &pos, &hwnd);
+
+                processed = MSWOnScroll(message == WM_HSCROLL ? wxHORIZONTAL
+                                                              : wxVERTICAL,
+                                        code, pos, hwnd);
+            }

             break;
             break;

-        }
+
+        // CTLCOLOR messages are sent by children to query the parent for their
+        // colors#ifndef __WXMICROWIN__
+#ifndef __WXMICROWIN__

 #ifdef __WIN32__
 #ifdef __WIN32__

+        case WM_CTLCOLORMSGBOX:
+        case WM_CTLCOLOREDIT:
+        case WM_CTLCOLORLISTBOX:

         case WM_CTLCOLORBTN:
         case WM_CTLCOLORBTN:

-        {
-          int nCtlColor = CTLCOLOR_BTN;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
-        }

         case WM_CTLCOLORDLG:
         case WM_CTLCOLORDLG:

-        {
-          int nCtlColor = CTLCOLOR_DLG;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);\
-          break;
-        }
-        case WM_CTLCOLORLISTBOX:
-        {
-          int nCtlColor = CTLCOLOR_LISTBOX;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
-        }
-        case WM_CTLCOLORMSGBOX:
-        {
-          int nCtlColor = CTLCOLOR_MSGBOX;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
-        }

         case WM_CTLCOLORSCROLLBAR:
         case WM_CTLCOLORSCROLLBAR:

-        {
-          int nCtlColor = CTLCOLOR_SCROLLBAR;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
-        }

         case WM_CTLCOLORSTATIC:
         case WM_CTLCOLORSTATIC:

-        {
-          int nCtlColor = CTLCOLOR_STATIC;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
-        }
-        case WM_CTLCOLOREDIT:
-        {
-          int nCtlColor = CTLCOLOR_EDIT;
-          HWND control = (HWND)lParam;
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
-        }
-#else
+#else // Win16

         case WM_CTLCOLOR:
         case WM_CTLCOLOR:

+#endif // Win32/16
+            {
+                WXWORD nCtlColor;
+                WXHDC hdc;
+                WXHWND hwnd;
+                UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
+
+                processed = HandleCtlColor(&rc.hBrush,
+                                           (WXHDC)hdc,
+                                           (WXHWND)hwnd,
+                                           nCtlColor,
+                                           message,
+                                           wParam,
+                                           lParam);
+            }
+            break;
+#endif // !__WXMICROWIN__
+
+            // the return value for this message is ignored
+        case WM_SYSCOLORCHANGE:
+            processed = HandleSysColorChange();
+            break;
+
+        case WM_PALETTECHANGED:
+            processed = HandlePaletteChanged((WXHWND) (HWND) wParam);
+            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;
+            }
+            break;
+
+        case WM_DROPFILES:
+            processed = HandleDropFiles(wParam);
+            break;
+
+        case WM_INITDIALOG:
+            processed = HandleInitDialog((WXHWND)(HWND)wParam);
+
+            if ( processed )
+            {
+                // we never set focus from here
+                rc.result = FALSE;
+            }
+            break;
+
+        case WM_QUERYENDSESSION:
+            processed = HandleQueryEndSession(lParam, &rc.allow);
+            break;
+
+        case WM_ENDSESSION:
+            processed = HandleEndSession(wParam != 0, lParam);
+            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 )
+            {
+                // returning TRUE stops the DefWindowProc() from further
+                // processing this message - exactly what we need because we've
+                // just set the cursor.
+                rc.result = TRUE;
+            }
+            break;
+
+#if defined(__WIN32__) && defined(WM_HELP)
+        case WM_HELP:
+            {
+                HELPINFO* info = (HELPINFO*) lParam;
+                // Don't yet process menu help events, just windows
+                if (info->iContextType == HELPINFO_WINDOW)
+                {
+                    wxWindowMSW* subjectOfHelp = this;
+                    bool eventProcessed = FALSE;
+                    while (subjectOfHelp && !eventProcessed)
+                    {
+                        wxHelpEvent helpEvent(wxEVT_HELP,
+                                              subjectOfHelp->GetId(),
+                                              wxPoint(info->MousePos.x,
+                                              info->MousePos.y) );
+                        helpEvent.SetEventObject(this);
+                        eventProcessed =
+                            GetEventHandler()->ProcessEvent(helpEvent);
+
+                        // Go up the window hierarchy until the event is
+                        // handled (or not)
+                        subjectOfHelp = subjectOfHelp->GetParent();
+                    }
+
+                    processed = eventProcessed;
+                }
+                else if (info->iContextType == HELPINFO_MENUITEM)
+                {
+                    wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId);
+                    helpEvent.SetEventObject(this);
+                    processed = GetEventHandler()->ProcessEvent(helpEvent);
+
+                }
+                //else: processed is already FALSE
+            }
+            break;
+
+        case WM_CONTEXTMENU:
+            {
+                // we don't convert from screen to client coordinates as
+                // the event may be handled by a parent window
+                wxPoint pt(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+
+                wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);
+                processed = GetEventHandler()->ProcessEvent(evtCtx);
+            }
+            break;
+#endif // __WIN32__
+
+#ifdef __WXUNIVERSAL__
+        case WM_NCHITTEST:
+            // we shouldn't allow the windows which don't want to get focus to
+            // get it
+            if ( !AcceptsFocus() )
+            {
+                rc.result = HTTRANSPARENT;
+                processed = TRUE;
+            }
+            break;
+#endif // __WXUNIVERSAL__
+    }
+
+    if ( !processed )
+    {
+#ifdef __WXDEBUG__
+        wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
+                   wxGetMessageName(message));
+#endif // __WXDEBUG__
+        rc.result = MSWDefWindowProc(message, wParam, lParam);
+    }
+
+    return rc.result;
+}
+
+// Dialog window proc
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND WXUNUSED(hWnd), UINT message, WPARAM WXUNUSED(wParam), LPARAM WXUNUSED(lParam))
+{
+    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;
+    }
+}
+
+wxList *wxWinHandleList = NULL;
+wxWindow *wxFindWinFromHandle(WXHWND hWnd)
+{
+    wxNode *node = wxWinHandleList->Find((long)hWnd);
+    if ( !node )
+        return NULL;
+    return (wxWindow *)node->Data();
+}
+
+#if 0 // def __WXDEBUG__
+static int gs_AssociationCount = 0;
+#endif
+
+void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
+{
+    // adding NULL hWnd is (first) surely a result of an error and
+    // (secondly) breaks menu command processing
+    wxCHECK_RET( hWnd != (HWND)NULL,
+                 wxT("attempt to add a NULL hWnd to window list ignored") );
+
+
+    wxWindow *oldWin = wxFindWinFromHandle((WXHWND) hWnd);
+    if ( oldWin && (oldWin != win) )
+    {
+        wxString str(win->GetClassInfo()->GetClassName());
+        wxLogError(wxT("Bug! Found existing HWND %X for new window of class %s"), (int) hWnd, (const wxChar*) str);
+    }
+    else if (!oldWin)
+    {
+#if 0 // def __WXDEBUG__
+        gs_AssociationCount ++;
+        wxLogDebug("+ Association %d", gs_AssociationCount);
+#endif
+
+        wxWinHandleList->Append((long)hWnd, win);
+    }
+}
+
+void wxRemoveHandleAssociation(wxWindowMSW *win)
+{
+#if 0 // def __WXDEBUG__
+    if (wxWinHandleList->Member(win))
+    {
+        wxLogDebug("- Association %d", gs_AssociationCount);
+        gs_AssociationCount --;
+    }
+#endif
+    wxWinHandleList->DeleteObject(win);
+}
+
+// Default destroyer - override if you destroy it in some other way
+// (e.g. with MDI child windows)
+void wxWindowMSW::MSWDestroyWindow()
+{
+}
+
+void wxWindowMSW::MSWDetachWindowMenu()
+{
+#ifndef __WXUNIVERSAL__
+    if ( m_hMenu )
+    {
+        wxChar buf[1024];
+        HMENU hMenu = (HMENU)m_hMenu;
+
+        int N = ::GetMenuItemCount(hMenu);
+        for ( int i = 0; i < N; i++ )

         {
         {

-          HWND control = (HWND)LOWORD(lParam);
-          int nCtlColor = (int)HIWORD(lParam);
-          HDC pDC = (HDC)wParam;
-          return (DWORD)MSWOnCtlColor((WXHDC) pDC, (WXHWND) control, nCtlColor,
-                                        message, wParam, lParam);
-          break;
+            if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
+            {
+                wxLogLastError(wxT("GetMenuString"));
+
+                continue;
+            }
+
+            if ( wxStrcmp(buf, _("&Window")) == 0 )
+            {
+                if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) )
+                {
+                    wxLogLastError(wxT("RemoveMenu"));
+                }
+
+                break;
+            }

         }
         }

+    }

 #endif
 #endif

-        case WM_SYSCOLORCHANGE:
+}
+
+bool wxWindowMSW::MSWCreate(int id,
+                            wxWindow *parent,
+                            const wxChar *wclass,
+                            wxWindow * WXUNUSED(wx_win),
+                            const wxChar *title,
+                            int x,
+                            int y,
+                            int width,
+                            int height,
+                            WXDWORD style,
+                            const wxChar *dialog_template,
+                            WXDWORD extendedStyle)
+{
+    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 rectParent;
+    if ( parent )
+    {
+        ::GetClientRect(GetHwndOf(parent), &rectParent);
+
+        width1 = rectParent.right - rectParent.left;
+        height1 = rectParent.bottom - rectParent.top;
+    }
+
+    if ( x != -1 )
+        x1 = x;
+    if ( y != -1 )
+        y1 = y;
+    if ( width != -1 )
+        width1 = width;
+    if ( height != -1 )
+        height1 = height;
+
+    // unfortunately, setting WS_EX_CONTROLPARENT only for some windows in the
+    // hierarchy with several embedded panels (and not all of them) causes the
+    // program to hang during the next call to IsDialogMessage() due to the bug
+    // in this function (at least in Windows NT 4.0, it seems to work ok in
+    // Win2K)
+#if 0
+    // if we have wxTAB_TRAVERSAL style, we want WS_EX_CONTROLPARENT or
+    // IsDialogMessage() won't work for us
+    if ( GetWindowStyleFlag() & wxTAB_TRAVERSAL )
+    {
+        extendedStyle |= WS_EX_CONTROLPARENT;
+    }
+#endif // 0
+
+    HWND hParent;
+    if ( GetWindowStyleFlag() & wxPOPUP_WINDOW )
+    {
+        // popup windows should have desktop as parent because they shouldn't
+        // be limited to the parents client area as child windows usually are
+        hParent = ::GetDesktopWindow();
+    }
+    else if ( parent )
+    {
+        hParent = GetHwndOf(parent);
+    }
+    else
+    {
+        // top level window
+        hParent = NULL;
+    }
+
+    wxWndHook = this;
+
+#ifndef __WXMICROWIN__
+    if ( dialog_template )
+    {
+        // for the dialogs without wxDIALOG_NO_PARENT style, use the top level
+        // app window as parent - this avoids creating modal dialogs without
+        // parent
+        if ( !hParent && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )

         {
         {

-          // Return value of 0 means, we processed it.
-          if (MSWOnColorChange((WXHWND) hWnd, message, wParam, lParam) == 0)
-            return 0;
-          else
-            return MSWDefWindowProc(message, wParam, lParam );
-          break;
+            wxWindow *winTop = wxTheApp->GetTopWindow();
+            if ( winTop )
+                hParent = GetHwndOf(winTop);

         }
         }

-        case WM_ERASEBKGND:
+
+        m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(),
+                                        dialog_template,
+                                        hParent,
+                                        (DLGPROC)wxDlgProc);
+
+        if ( m_hWnd == 0 )

         {
         {

-          // Prevents flicker when dragging
-          if (IsIconic(hWnd)) return 1;
-
-          // EXPERIMENTAL
-//          return 1;
-          if (!MSWOnEraseBkgnd((WXHDC) (HDC)wParam))
-            return 0; // Default(); MSWDefWindowProc(message, wParam, lParam );
-          else return 1;
-          break;
+            wxLogError(_("Can't find dialog template '%s'!\nCheck resource include path for finding wx.rc."),
+                       dialog_template);
+
+            return FALSE;

         }
         }

-        case WM_MDIACTIVATE:
+
+        if ( extendedStyle != 0 )

         {
         {

-#ifdef __WIN32__
-            HWND hWndActivate = GET_WM_MDIACTIVATE_HWNDACTIVATE(wParam,lParam);
-            HWND hWndDeactivate = GET_WM_MDIACTIVATE_HWNDDEACT(wParam,lParam);
-            BOOL activate = GET_WM_MDIACTIVATE_FACTIVATE(hWnd,wParam,lParam);
-            return MSWOnMDIActivate((long) activate, (WXHWND) hWndActivate, (WXHWND) hWndDeactivate);
-#else
-            return MSWOnMDIActivate((BOOL)wParam, (HWND)LOWORD(lParam),
-                                               (HWND)HIWORD(lParam));
-#endif
+            ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, extendedStyle);
+            ::SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
+                           SWP_NOSIZE |
+                           SWP_NOMOVE |
+                           SWP_NOZORDER |
+                           SWP_NOACTIVATE);

         }
         }

-        case WM_DROPFILES:
+
+#if defined(__WIN95__)
+        // For some reason, the system menu is activated when we use the
+        // WS_EX_CONTEXTHELP style, so let's set a reasonable icon
+        if (extendedStyle & WS_EX_CONTEXTHELP)

         {
         {

-            MSWOnDropFiles(wParam);
-            break;
+            wxFrame *winTop = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+            if ( winTop )
+            {
+                wxIcon icon = winTop->GetIcon();
+                if ( icon.Ok() )
+                {
+                    ::SendMessage(GetHwnd(), WM_SETICON,
+                                  (WPARAM)TRUE,
+                                  (LPARAM)GetHiconOf(icon));
+                }
+            }

         }
         }

-        case WM_INITDIALOG:
+#endif // __WIN95__
+
+
+        // JACS: is the following still necessary? The above seems to work.
+
+        // ::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 )

         {
         {

-            return 0; // MSWOnInitDialog((WXHWND)(HWND)wParam);
-            break;
+            if ( !::SetWindowPos(GetHwnd(), HWND_TOPMOST, 0, 0, 0, 0,
+                                 SWP_NOSIZE | SWP_NOMOVE) )
+            {
+                wxLogLastError(wxT("SetWindowPos"));
+            }

         }
         }

-        case WM_QUERYENDSESSION:
+
+        // move the dialog to its initial position without forcing repainting
+        if ( !::MoveWindow(GetHwnd(), x1, y1, width1, height1, FALSE) )

         {
         {

-            // Same as WM_CLOSE, but inverted results. Thx Microsoft :-)
-            return MSWOnClose();
-            break;
+            wxLogLastError(wxT("MoveWindow"));

         }
         }

-        case WM_CLOSE:
+
+    }
+    else // creating a normal window, not a dialog
+#endif // !__WXMICROWIN__
+    {
+        int controlId = 0;
+        if ( style & WS_CHILD )

         {
         {

-            if (MSWOnClose())
-              return 0L;
-            else
-              return 1L;
-            break;
+            controlId = id;
+
+            if ( GetWindowStyleFlag() & wxCLIP_SIBLINGS )
+            {
+                style |= WS_CLIPSIBLINGS;
+            }

         }
 
         }
 

-        case WM_GETMINMAXINFO:
+        wxString className(wclass);
+        if ( GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE )

         {
         {

-          MINMAXINFO *info = (MINMAXINFO *)lParam;
-          if (m_minSizeX != -1)
-           info->ptMinTrackSize.x = (int)m_minSizeX;
-          if (m_minSizeY != -1)
-           info->ptMinTrackSize.y = (int)m_minSizeY;
-          if (m_maxSizeX != -1)
-           info->ptMaxTrackSize.x = (int)m_maxSizeX;
-          if (m_maxSizeY != -1)
-           info->ptMaxTrackSize.y = (int)m_maxSizeY;
-          return MSWDefWindowProc(message, wParam, lParam );
-          break;
+            className += wxT("NR");

         }
 
         }
 

-        case WM_GETDLGCODE:
-          return MSWGetDlgCode();
-
-/*
-#if HAVE_SOCKET
-        case WM_TIMER:
-       {
-          __ddeUnblock(hWnd, wParam);
-          break;
-       }
-
-       case ASYNC_SELECT_MESSAGE:
-           return ddeWindowProc(hWnd,message,wParam,lParam);
-#endif
-*/
+        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!\nPossible Windows 3.x compatibility problem?"),
+                       wclass);

 
 

-        default:
-            return MSWDefWindowProc(message, wParam, lParam );
+            return FALSE;
+        }

     }
     }

-    return 0; // Success: we processed this command.
-}

 
 

-// Dialog window proc
-LONG APIENTRY _EXPORT
-  wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-  return 0;
-}
+    wxWndHook = NULL;

 
 

-wxList *wxWinHandleList = NULL;
-wxWindow *wxFindWinFromHandle(WXHWND hWnd)
-{
-  wxNode *node = wxWinHandleList->Find((long)hWnd);
-  if (!node)
-    return NULL;
-  return (wxWindow *)node->Data();
-}
+#ifdef __WXDEBUG__
+    wxNode* node = wxWinHandleList->Member(this);
+    if (node)
+    {
+        HWND hWnd = (HWND) node->GetKeyInteger();
+        if (hWnd != (HWND) m_hWnd)
+        {
+            wxLogError(wxT("A second HWND association is being added for the same window!"));
+        }
+    }
+#endif // Debug

 
 

-void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
-{
-  // adding NULL hWnd is (first) surely a result of an error and
-  // (secondly) breaks menu command processing
-  wxCHECK_RET( hWnd != NULL, "attempt to add a NULL hWnd to window list" );
+    wxAssociateWinWithHandle((HWND) m_hWnd, this);

 
 

-  if ( !wxWinHandleList->Find((long)hWnd) )
-    wxWinHandleList->Append((long)hWnd, win);
-}
+    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-void wxRemoveHandleAssociation(wxWindow *win)
-{
-  wxWinHandleList->DeleteObject(win);
+    return TRUE;

 }
 
 }
 

-// Default destroyer - override if you destroy it in some other way
-// (e.g. with MDI child windows)
-void wxWindow::MSWDestroyWindow(void)
-{
-#if 0
+// ===========================================================================
+// MSW message handlers
+// ===========================================================================

 
 

-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWDestroyWindow %d\n", handle);
-#endif
-  MSWDetachWindowMenu();
-//  SetWindowLong(handle, 0, (long)0);
-  HWND oldHandle = handle;
-  handle = NULL;
-
-  ::DestroyWindow(oldHandle);
-
-  // Menu is destroyed explicitly by wxMDIChild::DestroyWindow,
-  // or when Windows HWND is deleted if MDI parent or
-  // SDI frame.
-/*
-  if (m_hMenu)
-  {
-    ::DestroyMenu(m_hMenu);
-    m_hMenu = 0;
-  }
- */
-#endif
-}
+// ---------------------------------------------------------------------------
+// WM_NOTIFY
+// ---------------------------------------------------------------------------

 
 

-void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
-                    int x, int y, int width, int height,
-                    WXDWORD style, const char *dialog_template, WXDWORD extendedStyle)
-{
-  bool is_dialog = (dialog_template != NULL);
-  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)
-  {
-    // Was GetWindowRect: JACS 5/5/95
-    ::GetClientRect((HWND) parent->GetHWND(), &parent_rect);
-
-    width1 = parent_rect.right - parent_rect.left;
-    height1 = parent_rect.bottom - parent_rect.top;
-  }
-
-  if (x > -1) x1 = x;
-  if (y > -1) y1 = y;
-  if (width > -1) width1 = width;
-  if (height > -1) height1 = height;
-
-  HWND hParent = NULL;
-  if (parent)
-    hParent = (HWND) parent->GetHWND();
-
-  wxWndHook = this;
-
-  if (is_dialog)
-  {
-    // MakeProcInstance doesn't seem to be needed in C7. Is it needed for
-    // other compilers???
-    // VZ: it's always needed for Win16 and never for Win32
-#ifdef __WIN32__
-    m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
-                            (DLGPROC)wxDlgProc);
-#else
-    DLGPROC dlgproc = (DLGPROC)MakeProcInstance((DLGPROC)wxWndProc, wxGetInstance());
+#ifdef __WIN95__
+// FIXME: VZ: I'm not sure at all that the order of processing is correct
+bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
+{
+#ifndef __WXMICROWIN__
+    LPNMHDR hdr = (LPNMHDR)lParam;
+    HWND hWnd = hdr->hwndFrom;
+    wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd);

 
 

-    m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
-                            (DLGPROC)dlgproc);
-#endif
+    // is this one of our windows?
+    if ( win )
+    {
+        return win->MSWOnNotify(idCtrl, lParam, result);
+    }

 
 

-    if (m_hWnd == 0)
-       MessageBox(NULL, "Can't find dummy dialog template!\nCheck resource include path for finding wx.rc.",
-                  "wxWindows Error", MB_ICONEXCLAMATION | MB_OK);
-    else MoveWindow((HWND) m_hWnd, x1, y1, width1, height1, FALSE);
-  }
-  else
-  {
-    int controlId = 0;
-    if (style & WS_CHILD)
-      controlId = id;
-    if (!title)
-      title = "";
-      
-    m_hWnd = (WXHWND) CreateWindowEx(extendedStyle, wclass,
-                title,
-                style,
-                x1, y1,
-                width1, height1,
-//                hParent, NULL, wxGetInstance(),
-                hParent, (HMENU)controlId, wxGetInstance(),
-                NULL);
-
-    if (m_hWnd == 0)
-    {
-       char buf[300];
-       sprintf(buf, "Can't create window of class %s! Weird.\nPossible Windows 3.x compatibility problem?",
-         wclass);
-       wxFatalError(buf,
-                  "Fatal wxWindows Error");
-    }
-  }
-  wxWndHook = NULL;
-  wxWinHandleList->Append((long)m_hWnd, this);
-
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWCreate %d\n", m_hWnd);
-#endif
-}
+    // try all our children
+    wxWindowList::Node *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        if ( child->MSWOnNotify(idCtrl, lParam, result) )
+        {
+            return TRUE;
+        }

 
 

-void wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
-{
-}
+        node = node->GetNext();
+    }

 
 

-bool wxWindow::MSWOnClose(void)
-{
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnClose %d\n", handle);
+    // finally try this window too (catches toolbar case)
+    return MSWOnNotify(idCtrl, lParam, result);
+#else // __WXMICROWIN__
+    return FALSE;

 #endif
 #endif

-  return FALSE;

 }
 
 }
 

-bool wxWindow::MSWOnDestroy(void)
+bool wxWindowMSW::MSWOnNotify(int WXUNUSED(idCtrl),
+                           WXLPARAM lParam,
+                           WXLPARAM* WXUNUSED(result))

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnDestroy %d\n", handle);
-#endif
-  // delete our drop target if we've got one
-  #if USE_DRAG_AND_DROP
-    if ( m_pDropTarget != NULL ) {
-      m_pDropTarget->Revoke(m_hWnd);
+#if wxUSE_TOOLTIPS
+    NMHDR* hdr = (NMHDR *)lParam;
+    if ( (int)hdr->code == TTN_NEEDTEXT && m_tooltip )
+    {
+        TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
+        ttt->lpszText = (wxChar *)m_tooltip->GetTip().c_str();

 
 

-      delete m_pDropTarget;
-      m_pDropTarget = NULL;
+        // processed
+        return TRUE;

     }
     }

-  #endif
-
-  return TRUE;
-}
-
-// Deal with child commands from buttons etc.
-
-bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
-{
-#if defined(__WIN95__)
-    // Find a child window to send the notification to, e.g. a toolbar.
-    // There's a problem here. NMHDR::hwndFrom doesn't give us the
-    // handle of the toolbar; it's probably the handle of the tooltip
-    // window (anyway, it's parent is also the toolbar's parent).
-    // So, since we don't know which hWnd or wxWindow originated the
-    // WM_NOTIFY, we'll need to go through all the children of this window
-    // trying out MSWNotify.
-       // This won't work now, though, because any number of controls
-       // could respond to the same generic messages :-(
-
-/* This doesn't work for toolbars, but try for other controls first.
- */
-    NMHDR *hdr = (NMHDR *)lParam;
-    HWND hWnd = (HWND)hdr->hwndFrom;
-    wxWindow *win = wxFindWinFromHandle((WXHWND) hWnd);
-
-       if ( win )
-               return win->MSWNotify(wParam, lParam);
-       else
-       {
-                   // Rely on MSWNotify to check whether the message
-                       // belongs to the window or not
-               wxNode *node = GetChildren()->First();
-               while (node)
-               {
-                       wxWindow *child = (wxWindow *)node->Data();
-                               if ( child->MSWNotify(wParam, lParam) )
-                                       return TRUE;
-                               node = node->Next();
-               }
-       }
+#endif // wxUSE_TOOLTIPS

 
     return FALSE;
 
     return FALSE;

-
-#endif
-  return FALSE;
-}
-
-void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
-{
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnMenuHighlight %d\n", handle);
-#endif

 }
 }

+#endif // __WIN95__

 
 

-void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem)
-{
-}
+// ---------------------------------------------------------------------------
+// end session messages
+// ---------------------------------------------------------------------------

 
 

-bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate))
+bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnActivate %d\n", handle);
-#endif
+    wxCloseEvent event(wxEVT_QUERY_END_SESSION, -1);
+    event.SetEventObject(wxTheApp);
+    event.SetCanVeto(TRUE);
+    event.SetLoggingOff(logOff == (long)ENDSESSION_LOGOFF);

 
 

-  wxActivateEvent event(wxEVT_ACTIVATE, ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)),
-         m_windowId);
-  event.SetEventObject(this);
-  GetEventHandler()->ProcessEvent(event);
-  return 0;
-}
+    bool rc = wxTheApp->ProcessEvent(event);

 
 

-bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
-{
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnSetFocus %d\n", m_hWnd);
-#endif
-    // Deal with caret
-    if (m_caretEnabled && (m_caretWidth > 0) && (m_caretHeight > 0))
+    if ( rc )

     {
     {

-      ::CreateCaret((HWND) GetHWND(), NULL, m_caretWidth, m_caretHeight);
-      if (m_caretShown)
-        ::ShowCaret((HWND) GetHWND());
+        // we may end only if the app didn't veto session closing (double
+        // negation...)
+        *mayEnd = !event.GetVeto();

     }
 
     }
 

-  wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
-  event.SetEventObject(this);
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-  return TRUE;
+    return rc;

 }
 
 }
 

-bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
+bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnKillFocus %d\n", m_hWnd);
-#endif
-    // Deal with caret
-    if (m_caretEnabled)
+    // do nothing if the session isn't ending
+    if ( !endSession )
+        return FALSE;
+
+    wxCloseEvent event(wxEVT_END_SESSION, -1);
+    event.SetEventObject(wxTheApp);
+    event.SetCanVeto(FALSE);
+    event.SetLoggingOff( (logOff == (long)ENDSESSION_LOGOFF) );
+    if ( (this == wxTheApp->GetTopWindow()) && // Only send once
+        wxTheApp->ProcessEvent(event))

     {
     {

-      ::DestroyCaret();

     }
     }

-
-  wxFocusEvent event(wxEVT_KILL_FOCUS, m_windowId);
-  event.SetEventObject(this);
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-  return TRUE;
+    return TRUE;

 }
 
 }
 

-void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
+// ---------------------------------------------------------------------------
+// window creation/destruction
+// ---------------------------------------------------------------------------
+
+bool wxWindowMSW::HandleCreate(WXLPCREATESTRUCT WXUNUSED(cs), bool *mayCreate)

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd);
-#endif
+    // TODO: should generate this event from WM_NCCREATE
+    wxWindowCreateEvent event((wxWindow *)this);
+    (void)GetEventHandler()->ProcessEvent(event);

 
 

-  HDROP hFilesInfo = (HDROP) wParam;
-  POINT dropPoint;
-  DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);
-
-  // Get the total number of files dropped
-  WORD gwFilesDropped = (WORD)DragQueryFile ((HDROP)hFilesInfo,
-                                  (UINT)-1,
-                                   (LPSTR)0,
-                                   (UINT)0);
-
-  wxString *files = new wxString[gwFilesDropped];
-  int wIndex;
-  for (wIndex=0; wIndex < (int)gwFilesDropped; wIndex++)
-  {
-    DragQueryFile (hFilesInfo, wIndex, (LPSTR) wxBuffer, 1000);
-    files[wIndex] = wxBuffer;
-  }
-  DragFinish (hFilesInfo);
-
-  wxDropFilesEvent event(wxEVT_DROP_FILES, gwFilesDropped, files);
-  event.m_eventObject = this;
-  event.m_pos.x = dropPoint.x; event.m_pos.x = dropPoint.y;
-
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-
-  delete[] files;
-}
-
-bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
-{
-#if USE_OWNER_DRAWN
-    if ( id == 0 ) {    // is it a menu item?
-      DRAWITEMSTRUCT *pDrawStruct = (DRAWITEMSTRUCT *)itemStruct;
-      wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
-      wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
-
-      // 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
-             );
-    }
-#endif  // owner-drawn menus
+    *mayCreate = TRUE;

 
 

-  wxWindow *item = FindItem(id);
-#if USE_DYNAMIC_CLASSES
-  if (item && item->IsKindOf(CLASSINFO(wxControl)))
-  {
-    return ((wxControl *)item)->MSWOnDraw(itemStruct);
-  }
-  else
-#endif
-    return FALSE;
+    return TRUE;

 }
 
 }
 

-bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
+bool wxWindowMSW::HandleDestroy()

 {
 {

-#if USE_OWNER_DRAWN
-    if ( id == 0 ) {    // is it a menu item?
-      MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct;
-      wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);
-      wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
+    wxWindowDestroyEvent event((wxWindow *)this);
+    (void)GetEventHandler()->ProcessEvent(event);
+
+    // delete our drop target if we've got one
+#if wxUSE_DRAG_AND_DROP
+    if ( m_dropTarget != NULL )
+    {
+        m_dropTarget->Revoke(m_hWnd);

 
 

-      return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth, 
-                                      &pMeasureStruct->itemHeight);
+        delete m_dropTarget;
+        m_dropTarget = NULL;

     }
     }

-#endif  // owner-drawn menus
+#endif // wxUSE_DRAG_AND_DROP

 
 

-  wxWindow *item = FindItem(id);
-#if USE_DYNAMIC_CLASSES
-  if (item && item->IsKindOf(CLASSINFO(wxControl)))
-  {
-    return ((wxControl *)item)->MSWOnMeasure(itemStruct);
-  }
-  else
-#endif
-    return FALSE;
+    // WM_DESTROY handled
+    return TRUE;

 }
 
 }
 

-WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                         WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnCtlColour %d\n", m_hWnd);
-#endif
-  if (nCtlColor == CTLCOLOR_DLG)
-  {
-       return OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
-  }
-
-  wxControl *item = (wxControl *)FindItemByHWND(pWnd, TRUE);
+// ---------------------------------------------------------------------------
+// activation/focus
+// ---------------------------------------------------------------------------

 
 

-  WXHBRUSH hBrush = 0;
+void wxWindowMSW::OnSetFocus(wxFocusEvent& event)
+{
+    // panel wants to track the window which was the last to have focus in it,
+    // so we want to set ourselves as the window which last had focus
+    //
+    // notice that it's also important to do it upwards the tree becaus
+    // otherwise when the top level panel gets focus, it won't set it back to
+    // us, but to some other sibling
+    wxWindow *win = (wxWindow *)this;
+    while ( win )
+    {
+        wxWindow *parent = win->GetParent();
+        wxPanel *panel = wxDynamicCast(parent, wxPanel);
+        if ( panel )
+        {
+            panel->SetLastFocus(win);
+        }

 
 

-  if ( item )
-       hBrush = item->OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
+        win = parent;
+    }

 
 

-  // I think that even for dialogs, we may need to call DefWindowProc (?)
-  // Or maybe just rely on the usual default behaviour.
-  if ( !hBrush )
-    hBrush = (WXHBRUSH) MSWDefWindowProc(message, wParam, lParam);
+    wxLogTrace(_T("focus"), _T("%s (0x%08x) gets focus"),
+               GetClassInfo()->GetClassName(), GetHandle());

 
 

-  return hBrush ;
+    event.Skip();

 }
 
 }
 

-// Define for each class of dialog and control
-WXHBRUSH wxWindow::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxWindowMSW::HandleActivate(int state,
+                              bool WXUNUSED(minimized),
+                              WXHWND WXUNUSED(activate))

 {
 {

-    return (WXHBRUSH) MSWDefWindowProc(message, wParam, lParam);
+    wxActivateEvent event(wxEVT_ACTIVATE,
+                          (state == WA_ACTIVE) || (state == WA_CLICKACTIVE),
+                          m_windowId);
+    event.SetEventObject(this);
+
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-bool wxWindow::MSWOnColorChange(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxWindowMSW::HandleSetFocus(WXHWND hwnd)

 {
 {

-  wxSysColourChangedEvent event;
-  event.m_eventObject = this;
+#if wxUSE_CARET
+    // Deal with caret
+    if ( m_caret )
+    {
+        m_caret->OnSetFocus();
+    }
+#endif // wxUSE_CARET
+
+    wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
+    event.SetEventObject(this);

 
 

-  // Check if app handles this.
-  if (GetEventHandler()->ProcessEvent(event))
-    return 0;
+    // wxFindWinFromHandle() may return NULL, it is ok
+    event.SetWindow(wxFindWinFromHandle(hwnd));

 
 

-  // We didn't process it
-  return 1;
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+bool wxWindowMSW::HandleKillFocus(WXHWND hwnd)

 {
 {

-    wxNode *node = GetChildren()->First();
-    while ( node )
+#if wxUSE_CARET
+    // Deal with caret
+    if ( m_caret )

     {
     {

-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
-        {
-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
-        }
-
-        node = node->Next();
+        m_caret->OnKillFocus();

     }
     }

-}
-
-long wxWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  if ( m_oldWndProc )
-       return ::CallWindowProc(CASTWNDPROC (FARPROC) m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
-  else
-       return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
-}
+#endif // wxUSE_CARET

 
 

-long wxWindow::Default()
-{
-    // Ignore 'fake' events (perhaps generated as a result of a separate real event)
-    if (m_lastMsg == 0)
-        return 0;
+    wxFocusEvent event(wxEVT_KILL_FOCUS, m_windowId);
+    event.SetEventObject(this);

 
 

-    #ifdef __WXDEBUG__
-        wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",
-                  GetMessageName(m_lastMsg));
-    #endif // WXDEBUG
+    // wxFindWinFromHandle() may return NULL, it is ok
+    event.SetWindow(wxFindWinFromHandle(hwnd));

 
 

-    return this->MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
-{
-  if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) ) {
-    // intercept dialog navigation keys
-    MSG *msg = (MSG *)pMsg;
-    bool bProcess = TRUE;
-    if ( msg->message != WM_KEYDOWN )
-      bProcess = FALSE;
+// ---------------------------------------------------------------------------
+// miscellaneous
+// ---------------------------------------------------------------------------

 
 

-    if ( (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN )
-      bProcess = FALSE;
+bool wxWindowMSW::HandleShow(bool show, int WXUNUSED(status))
+{
+    wxShowEvent event(GetId(), show);
+    event.m_eventObject = this;

 
 

-    bool bCtrlDown = (::GetKeyState(VK_CONTROL) & 0x100) != 0;
+    return GetEventHandler()->ProcessEvent(event);
+}

 
 

-    // WM_GETDLGCODE: if the control wants it for itself, don't process it
-    // (except for Ctrl-Tab combination which is always processed)
-    LONG lDlgCode;
-    if ( bProcess && !bCtrlDown ) {
-      lDlgCode = ::SendMessage(msg->hwnd, WM_GETDLGCODE, 0, 0);
-    }
+bool wxWindowMSW::HandleInitDialog(WXHWND WXUNUSED(hWndFocus))
+{
+    wxInitDialogEvent event(GetId());
+    event.m_eventObject = this;

 
 

-    bool bForward;
-    if ( bProcess ) {
-      switch ( msg->wParam ) {
-        case VK_TAB:
-          if ( lDlgCode & DLGC_WANTTAB )
-            bProcess = FALSE;
-          else
-            bForward = !(::GetKeyState(VK_SHIFT) & 0x100);
-          break;
+    return GetEventHandler()->ProcessEvent(event);
+}

 
 

-        case VK_UP:
-        case VK_LEFT:
-          if ( lDlgCode & DLGC_WANTARROWS || bCtrlDown )
-            bProcess = FALSE;
-          else
-            bForward = FALSE;
-          break;
+bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
+{
+#ifndef __WXMICROWIN__
+    HDROP hFilesInfo = (HDROP) wParam;
+    POINT dropPoint;
+    DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);

 
 

-        case VK_DOWN:
-        case VK_RIGHT:
-          if ( lDlgCode & DLGC_WANTARROWS || bCtrlDown )
-            bProcess = FALSE;
-          else
-            bForward = TRUE;
-          break;
+    // Get the total number of files dropped
+    WORD gwFilesDropped = (WORD)::DragQueryFile
+                            (
+                                (HDROP)hFilesInfo,
+                                (UINT)-1,
+                                (LPTSTR)0,
+                                (UINT)0
+                            );

 
 

-        default:
-          bProcess = FALSE;
-      }
+    wxString *files = new wxString[gwFilesDropped];
+    int wIndex;
+    for (wIndex=0; wIndex < (int)gwFilesDropped; wIndex++)
+    {
+        DragQueryFile (hFilesInfo, wIndex, (LPTSTR) wxBuffer, 1000);
+        files[wIndex] = wxBuffer;

     }
     }

+    DragFinish (hFilesInfo);

 
 

-    if ( bProcess ) {
-      wxNavigationKeyEvent event;
-      event.SetDirection(bForward);
-      event.SetWindowChange(bCtrlDown);
-      event.SetEventObject(this);
-
-      if ( GetEventHandler()->ProcessEvent(event) )
-        return TRUE;
-    }
+    wxDropFilesEvent event(wxEVT_DROP_FILES, gwFilesDropped, files);
+    event.m_eventObject = this;
+    event.m_pos.x = dropPoint.x; event.m_pos.x = dropPoint.y;

 
 

-    return ::IsDialogMessage((HWND)GetHWND(), msg) != 0;
-  }
+    bool rc = GetEventHandler()->ProcessEvent(event);

 
 

-  return FALSE;
-}
+    delete[] files;

 
 

-long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))
-{
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnMDIActivate %d\n", m_hWnd);
+    return rc;
+#else // __WXMICROWIN__
+    return FALSE;

 #endif
 #endif

-  return 1;

 }
 
 }
 

-void wxWindow::MSWDetachWindowMenu(void)
+bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
+                                  short nHitTest,
+                                  int WXUNUSED(mouseMsg))

 {
 {

-  if (m_hMenu)
-  {
-    int N = GetMenuItemCount((HMENU) m_hMenu);
-    int i;
-    for (i = 0; i < N; i++)
+#ifndef __WXMICROWIN__
+    // the logic is as follows:
+    // -1. don't set cursor for non client area, including but not limited to
+    //     the title bar, scrollbars, &c
+    //  0. allow the user to override default behaviour by using EVT_SET_CURSOR
+    //  1. if we have the cursor set it unless wxIsBusy()
+    //  2. if we're a top level window, set some cursor anyhow
+    //  3. if wxIsBusy(), set the busy cursor, otherwise the global one
+
+    if ( nHitTest != HTCLIENT )

     {
     {

-      char buf[100];
-      int chars = GetMenuString((HMENU) m_hMenu, i, buf, 100, MF_BYPOSITION);
-      if ((chars > 0) && (strcmp(buf, "&Window") == 0))
-      {
-        RemoveMenu((HMENU) m_hMenu, i, MF_BYPOSITION);
-        break;
-      }
+        return FALSE;

     }
     }

-  }
-}

 
 

-bool wxWindow::MSWOnPaint(void)
-{
-  wxPaintEvent event(m_windowId);
-  event.SetEventObject(this);
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-  return TRUE;
-}
+    HCURSOR hcursor = 0;

 
 

-void wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag))
-{
-  if (m_inOnSize)
-    return;
-    
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnSize %d\n", m_hWnd);
+    // first ask the user code - it may wish to set the cursor in some very
+    // specific way (for example, depending on the current position)
+    POINT pt;
+#ifdef __WIN32__
+    if ( !::GetCursorPos(&pt) )
+    {
+        wxLogLastError(wxT("GetCursorPos"));
+    }
+#else
+    // In WIN16 it doesn't return a value.
+    ::GetCursorPos(&pt);

 #endif
 #endif

-  if (!m_hWnd)
-    return;
-
-  m_inOnSize = TRUE;
-
-  wxSizeEvent event(wxSize(w, h), m_windowId);
-  event.SetEventObject(this);
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-
-  m_inOnSize = FALSE;
-}
-
-void wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos))
-{
-    Default();
-}

 
 

-// Deal with child commands from buttons etc.
-bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
-{
-#if WXDEBUG > 1
-  wxDebugMsg("wxWindow::MSWOnCommand\n");
-#endif
-  if (wxCurrentPopupMenu)
-  {
-    wxMenu *popupMenu = wxCurrentPopupMenu;
-    wxCurrentPopupMenu = NULL;
-    bool succ = popupMenu->MSWCommand(cmd, id);
-    return succ;
-  }
-#if WXDEBUG > 1
-  char buf[80];
-  sprintf(buf, "Looking for item %d...\n", id);
-  wxDebugMsg(buf);
-#endif
+    int x = pt.x,
+        y = pt.y;
+    ScreenToClient(&x, &y);
+    wxSetCursorEvent event(x, y);

 
 

-  wxWindow *item = FindItem(id);
-  if (item)
-  {
-    bool value = item->MSWCommand(cmd, id);
-#if WXDEBUG > 1
-    if (value)
-      wxDebugMsg("MSWCommand succeeded\n");
-    else
-      wxDebugMsg("MSWCommand failed\n");
-#endif
-    return value;
-  }
-  else
-  {
-#if WXDEBUG > 1
-    wxDebugMsg("Could not find item!\n");
-    char buf[100];
-    wxDebugMsg("Item ids for this panel:\n");
-
-    wxNode *current = GetChildren()->First();
-    while (current)
+    bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
+    if ( processedEvtSetCursor && event.HasCursor() )

     {
     {

-      wxObject *obj = (wxObject *)current->Data() ;
-      if (obj->IsKindOf(CLASSINFO(wxControl)))
-      {
-        wxControl *item = (wxControl *)current->Data();
-        sprintf(buf, "  %d\n", (int)item->m_windowId);
-        wxDebugMsg(buf);
-      }
-      current = current->Next();  
+        hcursor = GetHcursorOf(event.GetCursor());

     }
     }

-    wxYield();
-#endif
-    return FALSE;
-  }
-}

 
 

-long wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam)
-{
-    switch (wParam)
+    if ( !hcursor )

     {
     {

-        case SC_MAXIMIZE:
+        bool isBusy = wxIsBusy();
+
+        // the test for processedEvtSetCursor is here to prevent using m_cursor
+        // if the user code caught EVT_SET_CURSOR() and returned nothing from
+        // it - this is a way to say that our cursor shouldn't be used for this
+        // point
+        if ( !processedEvtSetCursor && m_cursor.Ok() )

         {
         {

-            wxMaximizeEvent event(m_windowId);
-            event.SetEventObject(this);
-            if (!GetEventHandler()->ProcessEvent(event))
-                return Default();
-            else
-                return 0;
-            break;
+            hcursor = GetHcursorOf(m_cursor);

         }
         }

-        case SC_MINIMIZE:
+
+        if ( !GetParent() )

         {
         {

-            wxIconizeEvent event(m_windowId);
-            event.SetEventObject(this);
-            if (!GetEventHandler()->ProcessEvent(event))
-                return Default();
-            else
-                return 0;
-            break;
+            if ( isBusy )
+            {
+                hcursor = wxGetCurrentBusyCursor();
+            }
+            else if ( !hcursor )
+            {
+                const wxCursor *cursor = wxGetGlobalCursor();
+                if ( cursor && cursor->Ok() )
+                {
+                    hcursor = GetHcursorOf(*cursor);
+                }
+            }

         }
         }

-        default:
-            return Default();

     }
     }

-    return 0;
-}
-
-void wxWindow::MSWOnLButtonDown(int x, int y, WXUINT flags)
-{
-  wxMouseEvent event(wxEVT_LEFT_DOWN);

 
 

-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+    if ( hcursor )
+    {
+        ::SetCursor(hcursor);

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVENT_TYPE_LEFT_DOWN;
+        // cursor set, stop here
+        return TRUE;
+    }
+#endif // __WXMICROWIN__

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    // pass up the window chain
+    return FALSE;

 }
 
 }
 

-void wxWindow::MSWOnLButtonUp(int x, int y, WXUINT flags)
+// ---------------------------------------------------------------------------
+// owner drawn stuff
+// ---------------------------------------------------------------------------
+
+bool wxWindowMSW::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)

 {
 {

-  wxMouseEvent event(wxEVT_LEFT_UP);
+#if wxUSE_OWNER_DRAWN

 
 

-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+#if wxUSE_MENUS_NATIVE
+    // is it a menu item?
+    if ( id == 0 )
+    {
+        DRAWITEMSTRUCT *pDrawStruct = (DRAWITEMSTRUCT *)itemStruct;
+        wxMenuItem *pMenuItem = (wxMenuItem *)(pDrawStruct->itemData);
+
+        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
+
+        // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent
+        // the DC from being released
+        wxDCTemp dc((WXHDC)pDrawStruct->hDC);
+        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
+               );
+    }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_CONTROLS
+    wxWindow *item = FindItem(id);
+    if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
+    {
+        return ((wxControl *)item)->MSWOnDraw(itemStruct);
+    }
+#endif // wxUSE_CONTROLS

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_UP;
+#endif // USE_OWNER_DRAWN

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    return FALSE;

 }
 
 }
 

-void wxWindow::MSWOnLButtonDClick(int x, int y, WXUINT flags)
+bool wxWindowMSW::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)

 {
 {

-  wxMouseEvent event(wxEVT_LEFT_DCLICK);
+#if wxUSE_OWNER_DRAWN
+    // is it a menu item?
+    if ( id == 0 )
+    {
+        MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct;
+        wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);

 
 

-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+        wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_DCLICK;
+        return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth,
+                                        &pMeasureStruct->itemHeight);
+    }

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    wxWindow *item = FindItem(id);
+    if ( item && item->IsKindOf(CLASSINFO(wxControl)) )
+    {
+        return ((wxControl *)item)->MSWOnMeasure(itemStruct);
+    }
+#endif  // owner-drawn menus
+    return FALSE;

 }
 
 }
 

-void wxWindow::MSWOnMButtonDown(int x, int y, WXUINT flags)
-{
-  wxMouseEvent event(wxEVT_MIDDLE_DOWN);
-
-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+// ---------------------------------------------------------------------------
+// colours and palettes
+// ---------------------------------------------------------------------------

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_DOWN;
+bool wxWindowMSW::HandleSysColorChange()
+{
+    wxSysColourChangedEvent event;
+    event.SetEventObject(this);

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-void wxWindow::MSWOnMButtonUp(int x, int y, WXUINT flags)
+bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
+                              WXHDC pDC,
+                              WXHWND pWnd,
+                              WXUINT nCtlColor,
+                              WXUINT message,
+                              WXWPARAM wParam,
+                              WXLPARAM lParam)

 {
 {

-//wxDebugMsg("MButtonUp\n") ;
-  wxMouseEvent event(wxEVT_MIDDLE_UP);
+#ifndef __WXMICROWIN__
+    WXHBRUSH hBrush = 0;

 
 

-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+    if ( nCtlColor == CTLCOLOR_DLG )
+    {
+        hBrush = OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
+    }
+#if wxUSE_CONTROLS
+    else
+    {
+        wxControl *item = (wxControl *)FindItemByHWND(pWnd, TRUE);
+        if ( item )
+            hBrush = item->OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
+    }
+#endif // wxUSE_CONTROLS

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_UP;
+    if ( hBrush )
+        *brush = hBrush;

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    return hBrush != 0;
+#else // __WXMICROWIN__
+    return FALSE;
+#endif

 }
 
 }
 

-void wxWindow::MSWOnMButtonDClick(int x, int y, WXUINT flags)
+// Define for each class of dialog and control
+WXHBRUSH wxWindowMSW::OnCtlColor(WXHDC WXUNUSED(hDC),
+                                 WXHWND WXUNUSED(hWnd),
+                                 WXUINT WXUNUSED(nCtlColor),
+                                 WXUINT WXUNUSED(message),
+                                 WXWPARAM WXUNUSED(wParam),
+                                 WXLPARAM WXUNUSED(lParam))

 {
 {

-  wxMouseEvent event(wxEVT_MIDDLE_DCLICK);
-
-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+    return (WXHBRUSH)0;
+}

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_MIDDLE_DCLICK;
+bool wxWindowMSW::HandlePaletteChanged(WXHWND hWndPalChange)
+{
+    wxPaletteChangedEvent event(GetId());
+    event.SetEventObject(this);
+    event.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-void wxWindow::MSWOnRButtonDown(int x, int y, WXUINT flags)
+bool wxWindowMSW::HandleQueryNewPalette()

 {
 {

-  wxMouseEvent event(wxEVT_RIGHT_DOWN);
+    wxQueryNewPaletteEvent event(GetId());
+    event.SetEventObject(this);

 
 

-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+    return GetEventHandler()->ProcessEvent(event) && event.GetPaletteRealized();
+}

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_DOWN;
+// Responds to colour changes: passes event on to children.
+void wxWindowMSW::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        // Only propagate to non-top-level windows
+        wxWindow *win = (wxWindow *)node->Data();
+        if ( win->GetParent() )
+        {
+            wxSysColourChangedEvent event2;
+            event.m_eventObject = win;
+            win->GetEventHandler()->ProcessEvent(event2);
+        }

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+        node = node->Next();
+    }

 }
 
 }
 

-void wxWindow::MSWOnRButtonUp(int x, int y, WXUINT flags)
+// ---------------------------------------------------------------------------
+// painting
+// ---------------------------------------------------------------------------
+
+bool wxWindowMSW::HandlePaint()

 {
 {

-  wxMouseEvent event(wxEVT_RIGHT_UP);
+#ifdef __WIN32__
+    HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle
+    if ( !hRegion )
+        wxLogLastError(wxT("CreateRectRgn"));
+    if ( ::GetUpdateRgn(GetHwnd(), hRegion, FALSE) == ERROR )
+        wxLogLastError(wxT("GetUpdateRgn"));
+
+    m_updateRegion = wxRegion((WXHRGN) hRegion);
+#else // Win16
+    RECT updateRect;
+    ::GetUpdateRect(GetHwnd(), &updateRect, FALSE);
+
+    m_updateRegion = wxRegion(updateRect.left, updateRect.top,
+                              updateRect.right - updateRect.left,
+                              updateRect.bottom - updateRect.top);
+#endif // Win32/16
+
+    wxPaintEvent event(m_windowId);
+    event.SetEventObject(this);

 
 

-  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.m_eventObject = this;
-  event.SetTimestamp(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
+    bool processed = GetEventHandler()->ProcessEvent(event);

 
 

-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_UP;
+    // note that we must generate NC event after the normal one as otherwise
+    // BeginPaint() will happily overwrite our decorations with the background
+    // colour
+    wxNcPaintEvent eventNc(m_windowId);
+    eventNc.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(eventNc);

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    return processed;

 }
 
 }
 

-void wxWindow::MSWOnRButtonDClick(int x, int y, WXUINT flags)
+// Can be called from an application's OnPaint handler
+void wxWindowMSW::OnPaint(wxPaintEvent& event)

 {
 {

-  wxMouseEvent event(wxEVT_RIGHT_DCLICK);
-
-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
-
-  m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_RIGHT_DCLICK;
-
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+#ifdef __WXUNIVERSAL__
+    event.Skip();
+#else
+    HDC hDC = (HDC) wxPaintDC::FindDCInCache((wxWindow*) event.GetEventObject());
+    if (hDC != 0)
+    {
+        MSWDefWindowProc(WM_PAINT, (WPARAM) hDC, 0);
+    }
+#endif

 }
 
 }
 

-void wxWindow::MSWOnMouseMove(int x, int y, WXUINT flags)
+bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)

 {
 {

-  // 'normal' move event...
-  // Set cursor, but only if we're not in 'busy' mode
-  
-  // Trouble with this is that it sets the cursor for controls too :-(
-  if (m_windowCursor.Ok() && !wxIsBusy())
-    ::SetCursor((HCURSOR) m_windowCursor.GetHCURSOR());
+    // Prevents flicker when dragging
+    if ( ::IsIconic(GetHwnd()) )
+        return TRUE;

 
 

- if (!m_mouseInWindow)
-  {
-    // Generate an ENTER event
-    m_mouseInWindow = TRUE;
-    MSWOnMouseEnter(x, y, flags);
-  }
+    wxDCTemp dc(hdc);

 
 

-  wxMouseEvent event(wxEVT_MOTION);
+    dc.SetHDC(hdc);
+    dc.SetWindow((wxWindow *)this);
+    dc.BeginDrawing();

 
 

-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
+    wxEraseEvent event(m_windowId, &dc);
+    event.SetEventObject(this);
+    bool rc = GetEventHandler()->ProcessEvent(event);

 
 

-  // 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_lastEvent == wxEVT_RIGHT_DOWN || m_lastEvent == wxEVT_LEFT_DOWN ||
-       m_lastEvent == wxEVT_MIDDLE_DOWN) &&
-      (m_lastXPos == event.m_x && m_lastYPos == event.m_y))
-  {
-    m_lastXPos = event.m_x; m_lastYPos = event.m_y;
-    m_lastEvent = wxEVT_MOTION;
-    return;
-  }
+    dc.EndDrawing();

 
 

-  m_lastEvent = wxEVT_MOTION;
-  m_lastXPos = event.m_x; m_lastYPos = event.m_y;
+    // must be called manually as ~wxDC doesn't do anything for wxDCTemp
+    dc.SelectOldObjects(hdc);

 
 

-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
+    return rc;

 }
 
 }
 

-void wxWindow::MSWOnMouseEnter(int x, int y, WXUINT flags)
-{
-  wxMouseEvent event(wxEVT_ENTER_WINDOW);
-
-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
-
-  m_lastEvent = wxEVT_ENTER_WINDOW;
-  m_lastXPos = event.m_x; m_lastYPos = event.m_y;
-  // No message - ensure we don't try to call the default behaviour accidentally.
-  m_lastMsg = 0;
-  GetEventHandler()->ProcessEvent(event);
-}
-
-void wxWindow::MSWOnMouseLeave(int x, int y, WXUINT flags)
-{
-  wxMouseEvent event(wxEVT_LEAVE_WINDOW);
-
-  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(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
-  event.m_eventObject = this;
-
-  m_lastEvent = wxEVT_LEAVE_WINDOW;
-  m_lastXPos = event.m_x; m_lastYPos = event.m_y;
-  // No message - ensure we don't try to call the default behaviour accidentally.
-  m_lastMsg = 0;
-  GetEventHandler()->ProcessEvent(event);
-}
-
-void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
-{
-  int id;
-  bool tempControlDown = FALSE;
-  if (isASCII)
-  {
-    // If 1 -> 26, translate to CTRL plus a letter.
-    id = wParam;
-    if ((id > 0) && (id < 27))
-    {
-      switch (id)
-      {
-        case 13:
-        {
-          id = WXK_RETURN;
-          break;
-        }
-        case 8:
-        {
-          id = WXK_BACK;
-          break;
-        }
-        case 9:
-        {
-          id = WXK_TAB;
-          break;
-        }
-        default:
-        {
-          tempControlDown = TRUE;
-          id = id + 96;
-        }
-      }
-    }
-  }
-  else if ((id = wxCharCodeMSWToWX(wParam)) == 0) {
-      // it's ASCII and will be processed here only when called from
-      // WM_CHAR (i.e. when isASCII = TRUE)
-      id = -1;
-  }
-
-  if (id != -1)
-  {
-    wxKeyEvent event(wxEVT_CHAR);
-    event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE);
-    event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE);
-    if ((HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN)
-      event.m_altDown = TRUE;
+void wxWindowMSW::OnEraseBackground(wxEraseEvent& event)
+{
+    RECT rect;
+    ::GetClientRect(GetHwnd(), &rect);

 
 

-    event.m_eventObject = this;
-    event.m_keyCode = id;
-    event.SetTimestamp(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
+    COLORREF ref = PALETTERGB(m_backgroundColour.Red(),
+                              m_backgroundColour.Green(),
+                              m_backgroundColour.Blue());
+    HBRUSH hBrush = ::CreateSolidBrush(ref);
+    if ( !hBrush )
+        wxLogLastError(wxT("CreateSolidBrush"));

 
 

-    POINT pt ;
-    GetCursorPos(&pt) ;
-    RECT rect ;
-    GetWindowRect((HWND) GetHWND(),&rect) ;
-    pt.x -= rect.left ;
-    pt.y -= rect.top ;
+    HDC hdc = (HDC)event.GetDC()->GetHDC();

 
 

-    event.m_x = pt.x; event.m_y = pt.y;
+    int mode = ::SetMapMode(hdc, MM_TEXT);

 
 

-    if (!GetEventHandler()->ProcessEvent(event))
-               Default();
-  }
+    ::FillRect(hdc, &rect, hBrush);
+    ::DeleteObject(hBrush);
+    ::SetMapMode(hdc, mode);

 }
 
 }
 

-void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
-{
-    int buttons = 0;
-    int change = 0;
-    if (flags & JOY_BUTTON1CHG)
-        change = wxJOY_BUTTON1;
-    if (flags & JOY_BUTTON2CHG)
-        change = wxJOY_BUTTON2;
-    if (flags & JOY_BUTTON3CHG)
-        change = wxJOY_BUTTON3;
-    if (flags & JOY_BUTTON4CHG)
-        change = wxJOY_BUTTON4;
-
-    if (flags & JOY_BUTTON1)
-        buttons |= wxJOY_BUTTON1;
-    if (flags & JOY_BUTTON2)
-        buttons |= wxJOY_BUTTON2;
-    if (flags & JOY_BUTTON3)
-        buttons |= wxJOY_BUTTON3;
-    if (flags & JOY_BUTTON4)
-        buttons |= wxJOY_BUTTON4;
+// ---------------------------------------------------------------------------
+// moving and resizing
+// ---------------------------------------------------------------------------

 
 

-    wxJoystickEvent event(wxEVT_JOY_BUTTON_DOWN, buttons, joystick, change);
-    event.SetPosition(wxPoint(x, y));
+bool wxWindowMSW::HandleMinimize()
+{
+    wxIconizeEvent event(m_windowId);

     event.SetEventObject(this);
 
     event.SetEventObject(this);
 

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

 }
 
 }
 

-void wxWindow::MSWOnJoyUp(int joystick, int x, int y, WXUINT flags)
+bool wxWindowMSW::HandleMaximize()

 {
 {

-    int buttons = 0;
-    int change = 0;
-    if (flags & JOY_BUTTON1CHG)
-        change = wxJOY_BUTTON1;
-    if (flags & JOY_BUTTON2CHG)
-        change = wxJOY_BUTTON2;
-    if (flags & JOY_BUTTON3CHG)
-        change = wxJOY_BUTTON3;
-    if (flags & JOY_BUTTON4CHG)
-        change = wxJOY_BUTTON4;
-
-    if (flags & JOY_BUTTON1)
-        buttons |= wxJOY_BUTTON1;
-    if (flags & JOY_BUTTON2)
-        buttons |= wxJOY_BUTTON2;
-    if (flags & JOY_BUTTON3)
-        buttons |= wxJOY_BUTTON3;
-    if (flags & JOY_BUTTON4)
-        buttons |= wxJOY_BUTTON4;
-
-    wxJoystickEvent event(wxEVT_JOY_BUTTON_UP, buttons, joystick, change);
-    event.SetPosition(wxPoint(x, y));
+    wxMaximizeEvent event(m_windowId);

     event.SetEventObject(this);
 
     event.SetEventObject(this);
 

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

 }
 
 }
 

-void wxWindow::MSWOnJoyMove(int joystick, int x, int y, WXUINT flags)
+bool wxWindowMSW::HandleMove(int x, int y)

 {
 {

-    int buttons = 0;
-    if (flags & JOY_BUTTON1)
-        buttons |= wxJOY_BUTTON1;
-    if (flags & JOY_BUTTON2)
-        buttons |= wxJOY_BUTTON2;
-    if (flags & JOY_BUTTON3)
-        buttons |= wxJOY_BUTTON3;
-    if (flags & JOY_BUTTON4)
-        buttons |= wxJOY_BUTTON4;
-
-    wxJoystickEvent event(wxEVT_JOY_MOVE, buttons, joystick, 0);
-    event.SetPosition(wxPoint(x, y));
+    wxMoveEvent event(wxPoint(x, y), m_windowId);

     event.SetEventObject(this);
 
     event.SetEventObject(this);
 

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

 }
 
 }
 

-void wxWindow::MSWOnJoyZMove(int joystick, int z, WXUINT flags)
+bool wxWindowMSW::HandleSize(int w, int h, WXUINT WXUNUSED(flag))

 {
 {

-    int buttons = 0;
-    if (flags & JOY_BUTTON1)
-        buttons |= wxJOY_BUTTON1;
-    if (flags & JOY_BUTTON2)
-        buttons |= wxJOY_BUTTON2;
-    if (flags & JOY_BUTTON3)
-        buttons |= wxJOY_BUTTON3;
-    if (flags & JOY_BUTTON4)
-        buttons |= wxJOY_BUTTON4;
-
-    wxJoystickEvent event(wxEVT_JOY_ZMOVE, buttons, joystick, 0);
-    event.SetZPosition(z);
+    wxSizeEvent event(wxSize(w, h), m_windowId);

     event.SetEventObject(this);
 
     event.SetEventObject(this);
 

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

 }
 
 }
 

-void wxWindow::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
+bool wxWindowMSW::HandleGetMinMaxInfo(void *mmInfo)

 {
 {

-  if (control)
-  {
-    wxWindow *child = wxFindWinFromHandle(control);
-  if ( child )
-      child->MSWOnVScroll(wParam, pos, control);
-    return;
-  }
+    MINMAXINFO *info = (MINMAXINFO *)mmInfo;

 
 

-  wxScrollEvent event;
-  event.SetPosition(pos);
-  event.SetOrientation(wxVERTICAL);
-  event.m_eventObject = this;
+    bool rc = FALSE;

 
 

-       switch ( wParam )
-       {
-               case SB_TOP:
-                       event.m_eventType = wxEVT_SCROLL_TOP;
-                       break;
-
-               case SB_BOTTOM:
-                       event.m_eventType = wxEVT_SCROLL_BOTTOM;
-                       break;
-
-               case SB_LINEUP:
-                       event.m_eventType = wxEVT_SCROLL_LINEUP;
-                       break;
-
-               case SB_LINEDOWN:
-                       event.m_eventType = wxEVT_SCROLL_LINEDOWN;
-                       break;
-
-               case SB_PAGEUP:
-                        event.m_eventType = wxEVT_SCROLL_PAGEUP;
-                       break;
-
-               case SB_PAGEDOWN:
-                        event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
-                       break;
+    if ( m_minWidth != -1 )
+    {
+        info->ptMinTrackSize.x = m_minWidth;
+        rc = TRUE;
+    }

 
 

-        case SB_THUMBTRACK:
-        case SB_THUMBPOSITION:
-                        event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
-                       break;
+    if ( m_minHeight != -1 )
+    {
+        info->ptMinTrackSize.y = m_minHeight;
+        rc = TRUE;
+    }

 
 

-               default:
-                        return;
-                        break;
-       }
-
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-}
-
-void wxWindow::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control)
-{
-  if (control)
-  {
-    wxWindow *child = wxFindWinFromHandle(control);
-    if ( child )
-      child->MSWOnHScroll(wParam, pos, control);
-    return;
-  }
-  
-  wxScrollEvent event;
-  event.SetPosition(pos);
-  event.SetOrientation(wxHORIZONTAL);
-  event.m_eventObject = this;
-  
-  switch ( wParam )
-  {
-               case SB_TOP:
-                       event.m_eventType = wxEVT_SCROLL_TOP;
-                       break;
-
-               case SB_BOTTOM:
-                       event.m_eventType = wxEVT_SCROLL_BOTTOM;
-                       break;
-
-               case SB_LINEUP:
-                       event.m_eventType = wxEVT_SCROLL_LINEUP;
-                       break;
-
-               case SB_LINEDOWN:
-                       event.m_eventType = wxEVT_SCROLL_LINEDOWN;
-                       break;
-
-               case SB_PAGEUP:
-                        event.m_eventType = wxEVT_SCROLL_PAGEUP;
-                       break;
-
-               case SB_PAGEDOWN:
-                        event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
-                       break;
-
-        case SB_THUMBTRACK:
-        case SB_THUMBPOSITION:
-                        event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
-                       break;
-
-               default:
-                        return;
-                        break;
-       }
-  if (!GetEventHandler()->ProcessEvent(event))
-    Default();
-}
+    if ( m_maxWidth != -1 )
+    {
+        info->ptMaxTrackSize.x = m_maxWidth;
+        rc = TRUE;
+    }

 
 

-void wxWindow::MSWOnShow(bool show, int status)
-{
-  wxShowEvent event(GetId(), show);
-  event.m_eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-}
+    if ( m_maxHeight != -1 )
+    {
+        info->ptMaxTrackSize.y = m_maxHeight;
+        rc = TRUE;
+    }

 
 

-bool wxWindow::MSWOnInitDialog(WXHWND WXUNUSED(hWndFocus))
-{
-  wxInitDialogEvent event(GetId());
-  event.m_eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-  return TRUE;
+    return rc;

 }
 
 }
 

-void wxWindow::InitDialog(void)
-{
-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-}
+// ---------------------------------------------------------------------------
+// command messages
+// ---------------------------------------------------------------------------

 
 

-// Default init dialog behaviour is to transfer data to window
-void wxWindow::OnInitDialog(wxInitDialogEvent& event)
+bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)

 {
 {

-  TransferDataToWindow();
-}
+#if wxUSE_MENUS_NATIVE
+    if ( wxCurrentPopupMenu )
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;

 
 

-void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font)
-{
-  TEXTMETRIC tm;
-  HDC dc = ::GetDC((HWND) wnd);
-  HFONT fnt =0;
-  HFONT was = 0;
-  if (the_font)
-  {
-#if WXDEBUG > 1
-    wxDebugMsg("wxGetCharSize: Selecting HFONT %X\n", fnt);
-#endif
-//    the_font->UseResource();
-//    the_font->RealizeResource();
-    if ((fnt=(HFONT) the_font->GetResourceHandle()))
-      was = (HFONT) SelectObject(dc,fnt) ;
-  }
-  GetTextMetrics(dc, &tm);
-  if (the_font && fnt && was)
-  {
-#if WXDEBUG > 1
-    wxDebugMsg("wxGetCharSize: Selecting old HFONT %X\n", was);
-#endif
-    SelectObject(dc,was) ;
-  }
-  ReleaseDC((HWND)wnd, dc);
-  *x = tm.tmAveCharWidth;
-  *y = tm.tmHeight + tm.tmExternalLeading;
+        return popupMenu->MSWCommand(cmd, id);
+    }
+#endif // wxUSE_MENUS_NATIVE

 
 

-//  if (the_font)
-//    the_font->ReleaseResource();
-}
+    wxWindow *win = (wxWindow*) NULL;
+    if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
+    {
+        // must cast to a signed type before comparing with other ids!
+        win = FindItem((signed short)id);
+    }

 
 

-// 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 wxCharCodeMSWToWX(int keySym)
-{
-  int id = 0;
-  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:
+    if (!win && control)

     {
     {

-      return 0;
+        // find it from HWND - this works even with the broken programs using
+        // the same ids for different controls
+        win = wxFindWinFromHandle(control);

     }
     }

-  }
-  return id;
-}

 
 

-int wxCharCodeWXToMSW(int id, bool *isVirtual)
-{
-  *isVirtual = TRUE;
-  int keySym = 0;
-  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 ( win )

     {
     {

-      *isVirtual = FALSE;
-      keySym = id;
-      break;
+        return win->MSWCommand(cmd, id);

     }
     }

-  }
-  return keySym;
-}

 
 

-// Caret manipulation
-void wxWindow::CreateCaret(int w, int h)
-{
-  m_caretWidth = w;
-  m_caretHeight = h;
-  m_caretEnabled = TRUE;
-}
+    // the messages sent from the in-place edit control used by the treectrl
+    // for label editing have id == 0, but they should _not_ be treated as menu
+    // messages (they are EN_XXX ones, in fact) so don't translate anything
+    // coming from a control to wxEVT_COMMAND_MENU_SELECTED
+    if ( !control )
+    {
+        // If no child window, it may be an accelerator, e.g. for a popup menu
+        // command

 
 

-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
-{
-  // Not implemented
-}
+        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
+        event.SetEventObject(this);
+        event.SetId(id);
+        event.SetInt(id);

 
 

-void wxWindow::ShowCaret(bool show)
-{
-  if (m_caretEnabled)
-  {
-    if (show)
-      ::ShowCaret((HWND) GetHWND());
+        return GetEventHandler()->ProcessEvent(event);
+    }
+#if wxUSE_SPINCTRL && !defined(__WXUNIVERSAL__)

     else
     else

-      ::HideCaret((HWND) GetHWND());
-    m_caretShown = show;
-  }
-}
-
-void wxWindow::DestroyCaret(void)
-{
-  m_caretEnabled = FALSE;
-}
+    {
+        // the text ctrl which is logically part of wxSpinCtrl sends WM_COMMAND
+        // notifications to its parent which we want to reflect back to
+        // wxSpinCtrl
+        wxSpinCtrl *spin = wxSpinCtrl::GetSpinForTextCtrl(control);
+        if ( spin && spin->ProcessTextCommand(cmd, id) )
+            return TRUE;
+    }
+#endif // wxUSE_SPINCTRL

 
 

-void wxWindow::SetCaretPos(int x, int y)
-{
-  ::SetCaretPos(x, y);
+    return FALSE;

 }
 
 }
 

-void wxWindow::GetCaretPos(int *x, int *y) const
+bool wxWindowMSW::HandleSysCommand(WXWPARAM wParam, WXLPARAM WXUNUSED(lParam))

 {
 {

-  POINT point;
-  ::GetCaretPos(&point);
-  *x = point.x;
-  *y = point.y;
-}
-
-/*
- * Update iterator. Use from within OnPaint.
- */
+    // 4 bits are reserved
+    switch ( wParam & 0xFFFFFFF0 )
+    {
+        case SC_MAXIMIZE:
+            return HandleMaximize();

 
 

-static RECT gs_UpdateRect;
+        case SC_MINIMIZE:
+            return HandleMinimize();
+    }

 
 

-wxUpdateIterator::wxUpdateIterator(wxWindow* wnd)
-{
-  current = 0;                                 //start somewhere...
-#if defined(__WIN32__) && !defined(__win32s__)
-  rlist = NULL;                                        //make sure I don't free randomly
-  int len = GetRegionData((HRGN) wnd->m_updateRgn,0,NULL);     //Get buffer size
-  if (len)
-  {
-    rlist = (WXRGNDATA *) (RGNDATA *)new char[len];
-    GetRegionData((HRGN) wnd->m_updateRgn,len, (RGNDATA *)rlist);
-    rp = (void *)(RECT*) ((RGNDATA *)rlist)->Buffer;
-    rects = ((RGNDATA *)rlist)->rdh.nCount;
-  }
-  else
-#endif
-  {
-       gs_UpdateRect.left = wnd->m_updateRect.x;
-       gs_UpdateRect.top = wnd->m_updateRect.y;
-       gs_UpdateRect.right = wnd->m_updateRect.x + wnd->m_updateRect.width;
-       gs_UpdateRect.bottom = wnd->m_updateRect.y + wnd->m_updateRect.height;
-    rects = 1;
-    rp = (void *)&gs_UpdateRect;                       //Only one available in Win16,32s
-  }
+    return FALSE;

 }
 
 }
 

-wxUpdateIterator::~wxUpdateIterator(void)
-{
-#ifdef __WIN32__
-#ifndef __win32s__
-  if (rlist) delete (RGNDATA *) rlist;
-#endif
-#endif
-}
+// ---------------------------------------------------------------------------
+// mouse events
+// ---------------------------------------------------------------------------

 
 

-wxUpdateIterator::operator int (void)
+void wxWindowMSW::InitMouseEvent(wxMouseEvent& event,
+                                 int x, int y,
+                                 WXUINT flags)

 {
 {

-  if (current < rects)
-  {
-    return TRUE;
-  }
-  else
-  {
-    return FALSE;
-  }
-}
+    // our client coords are not quite the same as Windows ones
+    wxPoint pt = GetClientAreaOrigin();
+    event.m_x = x - pt.x;
+    event.m_y = y - pt.y;

 
 

-wxUpdateIterator* wxUpdateIterator::operator ++(int)
-{
-  current++;
-  return this;
-}
+    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.m_altDown = (::GetKeyState(VK_MENU) & 0x80000000) != 0;

 
 

-void wxUpdateIterator::GetRect(wxRect *rect)
-{
-  RECT *mswRect = ((RECT *)rp)+current;        //ought to error check this...
-  rect->x = mswRect->left;
-  rect->y = mswRect->top;
-  rect->width = mswRect->right - mswRect->left;
-  rect->height = mswRect->bottom - mswRect->top;
-}
+    event.SetTimestamp(s_currentMsg.time);
+    event.m_eventObject = this;

 
 

-int wxUpdateIterator::GetX()
-{
-  return ((RECT*)rp)[current].left;
+#if wxUSE_MOUSEEVENT_HACK
+    m_lastMouseX = x;
+    m_lastMouseY = y;
+    m_lastMouseEvent = event.GetEventType();
+#endif // wxUSE_MOUSEEVENT_HACK

 }
 
 }
 

-int wxUpdateIterator::GetY()
+bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)

 {
 {

-  return ((RECT *)rp)[current].top;
-}
+    // the mouse events take consecutive IDs from WM_MOUSEFIRST to
+    // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST
+    // from the message id and take the value in the table to get wxWin event
+    // id
+    static const wxEventType eventsMouse[] =
+    {
+        wxEVT_MOTION,
+        wxEVT_LEFT_DOWN,
+        wxEVT_LEFT_UP,
+        wxEVT_LEFT_DCLICK,
+        wxEVT_RIGHT_DOWN,
+        wxEVT_RIGHT_UP,
+        wxEVT_RIGHT_DCLICK,
+        wxEVT_MIDDLE_DOWN,
+        wxEVT_MIDDLE_UP,
+        wxEVT_MIDDLE_DCLICK
+    };

 
 

-int wxUpdateIterator::GetW()
-{
- return ((RECT *)rp)[current].right-GetX();
-}
+    wxMouseEvent event(eventsMouse[msg - WM_MOUSEMOVE]);
+    InitMouseEvent(event, x, y, flags);

 
 

-int wxUpdateIterator::GetH()
-{
-  return ((RECT *)rp)[current].bottom-GetY();
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-wxWindow *wxGetActiveWindow(void)
+bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)

 {
 {

-  HWND hWnd = GetActiveWindow();
-  if (hWnd != 0)
-  {
-    return wxFindWinFromHandle((WXHWND) hWnd);
-  }
-  return NULL;
-}
+    if ( !m_mouseInWindow )
+    {
+        // it would be wrong to assume that just because we get a mouse move
+        // event that the mouse is inside the window: although this is usually
+        // true, it is not if we had captured the mouse, so we need to check
+        // the mouse coordinates here
+        if ( !HasCapture() || IsMouseInWindow() )
+        {
+            // Generate an ENTER event
+            m_mouseInWindow = TRUE;

 
 

-// 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 APIENTRY _EXPORT
-  wxKeyboardHook(int nCode, WORD wParam, DWORD lParam);
+            wxMouseEvent event(wxEVT_ENTER_WINDOW);
+            InitMouseEvent(event, x, y, flags);

 
 

-void wxSetKeyboardHook(bool doIt)
-{
-  if (doIt)
-  {
-    wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance());
-    wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(),
-#ifdef __WIN32__
-      GetCurrentThreadId());
-//      (DWORD)GetCurrentProcess()); // This is another possibility. Which is right?
-#else
-      GetCurrentTask());
-#endif
-  }
-  else
-  {
-    UnhookWindowsHookEx(wxTheKeyboardHook);
-    FreeProcInstance(wxTheKeyboardHookProc);
-  }
-}
+            (void)GetEventHandler()->ProcessEvent(event);
+        }
+    }

 
 

-int APIENTRY _EXPORT
-  wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
-{
-  DWORD hiWord = HIWORD(lParam);
-  if (nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0))
-  {
-    int id;
-    if ((id = wxCharCodeMSWToWX(wParam)) != 0)
+#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 == x && m_lastMouseY == y) )

     {
     {

-      wxKeyEvent event(wxEVT_CHAR_HOOK);
-      if ((HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN)
-        event.m_altDown = TRUE;
-
-      event.m_eventObject = NULL;
-      event.m_keyCode = id;
-/* begin Albert's fix for control and shift key 26.5 */
-      event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE);
-      event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE);
-/* end Albert's fix for control and shift key 26.5 */
-      event.SetTimestamp(wxApp::sm_lastMessageTime); /* MATTHEW: timeStamp */
+        m_lastMouseEvent = wxEVT_MOTION;

 
 

-               wxWindow *win = wxGetActiveWindow();
-               if (win)
-               {
-            if (win->GetEventHandler()->ProcessEvent(event))
-                               return 1;
-               }
-               else
-               {
-                       if ( wxTheApp && wxTheApp->ProcessEvent(event) )
-                               return 1;
-               }
+        return FALSE;

     }
     }

-  }
-  return (int)CallNextHookEx(wxTheKeyboardHook, nCode, wParam, lParam);
-}
+#endif // wxUSE_MOUSEEVENT_HACK

 
 

-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH))
-{
-  m_minSizeX = minW;
-  m_minSizeY = minH;
-  m_maxSizeX = maxW;
-  m_maxSizeY = maxH;
+    return HandleMouseEvent(WM_MOUSEMOVE, x, y, flags);

 }
 
 }
 

-void wxWindow::Centre(int direction)
+
+bool wxWindowMSW::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+#if wxUSE_MOUSEWHEEL
+    wxMouseEvent event(wxEVT_MOUSEWHEEL);
+    InitMouseEvent(event,
+                   GET_X_LPARAM(lParam),
+                   GET_Y_LPARAM(lParam),
+                   LOWORD(wParam));
+    event.m_wheelRotation = (short)HIWORD(wParam);
+    event.m_wheelDelta = WHEEL_DELTA;

 
 

-  wxWindow *father = (wxWindow *)GetParent();
-  if (!father)
-    return;
+#ifdef __WIN32__
+    static int s_linesPerRotation = -1;
+    if ( s_linesPerRotation == -1 )
+    {
+        if ( !::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
+                                     &s_linesPerRotation, 0))
+        {
+            // this is not supposed to happen
+            wxLogLastError(_T("SystemParametersInfo(GETWHEELSCROLLLINES)"));

 
 

-  father->GetClientSize(&panel_width, &panel_height);
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+            // the default is 3, so use it if SystemParametersInfo() failed
+            s_linesPerRotation = 3;
+        }
+    }
+#else // Win16
+    // no SystemParametersInfo() under Win16
+    static const int s_linesPerRotation = 3;
+#endif

 
 

-  new_x = -1;
-  new_y = -1;
+    event.m_linesPerAction = s_linesPerRotation;
+    return GetEventHandler()->ProcessEvent(event);

 
 

-  if (direction & wxHORIZONTAL)
-    new_x = (int)((panel_width - width)/2);
+#else
+    (void) wParam;
+    (void) lParam;

 
 

-  if (direction & wxVERTICAL)
-    new_y = (int)((panel_height - height)/2);
+    return FALSE;
+#endif
+}

 
 

-  SetSize(new_x, new_y, -1, -1);

 
 

-}
+// ---------------------------------------------------------------------------
+// keyboard handling
+// ---------------------------------------------------------------------------

 
 

-/* TODO (maybe)
-void wxWindow::OnPaint(void)
+// create the key event of the given type for the given key - used by
+// HandleChar and HandleKeyDown/Up
+wxKeyEvent wxWindowMSW::CreateKeyEvent(wxEventType evType,
+                                    int id,
+                                    WXLPARAM lParam) const

 {
 {

-  PaintSelectionHandles();
-}
-*/
+    wxKeyEvent event(evType);
+    event.SetId(GetId());
+    event.m_shiftDown = wxIsShiftDown();
+    event.m_controlDown = wxIsCtrlDown();
+    event.m_altDown = (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN;

 
 

-void wxWindow::WarpPointer (int x_pos, int y_pos)
-{
-  // Move the pointer to (x_pos,y_pos) coordinates. They are expressed in
-  // pixel coordinates, relatives to the canvas -- So, we first need to
-  // substract origin of the window, then convert to screen position
+    event.m_eventObject = (wxWindow *)this; // const_cast
+    event.m_keyCode = id;
+    event.SetTimestamp(s_currentMsg.time);

 
 

-  int x = x_pos; int y = y_pos;
-/* Leave this to the app to decide (and/or wxScrolledWindow)
-      x -= m_xScrollPosition * m_xScrollPixelsPerLine;
-      y -= m_yScrollPosition * m_yScrollPixelsPerLine;
-*/
-      RECT rect;
-      GetWindowRect ((HWND) GetHWND(), &rect);
+    // translate the position to client coords
+    POINT pt;
+    GetCursorPos(&pt);
+    RECT rect;
+    GetWindowRect(GetHwnd(),&rect);
+    pt.x -= rect.left;
+    pt.y -= rect.top;

 
 

-      x += rect.left;
-      y += rect.top;
+    event.m_x = pt.x;
+    event.m_y = pt.y;

 
 

-      SetCursorPos (x, y);
+    return event;

 }
 
 }
 

-void wxWindow::MSWDeviceToLogical (float *x, float *y) const
+// isASCII is TRUE only when we're called from WM_CHAR handler and not from
+// WM_KEYDOWN one
+bool wxWindowMSW::HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII)

 {
 {

-    // TODO
-    // Do we have a SetUserScale in wxWindow too, so we can
-    // get mouse events scaled?
-/*
-      if (m_windowDC)
-      {
-        *x = m_windowDC->DeviceToLogicalX ((int) *x);
-        *y = m_windowDC->DeviceToLogicalY ((int) *y);
-      }
-*/
-}
+    bool ctrlDown = FALSE;

 
 

-bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC)
-{
-    wxDC dc ;
+    int id;
+    if ( isASCII )
+    {
+        // If 1 -> 26, translate to CTRL plus a letter.
+        id = wParam;
+        if ( (id > 0) && (id < 27) )
+        {
+            switch (id)
+            {
+                case 13:
+                    id = WXK_RETURN;
+                    break;

 
 

-       dc.SetHDC(pDC);
-       dc.SetWindow(this);
-       dc.BeginDrawing();
+                case 8:
+                    id = WXK_BACK;
+                    break;

 
 

-    wxEraseEvent event(m_windowId, &dc);
-    event.m_eventObject = this;
-    if (!GetEventHandler()->ProcessEvent(event))
-    {
-           dc.EndDrawing();
-           dc.SelectOldObjects(pDC);
-        return FALSE;
+                case 9:
+                    id = WXK_TAB;
+                    break;
+
+                default:
+                    ctrlDown = TRUE;
+                    id = id + 96;
+            }
+        }

     }
     }

-    else
+    else if ( (id = wxCharCodeMSWToWX(wParam)) == 0 )

     {
     {

-           dc.EndDrawing();
-           dc.SelectOldObjects(pDC);
+        // it's ASCII and will be processed here only when called from
+        // WM_CHAR (i.e. when isASCII = TRUE), don't process it now
+        id = -1;

     }
 
     }
 

-    dc.SetHDC((WXHDC) NULL);
-    return TRUE;
-}
-
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
-{
-  RECT rect;
-  ::GetClientRect((HWND) GetHWND(), &rect);
-
-  HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
-
-//  ::GetClipBox((HDC) event.GetDC()->GetHDC(), &rect);
-  ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
-  ::DeleteObject(hBrush);
-  ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
-/*
-  // Less efficient version (and doesn't account for scrolling)
-  int w, h;
-  GetClientSize(& w, & h);
-  wxBrush *brush = wxTheBrushList->FindOrCreateBrush(& GetBackgroundColour(), wxSOLID);
-  event.GetDC()->SetBrush(brush);
-  event.GetDC()->SetPen(wxTRANSPARENT_PEN);
-
-  event.GetDC()->DrawRectangle(0, 0, w+1, h+1);
-*/
-}
-
-#if WXWIN_COMPATIBILITY
-void wxWindow::SetScrollRange(int orient, int range, bool refresh)
-{
-#if defined(__WIN95__)
+    if ( id != -1 )
+    {
+        wxKeyEvent event(CreateKeyEvent(wxEVT_CHAR, id, lParam));
+        if ( ctrlDown )
+        {
+            event.m_controlDown = TRUE;
+        }

 
 

-  int range1 = range;
-
-  // Try to adjust the range to cope with page size > 1
-  // - a Windows API quirk
-  int pageSize = GetScrollPage(orient);
-  if ( pageSize > 1 && range > 0)
-  {
-       range1 += (pageSize - 1);
-  }
-
-  SCROLLINFO info;
-  int dir;
-
-  if (orient == wxHORIZONTAL) {
-       dir = SB_HORZ;
-  } else {
-       dir = SB_VERT;
-  }
-
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = pageSize; // Have to set this, or scrollbar goes awry
-  info.nMin = 0;
-  info.nMax = range1;
-  info.nPos = 0;
-  info.fMask = SIF_RANGE | SIF_PAGE;
-
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetScrollInfo(hWnd, dir, &info, refresh);
-#else
-  int wOrient ;
-  if (orient == wxHORIZONTAL)
-    wOrient = SB_HORZ;
-  else
-    wOrient = SB_VERT;
-    
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetScrollRange(hWnd, wOrient, 0, range, refresh);
-#endif
-}
+        if ( GetEventHandler()->ProcessEvent(event) )
+            return TRUE;
+    }

 
 

-void wxWindow::SetScrollPage(int orient, int page, bool refresh)
-{
-#if defined(__WIN95__)
-  SCROLLINFO info;
-  int dir;
-
-  if (orient == wxHORIZONTAL) {
-       dir = SB_HORZ;
-    m_xThumbSize = page;
-  } else {
-       dir = SB_VERT;
-    m_yThumbSize = page;
-  }
-
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = page;
-  info.nMin = 0;
-  info.fMask = SIF_PAGE ;
-
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetScrollInfo(hWnd, dir, &info, refresh);
-#else
-  if (orient == wxHORIZONTAL)
-    m_xThumbSize = page;
-  else
-    m_yThumbSize = page;
-#endif
+    return FALSE;

 }
 
 }
 

-int wxWindow::OldGetScrollRange(int orient) const
+bool wxWindowMSW::HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-  int wOrient ;
-  if (orient == wxHORIZONTAL)
-    wOrient = SB_HORZ;
-  else
-    wOrient = SB_VERT;
+    int id = wxCharCodeMSWToWX(wParam);

 
 

-#if __WATCOMC__ && defined(__WINDOWS_386__)
-  short minPos, maxPos;
-#else
-  int minPos, maxPos;
-#endif
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-  {
-    ::GetScrollRange(hWnd, wOrient, &minPos, &maxPos);
-#if defined(__WIN95__)
-    // Try to adjust the range to cope with page size > 1
-    // - a Windows API quirk
-    int pageSize = GetScrollPage(orient);
-    if ( pageSize > 1 )
+    if ( !id )

     {
     {

-         maxPos -= (pageSize - 1);
+        // normal ASCII char
+        id = wParam;

     }
     }

-#endif
-    return maxPos;
-  }
-  else
-    return 0;
-}

 
 

-int wxWindow::GetScrollPage(int orient) const
-{
-  if (orient == wxHORIZONTAL)
-    return m_xThumbSize;
-  else
-    return m_yThumbSize;
-}
-#endif
+    if ( id != -1 ) // VZ: does this ever happen (FIXME)?
+    {
+        wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_DOWN, id, lParam));
+        if ( GetEventHandler()->ProcessEvent(event) )
+        {
+            return TRUE;
+        }
+    }

 
 

-int wxWindow::GetScrollPos(int orient) const
-{
-  int wOrient ;
-  if (orient == wxHORIZONTAL)
-    wOrient = SB_HORZ;
-  else
-    wOrient = SB_VERT;
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-  {
-    return ::GetScrollPos(hWnd, wOrient);
-  }
-  else
-    return 0;
+    return FALSE;

 }
 
 }
 

-// This now returns the whole range, not just the number
-// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
+bool wxWindowMSW::HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-  int wOrient ;
-  if (orient == wxHORIZONTAL)
-    wOrient = SB_HORZ;
-  else
-    wOrient = SB_VERT;
+    int id = wxCharCodeMSWToWX(wParam);

 
 

-#if __WATCOMC__ && defined(__WINDOWS_386__)
-  short minPos, maxPos;
-#else
-  int minPos, maxPos;
-#endif
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-  {
-    ::GetScrollRange(hWnd, wOrient, &minPos, &maxPos);
-#if defined(__WIN95__)
-    // Try to adjust the range to cope with page size > 1
-    // - a Windows API quirk
-    int pageSize = GetScrollPage(orient);
-    if ( pageSize > 1 )
+    if ( !id )

     {
     {

-         maxPos -= (pageSize - 1);
+        // normal ASCII char
+        id = wParam;

     }
     }

-    // October 10th: new range concept.
-    maxPos += pageSize;
-#endif

 
 

-    return maxPos;
-  }
-  else
-    return 0;
-}
+    if ( id != -1 ) // VZ: does this ever happen (FIXME)?
+    {
+        wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_UP, id, lParam));
+        if ( GetEventHandler()->ProcessEvent(event) )
+            return TRUE;
+    }

 
 

-int wxWindow::GetScrollThumb(int orient) const
-{
-  if (orient == wxHORIZONTAL)
-    return m_xThumbSize;
-  else
-    return m_yThumbSize;
+    return FALSE;

 }
 
 }
 

-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
-{
-#if defined(__WIN95__)
-  SCROLLINFO info;
-  int dir;
-
-  if (orient == wxHORIZONTAL) {
-       dir = SB_HORZ;
-  } else {
-       dir = SB_VERT;
-  }
-
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = 0;
-  info.nMin = 0;
-  info.nPos = pos;
-  info.fMask = SIF_POS ;
-
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetScrollInfo(hWnd, dir, &info, refresh);
-#else
-  int wOrient ;
-  if (orient == wxHORIZONTAL)
-    wOrient = SB_HORZ;
-  else
-    wOrient = SB_VERT;
-    
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetScrollPos(hWnd, wOrient, pos, refresh);
-#endif
-}
+// ---------------------------------------------------------------------------
+// joystick
+// ---------------------------------------------------------------------------

 
 

-// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
-    int range, bool refresh)
+bool wxWindowMSW::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags)

 {
 {

-/*
-    SetScrollPage(orient, thumbVisible, FALSE);
+#ifdef JOY_BUTTON1
+    int change = 0;
+    if ( flags & JOY_BUTTON1CHG )
+        change = wxJOY_BUTTON1;
+    if ( flags & JOY_BUTTON2CHG )
+        change = wxJOY_BUTTON2;
+    if ( flags & JOY_BUTTON3CHG )
+        change = wxJOY_BUTTON3;
+    if ( flags & JOY_BUTTON4CHG )
+        change = wxJOY_BUTTON4;

 
 

-    int oldRange = range - thumbVisible ;
-    SetScrollRange(orient, oldRange, FALSE);
+    int buttons = 0;
+    if ( flags & JOY_BUTTON1 )
+        buttons |= wxJOY_BUTTON1;
+    if ( flags & JOY_BUTTON2 )
+        buttons |= wxJOY_BUTTON2;
+    if ( flags & JOY_BUTTON3 )
+        buttons |= wxJOY_BUTTON3;
+    if ( flags & JOY_BUTTON4 )
+        buttons |= wxJOY_BUTTON4;

 
 

-    SetScrollPos(orient, pos, refresh);
-*/
-#if defined(__WIN95__)
-  int oldRange = range - thumbVisible ;
-
-  int range1 = oldRange;
-
-  // Try to adjust the range to cope with page size > 1
-  // - a Windows API quirk
-  int pageSize = thumbVisible;
-  if ( pageSize > 1 && range > 0)
-  {
-       range1 += (pageSize - 1);
-  }
-
-  SCROLLINFO info;
-  int dir;
-
-  if (orient == wxHORIZONTAL) {
-       dir = SB_HORZ;
-  } else {
-       dir = SB_VERT;
-  }
-
-  info.cbSize = sizeof(SCROLLINFO);
-  info.nPage = pageSize; // Have to set this, or scrollbar goes awry
-  info.nMin = 0;
-  info.nMax = range1;
-  info.nPos = pos;
-  info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS;
-
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-    ::SetScrollInfo(hWnd, dir, &info, refresh);
-#else
-  int wOrient ;
-  if (orient == wxHORIZONTAL)
-    wOrient = SB_HORZ;
-  else
-    wOrient = SB_VERT;
-    
-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd)
-  {
-    ::SetScrollRange(hWnd, wOrient, 0, range, FALSE);
-    ::SetScrollPos(hWnd, wOrient, pos, refresh);
-  }
-#endif
-  if (orient == wxHORIZONTAL) {
-    m_xThumbSize = thumbVisible;
-  } else {
-    m_yThumbSize = thumbVisible;
-  }
-}
+    // the event ids aren't consecutive so we can't use table based lookup
+    int joystick;
+    wxEventType eventType;
+    switch ( msg )
+    {
+        case MM_JOY1MOVE:
+            joystick = 1;
+            eventType = wxEVT_JOY_MOVE;
+            break;

 
 

-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
-{
-       RECT rect2;
-       if ( rect )
-       {
-               rect2.left = rect->x;
-               rect2.top = rect->y;
-               rect2.right = rect->x + rect->width;
-               rect2.bottom = rect->y + rect->height;
-       }
+        case MM_JOY2MOVE:
+            joystick = 2;
+            eventType = wxEVT_JOY_MOVE;
+            break;

 
 

-       if ( rect )
-               ::ScrollWindow((HWND) GetHWND(), dx, dy, &rect2, NULL);
-       else
-               ::ScrollWindow((HWND) GetHWND(), dx, dy, NULL, NULL);
-}
+        case MM_JOY1ZMOVE:
+            joystick = 1;
+            eventType = wxEVT_JOY_ZMOVE;
+            break;

 
 

-/*
-void wxWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
-{
-  *xx = x;
-  *yy = y;
-}
+        case MM_JOY2ZMOVE:
+            joystick = 2;
+            eventType = wxEVT_JOY_ZMOVE;
+            break;

 
 

-void wxWindow::CalcUnscrolledPosition(int x, int y, float *xx, float *yy) const
-{
-  *xx = x;
-  *yy = y;
-}
-*/
+        case MM_JOY1BUTTONDOWN:
+            joystick = 1;
+            eventType = wxEVT_JOY_BUTTON_DOWN;
+            break;

 
 

-void wxWindow::SetFont(const wxFont& font)
-{
-  // Decrement the usage count of the old label font
-  // (we may be able to free it up)
-//  if (GetFont()->Ok())
-//    GetFont()->ReleaseResource();
-    
-  m_windowFont = font;
+        case MM_JOY2BUTTONDOWN:
+            joystick = 2;
+            eventType = wxEVT_JOY_BUTTON_DOWN;
+            break;

 
 

-  if (!m_windowFont.Ok())
-       return;
+        case MM_JOY1BUTTONUP:
+            joystick = 1;
+            eventType = wxEVT_JOY_BUTTON_UP;
+            break;

 
 

-//  m_windowFont.UseResource();
+        case MM_JOY2BUTTONUP:
+            joystick = 2;
+            eventType = wxEVT_JOY_BUTTON_UP;
+            break;

 
 

-  HWND hWnd = (HWND) GetHWND();
-  if (hWnd != 0)
-  {
-//      m_windowFont.RealizeResource();
+        default:
+            wxFAIL_MSG(wxT("no such joystick event"));

 
 

-      if (m_windowFont.GetResourceHandle())
-        SendMessage(hWnd, WM_SETFONT,
-                  (WPARAM)m_windowFont.GetResourceHandle(),TRUE);
-  }
-}
+            return FALSE;
+    }

 
 

-void wxWindow::SubclassWin(WXHWND hWnd)
-{
-  wxAssociateWinWithHandle((HWND)hWnd, this);
+    wxJoystickEvent event(eventType, buttons, joystick, change);
+    event.SetPosition(wxPoint(x, y));
+    event.SetEventObject(this);

 
 

-  m_oldWndProc = (WXFARPROC) GetWindowLong((HWND) hWnd, GWL_WNDPROC);
-  SetWindowLong((HWND) hWnd, GWL_WNDPROC, (LONG) wxWndProc);
+    return GetEventHandler()->ProcessEvent(event);
+#else
+    return FALSE;
+#endif

 }
 
 }
 

-void wxWindow::UnsubclassWin(void)
+// ---------------------------------------------------------------------------
+// scrolling
+// ---------------------------------------------------------------------------
+
+bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam,
+                           WXWORD pos, WXHWND control)

 {
 {

-       wxRemoveHandleAssociation(this);
+    if ( control )
+    {
+        wxWindow *child = wxFindWinFromHandle(control);
+        if ( child )
+            return child->MSWOnScroll(orientation, wParam, pos, control);
+    }

 
 

-  // Restore old Window proc
-  if ((HWND) GetHWND())
-  {
-    FARPROC farProc = (FARPROC) GetWindowLong((HWND) GetHWND(), GWL_WNDPROC);
-    if ((m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc))
-       {
-      SetWindowLong((HWND) GetHWND(), GWL_WNDPROC, (LONG) m_oldWndProc);
-         m_oldWndProc = 0;
-       }
-  }
-}
+    wxScrollWinEvent event;
+    event.SetPosition(pos);
+    event.SetOrientation(orientation);
+    event.m_eventObject = this;

 
 

-// Make a Windows extended style from the given wxWindows window style
-WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders)
-{
-       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 defined(__WIN95__)
-       if ( style & wxRAISED_BORDER )
-               exStyle |= WS_EX_WINDOWEDGE ;
-       if ( style & wxSTATIC_BORDER )
-               exStyle |= WS_EX_STATICEDGE ;
-#endif
-  }
-  return exStyle;
-}
+    switch ( wParam )
+    {
+    case SB_TOP:
+        event.m_eventType = wxEVT_SCROLLWIN_TOP;
+        break;

 
 

-// 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)
-{
-  // 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();
-
-  // 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;
-
-  // 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) )
-  {
-       *want3D = TRUE;
-       nativeBorder = TRUE;
-  }
-
-  // 5) If this isn't a Win95 app, and we are using CTL3D, remove border
-  // effects from extended style
-#if CTL3D
-  if ( *want3D )
-       nativeBorder = FALSE;
-#endif
+    case SB_BOTTOM:
+        event.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
+        break;
+
+    case SB_LINEUP:
+        event.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+        break;

 
 

-  DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder);
+    case SB_LINEDOWN:
+        event.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+        break;

 
 

-  // 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__) && !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
+    case SB_PAGEUP:
+        event.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+        break;

 
 

-  return exStyle;
-}
+    case SB_PAGEDOWN:
+        event.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+        break;

 
 

-void wxWindow::OnChar(wxKeyEvent& event)
-{
-    if ( event.KeyCode() == WXK_TAB ) {
-        // propagate the TABs to the parent - it's up to it to decide what
-        // to do with it
-        if ( GetParent() ) {
-            if ( GetParent()->ProcessEvent(event) )
-                return;
+    case SB_THUMBPOSITION:
+    case SB_THUMBTRACK:
+#ifdef __WIN32__
+        // under Win32, the scrollbar range and position are 32 bit integers,
+        // but WM_[HV]SCROLL only carry the low 16 bits of them, so we must
+        // explicitly query the scrollbar for the correct position (this must
+        // be done only for these two SB_ events as they are the only one
+        // carrying the scrollbar position)
+        {
+            SCROLLINFO scrollInfo;
+            wxZeroMemory(scrollInfo);
+            scrollInfo.cbSize = sizeof(SCROLLINFO);
+            scrollInfo.fMask = SIF_TRACKPOS;
+
+            if ( !::GetScrollInfo(GetHwnd(),
+                                  orientation == wxHORIZONTAL ? SB_HORZ
+                                                              : SB_VERT,
+                                  &scrollInfo) )
+            {
+                wxLogLastError(_T("GetScrollInfo"));
+            }
+
+            event.SetPosition(scrollInfo.nTrackPos);

         }
         }

-    }
+#endif // Win32

 
 

-    bool isVirtual;
-    int id = wxCharCodeWXToMSW((int)event.KeyCode(), &isVirtual);
+        event.m_eventType = wParam == SB_THUMBPOSITION
+                                ? wxEVT_SCROLLWIN_THUMBRELEASE
+                                : wxEVT_SCROLLWIN_THUMBTRACK;
+        break;

 
 

-    if ( id == -1 )
-        id= m_lastWParam;
+    default:
+        return FALSE;
+    }

 
 

-    if ( !event.ControlDown() )
-        (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-void wxWindow::OnPaint(wxPaintEvent& event)
-{
-       Default();
-}
+// ===========================================================================
+// global functions
+// ===========================================================================

 
 

-bool wxWindow::IsEnabled(void) const
+void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font)

 {
 {

-       return (::IsWindowEnabled((HWND) GetHWND()) != 0);
-}
-
-// Dialog support: override these and call
-// base class members to add functionality
-// that can't be done using validators.
-// NOTE: these functions assume that controls
-// are direct children of this window, not grandchildren
-// or other levels of descendant.
+    TEXTMETRIC tm;
+    HDC dc = ::GetDC((HWND) wnd);
+    HFONT fnt =0;
+    HFONT was = 0;
+    if ( the_font )
+    {
+        //    the_font->UseResource();
+        //    the_font->RealizeResource();
+        fnt = (HFONT)((wxFont *)the_font)->GetResourceHandle(); // const_cast
+        if ( fnt )
+            was = (HFONT) SelectObject(dc,fnt);
+    }
+    GetTextMetrics(dc, &tm);
+    if ( the_font && fnt && was )
+    {
+        SelectObject(dc,was);
+    }
+    ReleaseDC((HWND)wnd, dc);

 
 

-// Transfer values to controls. If returns FALSE,
-// it's an application error (pops up a dialog)
-bool wxWindow::TransferDataToWindow(void)
-{
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */
-               !child->GetValidator()->TransferToWindow() )
-               {
-                       wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
-                       return FALSE;
-               }
+    if ( x )
+        *x = tm.tmAveCharWidth;
+    if ( y )
+        *y = tm.tmHeight + tm.tmExternalLeading;

 
 

-               node = node->Next();
-       }
-       return TRUE;
+    //  if ( the_font )
+    //    the_font->ReleaseResource();

 }
 
 }
 

-// Transfer values from controls. If returns FALSE,
-// validation failed: don't quit
-bool wxWindow::TransferDataFromWindow(void)
+// 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 wxCharCodeMSWToWX(int keySym)

 {
 {

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() )
-               {
-                       return FALSE;
-               }
+    int id;
+    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 0xBB: // VK_OEM_PLUS
+        case VK_ADD:        id = WXK_ADD; break;
+        case 0xBD: // VK_OEM_MINUS
+        case VK_SUBTRACT:   id = WXK_SUBTRACT; break;
+        case 0xBE: // VK_OEM_PERIOD
+        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:
+            id = 0;
+    }

 
 

-               node = node->Next();
-       }
-       return TRUE;
+    return id;

 }
 
 }
 

-bool wxWindow::Validate(void)
+int wxCharCodeWXToMSW(int id, bool *isVirtual)

 {
 {

-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
+    *isVirtual = TRUE;
+    int keySym = 0;
+    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:
+        {
+            *isVirtual = FALSE;
+            keySym = id;
+            break;
+        }
+    }
+    return keySym;

 }
 
 }
 

-// Get the window with the focus
-wxWindow *wxWindow::FindFocus(void)
+wxWindow *wxGetActiveWindow()

 {
 {

-    HWND hWnd = ::GetFocus();
-    if ( hWnd )
+    HWND hWnd = GetActiveWindow();
+    if ( hWnd != 0 )

     {
         return wxFindWinFromHandle((WXHWND) hWnd);
     }
     return NULL;
 }
 
     {
         return wxFindWinFromHandle((WXHWND) hWnd);
     }
     return NULL;
 }
 

-void wxWindow::AddChild(wxWindow *child)
-{
-  GetChildren()->Append(child);
-  child->m_windowParent = this;
-}
-
-void wxWindow::RemoveChild(wxWindow *child)
+extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)

 {
 {

-  if (GetChildren())
-    GetChildren()->DeleteObject(child);
-  child->m_windowParent = NULL;
-}
-
-void wxWindow::DestroyChildren(void)
-{
-  if (GetChildren()) {
-    wxNode *node;
-    while ((node = GetChildren()->First()) != (wxNode *)NULL) {
-      wxWindow *child;
-      if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
-        delete child;
-               if ( GetChildren()->Member(child) )
-                       delete node;
-      }
-    } /* while */
-  }
-}
+    HWND hwnd = (HWND)hWnd;

 
 

-void wxWindow::MakeModal(bool modal)
-{
-  // Disable all other windows
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxNode *node = wxTopLevelWindows.First();
-    while (node)
+    // For a radiobutton, we get the radiobox from GWL_USERDATA (which is set
+    // by code in msw/radiobox.cpp), for all the others we just search up the
+    // window hierarchy
+    wxWindow *win = (wxWindow *)NULL;
+    if ( hwnd )

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (win != this)
-        win->Enable(!modal);
+        win = wxFindWinFromHandle((WXHWND)hwnd);
+        if ( !win )
+        {
+            // all these hacks only work under Win32 anyhow
+#ifdef __WIN32__

 
 

-      node = node->Next();
-    }
-  }
-}
+#if wxUSE_RADIOBOX
+            // native radiobuttons return DLGC_RADIOBUTTON here and for any
+            // wxWindow class which overrides WM_GETDLGCODE processing to
+            // do it as well, win would be already non NULL
+            if ( ::SendMessage(hwnd, WM_GETDLGCODE, 0, 0) & DLGC_RADIOBUTTON )
+            {
+                win = (wxWindow *)::GetWindowLong(hwnd, GWL_USERDATA);
+            }
+            //else: it's a wxRadioButton, not a radiobutton from wxRadioBox
+#endif // wxUSE_RADIOBOX

 
 

-// If nothing defined for this, try the parent.
-// E.g. we may be a button loaded from a resource, with no callback function
-// defined.
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-  if (GetEventHandler()->ProcessEvent(event) )
-       return;
-  if (m_windowParent)
-    m_windowParent->GetEventHandler()->OnCommand(win, event);
-}
-
-void wxWindow::SetConstraints(wxLayoutConstraints *c)
-{
-  if (m_constraints)
-  {
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-  }
-  m_constraints = c;
-  if (m_constraints)
-  {
-    // Make sure other windows know they're part of a 'meaningful relationship'
-    if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
-      m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
-      m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
-      m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
-      m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
-      m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
-      m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
-      m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
-      m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-  }
-}
-
-// This removes any dangling pointers to this window
-// in other windows' constraintsInvolvedIn lists.
-void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
-{
-  if (c)
-  {
-    if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
-      c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
-      c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
-      c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
-      c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
-      c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
-      c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-  }
-}
-
-// Back-pointer to other windows we're involved with, so if we delete
-// this window, we must delete any constraints we're involved with.
-void wxWindow::AddConstraintReference(wxWindow *otherWin)
-{
-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
-}
-
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
-{
-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
-}
-
-// Reset any constraints that mention this window
-void wxWindow::DeleteRelatedConstraints(void)
-{
-  if (m_constraintsInvolvedIn)
-  {
-    wxNode *node = m_constraintsInvolvedIn->First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      wxNode *next = node->Next();
-      wxLayoutConstraints *constr = win->GetConstraints();
-
-      // Reset any constraints involving this window
-      if (constr)
-      {
-        constr->left.ResetIfWin((wxWindow *)this);
-        constr->top.ResetIfWin((wxWindow *)this);
-        constr->right.ResetIfWin((wxWindow *)this);
-        constr->bottom.ResetIfWin((wxWindow *)this);
-        constr->width.ResetIfWin((wxWindow *)this);
-        constr->height.ResetIfWin((wxWindow *)this);
-        constr->centreX.ResetIfWin((wxWindow *)this);
-        constr->centreY.ResetIfWin((wxWindow *)this);
-      }
-      delete node;
-      node = next;
-    }
-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }
-}
-
-void wxWindow::SetSizer(wxSizer *sizer)
-{
-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
-}
-
-/*
- * New version
- */
-
-bool wxWindow::Layout(void)
-{
-  if (GetConstraints())
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    GetConstraints()->width.SetValue(w);
-    GetConstraints()->height.SetValue(h);
-  }
-  
-  // If top level (one sizer), evaluate the sizer's constraints.
-  if (GetSizer())
-  {
-    int noChanges;
-    GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-    GetSizer()->LayoutPhase1(&noChanges);
-    GetSizer()->LayoutPhase2(&noChanges);
-    GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
-    return TRUE;
-  }
-  else
-  {
-    // Otherwise, evaluate child constraints
-    ResetConstraints();   // Mark all constraints as unevaluated
-    DoPhase(1);           // Just one phase need if no sizers involved
-    DoPhase(2);
-    SetConstraintSizes(); // Recursively set the real window sizes
-  }
-  return TRUE;
-}
-
-
-// Do a phase of evaluating constraints:
-// the default behaviour. wxSizers may do a similar
-// thing, but also impose their own 'constraints'
-// and order the evaluation differently.
-bool wxWindow::LayoutPhase1(int *noChanges)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
-}
+            // spin control text buddy window should be mapped to spin ctrl
+            // itself so try it too
+#if wxUSE_SPINCTRL && !defined(__WXUNIVERSAL__)
+            if ( !win )
+            {
+                win = wxSpinCtrl::GetSpinForTextCtrl((WXHWND)hwnd);
+            }
+#endif // wxUSE_SPINCTRL

 
 

-bool wxWindow::LayoutPhase2(int *noChanges)
-{
-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
-}
-
-// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(int phase)
-{
-  int noIterations = 0;
-  int maxIterations = 500;
-  int noChanges = 1;
-  int noFailures = 0;
-  wxList succeeded;
-  while ((noChanges > 0) && (noIterations < maxIterations))
-  {
-    noChanges = 0;
-    noFailures = 0;
-    wxNode *node = GetChildren()->First();
-    while (node)
-    {
-      wxWindow *child = (wxWindow *)node->Data();
-      if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))
-      {
-        wxLayoutConstraints *constr = child->GetConstraints();
-        if (constr)
-        {
-          if (succeeded.Member(child))
-          {
-          }
-          else
-          {
-            int tempNoChanges = 0;
-            bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
-            noChanges += tempNoChanges;
-            if (success)
+#endif // Win32
+
+            if ( !win )

             {
             {

-              succeeded.Append(child);
+                // hwnd is not a wxWindow, try its parent next below
+                hwnd = ::GetParent(hwnd);

             }
             }

-          }

         }
         }

-      }
-      node = node->Next();
-    }
-    noIterations ++;
-  }
-  return TRUE;
-}
-
-void wxWindow::ResetConstraints(void)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    constr->left.SetDone(FALSE);
-    constr->top.SetDone(FALSE);
-    constr->right.SetDone(FALSE);
-    constr->bottom.SetDone(FALSE);
-    constr->width.SetDone(FALSE);
-    constr->height.SetDone(FALSE);
-    constr->centreX.SetDone(FALSE);
-    constr->centreY.SetDone(FALSE);
-  }
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-      win->ResetConstraints();
-    node = node->Next();
-  }
-}
-
-// Need to distinguish between setting the 'fake' size for
-// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(bool recurse)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr && constr->left.GetDone() && constr->right.GetDone() &&
-                constr->width.GetDone() && constr->height.GetDone())
-  {
-    int x = constr->left.GetValue();
-    int y = constr->top.GetValue();
-    int w = constr->width.GetValue();
-    int h = constr->height.GetValue();
-
-    // If we don't want to resize this window, just move it...
-    if ((constr->width.GetRelationship() != wxAsIs) ||
-        (constr->height.GetRelationship() != wxAsIs))
-    {
-      // Calls Layout() recursively. AAAGH. How can we stop that.
-      // Simply take Layout() out of non-top level OnSizes.
-      SizerSetSize(x, y, w, h);
-    }
-    else
-    {
-      SizerMove(x, y);

     }
     }

-  }
-  else if (constr)
-  {
-    char *windowClass = this->GetClassInfo()->GetClassName();

 
 

-    wxString winName;
-       if (GetName() == "")
-               winName = "unnamed";
-       else
-               winName = GetName();
-    wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
-    if (!constr->left.GetDone())
-      wxDebugMsg("  unsatisfied 'left' constraint.\n");
-    if (!constr->right.GetDone())
-      wxDebugMsg("  unsatisfied 'right' constraint.\n");
-    if (!constr->width.GetDone())
-      wxDebugMsg("  unsatisfied 'width' constraint.\n");
-    if (!constr->height.GetDone())
-      wxDebugMsg("  unsatisfied 'height' constraint.\n");
-    wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
-  }
-
-  if (recurse)
-  {
-    wxNode *node = GetChildren()->First();
-    while (node)
+    while ( hwnd && !win )

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-        win->SetConstraintSizes();
-      node = node->Next();
+        win = wxFindWinFromHandle((WXHWND)hwnd);
+        hwnd = ::GetParent(hwnd);

     }
     }

-  }
-}

 
 

-// This assumes that all sizers are 'on' the same
-// window, i.e. the parent of this window.
-void wxWindow::TransformSizerToActual(int *x, int *y) const
-{
-  if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
-                        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
-    return;
-    
-  int xp, yp;
-  m_sizerParent->GetPosition(&xp, &yp);
-  m_sizerParent->TransformSizerToActual(&xp, &yp);
-  *x += xp;
-  *y += yp;
+    return win;

 }
 
 }
 

-void wxWindow::SizerSetSize(int x, int y, int w, int h)
-{
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  SetSize(xx, yy, w, h);
-}
+#ifndef __WXMICROWIN__

 
 

-void wxWindow::SizerMove(int x, int y)
-{
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
-}
+// 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 APIENTRY _EXPORT
+wxKeyboardHook(int nCode, WORD wParam, DWORD lParam);

 
 

-// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
+void wxSetKeyboardHook(bool doIt)

 {
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
-    {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-    if (w != -1)
+    if ( doIt )

     {
     {

-      constr->width.SetValue(w);
-      constr->width.SetDone(TRUE);
+        wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance());
+        wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(),
+
+#if defined(__WIN32__) && !defined(__TWIN32__)
+            GetCurrentThreadId()
+        //      (DWORD)GetCurrentProcess()); // This is another possibility. Which is right?
+#else
+            GetCurrentTask()
+#endif
+            );

     }
     }

-    if (h != -1)
+    else

     {
     {

-      constr->height.SetValue(h);
-      constr->height.SetDone(TRUE);
+        UnhookWindowsHookEx(wxTheKeyboardHook);
+
+        // avoids warning about statement with no effect (FreeProcInstance
+        // doesn't do anything under Win32)
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(__NT__) && !defined(__GNUWIN32__)
+        FreeProcInstance(wxTheKeyboardHookProc);
+#endif

     }
     }

-  }

 }
 
 }
 

-void wxWindow::MoveConstraint(int x, int y)
+int APIENTRY _EXPORT
+wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)

 {
 {

-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
+    DWORD hiWord = HIWORD(lParam);
+    if ( nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0) )

     {
     {

-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
-    {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-  }
-}
+        int id = wxCharCodeMSWToWX(wParam);
+        if ( id != 0 )
+        {
+            wxKeyEvent event(wxEVT_CHAR_HOOK);
+            if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN )
+                event.m_altDown = TRUE;
+
+            event.m_eventObject = NULL;
+            event.m_keyCode = id;
+            event.m_shiftDown = wxIsShiftDown();
+            event.m_controlDown = wxIsCtrlDown();
+            event.SetTimestamp(s_currentMsg.time);
+
+            wxWindow *win = wxGetActiveWindow();
+            wxEvtHandler *handler;
+            if ( win )
+            {
+                handler = win->GetEventHandler();
+                event.SetId(win->GetId());
+            }
+            else
+            {
+                handler = wxTheApp;
+                event.SetId(-1);
+            }

 
 

-void wxWindow::GetSizeConstraint(int *w, int *h) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
-}
+            if ( handler && handler->ProcessEvent(event) )
+            {
+                // processed
+                return 1;
+            }
+        }
+    }

 
 

-void wxWindow::GetClientSizeConstraint(int *w, int *h) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
+    return (int)CallNextHookEx(wxTheKeyboardHook, nCode, wParam, lParam);

 }
 
 }
 

-void wxWindow::GetPositionConstraint(int *x, int *y) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
-}
+#endif // !__WXMICROWIN__

 
 

-bool wxWindow::Close(bool force)
+#ifdef __WXDEBUG__
+const char *wxGetMessageName(int message)

 {
 {

-  // Let's generalise it to work the same for any window.
-/*
-  if (!IsKindOf(CLASSINFO(wxDialog)) && !IsKindOf(CLASSINFO(wxFrame)))
-  {
-    this->Destroy();
-    return TRUE;
-  }
-*/
-
-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-  event.SetForce(force);
-
-  return GetEventHandler()->ProcessEvent(event);
-
-/*
-  if ( !force && event.GetVeto() )
-    return FALSE;
-
-  Show(FALSE);
-
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    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 0x020A: return "WM_MOUSEWHEEL";
+        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";

 
 

-  return TRUE;
-*/
-}
+#ifdef __WIN32__
+        // common controls messages - although they're not strictly speaking
+        // standard, it's nice to decode them nevertheless
+
+        // listview
+        case 0x1000 + 0: return "LVM_GETBKCOLOR";
+        case 0x1000 + 1: return "LVM_SETBKCOLOR";
+        case 0x1000 + 2: return "LVM_GETIMAGELIST";
+        case 0x1000 + 3: return "LVM_SETIMAGELIST";
+        case 0x1000 + 4: return "LVM_GETITEMCOUNT";
+        case 0x1000 + 5: return "LVM_GETITEMA";
+        case 0x1000 + 75: return "LVM_GETITEMW";
+        case 0x1000 + 6: return "LVM_SETITEMA";
+        case 0x1000 + 76: return "LVM_SETITEMW";
+        case 0x1000 + 7: return "LVM_INSERTITEMA";
+        case 0x1000 + 77: return "LVM_INSERTITEMW";
+        case 0x1000 + 8: return "LVM_DELETEITEM";
+        case 0x1000 + 9: return "LVM_DELETEALLITEMS";
+        case 0x1000 + 10: return "LVM_GETCALLBACKMASK";
+        case 0x1000 + 11: return "LVM_SETCALLBACKMASK";
+        case 0x1000 + 12: return "LVM_GETNEXTITEM";
+        case 0x1000 + 13: return "LVM_FINDITEMA";
+        case 0x1000 + 83: return "LVM_FINDITEMW";
+        case 0x1000 + 14: return "LVM_GETITEMRECT";
+        case 0x1000 + 15: return "LVM_SETITEMPOSITION";
+        case 0x1000 + 16: return "LVM_GETITEMPOSITION";
+        case 0x1000 + 17: return "LVM_GETSTRINGWIDTHA";
+        case 0x1000 + 87: return "LVM_GETSTRINGWIDTHW";
+        case 0x1000 + 18: return "LVM_HITTEST";
+        case 0x1000 + 19: return "LVM_ENSUREVISIBLE";
+        case 0x1000 + 20: return "LVM_SCROLL";
+        case 0x1000 + 21: return "LVM_REDRAWITEMS";
+        case 0x1000 + 22: return "LVM_ARRANGE";
+        case 0x1000 + 23: return "LVM_EDITLABELA";
+        case 0x1000 + 118: return "LVM_EDITLABELW";
+        case 0x1000 + 24: return "LVM_GETEDITCONTROL";
+        case 0x1000 + 25: return "LVM_GETCOLUMNA";
+        case 0x1000 + 95: return "LVM_GETCOLUMNW";
+        case 0x1000 + 26: return "LVM_SETCOLUMNA";
+        case 0x1000 + 96: return "LVM_SETCOLUMNW";
+        case 0x1000 + 27: return "LVM_INSERTCOLUMNA";
+        case 0x1000 + 97: return "LVM_INSERTCOLUMNW";
+        case 0x1000 + 28: return "LVM_DELETECOLUMN";
+        case 0x1000 + 29: return "LVM_GETCOLUMNWIDTH";
+        case 0x1000 + 30: return "LVM_SETCOLUMNWIDTH";
+        case 0x1000 + 31: return "LVM_GETHEADER";
+        case 0x1000 + 33: return "LVM_CREATEDRAGIMAGE";
+        case 0x1000 + 34: return "LVM_GETVIEWRECT";
+        case 0x1000 + 35: return "LVM_GETTEXTCOLOR";
+        case 0x1000 + 36: return "LVM_SETTEXTCOLOR";
+        case 0x1000 + 37: return "LVM_GETTEXTBKCOLOR";
+        case 0x1000 + 38: return "LVM_SETTEXTBKCOLOR";
+        case 0x1000 + 39: return "LVM_GETTOPINDEX";
+        case 0x1000 + 40: return "LVM_GETCOUNTPERPAGE";
+        case 0x1000 + 41: return "LVM_GETORIGIN";
+        case 0x1000 + 42: return "LVM_UPDATE";
+        case 0x1000 + 43: return "LVM_SETITEMSTATE";
+        case 0x1000 + 44: return "LVM_GETITEMSTATE";
+        case 0x1000 + 45: return "LVM_GETITEMTEXTA";
+        case 0x1000 + 115: return "LVM_GETITEMTEXTW";
+        case 0x1000 + 46: return "LVM_SETITEMTEXTA";
+        case 0x1000 + 116: return "LVM_SETITEMTEXTW";
+        case 0x1000 + 47: return "LVM_SETITEMCOUNT";
+        case 0x1000 + 48: return "LVM_SORTITEMS";
+        case 0x1000 + 49: return "LVM_SETITEMPOSITION32";
+        case 0x1000 + 50: return "LVM_GETSELECTEDCOUNT";
+        case 0x1000 + 51: return "LVM_GETITEMSPACING";
+        case 0x1000 + 52: return "LVM_GETISEARCHSTRINGA";
+        case 0x1000 + 117: return "LVM_GETISEARCHSTRINGW";
+        case 0x1000 + 53: return "LVM_SETICONSPACING";
+        case 0x1000 + 54: return "LVM_SETEXTENDEDLISTVIEWSTYLE";
+        case 0x1000 + 55: return "LVM_GETEXTENDEDLISTVIEWSTYLE";
+        case 0x1000 + 56: return "LVM_GETSUBITEMRECT";
+        case 0x1000 + 57: return "LVM_SUBITEMHITTEST";
+        case 0x1000 + 58: return "LVM_SETCOLUMNORDERARRAY";
+        case 0x1000 + 59: return "LVM_GETCOLUMNORDERARRAY";
+        case 0x1000 + 60: return "LVM_SETHOTITEM";
+        case 0x1000 + 61: return "LVM_GETHOTITEM";
+        case 0x1000 + 62: return "LVM_SETHOTCURSOR";
+        case 0x1000 + 63: return "LVM_GETHOTCURSOR";
+        case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT";
+        case 0x1000 + 65: return "LVM_SETWORKAREA";
+
+        // tree view
+        case 0x1100 + 0: return "TVM_INSERTITEMA";
+        case 0x1100 + 50: return "TVM_INSERTITEMW";
+        case 0x1100 + 1: return "TVM_DELETEITEM";
+        case 0x1100 + 2: return "TVM_EXPAND";
+        case 0x1100 + 4: return "TVM_GETITEMRECT";
+        case 0x1100 + 5: return "TVM_GETCOUNT";
+        case 0x1100 + 6: return "TVM_GETINDENT";
+        case 0x1100 + 7: return "TVM_SETINDENT";
+        case 0x1100 + 8: return "TVM_GETIMAGELIST";
+        case 0x1100 + 9: return "TVM_SETIMAGELIST";
+        case 0x1100 + 10: return "TVM_GETNEXTITEM";
+        case 0x1100 + 11: return "TVM_SELECTITEM";
+        case 0x1100 + 12: return "TVM_GETITEMA";
+        case 0x1100 + 62: return "TVM_GETITEMW";
+        case 0x1100 + 13: return "TVM_SETITEMA";
+        case 0x1100 + 63: return "TVM_SETITEMW";
+        case 0x1100 + 14: return "TVM_EDITLABELA";
+        case 0x1100 + 65: return "TVM_EDITLABELW";
+        case 0x1100 + 15: return "TVM_GETEDITCONTROL";
+        case 0x1100 + 16: return "TVM_GETVISIBLECOUNT";
+        case 0x1100 + 17: return "TVM_HITTEST";
+        case 0x1100 + 18: return "TVM_CREATEDRAGIMAGE";
+        case 0x1100 + 19: return "TVM_SORTCHILDREN";
+        case 0x1100 + 20: return "TVM_ENSUREVISIBLE";
+        case 0x1100 + 21: return "TVM_SORTCHILDRENCB";
+        case 0x1100 + 22: return "TVM_ENDEDITLABELNOW";
+        case 0x1100 + 23: return "TVM_GETISEARCHSTRINGA";
+        case 0x1100 + 64: return "TVM_GETISEARCHSTRINGW";
+        case 0x1100 + 24: return "TVM_SETTOOLTIPS";
+        case 0x1100 + 25: return "TVM_GETTOOLTIPS";
+
+        // header
+        case 0x1200 + 0: return "HDM_GETITEMCOUNT";
+        case 0x1200 + 1: return "HDM_INSERTITEMA";
+        case 0x1200 + 10: return "HDM_INSERTITEMW";
+        case 0x1200 + 2: return "HDM_DELETEITEM";
+        case 0x1200 + 3: return "HDM_GETITEMA";
+        case 0x1200 + 11: return "HDM_GETITEMW";
+        case 0x1200 + 4: return "HDM_SETITEMA";
+        case 0x1200 + 12: return "HDM_SETITEMW";
+        case 0x1200 + 5: return "HDM_LAYOUT";
+        case 0x1200 + 6: return "HDM_HITTEST";
+        case 0x1200 + 7: return "HDM_GETITEMRECT";
+        case 0x1200 + 8: return "HDM_SETIMAGELIST";
+        case 0x1200 + 9: return "HDM_GETIMAGELIST";
+        case 0x1200 + 15: return "HDM_ORDERTOINDEX";
+        case 0x1200 + 16: return "HDM_CREATEDRAGIMAGE";
+        case 0x1200 + 17: return "HDM_GETORDERARRAY";
+        case 0x1200 + 18: return "HDM_SETORDERARRAY";
+        case 0x1200 + 19: return "HDM_SETHOTDIVIDER";
+
+        // tab control
+        case 0x1300 + 2: return "TCM_GETIMAGELIST";
+        case 0x1300 + 3: return "TCM_SETIMAGELIST";
+        case 0x1300 + 4: return "TCM_GETITEMCOUNT";
+        case 0x1300 + 5: return "TCM_GETITEMA";
+        case 0x1300 + 60: return "TCM_GETITEMW";
+        case 0x1300 + 6: return "TCM_SETITEMA";
+        case 0x1300 + 61: return "TCM_SETITEMW";
+        case 0x1300 + 7: return "TCM_INSERTITEMA";
+        case 0x1300 + 62: return "TCM_INSERTITEMW";
+        case 0x1300 + 8: return "TCM_DELETEITEM";
+        case 0x1300 + 9: return "TCM_DELETEALLITEMS";
+        case 0x1300 + 10: return "TCM_GETITEMRECT";
+        case 0x1300 + 11: return "TCM_GETCURSEL";
+        case 0x1300 + 12: return "TCM_SETCURSEL";
+        case 0x1300 + 13: return "TCM_HITTEST";
+        case 0x1300 + 14: return "TCM_SETITEMEXTRA";
+        case 0x1300 + 40: return "TCM_ADJUSTRECT";
+        case 0x1300 + 41: return "TCM_SETITEMSIZE";
+        case 0x1300 + 42: return "TCM_REMOVEIMAGE";
+        case 0x1300 + 43: return "TCM_SETPADDING";
+        case 0x1300 + 44: return "TCM_GETROWCOUNT";
+        case 0x1300 + 45: return "TCM_GETTOOLTIPS";
+        case 0x1300 + 46: return "TCM_SETTOOLTIPS";
+        case 0x1300 + 47: return "TCM_GETCURFOCUS";
+        case 0x1300 + 48: return "TCM_SETCURFOCUS";
+        case 0x1300 + 49: return "TCM_SETMINTABWIDTH";
+        case 0x1300 + 50: return "TCM_DESELECTALL";
+
+        // toolbar
+        case WM_USER+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

 
 

-wxObject* wxWindow::GetChild(int number) const
-{
-  // Return a pointer to the Nth object in the Panel
-  if (!GetChildren())
-    return(NULL) ;
-  wxNode *node = GetChildren()->First();
-  int n = number;
-  while (node && n--)
-    node = node->Next() ;
-  if (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    return(obj) ;
-  }
-  else
-    return NULL ;
+        default:
+            static char s_szBuf[128];
+            sprintf(s_szBuf, "<unknown message = %d>", message);
+            return s_szBuf;
+    }

 }
 }

+#endif //__WXDEBUG__

 
 

-void wxWindow::OnDefaultAction(wxControl *initiatingItem)
+static void TranslateKbdEventToMouse(wxWindowMSW *win,
+                                     int *x, int *y, WPARAM *flags)

 {
 {

-/* This is obsolete now; if we wish to intercept listbox double-clicks,
- * we explicitly intercept the wxEVT_COMMAND_LISTBOX_DOUBLECLICKED
- * event.
+    // construct the key mask
+    WPARAM& fwKeys = *flags;

 
 

-  if (initiatingItem->IsKindOf(CLASSINFO(wxListBox)))
-  {
-    wxListBox *lbox = (wxListBox *)initiatingItem;
-    wxCommandEvent event(wxEVT_COMMAND_LEFT_DCLICK);
-    event.m_commandInt = -1;
-    if ((lbox->GetWindowStyleFlag() & wxLB_MULTIPLE) == 0)
-    {
-      event.m_commandString = copystring(lbox->GetStringSelection());
-      event.m_commandInt = lbox->GetSelection();
-      event.m_clientData = lbox->wxListBox::GetClientData(event.m_commandInt);
-    }
-    event.m_eventObject = lbox;
+    fwKeys = MK_RBUTTON;
+    if ( wxIsCtrlDown() )
+        fwKeys |= MK_CONTROL;
+    if ( wxIsShiftDown() )
+        fwKeys |= MK_SHIFT;

 
 

-    lbox->ProcessCommand(event);
+    // simulate right mouse button click
+    DWORD dwPos = ::GetMessagePos();
+    *x = GET_X_LPARAM(dwPos);
+    *y = GET_Y_LPARAM(dwPos);

 
 

-    if (event.m_commandString)
-      delete[] event.m_commandString;
-    return;
-  }
-  
-  wxButton *but = GetDefaultItem();
-  if (but)
-  {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED);
-    event.SetEventObject(but);
-    but->Command(event);
-  }
-*/
+    win->ScreenToClient(x, y);

 }
 
 }
 

-void wxWindow::Clear(void)
+static TEXTMETRIC wxGetTextMetrics(const wxWindowMSW *win)

 {
 {

-       wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
+    // prepare the DC
+    TEXTMETRIC tm;
+    HWND hwnd = GetHwndOf(win);
+    HDC hdc = ::GetDC(hwnd);

 
 

-// Fits the panel around the items
-void wxWindow::Fit(void)
-{
-       int maxX = 0;
-       int maxY = 0;
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *win = (wxWindow *)node->Data();
-               int wx, wy, ww, wh;
-               win->GetPosition(&wx, &wy);
-               win->GetSize(&ww, &wh);
-               if ( wx + ww > maxX )
-                       maxX = wx + ww;
-               if ( wy + wh > maxY )
-                       maxY = wy + wh;
-
-               node = node->Next();
-       }
-       SetClientSize(maxX + 5, maxY + 5);
-}
-
-void wxWindow::SetValidator(const wxValidator& validator)
-{
-       if ( m_windowValidator )
-               delete m_windowValidator;
-       m_windowValidator = validator.Clone();
-
-       if ( m_windowValidator )
-               m_windowValidator->SetWindow(this) ;
-}
-
-// Find a window by id or name
-wxWindow *wxWindow::FindWindow(long id)
-{
-       if ( GetId() == id)
-               return this;
-
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(id);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
-}
-
-wxWindow *wxWindow::FindWindow(const wxString& name)
-{
-       if ( GetName() == name)
-               return this;
-
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(name);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
-}
-
-/* TODO
-// Default input behaviour for a scrolling canvas should be to scroll
-// according to the cursor keys pressed
-void wxWindow::OnChar(wxKeyEvent& event)
-{
-  int x_page = 0;
-  int y_page = 0;
-  int start_x = 0;
-  int start_y = 0;
-  // Bugfix Begin
-  int v_width = 0;
-  int v_height = 0;
-  int y_pages = 0;
-  // Bugfix End
-
-  GetScrollUnitsPerPage(&x_page, &y_page);
-  // Bugfix Begin
-  GetVirtualSize(&v_width,&v_height);
-  // Bugfix End
-  ViewStart(&start_x, &start_y);
-  // Bugfix begin
-  if (vert_units)
-        y_pages = (int)(v_height/vert_units) - y_page;
-
-#ifdef __WXMSW__
-  int y = 0;
-#else
-  int y = y_page-1;
+#if !wxDIALOG_UNIT_COMPATIBILITY
+    // and select the current font into it
+    HFONT hfont = GetHfontOf(win->GetFont());
+    if ( hfont )
+    {
+        hfont = (HFONT)::SelectObject(hdc, hfont);
+    }

 #endif
 #endif

- // Bugfix End
-  switch (event.keyCode)
-  {
-        case WXK_PRIOR:
-        {
-        // BugFix Begin
-               if (y_page > 0)
-                 {
-                 if (start_y - y_page > 0)
-                        Scroll(start_x, start_y - y_page);
-                 else
-                        Scroll(start_x, 0);
-                 }
-                 // Bugfix End
-               break;
-        }
-        case WXK_NEXT:
-        {
-        // Bugfix Begin
-               if ((y_page > 0)  && (start_y <= y_pages-y-1))
-                                                {
-                       if (y_pages + y < start_y + y_page)
-                         Scroll(start_x, y_pages + y);
-                       else
-                         Scroll(start_x, start_y + y_page);
-                       }
-        // Bugfix End
-               break;
-        }
-        case WXK_UP:
-        {
-               if ((y_page > 0) && (start_y >= 1))
-                 Scroll(start_x, start_y - 1);
-               break;
-        }
-        case WXK_DOWN:
-        {
-        // Bugfix Begin
-               if ((y_page > 0) && (start_y <= y_pages-y-1))
-        // Bugfix End
-               {
-                 Scroll(start_x, start_y + 1);
-               }
-               break;
-        }
-        case WXK_LEFT:
-        {
-               if ((x_page > 0) && (start_x >= 1))
-                 Scroll(start_x - 1, start_y);
-               break;
-        }
-        case WXK_RIGHT:
-        {
-               if (x_page > 0)
-                 Scroll(start_x + 1, start_y);
-               break;
-        }
-        case WXK_HOME:
-        {
-               Scroll(0, 0);
-               break;
-        }
-        // This is new
-        case WXK_END:
-        {
-               Scroll(start_x, y_pages+y);
-               break;
-        }
-        // end
-  }
-}
-*/

 
 

-// Setup background and foreground colours correctly
-void wxWindow::SetupColours(void)
-{
-       if (GetParent())
-               SetBackgroundColour(GetParent()->GetBackgroundColour());
-}
+    // finally retrieve the text metrics from it
+    GetTextMetrics(hdc, &tm);

 
 

-void wxWindow::OnIdle(wxIdleEvent& event)
-{
-    // Check if we need to send a LEAVE event
-    if (m_mouseInWindow)
+#if !wxDIALOG_UNIT_COMPATIBILITY
+    // and clean up
+    if ( hfont )

     {
     {

-        POINT pt;
-        ::GetCursorPos(&pt);
-        if (::WindowFromPoint(pt) != (HWND) GetHWND())
-        {
-            // Generate a LEAVE event
-            m_mouseInWindow = FALSE;
-            MSWOnMouseLeave(pt.x, pt.y, 0);
-        }
+        (void)::SelectObject(hdc, hfont);

     }
     }

-       UpdateWindowUI();
-}
+#endif

 
 

-// Raise the window to the top of the Z order
-void wxWindow::Raise(void)
-{
-    ::BringWindowToTop((HWND) GetHWND());
+    ::ReleaseDC(hwnd, hdc);
+
+    return tm;

 }
 
 }
 

-// Lower the window to the bottom of the Z order
-void wxWindow::Lower(void)
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& WXUNUSED(pt))

 {
 {

-    ::SetWindowPos((HWND) GetHWND(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
+    return wxFindWindowAtPoint(wxGetMousePosition());

 }
 
 }
 

-long wxWindow::MSWGetDlgCode()
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-  // default: just forward to def window proc (the msg has no parameters)
-  return MSWDefWindowProc(WM_GETDLGCODE, 0, 0);
+    POINT pt2;
+    pt2.x = pt.x;
+    pt2.y = pt.y;
+    HWND hWndHit = ::WindowFromPoint(pt2);
+
+    wxWindow* win = wxFindWinFromHandle((WXHWND) hWndHit) ;
+    HWND hWnd = hWndHit;
+
+    // Try to find a window with a wxWindow associated with it
+    while (!win && (hWnd != 0))
+    {
+        hWnd = ::GetParent(hWnd);
+        win = wxFindWinFromHandle((WXHWND) hWnd) ;
+    }
+    return win;

 }
 
 }
 

-bool wxWindow::AcceptsFocus() const
+// Get the current mouse position.
+wxPoint wxGetMousePosition()

 {
 {

-  return IsShown() && IsEnabled();
+    POINT pt;
+    GetCursorPos( & pt );
+    return wxPoint(pt.x, pt.y);

 }
 
 }
 

-#ifdef __WXDEBUG__
-static const char *GetMessageName(int message)
-{
-  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";
-    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";
-    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 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";
-    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";
-    default:
-      static char s_szBuf[128];
-      sprintf(s_szBuf, "<unknown message = %d>", message);
-      return s_szBuf;
-  }
-}
-#endif //WXDEBUG