added untyped Sort() for compatibility

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index e5a66c3c52f8d4df815f4ba5c7c515d0ab121805..65ffdccfe91d8f657212c7b9fb63b355f5b73c18 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -82,7 +82,7 @@
 
 #ifdef  __WXDEBUG__
 const char *wxGetMessageName(int message);
 
 #ifdef  __WXDEBUG__
 const char *wxGetMessageName(int message);

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

 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 
 
 #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events
 


@@ -174,7 +174,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 +195,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 +207,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 +221,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 +266,13 @@ wxWindow::wxWindow(void)
 #endif
 }
 
 #endif
 }
 

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

 // Destructor
 // Destructor

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

 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 


@@ -302,7 +305,7 @@ wxWindow::~wxWindow(void)
     if (m_sizerParent)
         m_sizerParent->RemoveChild((wxWindow *)this);
 #endif
     if (m_sizerParent)
         m_sizerParent->RemoveChild((wxWindow *)this);
 #endif

-    
+

     // wxWnd
     MSWDetachWindowMenu();
 
     // wxWnd
     MSWDetachWindowMenu();
 


@@ -323,7 +326,7 @@ wxWindow::~wxWindow(void)
         m_globalHandle = 0;
     }
 #endif
         m_globalHandle = 0;
     }
 #endif

-    
+

     delete m_children;
     m_children = NULL;
 
     delete m_children;
     m_children = NULL;
 


@@ -340,13 +343,13 @@ wxWindow::~wxWindow(void)
     if ( m_windowValidator )
         delete m_windowValidator;
 
     if ( m_windowValidator )
         delete m_windowValidator;
 

-    // Restore old Window proc, if required 
+    // Restore old Window proc, if required

     // and remove hWnd <-> wxWindow association
     UnsubclassWin();
 }
 
 // Destroy the window (delayed, if a managed window)
     // and remove hWnd <-> wxWindow association
     UnsubclassWin();
 }
 
 // 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 +357,18 @@ 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
-    
-    // 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;
+    Init();

 
 

-    m_xThumbSize = 0;
-    m_yThumbSize = 0;
-    m_backgroundTransparent = FALSE;
+    wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );

 
 

-    m_lastXPos = (float)-1.0;
-    m_lastYPos = (float)-1.0;
-    m_lastEvent = -1;
-    m_returnCode = 0;
+    parent->AddChild(this);

 
     SetName(name);
 
 
     SetName(name);
 


@@ -433,11 +382,13 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     int width = size.x;
     int height = size.y;
 
     int width = size.x;
     int height = size.y;
 

-    wxSystemSettings settings;
+    // To be consistent with wxGTK
+    if (width == -1)
+        width = 20;
+    if (height == -1)
+        height = 20;

 
 

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

 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 


@@ -460,15 +411,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)


@@ -483,7 +432,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)


@@ -493,7 +442,7 @@ void wxWindow::CaptureMouse(void)
     }
 }
 
     }
 }
 

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

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


@@ -612,19 +561,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;


@@ -637,18 +575,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;


@@ -827,11 +753,12 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     HWND hWnd = (HWND) GetHWND();
     HDC dc = ::GetDC(hWnd);
 
     HWND hWnd = (HWND) GetHWND();
     HDC dc = ::GetDC(hWnd);
 

-    HFONT fnt = 0; 
+    HFONT fnt = 0;

     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) ;
     }
 


@@ -840,7 +767,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     GetTextExtentPoint(dc, (const char *)string, (int)string.Length(), &sizeRect);
     GetTextMetrics(dc, &tm);
 
     GetTextExtentPoint(dc, (const char *)string, (int)string.Length(), &sizeRect);
     GetTextMetrics(dc, &tm);
 

-    if (fontToUse && fnt && was) 
+    if (fontToUse && fnt && was)

         SelectObject(dc,was) ;
 
     ReleaseDC(hWnd, dc);
         SelectObject(dc,was) ;
 
     ReleaseDC(hWnd, dc);


@@ -912,9 +839,8 @@ 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
+    //    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.
     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) {


@@ -953,8 +879,8 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM 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;
 
     switch (message)
     HWND hWnd = (HWND)m_hWnd;
 
     switch (message)


@@ -1014,13 +940,14 @@ 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;
         }

-        
+

     case WM_SIZE:
         {
             int width = LOWORD(lParam);
     case WM_SIZE:
         {
             int width = LOWORD(lParam);


@@ -1028,7 +955,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             MSWOnSize(width, height, wParam);
             break;
         }
             MSWOnSize(width, height, wParam);
             break;
         }

