Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/utils/helpview/src/remhelp.cpp b/utils/helpview/src/remhelp.cpp
index 0d8a521098c3b26ce48cb11305f9b366cb6449ab..ee8da0e31bb93716557151d679970d8fb1893887 100644 (file)
--- a/utils/helpview/src/remhelp.cpp
+++ b/utils/helpview/src/remhelp.cpp
@@ -31,7 +31,7 @@
 //#include "ddesetup.h"
 //#define wxUSE_DDE_FOR_IPC 0
 
 //#include "ddesetup.h"
 //#define wxUSE_DDE_FOR_IPC 0
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 


@@ -252,7 +252,7 @@ bool wxRemoteHtmlHelpController::Quit()
                     switch ( sig )
                     {
                     default:
                     switch ( sig )
                     {
                     default:

-                    wxFAIL_MSG( _T("unexpected return value") );
+                    wxFAIL_MSG( wxT("unexpected return value") );

                     // fall through
 
                       case -1:
                     // fall through
 
                       case -1:


@@ -283,11 +283,11 @@ bool wxRemoteHtmlHelpController::Quit()
     {
         if ( wxProcess::Exists(m_pid) )
         {
     {
         if ( wxProcess::Exists(m_pid) )
         {

-            wxLogStatus(_T("Process %ld is running."), m_pid);
+            wxLogStatus(wxT("Process %ld is running."), m_pid);

         }
         else
         {
         }
         else
         {

-            wxLogStatus(_T("No process with pid = %ld."), m_pid);
+            wxLogStatus(wxT("No process with pid = %ld."), m_pid);

         }
     }
     else // not SIGNONE
         }
     }
     else // not SIGNONE


@@ -295,23 +295,23 @@ bool wxRemoteHtmlHelpController::Quit()
         wxKillError rc = wxProcess::Kill(m_pid, (wxSignal)sig);
         if ( rc == wxKILL_OK )
         {
         wxKillError rc = wxProcess::Kill(m_pid, (wxSignal)sig);
         if ( rc == wxKILL_OK )
         {

-            wxLogStatus(_T("Process %ld killed with signal %d."), m_pid, sig);
+            wxLogStatus(wxT("Process %ld killed with signal %d."), m_pid, sig);

         }
         else
         {
             static const wxChar *errorText[] =
             {
         }
         else
         {
             static const wxChar *errorText[] =
             {

-                _T(""), // no error
-                    _T("signal not supported"),
-                    _T("permission denied"),
-                    _T("no such process"),
-                    _T("unspecified error"),
+                wxT(""), // no error
+                    wxT("signal not supported"),
+                    wxT("permission denied"),
+                    wxT("no such process"),
+                    wxT("unspecified error"),

             };
 
             // sig = 3, 6, 9 or 12 all kill server with no apparent problem
             // but give error message on MSW - timout?
             //
             };
 
             // sig = 3, 6, 9 or 12 all kill server with no apparent problem
             // but give error message on MSW - timout?
             //

-            //wxLogError(_T("Failed to kill process %ld with signal %d: %s"),
+            //wxLogError(wxT("Failed to kill process %ld with signal %d: %s"),

             //            m_pid, sig, errorText[rc]);
         }
     }
             //            m_pid, sig, errorText[rc]);
         }
     }