fixed the vsprintf() problem once and for all

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8994821ca3e1d005ec642f5e7614793a39be651a..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;
 


@@ -346,7 +349,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 +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
+    Init();

 
 

-    // 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;
+    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);
 


@@ -441,10 +390,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 +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)


@@ -489,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)


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

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

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


@@ -814,7 +757,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) ;
     }
 


@@ -895,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) {


@@ -936,7 +879,7 @@ 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;
 
 
     HWND hWnd = (HWND)m_hWnd;
 


@@ -997,10 +940,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;
         }
 


@@ -1182,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:


@@ -1476,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()

 {
 }
 
 {
 }
 


@@ -1557,21 +1502,14 @@ 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;
 }
 


@@ -1612,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 ) {


@@ -1632,7 +1567,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.


@@ -1651,8 +1586,12 @@ 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);
+    {
+        win->MSWNotify(wParam, lParam, &result);
+    }

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


@@ -1661,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;
+    return result;
+#endif  // Win95

 
 

-#endif

     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)


@@ -1686,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);


@@ -1699,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))
     {


@@ -1719,9 +1648,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)
     {


@@ -1737,9 +1663,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;


@@ -1830,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);


@@ -1930,7 +1850,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);
 }


@@ -1956,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;

             }
         }
 
             }
         }
 


@@ -2014,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)
     {


@@ -2039,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


@@ -2066,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;
 


@@ -2090,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;


@@ -2100,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


@@ -2709,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 );


@@ -2730,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);


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

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

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


@@ -2955,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)


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

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

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


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


@@ -3597,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 )


@@ -3617,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 )


@@ -3633,7 +3526,7 @@ bool wxWindow::TransferDataFromWindow(void)
     return TRUE;
 }
 
     return TRUE;
 }
 

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

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


@@ -3650,7 +3543,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 )


@@ -3673,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;


@@ -3789,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)
     {


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

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

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


@@ -3931,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)


@@ -4193,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);


@@ -4202,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;


@@ -4371,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());


@@ -4406,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);
 }


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

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