-        
+

     case WM_MOVE:
         {
             wxMoveEvent event(wxPoint(LOWORD(lParam), HIWORD(lParam)),
     case WM_MOVE:
         {
             wxMoveEvent event(wxPoint(LOWORD(lParam), HIWORD(lParam)),


@@ -1044,7 +971,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             MSWOnWindowPosChanging((void *)lParam);
             break;
         }
             MSWOnWindowPosChanging((void *)lParam);
             break;
         }

-        
+

     case WM_RBUTTONDOWN:
         {
             int x = (DIMENSION_TYPE) LOWORD(lParam);
     case WM_RBUTTONDOWN:
         {
             int x = (DIMENSION_TYPE) LOWORD(lParam);


@@ -1199,9 +1126,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:


@@ -1231,7 +1159,7 @@ 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:
         // we consider these message "not interesting"
         if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
     case WM_KEYDOWN:
         // we consider these message "not interesting"
         if ( wParam == VK_SHIFT || wParam == VK_CONTROL )


@@ -1435,7 +1363,7 @@ 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;


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

-        
+

     case WM_GETDLGCODE:
         return MSWGetDlgCode();
 
     case WM_GETDLGCODE:
         return MSWGetDlgCode();
 


@@ -1493,7 +1421,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()

 {
 }
 
 {
 }
 


@@ -1544,7 +1472,7 @@ void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow
         m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
             (DLGPROC)dlgproc);
 #endif
         m_hWnd = (WXHWND) ::CreateDialog(wxGetInstance(), dialog_template, hParent,
             (DLGPROC)dlgproc);
 #endif

-        
+

         if (m_hWnd == 0)
             MessageBox(NULL, "Can't find dummy dialog template!\nCheck resource include path for finding wx.rc.",
             "wxWindows Error", MB_ICONEXCLAMATION | MB_OK);
         if (m_hWnd == 0)
             MessageBox(NULL, "Can't find dummy dialog template!\nCheck resource include path for finding wx.rc.",
             "wxWindows Error", MB_ICONEXCLAMATION | MB_OK);


@@ -1574,24 +1502,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)
 {


@@ -1624,11 +1550,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 ) {


@@ -1638,13 +1561,13 @@ bool wxWindow::MSWOnDestroy(void)
         m_pDropTarget = NULL;
     }
 #endif
         m_pDropTarget = NULL;
     }
 #endif

-    
+

     return TRUE;
 }
 
 // Deal with child commands from buttons etc.
 
     return TRUE;
 }
 
 // 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.


@@ -1662,9 +1585,13 @@ bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
     NMHDR *hdr = (NMHDR *)lParam;
     HWND hWnd = (HWND)hdr->hwndFrom;
     wxWindow *win = wxFindWinFromHandle((WXHWND) hWnd);
     NMHDR *hdr = (NMHDR *)lParam;
     HWND hWnd = (HWND)hdr->hwndFrom;
     wxWindow *win = wxFindWinFromHandle((WXHWND) hWnd);

-    
+
+    WXLPARAM result = 0;
+

     if ( win )
     if ( win )

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

     else
     {
         // Rely on MSWNotify to check whether the message
     else
     {
         // Rely on MSWNotify to check whether the message


@@ -1673,23 +1600,20 @@ bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
         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) )
+                break;

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

-    return FALSE;
-    
-#endif
+    return result;
+#endif  // Win95
+

     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)


@@ -1698,10 +1622,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);


@@ -1711,9 +1631,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))
     {


@@ -1721,7 +1638,7 @@ bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd))
         if (m_caretShown)
             ::ShowCaret((HWND) GetHWND());
     }
         if (m_caretShown)
             ::ShowCaret((HWND) GetHWND());
     }

-    
+

     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))


@@ -1731,15 +1648,12 @@ 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)
     {
         ::DestroyCaret();
     }
     // Deal with caret
     if (m_caretEnabled)
     {
         ::DestroyCaret();
     }

-    
+

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


@@ -1749,10 +1663,7 @@ 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;
     DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);
     HDROP hFilesInfo = (HDROP) wParam;
     POINT dropPoint;
     DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);


@@ -1803,7 +1714,7 @@ bool wxWindow::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
             );
     }
 #endif  // owner-drawn menus
             );
     }
 #endif  // owner-drawn menus

-    
+

     wxWindow *item = FindItem(id);
 #if wxUSE_DYNAMIC_CLASSES
     if (item && item->IsKindOf(CLASSINFO(wxControl)))
     wxWindow *item = FindItem(id);
 #if wxUSE_DYNAMIC_CLASSES
     if (item && item->IsKindOf(CLASSINFO(wxControl)))


@@ -1823,11 +1734,11 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
         wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);
         wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
 
         wxMenuItem *pMenuItem = (wxMenuItem *)(pMeasureStruct->itemData);
         wxCHECK( pMenuItem->IsKindOf(CLASSINFO(wxMenuItem)), FALSE );
 

