wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2031e5cc8438e7de67fbb262bc6990dcb6565c2b..7df198653369da2cfd03f4c0b7089ac8da0c1503 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -17,7 +17,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP


@@ -31,6 +31,7 @@
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.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/listbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"


@@ -38,11 +39,11 @@
 #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"
 #endif
 
 #include "wx/menuitem.h"


@@ -60,9 +61,11 @@
 #include <windowsx.h>
 #endif
 
 #include <windowsx.h>
 #endif
 

+#ifndef __TWIN32__

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

+#endif

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


@@ -81,13 +84,13 @@
 #endif
 
 #ifdef  __WXDEBUG__
 #endif
 
 #ifdef  __WXDEBUG__

-const char *wxGetMessageName(int message);
-#endif  //WXDEBUG
+    const char *wxGetMessageName(int message);
+#endif  //__WXDEBUG__

 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 
 wxMenu *wxCurrentPopupMenu = NULL;
 
 #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);
 
 void wxRemoveHandleAssociation(wxWindow *win);
 void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);


@@ -95,23 +98,24 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd);
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 #if !USE_SHARED_LIBRARY
 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_KEY_DOWN(wxWindow::OnKeyDown)
+    EVT_KEY_UP(wxWindow::OnKeyUp)
+    EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
+    EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindow::OnInitDialog)
+    EVT_IDLE(wxWindow::OnIdle)

 END_EVENT_TABLE()
 
 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 +127,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 +144,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() ;


@@ -174,7 +178,9 @@ bool wxWindow::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
+bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),
+                         WXLPARAM WXUNUSED(lParam),
+                         WXLPARAM* WXUNUSED(result))

 {
     return FALSE;
 }
 {
     return FALSE;
 }


@@ -193,8 +199,11 @@ void wxWindow::SetHWND(WXHWND hWnd)
     m_hWnd = hWnd;
 }
 
     m_hWnd = hWnd;
 }
 

-// Constructor
-wxWindow::wxWindow(void)
+// ----------------------------------------------------------------------------
+// constructors and such
+// ----------------------------------------------------------------------------
+
+void wxWindow::Init()

 {
     // Generic
     m_windowId = 0;
 {
     // Generic
     m_windowId = 0;


@@ -202,7 +211,6 @@ wxWindow::wxWindow(void)
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowEventHandler = this;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowEventHandler = this;

-    m_windowName = "";

     m_windowCursor = *wxSTANDARD_CURSOR;
     m_children = new wxList;
     m_doubleClickAllowed = 0 ;
     m_windowCursor = *wxSTANDARD_CURSOR;
     m_children = new wxList;
     m_doubleClickAllowed = 0 ;


@@ -217,41 +225,35 @@ wxWindow::wxWindow(void)
     // MSW-specific
     m_hWnd = 0;
     m_winEnabled = TRUE;
     // MSW-specific
     m_hWnd = 0;
     m_winEnabled = TRUE;

-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
+    m_caretWidth = m_caretHeight = 0;
+    m_caretEnabled =

     m_caretShown = FALSE;
     m_inOnSize = FALSE;
     m_caretShown = FALSE;
     m_inOnSize = FALSE;

-    m_minSizeX = -1;
-    m_minSizeY = -1;
-    m_maxSizeX = -1;
+    m_minSizeX =
+    m_minSizeY =
+    m_maxSizeX =

     m_maxSizeY = -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;
     m_isBeingDeleted = FALSE;
     m_oldWndProc = 0;
 #ifndef __WIN32__
     m_globalHandle = 0;
 #endif
     m_useCtl3D = FALSE;

+    m_mouseInWindow = FALSE;

 
 

+    m_windowParent = NULL;

     m_defaultItem = NULL;
 
     wxSystemSettings settings;
 
     m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_3DFACE) ;
     m_defaultItem = NULL;
 
     wxSystemSettings settings;
 
     m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_3DFACE) ;

