compilation fixes for --disable-compat26 (patch 1619037)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 6f6d2b4edd73413c2253d301eaae5f9938947350..72b3daa6a34c2e2f4b5fc9ad9725be498f3059a3 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -55,7 +55,7 @@ bool hvApp::OnInit()
     delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
 #endif
 
-    wxArtProvider::PushProvider(new AlternateArtProvider);
+    wxArtProvider::Push(new AlternateArtProvider);
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
@@ -259,7 +259,7 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
         _(
         "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\
         HTML Help Project (*.hhp)|*.hhp"),
-        wxOPEN | wxFILE_MUST_EXIST,
+        wxFD_OPEN | wxFD_FILE_MUST_EXIST,
         NULL);
 
     if ( !s.empty() )