-        return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth, 
+        return pMenuItem->OnMeasureItem(&pMeasureStruct->itemWidth,

             &pMeasureStruct->itemHeight);
     }
 #endif  // owner-drawn menus
             &pMeasureStruct->itemHeight);
     }
 #endif  // owner-drawn menus

-    
+

     wxWindow *item = FindItem(id);
 #if wxUSE_DYNAMIC_CLASSES
     if (item && item->IsKindOf(CLASSINFO(wxControl)))
     wxWindow *item = FindItem(id);
 #if wxUSE_DYNAMIC_CLASSES
     if (item && item->IsKindOf(CLASSINFO(wxControl)))


@@ -1842,9 +1753,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);


@@ -1920,7 +1828,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
             event.m_eventObject = win;
             win->GetEventHandler()->ProcessEvent(event2);
         }
             event.m_eventObject = win;
             win->GetEventHandler()->ProcessEvent(event2);
         }

-        
+

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


@@ -1938,12 +1846,12 @@ long wxWindow::Default()
     // Ignore 'fake' events (perhaps generated as a result of a separate real event)
     if (m_lastMsg == 0)
         return 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.",
         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);
 }
 


@@ -1968,34 +1876,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;

             }
         }
 
             }
         }
 


@@ -2026,13 +1932,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)
     {


@@ -2051,7 +1954,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


@@ -2065,7 +1968,7 @@ bool wxWindow::MSWOnPaint(void)
     m_updateRegion = wxRegion(updateRect.left, updateRect.top,
         updateRect.right - updateRect.left, updateRect.bottom - updateRect.top);
 #endif
     m_updateRegion = wxRegion(updateRect.left, updateRect.top,
         updateRect.right - updateRect.left, updateRect.bottom - updateRect.top);
 #endif

-    
+

     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     if (!GetEventHandler()->ProcessEvent(event))
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     if (!GetEventHandler()->ProcessEvent(event))


@@ -2078,9 +1981,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;
 


@@ -2102,9 +2002,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;


@@ -2112,22 +2009,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


@@ -2506,7 +2392,7 @@ void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
         change = wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4CHG)
         change = wxJOY_BUTTON4;
         change = wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4CHG)
         change = wxJOY_BUTTON4;

-    
+

     if (flags & JOY_BUTTON1)
         buttons |= wxJOY_BUTTON1;
     if (flags & JOY_BUTTON2)
     if (flags & JOY_BUTTON1)
         buttons |= wxJOY_BUTTON1;
     if (flags & JOY_BUTTON2)


@@ -2515,11 +2401,11 @@ void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;

-    
+

     wxJoystickEvent event(wxEVT_JOY_BUTTON_DOWN, buttons, joystick, change);
     event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);
     wxJoystickEvent event(wxEVT_JOY_BUTTON_DOWN, buttons, joystick, change);
     event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);

-    
+

     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 


@@ -2535,7 +2421,7 @@ void wxWindow::MSWOnJoyUp(int joystick, int x, int y, WXUINT flags)
         change = wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4CHG)
         change = wxJOY_BUTTON4;
         change = wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4CHG)
         change = wxJOY_BUTTON4;

-    
+

     if (flags & JOY_BUTTON1)
         buttons |= wxJOY_BUTTON1;
     if (flags & JOY_BUTTON2)
     if (flags & JOY_BUTTON1)
         buttons |= wxJOY_BUTTON1;
     if (flags & JOY_BUTTON2)


@@ -2544,11 +2430,11 @@ void wxWindow::MSWOnJoyUp(int joystick, int x, int y, WXUINT flags)
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;

-    
+

     wxJoystickEvent event(wxEVT_JOY_BUTTON_UP, buttons, joystick, change);
     event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);
     wxJoystickEvent event(wxEVT_JOY_BUTTON_UP, buttons, joystick, change);
     event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);

-    
+

     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 


@@ -2563,11 +2449,11 @@ void wxWindow::MSWOnJoyMove(int joystick, int x, int y, WXUINT flags)
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;

-    
+

     wxJoystickEvent event(wxEVT_JOY_MOVE, buttons, joystick, 0);
     event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);
     wxJoystickEvent event(wxEVT_JOY_MOVE, buttons, joystick, 0);
     event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);

-    
+

     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 


@@ -2582,11 +2468,11 @@ void wxWindow::MSWOnJoyZMove(int joystick, int z, WXUINT flags)
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;
         buttons |= wxJOY_BUTTON3;
     if (flags & JOY_BUTTON4)
         buttons |= wxJOY_BUTTON4;