-    // m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;

     m_foregroundColour = *wxBLACK;
 
     m_foregroundColour = *wxBLACK;
 

-    /*
-    wxColour(GetRValue(GetSysColor(COLOR_WINDOW)),
-    GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
-    */
-

     // wxWnd
     m_lastMsg = 0;
     m_lastWParam = 0;
     m_lastLParam = 0;
     // wxWnd
     m_lastMsg = 0;
     m_lastWParam = 0;
     m_lastLParam = 0;

-    //  m_acceleratorTable = 0;

     m_hMenu = 0;
 
     m_xThumbSize = 0;
     m_hMenu = 0;
 
     m_xThumbSize = 0;


@@ -268,8 +270,13 @@ wxWindow::wxWindow(void)
 #endif
 }
 
 #endif
 }
 

+wxWindow::wxWindow()
+{
+    Init();
+}
+

 // Destructor
 // Destructor

-wxWindow::~wxWindow(void)
+wxWindow::~wxWindow()

 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 


@@ -346,7 +353,7 @@ wxWindow::~wxWindow(void)
 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)

-bool wxWindow::Destroy(void)
+bool wxWindow::Destroy()

 {
     delete this;
     return TRUE;
 {
     delete this;
     return TRUE;


@@ -354,72 +361,16 @@ bool wxWindow::Destroy(void)
 
 extern char wxCanvasClassName[];
 
 
 extern char wxCanvasClassName[];
 

-// Constructor
+// real construction (Init() must have been called before!)

 bool wxWindow::Create(wxWindow *parent, wxWindowID id,
                       const wxPoint& pos,
                       const wxSize& size,
                       long style,
                       const wxString& name)
 {
 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_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  wxUSE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
-#endif
+    wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );

 
 

-    // 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_oldWndProc = 0;
-#ifndef __WIN32__
-    m_globalHandle = 0;
-#endif
-    m_useCtl3D = FALSE;
-    m_defaultItem = NULL;
-    m_windowParent = NULL;
-    m_mouseInWindow = FALSE;
-    if (!parent)
-        return FALSE;
-
-    if (parent) parent->AddChild(this);
-
-    // wxWnd
-    m_lastMsg = 0;
-    m_lastWParam = 0;
-    m_lastLParam = 0;
-    m_hMenu = 0;
-
-    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;
+    parent->AddChild(this);

 
     SetName(name);
 
 
     SetName(name);
 


@@ -441,10 +392,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 
     wxSystemSettings settings;
 
 
     wxSystemSettings settings;
 

-    m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    // m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-    m_foregroundColour = *wxBLACK;
-

     m_windowStyle = style;
 
     DWORD msflags = 0;
     m_windowStyle = style;
 
     DWORD msflags = 0;


@@ -466,15 +413,13 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
         (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
         msflags |= WS_BORDER;
 
         (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
         msflags |= WS_BORDER;
 

-    m_mouseInWindow = FALSE ;
-

     MSWCreate(m_windowId, parent, wxCanvasClassName, this, NULL,
     MSWCreate(m_windowId, parent, wxCanvasClassName, this, NULL,

-        x, y, width, height, msflags, NULL, exStyle);
+              x, y, width, height, msflags, NULL, exStyle);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-void wxWindow::SetFocus(void)
+void wxWindow::SetFocus()

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


@@ -489,7 +434,7 @@ void wxWindow::Enable(bool enable)
         ::EnableWindow(hWnd, (BOOL)enable);
 }
 
         ::EnableWindow(hWnd, (BOOL)enable);
 }
 

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

 {
     HWND hWnd = (HWND) GetHWND();
     if (hWnd && !m_winCaptured)
 {
     HWND hWnd = (HWND) GetHWND();
     if (hWnd && !m_winCaptured)


@@ -499,7 +444,7 @@ void wxWindow::CaptureMouse(void)
     }
 }
 
     }
 }
 

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

 {
     if (m_winCaptured)
     {
 {
     if (m_winCaptured)
     {


@@ -618,19 +563,8 @@ void wxWindow::ScreenToClient(int *x, int *y) const
     POINT pt;
     pt.x = *x;
     pt.y = *y;
     POINT pt;
     pt.x = *x;
     pt.y = *y;

-    ::ScreenToClient(hWnd, &pt);

 
 

-    /*
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-    wxPoint pt1(GetParent()->GetClientAreaOrigin());
-    pt.x -= pt1.x;
-    pt.y -= pt1.y;
-    }
-    */
+    ::ScreenToClient(hWnd, &pt);

 
     *x = pt.x;
     *y = pt.y;
 
     *x = pt.x;
     *y = pt.y;


@@ -643,18 +577,6 @@ void wxWindow::ClientToScreen(int *x, int *y) const
     pt.x = *x;
     pt.y = *y;
 
     pt.x = *x;
     pt.y = *y;
 

-    /*
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-    wxPoint pt1(GetParent()->GetClientAreaOrigin());
-    pt.x += pt1.x;
-    pt.y += pt1.y;
-    }
-    */
-

     ::ClientToScreen(hWnd, &pt);
 
     *x = pt.x;
     ::ClientToScreen(hWnd, &pt);
 
     *x = pt.x;


@@ -699,6 +621,12 @@ void wxWindow::SetSize(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;


@@ -710,8 +638,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)


@@ -837,7 +763,8 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     HFONT was = 0;
     if (fontToUse && fontToUse->Ok())
     {
     HFONT was = 0;
     if (fontToUse && fontToUse->Ok())
     {

-        if ((fnt=(HFONT) fontToUse->GetResourceHandle()))
+        fnt = (HFONT)fontToUse->GetResourceHandle();
+        if ( fnt )

             was = (HFONT) SelectObject(dc,fnt) ;
     }
 
             was = (HFONT) SelectObject(dc,fnt) ;
     }
 


@@ -860,7 +787,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)


@@ -918,9 +845,7 @@ 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;
     }

-#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) {
     // Stop right here if we don't have a valid handle
     // in our wxWnd object.
     if (wnd && !wnd->m_hWnd) {


@@ -944,22 +869,21 @@ 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
 
 // Main Windows 3 window proc
 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     wxASSERT( m_lastMsg == message &&
 #endif
 
 // Main Windows 3 window proc
 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)",
         wxGetMessageName(message), wParam, lParam);
 
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Processing %s(%lx, %lx)",
         wxGetMessageName(message), wParam, lParam);

-#endif // WXDEBUG
+#endif // __WXDEBUG__

 
     HWND hWnd = (HWND)m_hWnd;
 
 
     HWND hWnd = (HWND)m_hWnd;
 


@@ -1020,10 +944,11 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
         }
     case WM_QUERYDRAGICON:
         {
         }
     case WM_QUERYDRAGICON:
         {

-            HICON hIcon = 0;
-            if ((hIcon = (HICON) MSWOnQueryDragIcon()))
+            HICON hIcon = (HICON)MSWOnQueryDragIcon();
+            if ( hIcon )

                 return (long)hIcon;
                 return (long)hIcon;

-            else return MSWDefWindowProc(message, wParam, lParam );
+            else
+                return MSWDefWindowProc(message, wParam, lParam );

             break;
         }
 
             break;
         }
 


