Do not propagate key events from child controls unless they have modifiers

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

diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp
index 726900c638933d227f54e2c189aed9517d5dfb15..d2ddec0146f5154cddce7f12bc3d14a6a9361730 100644 (file)
--- a/src/msw/debughlp.cpp
+++ b/src/msw/debughlp.cpp
@@ -145,7 +145,7 @@ const wxString& wxDbgHelpDLL::GetErrorMessage()
 void wxDbgHelpDLL::LogError(const wxChar *func)
 {
     ::OutputDebugString(wxString::Format(_T("dbghelp: %s() failed: %s\r\n"),
 void wxDbgHelpDLL::LogError(const wxChar *func)
 {
     ::OutputDebugString(wxString::Format(_T("dbghelp: %s() failed: %s\r\n"),

-                        func, wxSysErrorMsg(::GetLastError())));
+                        func, wxSysErrorMsg(::GetLastError())).wx_str());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -391,7 +391,7 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
     s.reserve(512);
     s = GetSymbolName(pSym);
 
     s.reserve(512);
     s = GetSymbolName(pSym);
 

-#if !wxUSE_STL
+#if !wxUSE_STD_STRING

     // special handling for ubiquitous wxString: although the code below works
     // for it as well, it shows the wxStringBase class and takes 4 lines
     // instead of only one as this branch
     // special handling for ubiquitous wxString: although the code below works
     // for it as well, it shows the wxStringBase class and takes 4 lines
     // instead of only one as this branch


@@ -419,7 +419,7 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
         s << _T("(\"") << (p ? p : _T("???")) << _T(")\"");
     }
     else // any other UDT
         s << _T("(\"") << (p ? p : _T("???")) << _T(")\"");
     }
     else // any other UDT

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_STRING

     {
         // Determine how many children this type has.
         DWORD dwChildrenCount = 0;
     {
         // Determine how many children this type has.
         DWORD dwChildrenCount = 0;