-    
+

     wxJoystickEvent event(wxEVT_JOY_ZMOVE, buttons, joystick, 0);
     event.SetZPosition(z);
     event.SetEventObject(this);
     wxJoystickEvent event(wxEVT_JOY_ZMOVE, buttons, joystick, 0);
     event.SetZPosition(z);
     event.SetEventObject(this);

-    
+

     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 


@@ -2640,7 +2526,7 @@ void wxWindow::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
         return;
         break;
     }
         return;
         break;
     }

-    
+

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


@@ -2721,7 +2607,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 );


@@ -2742,20 +2628,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);


@@ -2949,7 +2830,7 @@ void wxWindow::ShowCaret(bool show)
     }
 }
 
     }
 }
 

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

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


@@ -2967,7 +2848,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)


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

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

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


@@ -3086,14 +2967,14 @@ void wxWindow::WarpPointer (int x_pos, int y_pos)
     // Move the pointer to (x_pos,y_pos) coordinates. They are expressed in
     // pixel coordinates, relatives to the canvas -- So, we first need to
     // substract origin of the window, then convert to screen position
     // Move the pointer to (x_pos,y_pos) coordinates. They are expressed in
     // pixel coordinates, relatives to the canvas -- So, we first need to
     // substract origin of the window, then convert to screen position

-    
+

     int x = x_pos; int y = y_pos;
     RECT rect;
     GetWindowRect ((HWND) GetHWND(), &rect);
     int x = x_pos; int y = y_pos;
     RECT rect;
     GetWindowRect ((HWND) GetHWND(), &rect);

-    
+

     x += rect.left;
     y += rect.top;
     x += rect.left;
     y += rect.top;

-    
+

     SetCursorPos (x, y);
 }
 
     SetCursorPos (x, y);
 }
 


@@ -3104,11 +2985,11 @@ void wxWindow::MSWDeviceToLogical (float *x, float *y) const
 bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC)
 {
     wxDC dc ;
 bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC)
 {
     wxDC dc ;

-    
+

     dc.SetHDC(pDC);
     dc.SetWindow(this);
     dc.BeginDrawing();
     dc.SetHDC(pDC);
     dc.SetWindow(this);
     dc.BeginDrawing();

-    
+

     wxEraseEvent event(m_windowId, &dc);
     event.m_eventObject = this;
     if (!GetEventHandler()->ProcessEvent(event))
     wxEraseEvent event(m_windowId, &dc);
     event.m_eventObject = this;
     if (!GetEventHandler()->ProcessEvent(event))


@@ -3122,7 +3003,7 @@ bool wxWindow::MSWOnEraseBkgnd (WXHDC pDC)
         dc.EndDrawing();
         dc.SelectOldObjects(pDC);
     }
         dc.EndDrawing();
         dc.SelectOldObjects(pDC);
     }

-    
+

     dc.SetHDC((WXHDC) NULL);
     return TRUE;
 }
     dc.SetHDC((WXHDC) NULL);
     return TRUE;
 }


@@ -3155,7 +3036,7 @@ void wxWindow::OnEraseBackground(wxEraseEvent& event)
 void wxWindow::SetScrollRange(int orient, int range, bool refresh)
 {
 #if defined(__WIN95__)
 void wxWindow::SetScrollRange(int orient, int range, bool refresh)
 {
 #if defined(__WIN95__)

-    
+

     int range1 = range;
 
     // Try to adjust the range to cope with page size > 1
     int range1 = range;
 
     // Try to adjust the range to cope with page size > 1


@@ -3315,7 +3196,7 @@ int wxWindow::GetScrollRange(int orient) const
         // October 10th: new range concept.
         maxPos += pageSize;
 #endif
         // October 10th: new range concept.
         maxPos += pageSize;
 #endif

-        
+

         return maxPos;
     }
     else
         return maxPos;
     }
     else


@@ -3373,7 +3254,7 @@ SetScrollPage(orient, thumbVisible, FALSE);
 
   int oldRange = range - thumbVisible ;
   SetScrollRange(orient, oldRange, FALSE);
 
   int oldRange = range - thumbVisible ;
   SetScrollRange(orient, oldRange, FALSE);

-  
+

     SetScrollPos(orient, pos, refresh);
     */
 #if defined(__WIN95__)
     SetScrollPos(orient, pos, refresh);
     */
 #if defined(__WIN95__)


@@ -3439,7 +3320,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
         rect2.right = rect->x + rect->width;
         rect2.bottom = rect->y + rect->height;
     }
         rect2.right = rect->x + rect->width;
         rect2.bottom = rect->y + rect->height;
     }