@@ -1205,9 +1130,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 #if defined(__WIN95__)
     case WM_NOTIFY:
         {
 #if defined(__WIN95__)
     case WM_NOTIFY:
         {

-            if (!MSWOnNotify(wParam, lParam))
-                return MSWDefWindowProc(message, wParam, lParam );
-            break;
+            // for some messages (TVN_ITEMEXPANDING for example), the return
+            // value of WM_NOTIFY handler is important, so don't just return 0
+            // if we processed the message
+            return MSWOnNotify(wParam, lParam);

         }
 #endif
     case WM_MENUSELECT:
         }
 #endif
     case WM_MENUSELECT:


@@ -1239,6 +1165,9 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
         }
 
     case WM_KEYDOWN:
         }
 
     case WM_KEYDOWN:

+    {
+        MSWOnKeyDown((WORD) wParam, lParam);
+#if 0

         // we consider these message "not interesting"
         if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
             return Default();
         // we consider these message "not interesting"
         if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
             return Default();


@@ -1256,8 +1185,15 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             MSWOnChar((WORD)wParam, lParam);
         else
             return Default();
             MSWOnChar((WORD)wParam, lParam);
         else
             return Default();

+#endif

         break;
         break;

+    }

 
 

+    case WM_KEYUP:
+    {
+        MSWOnKeyUp((WORD) wParam, lParam);
+        break;
+    }

     case WM_CHAR: // Always an ASCII character
         {
             MSWOnChar((WORD)wParam, lParam, TRUE);
     case WM_CHAR: // Always an ASCII character
         {
             MSWOnChar((WORD)wParam, lParam, TRUE);


@@ -1486,7 +1422,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);


@@ -1499,7 +1435,7 @@ void wxRemoveHandleAssociation(wxWindow *win)
 
 // Default destroyer - override if you destroy it in some other way
 // (e.g. with MDI child windows)
 
 // Default destroyer - override if you destroy it in some other way
 // (e.g. with MDI child windows)

-void wxWindow::MSWDestroyWindow(void)
+void wxWindow::MSWDestroyWindow()

 {
 }
 
 {
 }
 


@@ -1545,10 +1481,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)


