SetMenuBar potential memory leak fixed; added wxTAB_TRAVERSAL as dummy (0) style
for backward compatibility git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
107e4716f2
commit
da4b7ffc78
@ -169,7 +169,7 @@ Returns whether the verbose mode is currently active.
|
|||||||
Sets the timestamp format prepended by the default log targets to all
|
Sets the timestamp format prepended by the default log targets to all
|
||||||
messages. The string may contain any normal characters as well as \%
|
messages. The string may contain any normal characters as well as \%
|
||||||
prefixed format specificators, see {\it strftime()} manual for details.
|
prefixed format specificators, see {\it strftime()} manual for details.
|
||||||
Passing a null value (not empty string) to this function disables message timestamping.
|
Passing a NULL value (not empty string) to this function disables message timestamping.
|
||||||
|
|
||||||
\membersection{wxLog::GetTimestamp}\label{wxloggettimestamp}
|
\membersection{wxLog::GetTimestamp}\label{wxloggettimestamp}
|
||||||
|
|
||||||
|
@ -1935,6 +1935,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
|
|||||||
{ _T("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
|
{ _T("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
|
||||||
{ _T("wxNO_BORDER"), wxNO_BORDER},
|
{ _T("wxNO_BORDER"), wxNO_BORDER},
|
||||||
{ _T("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
|
{ _T("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
|
||||||
|
{ _T("wxTAB_TRAVERSAL"), 0}, // Compatibility only
|
||||||
|
|
||||||
{ _T("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
|
{ _T("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
|
||||||
{ _T("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
|
{ _T("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
|
||||||
|
@ -422,6 +422,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
|
|||||||
{
|
{
|
||||||
if (!menu_bar)
|
if (!menu_bar)
|
||||||
{
|
{
|
||||||
|
delete m_frameMenuBar;
|
||||||
m_frameMenuBar = NULL;
|
m_frameMenuBar = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user