Skip to content

Commit 3b45e7c

Browse files
committed
CTimelineView fixed in class LogView, now rendering is ok, but closing a tab causes an assertion
1 parent 8024f9f commit 3b45e7c

File tree

6 files changed

+23
-7
lines changed

6 files changed

+23
-7
lines changed

DebugView++/LogView.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ BEGIN_MSG_MAP2(CLogView)
170170
COMMAND_RANGE_HANDLER_EX(ID_VIEW_COLUMN_FIRST, ID_VIEW_COLUMN_LAST, OnViewColumn)
171171
CHAIN_MSG_MAP_ALT(COwnerDraw<CLogView>, 1)
172172
CHAIN_MSG_MAP(CDoubleBufferImpl<CLogView>) //DrMemory: GDI USAGE ERROR: DC 0x3e011cca that contains selected object being deleted
173+
174+
// Provides a default handler that will receive reflected messages; the handler will properly pass unhandled messages to DefWindowProc.
173175
DEFAULT_REFLECTION_HANDLER()
174176
END_MSG_MAP()
175177

DebugView++/MainFrame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ CLogView& CLogViewTabItem::GetView()
6060
return *m_pView;
6161
}
6262

63-
void DisablePaneHeader(CPaneContainer& panecontainer)
63+
void DisablePaneHeader(CMyPaneContainer& panecontainer)
6464
{
6565
panecontainer.SetPaneContainerExtendedStyle(PANECNT_NOCLOSEBUTTON, 0);
6666
panecontainer.m_cxyHeader = 0;

DebugView++/MainFrame.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ class CLogViewTabItem : public CTabViewTabItem
5757
HWND m_parent;
5858
};
5959

60+
class CMyPaneContainer : public CPaneContainerImpl<CMyPaneContainer>
61+
{
62+
public:
63+
DECLARE_WND_CLASS_EX(_T("MY_PaneContainer"), 0, -1)
64+
65+
BEGIN_MSG_MAP(CMyPaneContainerImpl)
66+
REFLECT_NOTIFICATIONS()
67+
CHAIN_MSG_MAP(CPaneContainerImpl<CMyPaneContainer>)
68+
END_MSG_MAP()
69+
};
70+
6071
class CLogViewTabItem2 : public CTabViewTabItem
6172
{
6273
public:
@@ -69,8 +80,8 @@ class CLogViewTabItem2 : public CTabViewTabItem
6980
private:
7081
std::shared_ptr<CLogView> m_pView;
7182
CHorSplitterWindow m_split;
72-
CPaneContainer m_top;
73-
CPaneContainer m_bottom;
83+
CMyPaneContainer m_top;
84+
CMyPaneContainer m_bottom;
7485
gdi::CTimelineView m_timelineView;
7586
};
7687

DebugView++/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#define VERSION 1,8,0,7
2-
#define VERSION_STR "1.8.0.7"
1+
#define VERSION 1,8,0,10
2+
#define VERSION_STR "1.8.0.10"

DebugView++/version.wxi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<?define ProductVersion.Major="1" ?>
44
<?define ProductVersion.Minor="8" ?>
55
<?define ProductVersion.Revision="0" ?>
6-
<?define ProductVersion.Build="7" ?>
7-
<?define ProductVersion="1.8.0.7" ?>
6+
<?define ProductVersion.Build="10" ?>
7+
<?define ProductVersion="1.8.0.10" ?>
88
</Include>

DebugViewConsole/DebugViewConsole.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@
184184
<ProjectReference Include="..\DebugView++Lib\DebugView++Lib.vcxproj">
185185
<Project>{5e5b7c33-8076-4e21-adf3-d56c8c28822a}</Project>
186186
</ProjectReference>
187+
<ProjectReference Include="..\Win32Lib\Win32Lib.vcxproj">
188+
<Project>{7aa3a43a-f0cd-4bd8-bc04-5a30f7260c38}</Project>
189+
</ProjectReference>
187190
</ItemGroup>
188191
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
189192
<ImportGroup Label="ExtensionTargets">

0 commit comments

Comments
 (0)