Added $(NEW_WXLIBNAME) to allow changing the library or DLL name

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 65ffdccfe91d8f657212c7b9fb63b355f5b73c18..7149e45154d3609a3fb02dbb148b0eefa1f3a3eb 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -17,53 +17,72 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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 "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/settings.h"
+    #include "wx/msgdlg.h"
+
+    #include <stdio.h>

 #endif
 
 #if     wxUSE_OWNER_DRAWN
 #endif
 
 #if     wxUSE_OWNER_DRAWN

-#include "wx/ownerdrw.h"
+    #include "wx/ownerdrw.h"

 #endif
 
 #if     wxUSE_DRAG_AND_DROP
 #endif
 
 #if     wxUSE_DRAG_AND_DROP

-#include "wx/msw/ole/droptgt.h"
+    #include "wx/msw/ole/droptgt.h"

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

+
+#if wxUSE_TOOLTIPS
+#include "wx/tooltip.h"
+#endif
+
+#include "wx/intl.h"
+#include "wx/log.h"
+

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

+#include "wx/textctrl.h"
+

 #include <string.h>
 
 #ifndef __GNUWIN32__
 #include <string.h>
 
 #ifndef __GNUWIN32__

-#include <shellapi.h>
-#include <mmsystem.h>
+    #include <shellapi.h>
+    #include <mmsystem.h>

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-#include <windowsx.h>
+    #include <windowsx.h>
+#endif
+
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#include <commctrl.h>

 #endif
 
 #endif
 

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

 #endif
 
 #endif
 

+// all these are defined in <windows.h>

 #ifdef GetCharWidth
 #undef GetCharWidth
 #endif
 #ifdef GetCharWidth
 #undef GetCharWidth
 #endif


@@ -81,37 +100,36 @@
 #endif
 
 #ifdef  __WXDEBUG__
 #endif
 
 #ifdef  __WXDEBUG__

-const char *wxGetMessageName(int message);
+    const char *wxGetMessageName(int message);

 #endif  //__WXDEBUG__
 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 
 wxMenu *wxCurrentPopupMenu = NULL;
 #endif  //__WXDEBUG__
 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 
 wxMenu *wxCurrentPopupMenu = NULL;

-extern wxList wxPendingDelete;
+extern wxList WXDLLEXPORT wxPendingDelete;

 
 void wxRemoveHandleAssociation(wxWindow *win);
 void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 wxWindow *wxFindWinFromHandle(WXHWND hWnd);
 
 #if !USE_SHARED_LIBRARY
 
 void wxRemoveHandleAssociation(wxWindow *win);
 void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 wxWindow *wxFindWinFromHandle(WXHWND hWnd);
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+#endif

 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
 
 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)
