forwarding mouse moved events to the view under the mouse, not the firstResponder

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

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 6a74791cff6da544fb4a274982bb15fe98ee2694..ecd2a732f0800963c6d72985f5d78f6785998816 100644 (file)
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -265,7 +265,7 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
     if ( !s.empty() )
     {
         wxString ext = s.Right(4).Lower();
     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);
         {
             wxBusyCursor bcur;
             wxFileName fileName(s);


@@ -279,10 +279,10 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
 
 #ifdef __WXMAC__
 /// Respond to Apple Event for opening a document
 
 #ifdef __WXMAC__
 /// Respond to Apple Event for opening a document

-void hvApp::MacOpenFile(const wxString& filename)
+void hvApp::MacOpenFiles(const wxArrayString& fileNames)

 {
     wxBusyCursor bcur;
 {
     wxBusyCursor bcur;

-    wxFileName fileName(filename);
+    wxFileName fileName(fileNames[0]);

     m_helpController->AddBook(fileName);
     m_helpController->DisplayContents();
 }
     m_helpController->AddBook(fileName);
     m_helpController->DisplayContents();
 }


@@ -312,7 +312,7 @@ if ( id == artId ) return wxBitmap(xpmRc##_xpm);
 #else
 #define CREATE_STD_ICON(iconId, xpmRc) \
 { \
 #else
 #define CREATE_STD_ICON(iconId, xpmRc) \
 { \

-    wxIcon icon(_T(iconId)); \
+    wxIcon icon(wxT(iconId)); \

     wxBitmap bmp; \
     bmp.CopyFromIcon(icon); \
     return bmp; \
     wxBitmap bmp; \
     bmp.CopyFromIcon(icon); \
     return bmp; \


@@ -407,14 +407,12 @@ hvConnection::~hvConnection()
     wxGetApp().GetConnections().DeleteObject(this);
 }
 
     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);
 
 {
     //    wxLogStatus("Execute command: %s", data);
 

-    if ( !wxStrncmp( data, wxT("--intstring"), 11 ) )
+    if ( data == "--intstring" )

     {
         long i;
         wxString argStr = data;
     {
         long i;
         wxString argStr = data;


@@ -438,10 +436,12 @@ bool hvConnection::OnExecute(const wxString& WXUNUSED(topic),
 
 bool hvConnection::OnPoke(const wxString& WXUNUSED(topic),
                           const wxString& item,
 
 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
 
     //    wxLogStatus("Poke command: %s = %s", item.c_str(), data);
     //topic is not tested
 


@@ -488,18 +488,4 @@ bool hvConnection::OnPoke(const wxString& WXUNUSED(topic),
     return true;
 }
 
     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
 #endif // #if wxUSE_IPC