-    
+

     if ( rect )
         ::ScrollWindow((HWND) GetHWND(), dx, dy, &rect2, NULL);
     else
     if ( rect )
         ::ScrollWindow((HWND) GetHWND(), dx, dy, &rect2, NULL);
     else


@@ -3472,10 +3353,10 @@ 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);

-    
+

     // Restore old Window proc
     if ((HWND) GetHWND())
     {
     // Restore old Window proc
     if ((HWND) GetHWND())
     {


@@ -3494,7 +3375,7 @@ WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders)
     WXDWORD exStyle = 0;
     if ( style & wxTRANSPARENT_WINDOW )
         exStyle |= WS_EX_TRANSPARENT ;
     WXDWORD exStyle = 0;
     if ( style & wxTRANSPARENT_WINDOW )
         exStyle |= WS_EX_TRANSPARENT ;

-    
+

     if ( !eliminateBorders )
     {
         if ( style & wxSUNKEN_BORDER )
     if ( !eliminateBorders )
     {
         if ( style & wxSUNKEN_BORDER )


@@ -3554,7 +3435,7 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
     if ( *want3D )
         nativeBorder = FALSE;
 #endif
     if ( *want3D )
         nativeBorder = FALSE;
 #endif

-    
+

     DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder);
 
     // If we want 3D, but haven't specified a border here,
     DWORD exStyle = MakeExtendedStyle(m_windowStyle, !nativeBorder);
 
     // If we want 3D, but haven't specified a border here,


@@ -3565,7 +3446,7 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
         (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) ))
         exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE ;
 #endif
         (m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) ))
         exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE ;
 #endif

-    
+

     return exStyle;
 }
 
     return exStyle;
 }
 


@@ -3575,17 +3456,17 @@ void wxWindow::OnChar(wxKeyEvent& event)
         // propagate the TABs to the parent - it's up to it to decide what
         // to do with it
         if ( GetParent() ) {
         // propagate the TABs to the parent - it's up to it to decide what
         // to do with it
         if ( GetParent() ) {

-            if ( GetParent()->ProcessEvent(event) )
+            if ( GetParent()->GetEventHandler()->ProcessEvent(event) )

                 return;
         }
     }
                 return;
         }
     }

-    
+

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

-    
+

     if ( id == -1 )
         id= m_lastWParam;
     if ( id == -1 )
         id= m_lastWParam;

-    
+

     if ( !event.ControlDown() )
         (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
 }
     if ( !event.ControlDown() )
         (void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
 }


@@ -3609,7 +3490,7 @@ 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();
     while ( node )
 {
     wxNode *node = GetChildren()->First();
     while ( node )


@@ -3621,7 +3502,7 @@ bool wxWindow::TransferDataToWindow(void)
             wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
             return FALSE;
         }
             wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
             return FALSE;
         }

-        
+

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


@@ -3629,7 +3510,7 @@ 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();
     while ( node )
 {
     wxNode *node = GetChildren()->First();
     while ( node )


@@ -3639,13 +3520,13 @@ bool wxWindow::TransferDataFromWindow(void)
         {
             return FALSE;
         }
         {
             return FALSE;
         }

-        
+

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

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

 {
     wxNode *node = GetChildren()->First();
     while ( node )
 {
     wxNode *node = GetChildren()->First();
     while ( node )


@@ -3655,14 +3536,14 @@ bool wxWindow::Validate(void)
         {
             return FALSE;
         }
         {
             return FALSE;
         }

-        
+

         node = node->Next();
     }
     return TRUE;
 }
 
 // Get the window with the focus
         node = node->Next();
     }
     return TRUE;
 }
 
 // Get the window with the focus

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

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


@@ -3685,7 +3566,7 @@ void wxWindow::RemoveChild(wxWindow *child)
     child->m_windowParent = NULL;
 }
 
     child->m_windowParent = NULL;
 }
 

-void wxWindow::DestroyChildren(void)
+void wxWindow::DestroyChildren()

 {
     if (GetChildren()) {
         wxNode *node;
 {
     if (GetChildren()) {
         wxNode *node;


@@ -3801,7 +3682,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)
     {


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

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

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


@@ -3943,7 +3824,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)


@@ -4187,9 +4068,9 @@ void wxWindow::OnDefaultAction(wxControl *initiatingItem)
   event.m_clientData = lbox->wxListBox::GetClientData(event.m_commandInt);
   }
   event.m_eventObject = lbox;
   event.m_clientData = lbox->wxListBox::GetClientData(event.m_commandInt);
   }
   event.m_eventObject = lbox;

-  
+

     lbox->ProcessCommand(event);
     lbox->ProcessCommand(event);

-    
+

       if (event.m_commandString)
       delete[] event.m_commandString;
       return;
       if (event.m_commandString)
       delete[] event.m_commandString;
       return;


@@ -4205,7 +4086,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);


