Order fix.

[wxWidgets.git] / utils / helpview / src / helpview.cpp

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 14e98cf8dc586f338fbf277aa6e113857c55205d..c6a0a84576074acc0e8a8577279c90213e87d46f 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -22,7 +22,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -68,7 +68,8 @@ bool hvApp::OnInit()
 
     int istyle = wxHF_DEFAULT_STYLE;
 
-    wxString service, windowName, book[10], titleFormat, argStr;
+    wxString service, windowName, titleFormat, argStr;
+    wxString book[10];
     int bookCount = 0;
     int i;
     bool hasService = false;
@@ -191,7 +192,7 @@ bool hvApp::OnInit()
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
-    SetVendorName(wxT("wxWindows") );
+    SetVendorName(wxT("wxWidgets") );
     SetAppName(wxT("wxHTMLHelpServer") );
     wxConfig::Get(); // create an instance
 
@@ -229,10 +230,10 @@ bool hvApp::OnInit()
 int hvApp::OnExit()
 {
 #if hvUSE_IPC
-    wxNode* node = m_connections.GetFirst();
+    wxObjectList::compatibility_iterator node = m_connections.GetFirst();
     while (node)
     {
-        wxNode* next = node->GetNext();
+        wxObjectList::compatibility_iterator next = node->GetNext();
         hvConnection* connection = (hvConnection*) node->GetData();
         connection->Disconnect();
         delete connection;
@@ -395,7 +396,7 @@ wxBitmap AlternateArtProvider::CreateBitmap(const wxArtID& id,
 
         //ART(wxART_GO_HOME,                             home)
 
-        // Any wxWindows icons not implemented here
+        // Any wxWidgets icons not implemented here
         // will be provided by the default art provider.
         return wxNullBitmap;
 }