+    EVT_CHAR(wxWindow::OnChar)
+    EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
+    EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindow::OnInitDialog)
+    EVT_IDLE(wxWindow::OnIdle)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif
-

 // Find an item given the MS Windows id
 wxWindow *wxWindow::FindItem(int id) const
 {
 // Find an item given the MS Windows id
 wxWindow *wxWindow::FindItem(int id) const
 {

-    if (!GetChildren())
-        return NULL;
-    wxNode *current = GetChildren()->First();
+//    if (!GetChildren())
+//        return NULL;
+    wxNode *current = GetChildren().First();

     while (current)
     {
         wxWindow *childWin = (wxWindow *)current->Data();
     while (current)
     {
         wxWindow *childWin = (wxWindow *)current->Data();


@@ -123,7 +141,7 @@ wxWindow *wxWindow::FindItem(int id) const
         if (childWin->IsKindOf(CLASSINFO(wxControl)))
         {
             wxControl *item = (wxControl *)childWin;
         if (childWin->IsKindOf(CLASSINFO(wxControl)))
         {
             wxControl *item = (wxControl *)childWin;

-            if (item->m_windowId == id)
+            if (item->GetId() == id)

                 return item;
             else
             {
                 return item;
             else
             {


@@ -140,9 +158,9 @@ wxWindow *wxWindow::FindItem(int id) const
 // Find an item given the MS Windows handle
 wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
 {
 // Find an item given the MS Windows handle
 wxWindow *wxWindow::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
 {

-    if (!GetChildren())
-        return NULL;
-    wxNode *current = GetChildren()->First();
+//    if (!GetChildren())
+//        return NULL;
+    wxNode *current = GetChildren().First();

     while (current)
     {
         wxObject *obj = (wxObject *)current->Data() ;
     while (current)
     {
         wxObject *obj = (wxObject *)current->Data() ;


@@ -175,9 +193,23 @@ bool wxWindow::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 }
 
 bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),
 }
 
 bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),

-                         WXLPARAM WXUNUSED(lParam),
+                         WXLPARAM lParam,

                          WXLPARAM* WXUNUSED(result))
 {
                          WXLPARAM* WXUNUSED(result))
 {

+#ifdef __WIN95__
+#if wxUSE_TOOLTIPS
+    NMHDR* hdr = (NMHDR *)lParam;
+    if ( hdr->code == TTN_NEEDTEXT && m_tooltip )
+    {
+        TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
+        ttt->lpszText = (char *)m_tooltip->GetTip().c_str();
+
+        // processed
+        return TRUE;
+    }
+#endif
+#endif
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -201,13 +233,15 @@ void wxWindow::SetHWND(WXHWND hWnd)
 
 void wxWindow::Init()
 {
 
 void wxWindow::Init()
 {

+    m_isWindow = TRUE;
+

     // Generic
     // Generic

+//    m_windowCursor = * wxSTANDARD_CURSOR;

     m_windowId = 0;
     m_isShown = TRUE;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowEventHandler = this;
     m_windowId = 0;
     m_isShown = TRUE;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowEventHandler = this;

-    m_windowCursor = *wxSTANDARD_CURSOR;

     m_children = new wxList;
     m_doubleClickAllowed = 0 ;
     m_winCaptured = FALSE;
     m_children = new wxList;
     m_doubleClickAllowed = 0 ;
     m_winCaptured = FALSE;


@@ -264,6 +298,10 @@ void wxWindow::Init()
 #if  wxUSE_DRAG_AND_DROP
     m_pDropTarget = NULL;
 #endif
 #if  wxUSE_DRAG_AND_DROP
     m_pDropTarget = NULL;
 #endif

+
+#if wxUSE_TOOLTIPS
+    m_tooltip = NULL;
+#endif

 }
 
 wxWindow::wxWindow()
 }
 
 wxWindow::wxWindow()


@@ -276,6 +314,12 @@ wxWindow::~wxWindow()
 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 

+    // first of all, delete the things on which nothing else depends
+
+#if wxUSE_TOOLTIPS
+    wxDELETE(m_tooltip);
+#endif
+

     // JACS - if behaviour is odd, restore this
     // to the start of ~wxWindow. Vadim has changed
     // it to nearer the end. Unsure of side-effects
     // JACS - if behaviour is odd, restore this
     // to the start of ~wxWindow. Vadim has changed
     // it to nearer the end. Unsure of side-effects


@@ -288,6 +332,7 @@ wxWindow::~wxWindow()
     // delete themselves.
 #if wxUSE_CONSTRAINTS
     DeleteRelatedConstraints();
     // delete themselves.
 #if wxUSE_CONSTRAINTS
     DeleteRelatedConstraints();

+

     if (m_constraints)
     {
         // This removes any dangling pointers to this window
     if (m_constraints)
     {
         // This removes any dangling pointers to this window


@@ -296,11 +341,9 @@ wxWindow::~wxWindow()
         delete m_constraints;
         m_constraints = NULL;
     }
         delete m_constraints;
         m_constraints = NULL;
     }

-    if (m_windowSizer)
-    {
-        delete m_windowSizer;
-        m_windowSizer = NULL;
-    }
+
+    wxDELETE(m_windowSizer);
+

     // If this is a child of a sizer, remove self from parent
     if (m_sizerParent)
         m_sizerParent->RemoveChild((wxWindow *)this);
     // If this is a child of a sizer, remove self from parent
     if (m_sizerParent)
         m_sizerParent->RemoveChild((wxWindow *)this);


@@ -364,8 +407,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

-    Init();
-

     wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
 
     parent->AddChild(this);
     wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
 
     parent->AddChild(this);


@@ -499,7 +540,8 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
         m_pDropTarget->Register(m_hWnd);
 }
 
         m_pDropTarget->Register(m_hWnd);
 }
 

-#endif
+#endif // wxUSE_DRAG_AND_DROP
+

 
 //old style file-manager drag&drop support
 // I think we should retain the old-style
 
 //old style file-manager drag&drop support
 // I think we should retain the old-style


@@ -512,6 +554,28 @@ void wxWindow::DragAcceptFiles(bool accept)
         ::DragAcceptFiles(hWnd, (BOOL)accept);
 }
 
         ::DragAcceptFiles(hWnd, (BOOL)accept);
 }
 

+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS
+
+void wxWindow::SetToolTip(const wxString &tip)
+{
+    SetToolTip(new wxToolTip(tip));
+}
+
+void wxWindow::SetToolTip(wxToolTip *tooltip)
+{
+    if ( m_tooltip )
+        delete m_tooltip;
+
+    m_tooltip = tooltip;
+    m_tooltip->SetWindow(this);
+}
+
+#endif // wxUSE_TOOLTIPS
+

 // Get total size
 void wxWindow::GetSize(int *x, int *y) const
 {
 // Get total size
 void wxWindow::GetSize(int *x, int *y) const
 {


@@ -610,15 +674,21 @@ void wxWindow::GetClientSize(int *x, int *y) const
 {
     HWND hWnd = (HWND) GetHWND();
     RECT rect;
 {
     HWND hWnd = (HWND) GetHWND();
     RECT rect;

-    GetClientRect(hWnd, &rect);
+    ::GetClientRect(hWnd, &rect);

     *x = rect.right;
     *y = rect.bottom;
 }
 
     *x = rect.right;
     *y = rect.bottom;
 }
 

-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
 {
     int currentX, currentY;
     GetPosition(&currentX, &currentY);

+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    if (x == currentX && y == currentY && width == currentW && height == currentH)
+        return;
+

     int actualWidth = width;
     int actualHeight = height;
     int actualX = x;
     int actualWidth = width;
     int actualHeight = height;
     int actualX = x;


@@ -630,8 +700,6 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
 
     AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
 
 
     AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
 

-    int currentW,currentH;
-    GetSize(&currentW, &currentH);

     if (width == -1)
         actualWidth = currentW ;
     if (height == -1)
     if (width == -1)
         actualWidth = currentW ;
     if (height == -1)


@@ -642,14 +710,16 @@ void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
         MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE);
 }
 
         MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE);
 }
 

-void wxWindow::SetClientSize(int width, int height)
+void wxWindow::DoSetClientSize(int width, int height)

 {
     wxWindow *parent = GetParent();
     HWND hWnd = (HWND) GetHWND();
 {
     wxWindow *parent = GetParent();
     HWND hWnd = (HWND) GetHWND();

-    HWND hParentWnd = (HWND) (HWND) parent->GetHWND();
+    HWND hParentWnd = (HWND) 0;
+    if (parent)
+        hParentWnd = (HWND) parent->GetHWND();

 
     RECT rect;
 
     RECT rect;

-    GetClientRect(hWnd, &rect);
+    ::GetClientRect(hWnd, &rect);

 
     RECT rect2;
     GetWindowRect(hWnd, &rect2);
 
     RECT rect2;
     GetWindowRect(hWnd, &rect2);


@@ -698,13 +768,14 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
 
 bool wxWindow::Show(bool show)
 {
 
 bool wxWindow::Show(bool show)
 {

+    m_isShown = show;

     HWND hWnd = (HWND) GetHWND();
     int cshow;
     if (show)
         cshow = SW_SHOW;
     else
         cshow = SW_HIDE;
     HWND hWnd = (HWND) GetHWND();
     int cshow;
     if (show)
         cshow = SW_SHOW;
     else
         cshow = SW_HIDE;

-    ShowWindow(hWnd, (BOOL)cshow);
+    ShowWindow(hWnd, cshow);

     if (show)
     {
         BringWindowToTop(hWnd);
     if (show)
     {
         BringWindowToTop(hWnd);


@@ -716,7 +787,11 @@ bool wxWindow::Show(bool show)
 
 bool wxWindow::IsShown(void) const
 {
 
 bool wxWindow::IsShown(void) const
 {

-    return (::IsWindowVisible((HWND) GetHWND()) != 0);
+    // Can't rely on IsWindowVisible, since it will return FALSE
+    // if the parent is not visible.
+    return m_isShown;
+//    int ret = ::IsWindowVisible((HWND) GetHWND()) ;
+//    return (ret != 0);

 }
 
 int wxWindow::GetCharHeight(void) const
 }
 
 int wxWindow::GetCharHeight(void) const


@@ -781,7 +856,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     //    fontToUse->ReleaseResource();
 }
 
     //    fontToUse->ReleaseResource();
 }
 

-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)

 {
     HWND hWnd = (HWND) GetHWND();
     if (hWnd)
 {
     HWND hWnd = (HWND) GetHWND();
     if (hWnd)


@@ -839,12 +914,9 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
         wxWndHook = NULL;
         wnd->m_hWnd = (WXHWND) hWnd;
     }
         wxWndHook = NULL;
         wnd->m_hWnd = (WXHWND) hWnd;
     }

-    //    wxDebugMsg("hWnd = %d, m_hWnd = %d, msg = %d\n", hWnd, m_hWnd, message);

 
 

-    // Stop right here if we don't have a valid handle
-    // in our wxWnd object.
+    // Stop right here if we don't have a valid handle in our wxWindow object.

     if (wnd && !wnd->m_hWnd) {
     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;
         wnd->m_hWnd = (WXHWND) hWnd;
         long res = wnd->MSWDefWindowProc(message, wParam, lParam );
         wnd->m_hWnd = 0;


@@ -864,21 +936,20 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 // Should probably have a test for 'genuine' NT
 #if defined(__WIN32__)
 
 // Should probably have a test for 'genuine' NT
 #if defined(__WIN32__)

-#define DIMENSION_TYPE short
+    #define DIMENSION_TYPE short

 #else
 #else

-#define DIMENSION_TYPE int
+    #define DIMENSION_TYPE int

 #endif
 
 #endif
 

-// Main Windows 3 window proc
+// Main Windows window proc

 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     wxASSERT( m_lastMsg == message &&
 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     wxASSERT( m_lastMsg == message &&

-        m_lastWParam == wParam &&
-        m_lastLParam == lParam );
+              m_lastWParam == wParam && m_lastLParam == lParam );

 
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Processing %s(%lx, %lx)",
 
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Processing %s(%lx, %lx)",

-        wxGetMessageName(message), wParam, lParam);
+               wxGetMessageName(message), wParam, lParam);

 #endif // __WXDEBUG__
 
     HWND hWnd = (HWND)m_hWnd;
 #endif // __WXDEBUG__
 
     HWND hWnd = (HWND)m_hWnd;


@@ -1108,6 +1179,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             return MSWOnSysCommand(wParam, lParam);
             break;
         }
             return MSWOnSysCommand(wParam, lParam);
             break;
         }

+

     case WM_COMMAND:
         {
 #ifdef __WIN32__
     case WM_COMMAND:
         {
 #ifdef __WIN32__


@@ -1159,32 +1231,81 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             return MSWOnMeasureItem((int)wParam, (WXMEASUREITEMSTRUCT *)lParam);
             break;
         }
             return MSWOnMeasureItem((int)wParam, (WXMEASUREITEMSTRUCT *)lParam);
             break;
         }

-

     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 ( MSWOnKeyDown((WORD) wParam, lParam) )
+            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();
             return Default();

+        }

 
 

-        // Avoid duplicate messages to OnChar
-        if ( (wParam != VK_ESCAPE) && (wParam != VK_SPACE) &&
-            (wParam != VK_RETURN) && (wParam != VK_BACK) &&
-            (wParam != VK_TAB) )
+        switch ( wParam )

         {
         {

-            MSWOnChar((WORD)wParam, lParam);
-            if ( ::GetKeyState(VK_CONTROL) & 0x100 )
+            // 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:

                 return Default();
                 return Default();

+
+#ifdef VK_APPS
+
+            // normally these macros would be defined in windows.h
+#ifndef GET_X_LPARAM
+    #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
+    #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
+#endif
+
+            // special case of VK_APPS: treat it the same as right mouse click
+            // because both usually pop up a context menu
+            case VK_APPS:
+                {
+                    // construct the key mask
+                    WPARAM fwKeys = MK_RBUTTON;
+                    if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
+                        fwKeys |= MK_CONTROL;
+                    if ( (::GetKeyState(VK_SHIFT) & 0x100) != 0 )
+                        fwKeys |= MK_SHIFT;
+
+                    // simulate right mouse button click
+                    DWORD dwPos = ::GetMessagePos();
+                    int x = GET_X_LPARAM(dwPos),
+                        y = GET_Y_LPARAM(dwPos);
+
+                    ScreenToClient(&x, &y);
+                    MSWOnRButtonDown(x, y, fwKeys);
+                }
+                break;
+#endif // VK_APPS
+
+            case VK_LEFT:
+            case VK_RIGHT:
+            case VK_DOWN:
+            case VK_UP:
+            default:
+                if ( !MSWOnChar((WORD)wParam, lParam) )
+                {
+                    return Default();
+                }
+                break;

         }
         }

-        else if ( ::GetKeyState(VK_CONTROL) & 0x100 )
-            MSWOnChar((WORD)wParam, lParam);
-        else
+        break;
+
+    case WM_KEYUP:
+        if ( !MSWOnKeyUp((WORD) wParam, lParam) )

             return Default();
         break;
 
     case WM_CHAR: // Always an ASCII character
             return Default();
         break;
 
     case WM_CHAR: // Always an ASCII character

-        {
-            MSWOnChar((WORD)wParam, lParam, TRUE);
-            break;
-        }
+        if ( !MSWOnChar((WORD)wParam, lParam, TRUE) )
+            return Default();
+        break;

 
     case WM_HSCROLL:
         {
 
     case WM_HSCROLL:
         {


@@ -1363,7 +1484,6 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 return 1L;
             break;
         }
                 return 1L;
             break;
         }

-

     case WM_GETMINMAXINFO:
         {
             MINMAXINFO *info = (MINMAXINFO *)lParam;
     case WM_GETMINMAXINFO:
         {
             MINMAXINFO *info = (MINMAXINFO *)lParam;


@@ -1378,13 +1498,69 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             return MSWDefWindowProc(message, wParam, lParam );
             break;
         }
             return MSWDefWindowProc(message, wParam, lParam );
             break;
         }

-

     case WM_GETDLGCODE:
     case WM_GETDLGCODE:

-        return MSWGetDlgCode();
+        {
+            return MSWGetDlgCode();
+        }
+    case WM_SETCURSOR:
+        {
+            // don't set cursor for other windows, only for this one: this
+            // prevents children of this window from gettign the same cursor
+            // as the parent has (don't forget that this message is propagated
+            // by default up the window parent-child hierarchy)
+            if ( (HWND)wParam == hWnd )
+            {
+                // don't set cursor when the mouse is not in the client part
+                short nHitTest = LOWORD(lParam);
+                if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
+                {
+                    HCURSOR hcursor = 0;
+                    if ( wxIsBusy() )
+                    {
+                        // from msw\utils.cpp
+                        extern HCURSOR gs_wxBusyCursor;
+
+                        hcursor = gs_wxBusyCursor;
+                    }
+                    else
+                    {
+                        wxCursor *cursor = NULL;
+
+                        if ( m_windowCursor.Ok() )
+                        {
+                            cursor = &m_windowCursor;
+                        }
+                        else
+                        {
+                            // from msw\data.cpp
+                            extern wxCursor *g_globalCursor;
+
+                            if ( g_globalCursor && g_globalCursor->Ok() )
+                                cursor = g_globalCursor;
+                        }
+
+                        if ( cursor )
+                            hcursor = (HCURSOR)cursor->GetHCURSOR();
+                    }
+
+                    if ( hcursor )
+                    {
+                        ::SetCursor(hcursor);
+
+                        // returning TRUE stops the DefWindowProc() from
+                        // further processing this message - exactly what we
+                        // need because we've just set the cursor.
+                        return TRUE;
+                    }
+                }
+            }
+        }
+        return MSWDefWindowProc(message, wParam, lParam );

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

+

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


@@ -1408,7 +1584,7 @@ void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
 {
     // adding NULL hWnd is (first) surely a result of an error and
     // (secondly) breaks menu command processing
 {
     // 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" );
+    wxCHECK_RET( hWnd != (HWND) NULL, "attempt to add a NULL hWnd to window list" );

 
     if ( !wxWinHandleList->Find((long)hWnd) )
         wxWinHandleList->Append((long)hWnd, win);
 
     if ( !wxWinHandleList->Find((long)hWnd) )
         wxWinHandleList->Append((long)hWnd, win);


@@ -1467,10 +1643,18 @@ void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow
         m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
             (DLGPROC)wxDlgProc);
 #else
         m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
             (DLGPROC)wxDlgProc);
 #else

+        // N.B.: if we _don't_ use this form,
+        // then with VC++ 1.5, it crashes horribly.
+#if 1
+       m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
+                            (DLGPROC)wxDlgProc);
+#else
+        // Crashes when we use this.

         DLGPROC dlgproc = (DLGPROC)MakeProcInstance((DLGPROC)wxWndProc, wxGetInstance());
 
         m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
             (DLGPROC)dlgproc);
         DLGPROC dlgproc = (DLGPROC)MakeProcInstance((DLGPROC)wxWndProc, wxGetInstance());
 
         m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
             (DLGPROC)dlgproc);