@@ -4214,7 +4095,7 @@ 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;


@@ -4229,7 +4110,7 @@ void wxWindow::Fit(void)
             maxX = wx + ww;
         if ( wy + wh > maxY )
             maxY = wy + wh;
             maxX = wx + ww;
         if ( wy + wh > maxY )
             maxY = wy + wh;

-        
+

         node = node->Next();
     }
     SetClientSize(maxX + 5, maxY + 5);
         node = node->Next();
     }
     SetClientSize(maxX + 5, maxY + 5);


@@ -4240,7 +4121,7 @@ void wxWindow::SetValidator(const wxValidator& validator)
     if ( m_windowValidator )
         delete m_windowValidator;
     m_windowValidator = validator.Clone();
     if ( m_windowValidator )
         delete m_windowValidator;
     m_windowValidator = validator.Clone();

-    
+

     if ( m_windowValidator )
         m_windowValidator->SetWindow(this) ;
 }
     if ( m_windowValidator )
         m_windowValidator->SetWindow(this) ;
 }


@@ -4250,7 +4131,7 @@ wxWindow *wxWindow::FindWindow(long id)
 {
     if ( GetId() == id)
         return this;
 {
     if ( GetId() == id)
         return this;

-    
+

     wxNode *node = GetChildren()->First();
     while ( node )
     {
     wxNode *node = GetChildren()->First();
     while ( node )
     {


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

-    
+

     wxNode *node = GetChildren()->First();
     while ( node )
     {
     wxNode *node = GetChildren()->First();
     while ( node )
     {


@@ -4303,7 +4184,7 @@ int y_pages = 0;
   // Bugfix begin
   if (vert_units)
   y_pages = (int)(v_height/vert_units) - y_page;
   // Bugfix begin
   if (vert_units)
   y_pages = (int)(v_height/vert_units) - y_page;

-  
+

     #ifdef __WXMSW__
     int y = 0;
     #else
     #ifdef __WXMSW__
     int y = 0;
     #else


@@ -4383,7 +4264,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());


@@ -4400,17 +4281,17 @@ void wxWindow::OnIdle(wxIdleEvent& event)
         {
             // Generate a LEAVE event
             m_mouseInWindow = FALSE;
         {
             // Generate a LEAVE event
             m_mouseInWindow = FALSE;

-            
+

             int state = 0;
             if (::GetKeyState(VK_SHIFT) != 0)
                 state |= MK_SHIFT;
             if (::GetKeyState(VK_CONTROL) != 0)
                 state |= MK_CONTROL;
             int state = 0;
             if (::GetKeyState(VK_SHIFT) != 0)
                 state |= MK_SHIFT;
             if (::GetKeyState(VK_CONTROL) != 0)
                 state |= MK_CONTROL;

-            
+

             // Unfortunately the mouse button and keyboard state may have changed
             // by the time the OnIdle function is called, so 'state' may be
             // meaningless.
             // Unfortunately the mouse button and keyboard state may have changed
             // by the time the OnIdle function is called, so 'state' may be
             // meaningless.

-            
+

             MSWOnMouseLeave(pt.x, pt.y, state);
         }
     }
             MSWOnMouseLeave(pt.x, pt.y, state);
         }
     }


@@ -4418,13 +4299,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);
 }


@@ -4518,7 +4399,7 @@ const char *wxGetMessageName(int message)
     case 0x0046: return "WM_WINDOWPOSCHANGING";
     case 0x0047: return "WM_WINDOWPOSCHANGED";
     case 0x0048: return "WM_POWER";
     case 0x0046: return "WM_WINDOWPOSCHANGING";
     case 0x0047: return "WM_WINDOWPOSCHANGED";
     case 0x0048: return "WM_POWER";

-        
+

 #ifdef  __WIN32__
     case 0x004A: return "WM_COPYDATA";
     case 0x004B: return "WM_CANCELJOURNAL";
 #ifdef  __WIN32__
     case 0x004A: return "WM_COPYDATA";
     case 0x004B: return "WM_CANCELJOURNAL";


@@ -4536,7 +4417,7 @@ const char *wxGetMessageName(int message)
     case 0x007F: return "WM_GETICON";
     case 0x0080: return "WM_SETICON";
 #endif  //WIN32
     case 0x007F: return "WM_GETICON";
     case 0x0080: return "WM_SETICON";
 #endif  //WIN32

-        
+

     case 0x0081: return "WM_NCCREATE";
     case 0x0082: return "WM_NCDESTROY";
     case 0x0083: return "WM_NCCALCSIZE";
     case 0x0081: return "WM_NCCREATE";
     case 0x0082: return "WM_NCDESTROY";
     case 0x0083: return "WM_NCCALCSIZE";


@@ -4563,13 +4444,13 @@ const char *wxGetMessageName(int message)
     case 0x0106: return "WM_SYSCHAR";
     case 0x0107: return "WM_SYSDEADCHAR";
     case 0x0108: return "WM_KEYLAST";
     case 0x0106: return "WM_SYSCHAR";
     case 0x0107: return "WM_SYSDEADCHAR";
     case 0x0108: return "WM_KEYLAST";

-        
+

 #ifdef  __WIN32__
     case 0x010D: return "WM_IME_STARTCOMPOSITION";
     case 0x010E: return "WM_IME_ENDCOMPOSITION";
     case 0x010F: return "WM_IME_COMPOSITION";
 #endif  //WIN32
 #ifdef  __WIN32__
     case 0x010D: return "WM_IME_STARTCOMPOSITION";
     case 0x010E: return "WM_IME_ENDCOMPOSITION";
     case 0x010F: return "WM_IME_COMPOSITION";
 #endif  //WIN32

-        
+

     case 0x0110: return "WM_INITDIALOG";
     case 0x0111: return "WM_COMMAND";
     case 0x0112: return "WM_SYSCOMMAND";
     case 0x0110: return "WM_INITDIALOG";
     case 0x0111: return "WM_COMMAND";
     case 0x0112: return "WM_SYSCOMMAND";


@@ -4594,7 +4475,7 @@ const char *wxGetMessageName(int message)
     case 0x0210: return "WM_PARENTNOTIFY";
     case 0x0211: return "WM_ENTERMENULOOP";
     case 0x0212: return "WM_EXITMENULOOP";
     case 0x0210: return "WM_PARENTNOTIFY";
     case 0x0211: return "WM_ENTERMENULOOP";
     case 0x0212: return "WM_EXITMENULOOP";

-        
+

 #ifdef  __WIN32__
     case 0x0213: return "WM_NEXTMENU";
     case 0x0214: return "WM_SIZING";
 #ifdef  __WIN32__
     case 0x0213: return "WM_NEXTMENU";
     case 0x0214: return "WM_SIZING";


@@ -4603,7 +4484,7 @@ const char *wxGetMessageName(int message)
     case 0x0218: return "WM_POWERBROADCAST";
     case 0x0219: return "WM_DEVICECHANGE";
 #endif  //WIN32
     case 0x0218: return "WM_POWERBROADCAST";
     case 0x0219: return "WM_DEVICECHANGE";
 #endif  //WIN32

-        
+

     case 0x0220: return "WM_MDICREATE";
     case 0x0221: return "WM_MDIDESTROY";
     case 0x0222: return "WM_MDIACTIVATE";
     case 0x0220: return "WM_MDICREATE";
     case 0x0221: return "WM_MDIDESTROY";
     case 0x0222: return "WM_MDIACTIVATE";


@@ -4616,7 +4497,7 @@ const char *wxGetMessageName(int message)
     case 0x0229: return "WM_MDIGETACTIVE";
     case 0x0230: return "WM_MDISETMENU";
     case 0x0233: return "WM_DROPFILES";
     case 0x0229: return "WM_MDIGETACTIVE";
     case 0x0230: return "WM_MDISETMENU";
     case 0x0233: return "WM_DROPFILES";

-        
+

 #ifdef  __WIN32__
     case 0x0281: return "WM_IME_SETCONTEXT";
     case 0x0282: return "WM_IME_NOTIFY";
 #ifdef  __WIN32__
     case 0x0281: return "WM_IME_SETCONTEXT";
     case 0x0282: return "WM_IME_NOTIFY";


@@ -4627,7 +4508,7 @@ const char *wxGetMessageName(int message)
     case 0x0290: return "WM_IME_KEYDOWN";
     case 0x0291: return "WM_IME_KEYUP";
 #endif  //WIN32
     case 0x0290: return "WM_IME_KEYDOWN";
     case 0x0291: return "WM_IME_KEYUP";
 #endif  //WIN32

-        
+

     case 0x0300: return "WM_CUT";
     case 0x0301: return "WM_COPY";
     case 0x0302: return "WM_PASTE";
     case 0x0300: return "WM_CUT";
     case 0x0301: return "WM_COPY";
     case 0x0302: return "WM_PASTE";


@@ -4646,7 +4527,7 @@ const char *wxGetMessageName(int message)
     case 0x030F: return "WM_QUERYNEWPALETTE";
     case 0x0310: return "WM_PALETTEISCHANGING";
     case 0x0311: return "WM_PALETTECHANGED";
     case 0x030F: return "WM_QUERYNEWPALETTE";
     case 0x0310: return "WM_PALETTEISCHANGING";
     case 0x0311: return "WM_PALETTECHANGED";

-        
+

 #ifdef __WIN32__
         // common controls messages - although they're not strictly speaking
         // standard, it's nice to decode them nevertheless
 #ifdef __WIN32__
         // common controls messages - although they're not strictly speaking
         // standard, it's nice to decode them nevertheless


@@ -4729,7 +4610,7 @@ const char *wxGetMessageName(int message)
     case 0x1000 + 63: return "LVM_GETHOTCURSOR";
     case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT";
     case 0x1000 + 65: return "LVM_SETWORKAREA";
     case 0x1000 + 63: return "LVM_GETHOTCURSOR";
     case 0x1000 + 64: return "LVM_APPROXIMATEVIEWRECT";
     case 0x1000 + 65: return "LVM_SETWORKAREA";

-        
+

         // tree view
     case 0x1100 + 0: return "TVM_INSERTITEMA";
     case 0x1100 + 50: return "TVM_INSERTITEMW";
         // tree view
     case 0x1100 + 0: return "TVM_INSERTITEMA";
     case 0x1100 + 50: return "TVM_INSERTITEMW";


@@ -4761,7 +4642,7 @@ const char *wxGetMessageName(int message)
     case 0x1100 + 64: return "TVM_GETISEARCHSTRINGW";
     case 0x1100 + 24: return "TVM_SETTOOLTIPS";
     case 0x1100 + 25: return "TVM_GETTOOLTIPS";
     case 0x1100 + 64: return "TVM_GETISEARCHSTRINGW";
     case 0x1100 + 24: return "TVM_SETTOOLTIPS";
     case 0x1100 + 25: return "TVM_GETTOOLTIPS";

-        
+

         // header
     case 0x1200 + 0: return "HDM_GETITEMCOUNT";
     case 0x1200 + 1: return "HDM_INSERTITEMA";
         // header
     case 0x1200 + 0: return "HDM_GETITEMCOUNT";
     case 0x1200 + 1: return "HDM_INSERTITEMA";


@@ -4781,7 +4662,7 @@ const char *wxGetMessageName(int message)
     case 0x1200 + 17: return "HDM_GETORDERARRAY";
     case 0x1200 + 18: return "HDM_SETORDERARRAY";
     case 0x1200 + 19: return "HDM_SETHOTDIVIDER";
     case 0x1200 + 17: return "HDM_GETORDERARRAY";
     case 0x1200 + 18: return "HDM_SETORDERARRAY";
     case 0x1200 + 19: return "HDM_SETHOTDIVIDER";

-        
+

         // tab control
     case 0x1300 + 2: return "TCM_GETIMAGELIST";
     case 0x1300 + 3: return "TCM_SETIMAGELIST";
         // tab control
     case 0x1300 + 2: return "TCM_GETIMAGELIST";
     case 0x1300 + 3: return "TCM_SETIMAGELIST";


@@ -4810,7 +4691,7 @@ const char *wxGetMessageName(int message)
     case 0x1300 + 48: return "TCM_SETCURFOCUS";
     case 0x1300 + 49: return "TCM_SETMINTABWIDTH";
     case 0x1300 + 50: return "TCM_DESELECTALL";
     case 0x1300 + 48: return "TCM_SETCURFOCUS";
     case 0x1300 + 49: return "TCM_SETMINTABWIDTH";
     case 0x1300 + 50: return "TCM_DESELECTALL";

-        
+

         // toolbar
     case WM_USER+1: return "TB_ENABLEBUTTON";
     case WM_USER+2: return "TB_CHECKBUTTON";
         // toolbar
     case WM_USER+1: return "TB_ENABLEBUTTON";
     case WM_USER+2: return "TB_CHECKBUTTON";


@@ -4868,13 +4749,13 @@ const char *wxGetMessageName(int message)
     case WM_USER+60: return "TB_SETMAXTEXTROWS";
     case WM_USER+61: return "TB_GETTEXTROWS";
     case WM_USER+41: return "TB_GETBITMAPFLAGS";
     case WM_USER+60: return "TB_SETMAXTEXTROWS";
     case WM_USER+61: return "TB_GETTEXTROWS";
     case WM_USER+41: return "TB_GETBITMAPFLAGS";

-        
+

 #endif //WIN32
 #endif //WIN32

-        
+

     default:
         static char s_szBuf[128];
         sprintf(s_szBuf, "<unknown message = %d>", message);
         return s_szBuf;
   }
 }
     default:
         static char s_szBuf[128];
         sprintf(s_szBuf, "<unknown message = %d>", message);
         return s_szBuf;
   }
 }

-#endif //WXDEBUG
\ No newline at end of file
+#endif //__WXDEBUG__