@@ -1580,24 +1524,22 @@ void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow
 
     wxWndHook = NULL;
     wxWinHandleList->Append((long)m_hWnd, this);
 
     wxWndHook = NULL;
     wxWinHandleList->Append((long)m_hWnd, this);

-
-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWCreate %d\n", m_hWnd);
-#endif

 }
 
 void wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 {
 }
 
 }
 
 void wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 {
 }
 

-bool wxWindow::MSWOnClose(void)
+bool wxWindow::MSWOnClose()

 {
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnClose %d\n", handle);
-#endif

     return FALSE;
 }
 
     return FALSE;
 }
 

+// Some compilers don't define this
+#ifndef ENDSESSION_LOGOFF
+#define ENDSESSION_LOGOFF    0x80000000
+#endif
+

 // Return TRUE to end session, FALSE to veto end session.
 bool wxWindow::MSWOnQueryEndSession(long logOff)
 {
 // Return TRUE to end session, FALSE to veto end session.
 bool wxWindow::MSWOnQueryEndSession(long logOff)
 {


@@ -1630,11 +1572,8 @@ bool wxWindow::MSWOnEndSession(bool endSession, long logOff)
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxWindow::MSWOnDestroy(void)
+bool wxWindow::MSWOnDestroy()

 {
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnDestroy %d\n", handle);
-#endif

     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_pDropTarget != NULL ) {
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_pDropTarget != NULL ) {


@@ -1650,7 +1589,7 @@ bool wxWindow::MSWOnDestroy(void)
 
 // Deal with child commands from buttons etc.
 
 
 // Deal with child commands from buttons etc.
 

-bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
+long wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)

 {
 #if defined(__WIN95__)
     // Find a child window to send the notification to, e.g. a toolbar.
 {
 #if defined(__WIN95__)
     // Find a child window to send the notification to, e.g. a toolbar.


@@ -1669,33 +1608,38 @@ bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
     HWND hWnd = (HWND)hdr->hwndFrom;
     wxWindow *win = wxFindWinFromHandle((WXHWND) hWnd);
 
     HWND hWnd = (HWND)hdr->hwndFrom;
     wxWindow *win = wxFindWinFromHandle((WXHWND) hWnd);
 

+    WXLPARAM result = 0;
+

     if ( win )
     if ( win )

-        return win->MSWNotify(wParam, lParam);
+    {
+        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();
         while (node)
         {
             wxWindow *child = (wxWindow *)node->Data();

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

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

-    }

 
 

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

 
 

-#endif
+    // not processed

     return FALSE;
 }
 
 void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
 {
     return FALSE;
 }
 
 void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu))
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnMenuHighlight %d\n", handle);
-#endif

 }
 
 void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem)
 }
 
 void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem)