+#endif

 #endif
 
         if (m_hWnd == 0)
 #endif
 
         if (m_hWnd == 0)


@@ -1590,26 +1774,30 @@ long wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
 
     if ( win )
     {
 
     if ( win )
     {

-        win->MSWNotify(wParam, lParam, &result);
+        if ( win->MSWNotify(wParam, lParam, &result) )
+            return result;

     }
     else
     {
         // Rely on MSWNotify to check whether the message
         // belongs to the window or not
     }
     else
     {
         // Rely on MSWNotify to check whether the message
         // belongs to the window or not

-        wxNode *node = GetChildren()->First();
+        wxNode *node = GetChildren().First();

         while (node)
         {
             wxWindow *child = (wxWindow *)node->Data();
             if ( child->MSWNotify(wParam, lParam, &result) )
         while (node)
         {
             wxWindow *child = (wxWindow *)node->Data();
             if ( child->MSWNotify(wParam, lParam, &result) )

-                break;
+                return result;

             node = node->Next();
         }
             node = node->Next();
         }

-    }

 
 

-    return result;
+        // finally try this window too (catches toolbar case)
+        if ( MSWNotify(wParam, lParam, &result) )
+            return result;
+    }

 #endif  // Win95
 
 #endif  // Win95
 

-    return FALSE;
+    // not processed
+    return Default();

 }
 
 void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
 }
 
 void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))


