Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index b2ed6bb6fdfdac5437850825c52c1473e1060924..e288092dcb4007879d767ac521e57abbd7bbd4f1 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -62,6 +62,7 @@ bool hvApp::OnInit()
     wxArtProvider::PushProvider(new AlternateArtProvider);
        
 #ifdef __WXMAC__
+    wxApp::s_macAboutMenuItemId = wxID_ABOUT;
     wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
 #endif
 
@@ -152,9 +153,7 @@ bool hvApp::OnInit()
                        wxGetCwd(),
                        wxEmptyString,
                        wxEmptyString,
-                       wxT(
-                       "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\
-                       HTML Help Project (*.hhp)|*.hhp"),
+                       wxT("Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp"),
                        wxOPEN | wxFILE_MUST_EXIST,
                        NULL);
                
@@ -225,11 +224,11 @@ bool hvApp::OnInit()
 int hvApp::OnExit()
 {
 #if hvUSE_IPC
-    wxNode* node = m_connections.First();
+    wxNode* node = m_connections.GetFirst();
     while (node)
     {
-        wxNode* next = node->Next();
-        hvConnection* connection = (hvConnection*) node->Data();
+        wxNode* next = node->GetNext();
+        hvConnection* connection = (hvConnection*) node->GetData();
         connection->Disconnect();
         delete connection;
         node = next;