From: Robert Roebling <robert@roebling.de>
Date: Sun, 2 Jun 2002 10:57:13 +0000 (+0000)
Subject:   Removed hack in Toolbar that breaks UI updates under MSW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d3734d65e66f0b8c7a7aafcbdba922e0f0516d62

  Removed hack in Toolbar that breaks UI updates under MSW.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index d99e214263..5f4b02fa90 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -554,11 +554,15 @@ void wxToolBarBase::DoToolbarUpdates()
     while (parent->GetParent())
         parent = parent->GetParent();
 
-#ifdef __WXMSW__
-    wxWindow* focusWin = wxFindFocusDescendant(parent);
-#else
+// This kind of #ifdef is a good way to annoy people. It breaks
+// apps, but only on one platform and due to a hack in officially
+// platform independent code. It took me hours to fix this. RR.
+//
+// #ifdef __WXMSW__
+//    wxWindow* focusWin = wxFindFocusDescendant(parent);
+// #else
     wxWindow* focusWin = (wxWindow*) NULL;
-#endif
+// #endif
 
     wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler() ;