@@ -1704,10 +1648,6 @@ void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem)
 
 bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate))
 {
 
 bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate))
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnActivate %d\n", handle);
-#endif
-

     wxActivateEvent event(wxEVT_ACTIVATE, ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)),
         m_windowId);
     event.SetEventObject(this);
     wxActivateEvent event(wxEVT_ACTIVATE, ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)),
         m_windowId);
     event.SetEventObject(this);


@@ -1717,9 +1657,6 @@ bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSE
 
 bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
 {
 
 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))
     {
     // Deal with caret
     if (m_caretEnabled && (m_caretWidth > 0) && (m_caretHeight > 0))
     {


@@ -1737,9 +1674,6 @@ bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
 
 bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
 {
 
 bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnKillFocus %d\n", m_hWnd);
-#endif

     // Deal with caret
     if (m_caretEnabled)
     {
     // Deal with caret
     if (m_caretEnabled)
     {


@@ -1755,9 +1689,6 @@ bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd))
 
 void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
 {
 
 void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd);
-#endif

 
     HDROP hFilesInfo = (HDROP) wParam;
     POINT dropPoint;
 
     HDROP hFilesInfo = (HDROP) wParam;
     POINT dropPoint;


@@ -1848,9 +1779,6 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
 WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                  WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 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);
     if (nCtlColor == CTLCOLOR_DLG)
     {
         return OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);


@@ -1915,7 +1843,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


@@ -1948,7 +1876,7 @@ long wxWindow::Default()
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",
         wxGetMessageName(m_lastMsg));
 #ifdef __WXDEBUG__
     wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.",
         wxGetMessageName(m_lastMsg));

-#endif // WXDEBUG
+#endif // __WXDEBUG__

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


@@ -1974,34 +1902,32 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
             lDlgCode = ::SendMessage(msg->hwnd, WM_GETDLGCODE, 0, 0);
         }
 
             lDlgCode = ::SendMessage(msg->hwnd, WM_GETDLGCODE, 0, 0);
         }
 

-        bool bForward;
+        bool bForward = TRUE;

         if ( bProcess ) {
             switch ( msg->wParam ) {
         if ( bProcess ) {
             switch ( msg->wParam ) {

-            case VK_TAB:
-                if ( lDlgCode & DLGC_WANTTAB )  // this is FALSE for Ctrl-Tab
-                    bProcess = FALSE;
-                else
-                    bForward = !(::GetKeyState(VK_SHIFT) & 0x100);
-                break;
+                case VK_TAB:
+                    if ( lDlgCode & DLGC_WANTTAB )  // FALSE for Ctrl-Tab
+                        bProcess = FALSE;
+                    else
+                        bForward = !(::GetKeyState(VK_SHIFT) & 0x100);
+                    break;

 
 

-            case VK_UP:
-            case VK_LEFT:
-                if ( (lDlgCode & DLGC_WANTARROWS) || bCtrlDown )
-                    bProcess = FALSE;
-                else
-                    bForward = FALSE;
-                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;
-                else
-                    bForward = TRUE;
-                break;
+                case VK_DOWN:
+                case VK_RIGHT:
+                    if ( (lDlgCode & DLGC_WANTARROWS) || bCtrlDown )
+                        bProcess = FALSE;
+                    break;

 
 

-            default:
-                bProcess = FALSE;
+                default:
+                    bProcess = FALSE;

             }
         }
 
             }
         }
 