@@ -1639,6 +1827,13 @@ bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
             ::ShowCaret((HWND) GetHWND());
     }
 
             ::ShowCaret((HWND) GetHWND());
     }
 

+    // panel wants to track the window which was the last to have focus in it
+    wxWindow *parent = GetParent();
+    if ( parent && parent->IsKindOf(CLASSINFO(wxPanel)) )
+    {
+        ((wxPanel *)parent)->SetLastFocus(GetId());
+    }
+

     wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
     event.SetEventObject(this);
     if (!GetEventHandler()->ProcessEvent(event))
     wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
     event.SetEventObject(this);
     if (!GetEventHandler()->ProcessEvent(event))


@@ -1817,7 +2012,7 @@ long wxWindow::MSWOnQueryNewPalette()
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes: passes event on to children.
 void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         // Only propagate to non-top-level windows
     while ( node )
     {
         // Only propagate to non-top-level windows


@@ -1843,47 +2038,59 @@ long wxWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
 long wxWindow::Default()
 {
 
 long wxWindow::Default()
 {

-    // Ignore 'fake' events (perhaps generated as a result of a separate real event)
-    if (m_lastMsg == 0)
+    // Ignore 'fake' events (perhaps generated as a result of a separate real
+    // event)
+    if ( m_lastMsg == 0 )

         return 0;
 
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",
         return 0;
 
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",

-        wxGetMessageName(m_lastMsg));
+               wxGetMessageName(m_lastMsg));

 #endif // __WXDEBUG__
 
 #endif // __WXDEBUG__
 

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

 }
 
 bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
 {
 }
 
 bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
 {

-    if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) ) {
+    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;
 
         // intercept dialog navigation keys
         MSG *msg = (MSG *)pMsg;
         bool bProcess = TRUE;
         if ( msg->message != WM_KEYDOWN )
             bProcess = FALSE;
 

-        if ( (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN )
+        if ( bProcess && (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN )

             bProcess = FALSE;
 
             bProcess = FALSE;
 

-        bool bCtrlDown = (::GetKeyState(VK_CONTROL) & 0x100) != 0;
+        if ( bProcess )
+        {
+            bool bCtrlDown = (::GetKeyState(VK_CONTROL) & 0x100) != 0;
+
+            // 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);
+            }

 
 

-        // WM_GETDLGCODE: if the control wants it for itself, don't process it
-        // (except for Ctrl-Tab combination which is always processed)
-        LONG lDlgCode = 0;
-        if ( bProcess && !bCtrlDown ) {
-            lDlgCode = ::SendMessage(msg->hwnd, WM_GETDLGCODE, 0, 0);
-        }
+            bool bForward = TRUE,
+                 bWindowChange = FALSE;

 
 

-        bool bForward = TRUE;
-        if ( bProcess ) {
-            switch ( msg->wParam ) {
+            switch ( msg->wParam ) 
+            {

                 case VK_TAB:
                 case VK_TAB:

-                    if ( lDlgCode & DLGC_WANTTAB )  // FALSE for Ctrl-Tab
+                    if ( lDlgCode & DLGC_WANTTAB ) {

                         bProcess = FALSE;
                         bProcess = FALSE;

-                    else
+                    }
+                    else {
+                        // Ctrl-Tab cycles thru notebook pages
+                        bWindowChange = bCtrlDown;

                         bForward = !(::GetKeyState(VK_SHIFT) & 0x100);
                         bForward = !(::GetKeyState(VK_SHIFT) & 0x100);

+                    }

                     break;
 
                 case VK_UP:
                     break;
 
                 case VK_UP:


@@ -1900,24 +2107,75 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
                         bProcess = FALSE;
                     break;
 
                         bProcess = FALSE;
                     break;
 

+                case VK_RETURN:
+                    {
+                        if ( lDlgCode & DLGC_WANTMESSAGE )
+                        {
+                            // control wants to process Enter itself, don't
+                            // call IsDialogMessage() which would interpret
+                            // it
+                            return FALSE;
+                        }
+#ifndef __WIN16__
+                        wxButton *btnDefault = GetDefaultItem();
+                        if ( btnDefault && !bCtrlDown )
+                        {
+                            // if there is a default button, Enter should
+                            // press it
+                            (void)::SendMessage((HWND)btnDefault->GetHWND(),
+                                                BM_CLICK, 0, 0);
+                            return TRUE;
+                        }
+                        // else: but if there is 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
+                    }
+                    break;
+

                 default:
                     bProcess = FALSE;
             }
                 default:
                     bProcess = FALSE;
             }

-        }

 
 

-        if ( bProcess ) {
-            wxNavigationKeyEvent event;
-            event.SetDirection(bForward);
-            event.SetWindowChange(bCtrlDown);
-            event.SetEventObject(this);
+            if ( bProcess )
+            {
+                wxNavigationKeyEvent event;
+                event.SetDirection(bForward);
+                event.SetWindowChange(bWindowChange);
+                event.SetEventObject(this);

 
 

-            if ( GetEventHandler()->ProcessEvent(event) )
-                return TRUE;
+                if ( GetEventHandler()->ProcessEvent(event) )
+                    return TRUE;
+            }

         }
 
         }
 

-        return ::IsDialogMessage((HWND)GetHWND(), msg) != 0;
+        if ( ::IsDialogMessage((HWND)GetHWND(), msg) )
+            return TRUE;
+    }
+
+#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

 
 

+/* This code manages to disable character input completely. Nice one!
+ * Probably because the dialog is requesting all char input. Or,
+ * it gets called by non-dialog windows.
+
+    // In case we don't have wxTAB_TRAVERSAL style on.
+    // If we don't call this, we may never process Enter correctly.
+    if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) == 0 )
+    {
+        MSG *msg = (MSG *)pMsg;
+        if ( ::IsDialogMessage((HWND)GetHWND(), msg) )
+            return TRUE;
+    }
+*/

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -2027,7 +2285,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 
 long wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam)
 {

-    switch (wParam)
+    switch (wParam & 0xFFFFFFF0)

     {
     case SC_MAXIMIZE:
         {
     {
     case SC_MAXIMIZE:
         {


@@ -2068,7 +2326,7 @@ void wxWindow::MSWOnLButtonDown(int x, int y, WXUINT flags)
     event.SetTimestamp(wxApp::sm_lastMessageTime);
     event.m_eventObject = this;
 
     event.SetTimestamp(wxApp::sm_lastMessageTime);
     event.m_eventObject = this;
 

-    m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVENT_TYPE_LEFT_DOWN;
+    m_lastXPos = event.m_x; m_lastYPos = event.m_y; m_lastEvent = wxEVT_LEFT_DOWN;

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


@@ -2133,7 +2391,6 @@ void wxWindow::MSWOnMButtonDown(int x, int y, WXUINT flags)
 
 void wxWindow::MSWOnMButtonUp(int x, int y, WXUINT flags)
 {
 
 void wxWindow::MSWOnMButtonUp(int x, int y, WXUINT flags)
 {

-    //wxDebugMsg("MButtonUp\n") ;

     wxMouseEvent event(wxEVT_MIDDLE_UP);
 
     event.m_x = x; event.m_y = y;
     wxMouseEvent event(wxEVT_MIDDLE_UP);
 
     event.m_x = x; event.m_y = y;


@@ -2230,11 +2487,6 @@ void wxWindow::MSWOnRButtonDClick(int x, int y, WXUINT flags)
 void wxWindow::MSWOnMouseMove(int x, int y, WXUINT flags)
 {
     // 'normal' move event...
 void wxWindow::MSWOnMouseMove(int x, int y, WXUINT flags)
 {
     // '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());

 
     if (!m_mouseInWindow)
     {
 
     if (!m_mouseInWindow)
     {


@@ -2313,7 +2565,9 @@ void wxWindow::MSWOnMouseLeave(int x, int y, WXUINT flags)
     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 

-void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
+// isASCII is TRUE only when we're called from WM_CHAR handler and not from
+// WM_KEYDOWN one
+bool wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)

 {
     int id;
     bool tempControlDown = FALSE;
 {
     int id;
     bool tempControlDown = FALSE;


@@ -2375,9 +2629,92 @@ void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
 
         event.m_x = pt.x; event.m_y = pt.y;
 
 
         event.m_x = pt.x; event.m_y = pt.y;
 

-        if (!GetEventHandler()->ProcessEvent(event))
-            Default();
+        if (GetEventHandler()->ProcessEvent(event))
+            return TRUE;
+        else
+            return FALSE;
+    }
+    else
+        return FALSE;
+}
+
+bool wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam)
+{
+    int id;
+
+    if ((id = wxCharCodeMSWToWX(wParam)) == 0) {
+        id = wParam;
+    }
+
+    if (id != -1)
+    {
+        wxKeyEvent event(wxEVT_KEY_DOWN);
+        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;
+
+        event.m_eventObject = this;
+        event.m_keyCode = id;
+        event.SetTimestamp(wxApp::sm_lastMessageTime);
+
+        POINT pt ;
+        GetCursorPos(&pt) ;
+        RECT rect ;
+        GetWindowRect((HWND) GetHWND(),&rect) ;
+        pt.x -= rect.left ;
+        pt.y -= rect.top ;
+
+        event.m_x = pt.x; event.m_y = pt.y;
+
+        if (GetEventHandler()->ProcessEvent(event))
+        {
+            return TRUE;
+        }
+        else return FALSE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+bool wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam)
+{
+    int id;
+
+    if ((id = wxCharCodeMSWToWX(wParam)) == 0) {
+        id = wParam;
+    }
+
+    if (id != -1)
+    {
+        wxKeyEvent event(wxEVT_KEY_UP);
+        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;
+
+        event.m_eventObject = this;
+        event.m_keyCode = id;
+        event.SetTimestamp(wxApp::sm_lastMessageTime);
+
+        POINT pt ;
+        GetCursorPos(&pt) ;
+        RECT rect ;
+        GetWindowRect((HWND) GetHWND(),&rect) ;
+        pt.x -= rect.left ;
+        pt.y -= rect.top ;
+
+        event.m_x = pt.x; event.m_y = pt.y;
+
+        if (GetEventHandler()->ProcessEvent(event))
+            return TRUE;
+        else
+            return FALSE;

     }
     }

+    else
+        return FALSE;

 }
 
 void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
 }
 
 void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)


@@ -2871,7 +3208,7 @@ void wxSetKeyboardHook(bool doIt)
     {
         wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance());
         wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(),
     {
         wxTheKeyboardHookProc = MakeProcInstance((FARPROC) wxKeyboardHook, wxGetInstance());
         wxTheKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC) wxTheKeyboardHookProc, wxGetInstance(),

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__TWIN32__)

             GetCurrentThreadId());
         //      (DWORD)GetCurrentProcess()); // This is another possibility. Which is right?
 #else
             GetCurrentThreadId());
         //      (DWORD)GetCurrentProcess()); // This is another possibility. Which is right?
 #else


@@ -2955,13 +3292,6 @@ void wxWindow::Centre(int direction)
 
 }
 
 
 }
 

-/* TODO (maybe)
-void wxWindow::OnPaint()
-{
-PaintSelectionHandles();
-}
-*/
-

 void wxWindow::WarpPointer (int x_pos, int y_pos)
 {
     // Move the pointer to (x_pos,y_pos) coordinates. They are expressed in
 void wxWindow::WarpPointer (int x_pos, int y_pos)
 {
     // Move the pointer to (x_pos,y_pos) coordinates. They are expressed in


@@ -3010,10 +3340,14 @@ bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC)
 
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 {
 
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 {

+    if (!GetHWND())
+        return;
+

     RECT rect;
     ::GetClientRect((HWND) GetHWND(), &rect);
 
     RECT rect;
     ::GetClientRect((HWND) GetHWND(), &rect);
 

-    HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
+    COLORREF ref = PALETTERGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue()) ;
+    HBRUSH hBrush = ::CreateSolidBrush(ref);

     int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
 
     //  ::GetClipBox((HDC) event.GetDC()->GetHDC(), &rect);
     int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
 
     //  ::GetClipBox((HDC) event.GetDC()->GetHDC(), &rect);


@@ -3188,7 +3522,7 @@ int wxWindow::GetScrollRange(int orient) const
 #if defined(__WIN95__)
         // Try to adjust the range to cope with page size > 1
         // - a Windows API quirk
 #if defined(__WIN95__)
         // Try to adjust the range to cope with page size > 1
         // - a Windows API quirk

-        int pageSize = GetScrollPage(orient);
+        int pageSize = GetScrollThumb(orient);

         if ( pageSize > 1 )
         {
             maxPos -= (pageSize - 1);
         if ( pageSize > 1 )
         {
             maxPos -= (pageSize - 1);


@@ -3310,7 +3644,7 @@ SetScrollPage(orient, thumbVisible, FALSE);
     }
 }
 
     }
 }
 

-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)

 {
     RECT rect2;
     if ( rect )
 {
     RECT rect2;
     if ( rect )


@@ -3431,7 +3765,7 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
 
     // 5) If this isn't a Win95 app, and we are using CTL3D, remove border
     // effects from extended style
 
     // 5) If this isn't a Win95 app, and we are using CTL3D, remove border
     // effects from extended style

-#if CTL3D
+#if wxUSE_CTL3D

     if ( *want3D )
         nativeBorder = FALSE;
 #endif
     if ( *want3D )
         nativeBorder = FALSE;
 #endif


@@ -3441,7 +3775,7 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
     // 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 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 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 ;
     if (defaultBorderStyle && (*want3D) && ! ((m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
         (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) ))
         exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE ;


@@ -3452,23 +3786,17 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
 
 void wxWindow::OnChar(wxKeyEvent& event)
 {
 
 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()->GetEventHandler()->ProcessEvent(event) )
-                return;
-        }
-    }
-
-    bool isVirtual;
-    int id = wxCharCodeWXToMSW((int)event.KeyCode(), &isVirtual);
+    event.Skip();
+}

 
 

-    if ( id == -1 )
-        id= m_lastWParam;
+void wxWindow::OnKeyDown(wxKeyEvent& event)
+{
+    Default();
+}

 
 

-    if ( !event.ControlDown() )
-        (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
+void wxWindow::OnKeyUp(wxKeyEvent& event)
+{
+    Default();

 }
 
 void wxWindow::OnPaint(wxPaintEvent& event)
 }
 
 void wxWindow::OnPaint(wxPaintEvent& event)


@@ -3492,14 +3820,14 @@ bool wxWindow::IsEnabled(void) const
 // it's an application error (pops up a dialog)
 bool wxWindow::TransferDataToWindow()
 {
 // it's an application error (pops up a dialog)
 bool wxWindow::TransferDataToWindow()
 {

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();
         if ( child->GetValidator() && /* child->GetValidator()->Ok() && */
             !child->GetValidator()->TransferToWindow() )
         {
     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);
+            wxLogError(_("Could not transfer data to window"));

             return FALSE;
         }
 
             return FALSE;
         }
 


@@ -3512,7 +3840,7 @@ bool wxWindow::TransferDataToWindow()
 // validation failed: don't quit
 bool wxWindow::TransferDataFromWindow()
 {
 // validation failed: don't quit
 bool wxWindow::TransferDataFromWindow()
 {

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();
     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();


@@ -3528,7 +3856,7 @@ bool wxWindow::TransferDataFromWindow()
 
 bool wxWindow::Validate()
 {
 
 bool wxWindow::Validate()
 {

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();
     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();


@@ -3555,30 +3883,28 @@ wxWindow *wxWindow::FindFocus()
 
 void wxWindow::AddChild(wxWindow *child)
 {
 
 void wxWindow::AddChild(wxWindow *child)
 {

-    GetChildren()->Append(child);
+    GetChildren().Append(child);

     child->m_windowParent = this;
 }
 
 void wxWindow::RemoveChild(wxWindow *child)
 {
     child->m_windowParent = this;
 }
 
 void wxWindow::RemoveChild(wxWindow *child)
 {

-    if (GetChildren())
-        GetChildren()->DeleteObject(child);
+//    if (GetChildren())
+    GetChildren().DeleteObject(child);

     child->m_windowParent = NULL;
 }
 
 void wxWindow::DestroyChildren()
 {
     child->m_windowParent = NULL;
 }
 
 void wxWindow::DestroyChildren()
 {

-    if (GetChildren()) {

         wxNode *node;
         wxNode *node;

-        while ((node = GetChildren()->First()) != (wxNode *)NULL) {
+        while ((node = GetChildren().First()) != (wxNode *)NULL) {

             wxWindow *child;
             if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
                 delete child;
             wxWindow *child;
             if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
                 delete child;

-                if ( GetChildren()->Member(child) )
+                if ( GetChildren().Member(child) )

                     delete node;
             }
         } /* while */
                     delete node;
             }
         } /* while */

-    }

 }
 
 void wxWindow::MakeModal(bool modal)
 }
 
 void wxWindow::MakeModal(bool modal)


@@ -3793,7 +4119,7 @@ bool wxWindow::DoPhase(int phase)
     {
         noChanges = 0;
         noFailures = 0;
     {
         noChanges = 0;
         noFailures = 0;

-        wxNode *node = GetChildren()->First();
+        wxNode *node = GetChildren().First();

         while (node)
         {
             wxWindow *child = (wxWindow *)node->Data();
         while (node)
         {
             wxWindow *child = (wxWindow *)node->Data();


@@ -3838,7 +4164,7 @@ void wxWindow::ResetConstraints()
         constr->centreX.SetDone(FALSE);
         constr->centreY.SetDone(FALSE);
     }
         constr->centreX.SetDone(FALSE);
         constr->centreY.SetDone(FALSE);
     }

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while (node)
     {
         wxWindow *win = (wxWindow *)node->Data();
     while (node)
     {
         wxWindow *win = (wxWindow *)node->Data();


@@ -3883,21 +4209,22 @@ void wxWindow::SetConstraintSizes(bool recurse)
             winName = "unnamed";
         else
             winName = 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);
+        wxLogDebug("Constraint(s) not satisfied for window of type %s, name %s:",
+                    (const char *)windowClass, (const char *)winName);

         if (!constr->left.GetDone())
         if (!constr->left.GetDone())

-            wxDebugMsg("  unsatisfied 'left' constraint.\n");
+            wxLogDebug("  unsatisfied 'left' constraint.");

         if (!constr->right.GetDone())
         if (!constr->right.GetDone())

-            wxDebugMsg("  unsatisfied 'right' constraint.\n");
+            wxLogDebug("  unsatisfied 'right' constraint.");

         if (!constr->width.GetDone())
         if (!constr->width.GetDone())

-            wxDebugMsg("  unsatisfied 'width' constraint.\n");
+            wxLogDebug("  unsatisfied 'width' constraint.");

         if (!constr->height.GetDone())
         if (!constr->height.GetDone())

-            wxDebugMsg("  unsatisfied 'height' constraint.\n");
-        wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
+            wxLogDebug("  unsatisfied 'height' constraint.");
+        wxLogDebug("Please check constraints: try adding AsIs() constraints.\n");

     }
 
     if (recurse)
     {
     }
 
     if (recurse)
     {

-        wxNode *node = GetChildren()->First();
+        wxNode *node = GetChildren().First();

         while (node)
         {
             wxWindow *win = (wxWindow *)node->Data();
         while (node)
         {
             wxWindow *win = (wxWindow *)node->Data();


@@ -4026,7 +4353,9 @@ bool wxWindow::Close(bool force)
 {
     wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
     event.SetEventObject(this);
 {
     wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
     event.SetEventObject(this);

+#if WXWIN_COMPATIBILITY

     event.SetForce(force);
     event.SetForce(force);

+#endif

     event.SetCanVeto(!force);
 
     return (GetEventHandler()->ProcessEvent(event) && !event.GetVeto());
     event.SetCanVeto(!force);
 
     return (GetEventHandler()->ProcessEvent(event) && !event.GetVeto());


@@ -4035,9 +4364,9 @@ bool wxWindow::Close(bool force)
 wxObject* wxWindow::GetChild(int number) const
 {
     // Return a pointer to the Nth object in the Panel
 wxObject* wxWindow::GetChild(int number) const
 {
     // Return a pointer to the Nth object in the Panel

-    if (!GetChildren())
-        return(NULL) ;
-    wxNode *node = GetChildren()->First();
+//    if (!GetChildren())
+//        return(NULL) ;
+    wxNode *node = GetChildren().First();

     int n = number;
     while (node && n--)
         node = node->Next() ;
     int n = number;
     while (node && n--)
         node = node->Next() ;


@@ -4099,7 +4428,7 @@ void wxWindow::Fit()
 {
     int maxX = 0;
     int maxY = 0;
 {
     int maxX = 0;
     int maxY = 0;

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         wxWindow *win = (wxWindow *)node->Data();
     while ( node )
     {
         wxWindow *win = (wxWindow *)node->Data();


@@ -4132,7 +4461,7 @@ wxWindow *wxWindow::FindWindow(long id)
     if ( GetId() == id)
         return this;
 
     if ( GetId() == id)
         return this;
 

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();
     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();


@@ -4149,7 +4478,7 @@ wxWindow *wxWindow::FindWindow(const wxString& name)
     if ( GetName() == name)
         return this;
 
     if ( GetName() == name)
         return this;
 

-    wxNode *node = GetChildren()->First();
+    wxNode *node = GetChildren().First();

     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();
     while ( node )
     {
         wxWindow *child = (wxWindow *)node->Data();


@@ -4318,6 +4647,7 @@ long wxWindow::MSWGetDlgCode()
 
 bool wxWindow::AcceptsFocus() const
 {
 
 bool wxWindow::AcceptsFocus() const
 {

+    // invisible and disabled controls don't need focus

     return IsShown() && IsEnabled();
 }
 
     return IsShown() && IsEnabled();
 }
 


@@ -4342,6 +4672,35 @@ bool wxWindow::IsExposed(const wxRect& rect) const
     return (m_updateRegion.Contains(rect) != wxOutRegion);
 }
 
     return (m_updateRegion.Contains(rect) != wxOutRegion);
 }
 

+// Set this window to be the child of 'parent'.
+bool wxWindow::Reparent(wxWindow *parent)
+{
+    if (parent == GetParent())
+        return TRUE;
+
+    // Unlink this window from the existing parent.
+    if (GetParent())
+    {
+        GetParent()->RemoveChild(this);
+    }
+    else
+        wxTopLevelWindows.DeleteObject(this);
+
+    HWND hWndParent = 0;
+    HWND hWndChild = (HWND) GetHWND();
+    if (parent != (wxWindow*) NULL)
+    {
+        parent->AddChild(this);
+        hWndParent = (HWND) parent->GetHWND();
+    }
+    else
+        wxTopLevelWindows.Append(this);
+
+    ::SetParent(hWndChild, hWndParent);
+
+    return TRUE;
+}
+

 #ifdef __WXDEBUG__
 const char *wxGetMessageName(int message)
 {
 #ifdef __WXDEBUG__
 const char *wxGetMessageName(int message)
 {