// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "help.cpp"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
hvApp::hvApp()
{
-#if hvUSE_IPC
+#if wxUSE_IPC
m_server = NULL;
#endif
}
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;
- wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+ wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
#endif
int istyle = wxHF_DEFAULT_STYLE;
bool hasWindowName = false;
bool createServer = false;
-#if hvUSE_IPC
+#if wxUSE_IPC
m_server = NULL;
#endif
wxEmptyString,
wxEmptyString,
wxT("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.IsEmpty())
+ if (!s.empty())
{
book[0] = s;
bookCount = 1;
}
#endif
-#if hvUSE_IPC
+#if wxUSE_IPC
if ( createServer )
{
wxUnusedVar(createServer);
}
-#endif // hvUSE_IPC
+#endif // wxUSE_IPC
//now add help
wxInitAllImageHandlers();
int hvApp::OnExit()
{
-#if hvUSE_IPC
+#if wxUSE_IPC
wxObjectList::compatibility_iterator node = m_connections.GetFirst();
while (node)
{
_(
"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() )
#define ART(artId, xpmRc) \
if ( id == artId ) return wxBitmap(xpmRc##_xpm);
-// Compatibility hack to use wxApp::GetStdIcon of overriden by the user
-#if WXWIN_COMPATIBILITY_2_2
-#define GET_STD_ICON_FROM_APP(iconId) \
- if ( client == wxART_MESSAGE_BOX ) \
-{ \
- wxIcon icon = wxTheApp->GetStdIcon(iconId); \
- if ( icon.Ok() ) \
-{ \
- wxBitmap bmp; \
- bmp.CopyFromIcon(icon); \
- return bmp; \
-} \
-}
-#else
#define GET_STD_ICON_FROM_APP(iconId)
-#endif
// There are two ways of getting the standard icon: either via XPMs or via
// wxIcon ctor. This depends on the platform:
return wxNullBitmap;
}
-#if hvUSE_IPC
+#if wxUSE_IPC
wxConnectionBase *hvServer::OnAcceptConnection(const wxString& topic)
{
return true;
}
-#endif // #if hvUSE_IPC
+#endif // #if wxUSE_IPC