@@ -2032,13 +1958,10 @@ bool wxWindow::MSWTranslateMessage(WXMSG* pMsg)
 
 long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))
 {
 
 long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnMDIActivate %d\n", m_hWnd);
-#endif

     return 1;
 }
 
     return 1;
 }
 

-void wxWindow::MSWDetachWindowMenu(void)
+void wxWindow::MSWDetachWindowMenu()

 {
     if (m_hMenu)
     {
 {
     if (m_hMenu)
     {


@@ -2057,7 +1980,7 @@ void wxWindow::MSWDetachWindowMenu(void)
     }
 }
 
     }
 }
 

-bool wxWindow::MSWOnPaint(void)
+bool wxWindow::MSWOnPaint()

 {
 #ifdef __WIN32__
     HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle
 {
 #ifdef __WIN32__
     HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle


@@ -2084,9 +2007,6 @@ void wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag))
     if (m_inOnSize)
         return;
 
     if (m_inOnSize)
         return;
 

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnSize %d\n", m_hWnd);
-#endif

     if (!m_hWnd)
         return;
 
     if (!m_hWnd)
         return;
 


@@ -2108,9 +2028,6 @@ void wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos))
 // Deal with child commands from buttons etc.
 bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
 // Deal with child commands from buttons etc.
 bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {

-#if WXDEBUG > 1
-    wxDebugMsg("wxWindow::MSWOnCommand\n");
-#endif

     if (wxCurrentPopupMenu)
     {
         wxMenu *popupMenu = wxCurrentPopupMenu;
     if (wxCurrentPopupMenu)
     {
         wxMenu *popupMenu = wxCurrentPopupMenu;


@@ -2118,22 +2035,11 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
         bool succ = popupMenu->MSWCommand(cmd, id);
         return succ;
     }
         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

 
     wxWindow *item = FindItem(id);
     if (item)
     {
         bool value = item->MSWCommand(cmd, id);
 
     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
         return value;
     }
     else


@@ -2188,7 +2094,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();


@@ -2500,6 +2406,74 @@ void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
     }
 }
 
     }
 }
 

+void wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII)
+{
+    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))
+            Default();
+    }
+}
+
+void wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII)
+{
+    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))
+            Default();
+    }
+}
+

 void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
 {
     int buttons = 0;
 void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
 {
     int buttons = 0;


@@ -2727,7 +2701,7 @@ bool wxWindow::MSWOnInitDialog(WXHWND WXUNUSED(hWndFocus))
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindow::InitDialog(void)
+void wxWindow::InitDialog()

 {
     wxInitDialogEvent event(GetId());
     event.SetEventObject( this );
 {
     wxInitDialogEvent event(GetId());
     event.SetEventObject( this );


@@ -2748,20 +2722,15 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font)
     HFONT was = 0;
     if (the_font)
     {
     HFONT was = 0;
     if (the_font)
     {

-#if WXDEBUG > 1
-        wxDebugMsg("wxGetCharSize: Selecting HFONT %X\n", fnt);
-#endif

         //    the_font->UseResource();
         //    the_font->RealizeResource();
         //    the_font->UseResource();
         //    the_font->RealizeResource();

-        if ((fnt=(HFONT) the_font->GetResourceHandle()))
+        fnt = (HFONT)the_font->GetResourceHandle();
+        if ( fnt )

             was = (HFONT) SelectObject(dc,fnt) ;
     }
     GetTextMetrics(dc, &tm);
     if (the_font && fnt && was)
     {
             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);
         SelectObject(dc,was) ;
     }
     ReleaseDC((HWND)wnd, dc);


@@ -2955,7 +2924,7 @@ void wxWindow::ShowCaret(bool show)
     }
 }
 
     }
 }
 

-void wxWindow::DestroyCaret(void)
+void wxWindow::DestroyCaret()

 {
     m_caretEnabled = FALSE;
 }
 {
     m_caretEnabled = FALSE;
 }


@@ -2973,7 +2942,7 @@ void wxWindow::GetCaretPos(int *x, int *y) const
     *y = point.y;
 }
 
     *y = point.y;
 }
 

