// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "help.cpp"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
#endif
- wxArtProvider::PushProvider(new AlternateArtProvider);
+ wxArtProvider::Push(new AlternateArtProvider);
-#ifdef __WXMAC__
+#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
wxApp::s_macAboutMenuItemId = wxID_ABOUT;
- wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+ wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
#endif
int istyle = wxHF_DEFAULT_STYLE;
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.empty())
_(
"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() )
{
wxString ext = s.Right(4).Lower();
- if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp"))
+ if (ext == wxT(".zip") || ext == wxT(".htb") || ext == wxT(".hhp"))
{
wxBusyCursor bcur;
wxFileName fileName(s);
#ifdef __WXMAC__
/// Respond to Apple Event for opening a document
-void hvApp::MacOpenFile(const wxString& filename)
+void hvApp::MacOpenFiles(const wxArrayString& fileNames)
{
wxBusyCursor bcur;
- wxFileName fileName(filename);
+ wxFileName fileName(fileNames[0]);
m_helpController->AddBook(fileName);
m_helpController->DisplayContents();
}
#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:
#else
#define CREATE_STD_ICON(iconId, xpmRc) \
{ \
- wxIcon icon(_T(iconId)); \
+ wxIcon icon(wxT(iconId)); \
wxBitmap bmp; \
bmp.CopyFromIcon(icon); \
return bmp; \
wxGetApp().GetConnections().DeleteObject(this);
}
-bool hvConnection::OnExecute(const wxString& WXUNUSED(topic),
- wxChar *data,
- int WXUNUSED(size),
- wxIPCFormat WXUNUSED(format))
+bool hvConnection::OnExec(const wxString& WXUNUSED(topic),
+ const wxString& data)
{
// wxLogStatus("Execute command: %s", data);
- if ( !wxStrncmp( data, wxT("--intstring"), 11 ) )
+ if ( data == "--intstring" )
{
long i;
wxString argStr = data;
bool hvConnection::OnPoke(const wxString& WXUNUSED(topic),
const wxString& item,
- wxChar *data,
- int WXUNUSED(size),
- wxIPCFormat WXUNUSED(format))
+ const void *buf,
+ size_t size,
+ wxIPCFormat format)
{
+ const wxString data = GetTextFromData(buf, size, format);
+
// wxLogStatus("Poke command: %s = %s", item.c_str(), data);
//topic is not tested
return true;
}
-wxChar *hvConnection::OnRequest(const wxString& WXUNUSED(topic),
- const wxString& WXUNUSED(item),
- int * WXUNUSED(size),
- wxIPCFormat WXUNUSED(format))
-{
- return NULL;
-}
-
-bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
- const wxString& WXUNUSED(item))
-{
- return true;
-}
-
#endif // #if wxUSE_IPC