revert r59246; the window parameter was there by purpose (i.e. for consistency with...

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

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 68991f746792e1b05f1fef5e15a2feb942b3e183..6a74791cff6da544fb4a274982bb15fe98ee2694 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -57,7 +57,7 @@ bool hvApp::OnInit()
 
     wxArtProvider::Push(new AlternateArtProvider);
 
 
     wxArtProvider::Push(new AlternateArtProvider);
 

-#ifdef __WXMAC__
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON

     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
     wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
     wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif


@@ -219,8 +219,6 @@ bool hvApp::OnInit()
 
     m_helpController->DisplayContents();
 
 
     m_helpController->DisplayContents();
 

-    SetTopWindow(m_helpController->GetFrame());
-

     return true;
 }
 
     return true;
 }