-wxWindow *wxGetActiveWindow(void)
+wxWindow *wxGetActiveWindow()

 {
     HWND hWnd = GetActiveWindow();
     if (hWnd != 0)
 {
     HWND hWnd = GetActiveWindow();
     if (hWnd != 0)


@@ -2996,7 +2965,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


@@ -3081,7 +3050,7 @@ void wxWindow::Centre(int direction)
 }
 
 /* TODO (maybe)
 }
 
 /* TODO (maybe)

-void wxWindow::OnPaint(void)
+void wxWindow::OnPaint()

 {
 PaintSelectionHandles();
 }
 {
 PaintSelectionHandles();
 }


@@ -3135,10 +3104,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);


@@ -3313,7 +3286,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);


@@ -3435,7 +3408,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 )


@@ -3478,7 +3451,7 @@ void wxWindow::SubclassWin(WXHWND hWnd)
     SetWindowLong((HWND) hWnd, GWL_WNDPROC, (LONG) wxWndProc);
 }
 
     SetWindowLong((HWND) hWnd, GWL_WNDPROC, (LONG) wxWndProc);
 }
 

-void wxWindow::UnsubclassWin(void)
+void wxWindow::UnsubclassWin()

 {
     wxRemoveHandleAssociation(this);
 
 {
     wxRemoveHandleAssociation(this);
 


@@ -3577,6 +3550,8 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
 
 void wxWindow::OnChar(wxKeyEvent& event)
 {
 
 void wxWindow::OnChar(wxKeyEvent& event)
 {

+/* I'm commenting this out because otherwise, we lose tabs in e.g. a text window (see MDI sample)
+ * (JACS, 14/01/99)

     if ( event.KeyCode() == WXK_TAB ) {
         // propagate the TABs to the parent - it's up to it to decide what
         // to do with it
     if ( event.KeyCode() == WXK_TAB ) {
         // propagate the TABs to the parent - it's up to it to decide what
         // to do with it


@@ -3585,6 +3560,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
                 return;
         }
     }
                 return;
         }
     }

+*/

 
     bool isVirtual;
     int id = wxCharCodeWXToMSW((int)event.KeyCode(), &isVirtual);
 
     bool isVirtual;
     int id = wxCharCodeWXToMSW((int)event.KeyCode(), &isVirtual);


@@ -3596,6 +3572,16 @@ void wxWindow::OnChar(wxKeyEvent& event)
         (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
 }
 
         (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
 }
 

+void wxWindow::OnKeyDown(wxKeyEvent& event)
+{
+    Default();
+}
+
+void wxWindow::OnKeyUp(wxKeyEvent& event)
+{
+    Default();
+}
+

 void wxWindow::OnPaint(wxPaintEvent& event)
 {
     Default();
 void wxWindow::OnPaint(wxPaintEvent& event)
 {
     Default();


@@ -3615,9 +3601,9 @@ bool wxWindow::IsEnabled(void) const
 
 // Transfer values to controls. If returns FALSE,
 // it's an application error (pops up a dialog)
 
 // Transfer values to controls. If returns FALSE,
 // it's an application error (pops up a dialog)

-bool wxWindow::TransferDataToWindow(void)
+bool wxWindow::TransferDataToWindow()

 {
 {

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

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


@@ -3635,9 +3621,9 @@ bool wxWindow::TransferDataToWindow(void)
 
 // Transfer values from controls. If returns FALSE,
 // validation failed: don't quit
 
 // Transfer values from controls. If returns FALSE,
 // validation failed: don't quit

-bool wxWindow::TransferDataFromWindow(void)
+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();


@@ -3651,9 +3637,9 @@ bool wxWindow::TransferDataFromWindow(void)
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxWindow::Validate(void)
+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();


@@ -3668,7 +3654,7 @@ bool wxWindow::Validate(void)
 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindow *wxWindow::FindFocus(void)
+wxWindow *wxWindow::FindFocus()

 {
     HWND hWnd = ::GetFocus();
     if ( hWnd )
 {
     HWND hWnd = ::GetFocus();
     if ( hWnd )


@@ -3680,30 +3666,28 @@ wxWindow *wxWindow::FindFocus(void)
 
 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;
 }
 
     child->m_windowParent = NULL;
 }
 

-void wxWindow::DestroyChildren(void)
+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)


@@ -3807,7 +3791,7 @@ void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
 }
 
 // Reset any constraints that mention this window
 }
 
 // Reset any constraints that mention this window

-void wxWindow::DeleteRelatedConstraints(void)
+void wxWindow::DeleteRelatedConstraints()

 {
     if (m_constraintsInvolvedIn)
     {
 {
     if (m_constraintsInvolvedIn)
     {


@@ -3849,7 +3833,7 @@ void wxWindow::SetSizer(wxSizer *sizer)
 * New version
 */
 
 * New version
 */
 

-bool wxWindow::Layout(void)
+bool wxWindow::Layout()

 {
     if (GetConstraints())
     {
 {
     if (GetConstraints())
     {


@@ -3918,7 +3902,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();


@@ -3949,7 +3933,7 @@ bool wxWindow::DoPhase(int phase)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindow::ResetConstraints(void)
+void wxWindow::ResetConstraints()

 {
     wxLayoutConstraints *constr = GetConstraints();
     if (constr)
 {
     wxLayoutConstraints *constr = GetConstraints();
     if (constr)


@@ -3963,7 +3947,7 @@ void wxWindow::ResetConstraints(void)
         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();


@@ -4022,7 +4006,7 @@ void wxWindow::SetConstraintSizes(bool recurse)
 
     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();


@@ -4160,9 +4144,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() ;


@@ -4211,7 +4195,7 @@ void wxWindow::OnDefaultAction(wxControl *initiatingItem)
     */
 }
 
     */
 }
 

-void wxWindow::Clear(void)
+void wxWindow::Clear()

 {
     wxClientDC dc(this);
     wxBrush brush(GetBackgroundColour(), wxSOLID);
 {
     wxClientDC dc(this);
     wxBrush brush(GetBackgroundColour(), wxSOLID);


@@ -4220,11 +4204,11 @@ void wxWindow::Clear(void)
 }
 
 // Fits the panel around the items
 }
 
 // Fits the panel around the items

-void wxWindow::Fit(void)
+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();


@@ -4257,7 +4241,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();


@@ -4274,7 +4258,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();


@@ -4389,7 +4373,7 @@ int y_pages = 0;
 */
 
 // Setup background and foreground colours correctly
 */
 
 // Setup background and foreground colours correctly

-void wxWindow::SetupColours(void)
+void wxWindow::SetupColours()

 {
     if (GetParent())
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 {
     if (GetParent())
         SetBackgroundColour(GetParent()->GetBackgroundColour());


@@ -4424,13 +4408,13 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 }
 
 // Raise the window to the top of the Z order
 }
 
 // Raise the window to the top of the Z order

-void wxWindow::Raise(void)
+void wxWindow::Raise()

 {
     ::BringWindowToTop((HWND) GetHWND());
 }
 
 // Lower the window to the bottom of the Z order
 {
     ::BringWindowToTop((HWND) GetHWND());
 }
 
 // Lower the window to the bottom of the Z order

-void wxWindow::Lower(void)
+void wxWindow::Lower()

 {
     ::SetWindowPos((HWND) GetHWND(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
 }
 {
     ::SetWindowPos((HWND) GetHWND(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
 }


@@ -4467,6 +4451,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)
 {


@@ -4883,4 +4896,4 @@ const char *wxGetMessageName(int message)
         return s_szBuf;
   }
 }
         return s_szBuf;
   }
 }

-#endif //WXDEBUG
+#endif //__WXDEBUG__