set string length to 0 in AllocBeforeWrite() just to be tidy (replaces patch 1123226)

[wxWidgets.git] / src / html / helpctrl.cpp

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 5f0bc3fd68e44db3555a3f40bc13e88cb4953547..9ac2bce17817b5dc822914d653560a054b800cf7 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -38,7 +38,7 @@
 #if wxUSE_HELP
     #include "wx/tipwin.h"
 #endif
 #if wxUSE_HELP
     #include "wx/tipwin.h"
 #endif

-    
+

 
 #if wxUSE_LIBMSPACK
 #include "wx/html/forcelnk.h"
 
 #if wxUSE_LIBMSPACK
 #include "wx/html/forcelnk.h"


@@ -111,8 +111,10 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;

+#else
+    wxUnusedVar(show_wait_msg);

 #endif
 #endif

-    if (m_helpFrame) 
+    if (m_helpFrame)

         m_helpFrame->RefreshLists();
     return retval;
 }
         m_helpFrame->RefreshLists();
     return retval;
 }


@@ -135,7 +137,7 @@ void wxHtmlHelpController::CreateHelpWindow()
 
     if (m_Config == NULL)
     {
 
     if (m_Config == NULL)
     {

-        m_Config = wxConfigBase::Get(FALSE);
+        m_Config = wxConfigBase::Get(false);

         if (m_Config != NULL)
             m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
     }
         if (m_Config != NULL)
             m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
     }


@@ -149,7 +151,7 @@ void wxHtmlHelpController::CreateHelpWindow()
     m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);
 
     m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);
 

-    m_helpFrame->Show(TRUE);
+    m_helpFrame->Show(true);

 }
 
 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
 }
 
 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)


@@ -209,7 +211,7 @@ bool wxHtmlHelpController::Initialize(const wxString& file)
 bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
 {
     // Don't reload the file or we'll have it appear again, presumably.
 bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
 {
     // Don't reload the file or we'll have it appear again, presumably.

-    return TRUE;
+    return true;

 }
 
 bool wxHtmlHelpController::DisplaySection(int sectionNo)
 }
 
 bool wxHtmlHelpController::DisplaySection(int sectionNo)


@@ -235,11 +237,11 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
     {
         s_tipWindow = new wxTipWindow(wxTheApp->GetTopWindow(), text, 100, & s_tipWindow);
 
     {
         s_tipWindow = new wxTipWindow(wxTheApp->GetTopWindow(), text, 100, & s_tipWindow);
 

-        return TRUE;
+        return true;

     }
 #endif // wxUSE_TIPWINDOW
 
     }
 #endif // wxUSE_TIPWINDOW
 

-    return FALSE;
+    return false;

 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,
 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,


@@ -259,7 +261,7 @@ wxFrame* wxHtmlHelpController::GetFrameParameters(wxSize *size,
                                    bool *newFrameEachTime)
 {
     if (newFrameEachTime)
                                    bool *newFrameEachTime)
 {
     if (newFrameEachTime)

-        (* newFrameEachTime) = FALSE;
+        (* newFrameEachTime) = false;

     if (size && m_helpFrame)
         (* size) = m_helpFrame->GetSize();
     if (pos && m_helpFrame)
     if (size && m_helpFrame)
         (* size) = m_helpFrame->GetSize();
     if (pos && m_helpFrame)


@@ -270,7 +272,7 @@ wxFrame* wxHtmlHelpController::GetFrameParameters(wxSize *size,
 bool wxHtmlHelpController::Quit()
 {
     DestroyHelpWindow();
 bool wxHtmlHelpController::Quit()
 {
     DestroyHelpWindow();

-    return TRUE;
+    return true;

 }
 
 // Make the help controller's frame 'modal' if
 }
 
 // Make the help controller's frame 'modal' if


@@ -279,8 +281,8 @@ void wxHtmlHelpController::AddGrabIfNeeded()
 {
     // So far, wxGTK only
 #ifdef __WXGTK__
 {
     // So far, wxGTK only
 #ifdef __WXGTK__

-    bool needGrab = FALSE;
-    
+    bool needGrab = false;
+

     // Check if there are any modal windows present,
     // in which case we need to add a grab.
     for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     // Check if there are any modal windows present,
     // in which case we need to add a grab.
     for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();


@@ -291,7 +293,7 @@ void wxHtmlHelpController::AddGrabIfNeeded()
         wxDialog *dialog = wxDynamicCast(win, wxDialog);
 
         if (dialog && dialog->IsModal())
         wxDialog *dialog = wxDynamicCast(win, wxDialog);
 
         if (dialog && dialog->IsModal())

-            needGrab = TRUE;
+            needGrab = true;

     }
 
     if (needGrab && m_helpFrame)
     }
 
     if (needGrab && m_helpFrame)


@@ -304,7 +306,7 @@ bool wxHtmlHelpController::Display(const wxString& x)
     CreateHelpWindow();
     bool success = m_helpFrame->Display(x);
     AddGrabIfNeeded();
     CreateHelpWindow();
     bool success = m_helpFrame->Display(x);
     AddGrabIfNeeded();

-    return success;    
+    return success;

 }
 
 bool wxHtmlHelpController::Display(int id)
 }
 
 bool wxHtmlHelpController::Display(int id)