From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 8 Sep 2012 21:48:57 +0000 (+0000)
Subject: Fix narrow/wide string concatenation in recently added wxSizerFlags assert.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e60165f72ed20e09d0fcbe4a50227f79d529dbb8?ds=inline

Fix narrow/wide string concatenation in recently added wxSizerFlags assert.

This fixes MSVC build after r72434.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 41da10945d..7e01ff8ad9 100644
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -126,8 +126,8 @@ public:
     wxSizerFlags& Border(int direction, int borderInPixels)
     {
         wxCHECK_MSG( !(direction & ~wxALL), *this,
-                     wxS("direction must be a combination of wxDirection enum "
-                         "values.") );
+                     wxS("direction must be a combination of wxDirection ")
+                     wxS("enum values.") );
 
         m_flags &= ~wxALL;
         m_flags |= direction;
diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 4141b0e3c8..6cd962b79c 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -110,10 +110,8 @@ static BOOL wxShellNotifyIcon(DWORD dwMessage, NOTIFYICONDATA *pData)
 // wxTaskBarIconWindow: helper window
 // ----------------------------------------------------------------------------
 
-// NB: this class serves two purposes:
-//     1. win32 needs a HWND associated with taskbar icon, this provides it
-//     2. we need wxTopLevelWindow so that the app doesn't exit when
-//        last frame is closed but there still is a taskbar icon
+// We need a HWND to create a taskbar icon, so create a special hidden window
+// just to be able to use its HWND.
 class wxTaskBarIconWindow : public wxFrame
 {
 public:
@@ -123,6 +121,11 @@ public:
     {
     }
 
+    // This implicitly created window shouldn't prevent the application from
+    // exiting if all its other windows are closed.
+    virtual bool ShouldPreventAppExit() const { return false; }
+
+protected:
     WXLRESULT MSWWindowProc(WXUINT msg,
                             WXWPARAM wParam, WXLPARAM lParam)
     {