From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 2 Sep 1999 08:23:23 +0000 (+0000)
Subject: SetMenuBar potential memory leak fixed; added wxTAB_TRAVERSAL as dummy (0) style
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/da4b7ffc783b90227e05df7484121c5435ae8985

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
---

diff --git a/docs/latex/wx/log.tex b/docs/latex/wx/log.tex
index e789c37132..07a557df28 100644
--- a/docs/latex/wx/log.tex
+++ b/docs/latex/wx/log.tex
@@ -169,7 +169,7 @@ Returns whether the verbose mode is currently active.
 Sets the timestamp format prepended by the default log targets to all
 messages. The string may contain any normal characters as well as \%
 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}
 
diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index c51def975a..7724ad4b3e 100644
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -1935,6 +1935,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { _T("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
   { _T("wxNO_BORDER"), wxNO_BORDER},
   { _T("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
+  { _T("wxTAB_TRAVERSAL"), 0}, // Compatibility only
 
   { _T("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
   { _T("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 3549546754..1f463ef76a 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -422,6 +422,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     if (!menu_bar)
     {
+        delete m_frameMenuBar;
         m_frameMenuBar = NULL;
         return;
     }