diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.cpp b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.cpp index 593c4327..b35489ea 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.cpp +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.cpp @@ -29,7 +29,7 @@ CResourceViewBar::~CResourceViewBar() { } -BEGIN_MESSAGE_MAP(CResourceViewBar, CDockablePane) +BEGIN_MESSAGE_MAP(CResourceViewBar, CDockablePaneEx) ON_WM_CREATE() ON_WM_SIZE() ON_WM_CONTEXTMENU() diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.h b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.h index 165b2086..5c432bbc 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.h +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/ResourceView.h @@ -11,7 +11,7 @@ #include "ClassTreeWnd.h" -class CResourceViewBar : public CDockablePane +class CResourceViewBar : public CDockablePaneEx { // Construction public: diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj index e9dfb9e1..ef5ac583 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj @@ -108,101 +108,119 @@ Application Dynamic MultiByte + v143 Application Dynamic MultiByte true + v143 Application Dynamic MultiByte + v143 Application Dynamic MultiByte true + v143 Application Dynamic Unicode + v143 Application Dynamic Unicode + v143 Application Dynamic Unicode true + v143 Application Dynamic Unicode true + v143 Application Static MultiByte + v143 Application Static MultiByte + v143 Application Static MultiByte true + v143 Application Static MultiByte true + v143 Application Static Unicode + v143 Application Static Unicode + v143 Application Static Unicode true + v143 Application Static Unicode true + v143 Application Dynamic MultiByte true + v143 Application Dynamic MultiByte true + v143 Application @@ -210,6 +228,7 @@ MultiByte true true + v143 Application @@ -217,18 +236,21 @@ MultiByte true true + v143 Application Dynamic Unicode true + v143 Application Dynamic Unicode true + v143 Application @@ -236,6 +258,7 @@ Unicode true true + v143 Application @@ -243,6 +266,7 @@ Unicode true true + v143 diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj.filters b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj.filters index 210272f0..f5283d9b 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj.filters +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/VisualStudioDemo.vcxproj.filters @@ -242,6 +242,7 @@ Resource Files + diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.cpp b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.cpp index 8a09fb39..a5073b6b 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.cpp +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.cpp @@ -30,7 +30,7 @@ CWatchBar::~CWatchBar() { } -BEGIN_MESSAGE_MAP(CWatchBar, CDockablePane) +BEGIN_MESSAGE_MAP(CWatchBar, CDockablePaneEx) ON_WM_CREATE() ON_WM_SIZE() ON_WM_PAINT() diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.h b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.h index 6add9ba0..deea15f9 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.h +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/WatchBar.h @@ -12,7 +12,7 @@ ///////////////////////////////////////////////////////////////////////////// // CWatchBar window -class CWatchBar : public CDockablePane +class CWatchBar : public CDockablePaneEx { // Construction public: diff --git a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/stdafx.h b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/stdafx.h index b18fab13..d3bb7c8c 100644 --- a/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/stdafx.h +++ b/VC2010Samples/MFC/Visual C++ 2008 Feature Pack/VisualStudioDemo/stdafx.h @@ -50,3 +50,9 @@ #else #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") #endif + +class CDockablePaneEx : public CDockablePane +{ +protected: + virtual BOOL CanAdjustLayout() const { return !m_bIsSliding || !m_bIsHiding; } +};