A few compile things.

[wxWidgets.git] / src / generic / helpxlp.cpp

diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp
index 0631f6d80a7e0946f8c6cb9b811c4d3d923c9d30..26bec27921ca8ad4af0c9b1f64a2aaf24b73b116 100644 (file)
--- a/src/generic/helpxlp.cpp
+++ b/src/generic/helpxlp.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -26,7 +26,7 @@
 
 #include "wx/generic/helpxlp.h"
 
 
 #include "wx/generic/helpxlp.h"
 

-#if USE_HELP
+#if wxUSE_HELP

 #include <time.h>
 
 #ifdef __X__
 #include <time.h>
 
 #ifdef __X__


@@ -55,7 +55,7 @@
 
 #if !USE_SHARED_LIBRARY
 
 
 #if !USE_SHARED_LIBRARY
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
 IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
 #else
 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
 IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
 #else


@@ -66,13 +66,22 @@ IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection)
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
 #endif
 
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
 #endif
 

-wxXLPHelpController::wxXLPHelpController(void):
-  helpClient(this)
+// suppress annoying warning "'this' used in base member init list" (so what?)
+#ifdef __VISUALC__
+    #pragma warning(disable: 4355)
+#endif // Visual C++
+
+wxXLPHelpController::wxXLPHelpController(void)
+                   : helpClient(this)

 {
   helpFile = ""; helpServer = -1; helpHost = "";
   helpRunning = FALSE; helpConnection = NULL;
 }
 
 {
   helpFile = ""; helpServer = -1; helpHost = "";
   helpRunning = FALSE; helpConnection = NULL;
 }
 

+#ifdef __VISUALC__
+    #pragma warning(default: 4355)
+#endif // Visual C++
+

 wxXLPHelpController::~wxXLPHelpController(void)
 {
 }
 wxXLPHelpController::~wxXLPHelpController(void)
 {
 }


@@ -88,7 +97,6 @@ bool wxXLPHelpController::Initialize(const wxString& filename, int server)
 
   helpFile = filename;
   helpServer = server;
 
   helpFile = filename;
   helpServer = server;

-  wxIPCInitialize();

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -110,21 +118,21 @@ bool wxXLPHelpController::LoadFile(const wxString& file)
 
 bool wxXLPHelpController::DisplayContents(void)
 {
 
 bool wxXLPHelpController::DisplayContents(void)
 {

-       if (!helpRunning)
-       {
+  if (!helpRunning)
+  {

       if (!Run())
         return FALSE;
     }
     if (helpConnection)
       if (!Run())
         return FALSE;
     }
     if (helpConnection)

-       return helpConnection->Execute("s -1");
+        return helpConnection->Execute("s -1");

     else
     else

-           return FALSE;
+      return FALSE;

 }
 
 bool wxXLPHelpController::DisplaySection(int section)
 {
     if (!helpRunning)
 }
 
 bool wxXLPHelpController::DisplaySection(int section)
 {
     if (!helpRunning)

-       {
+  {

       if (!Run())
         return FALSE;
     }
       if (!Run())
         return FALSE;
     }


@@ -138,7 +146,7 @@ bool wxXLPHelpController::DisplaySection(int section)
 bool wxXLPHelpController::DisplayBlock(long block)
 {
     if (!helpRunning)
 bool wxXLPHelpController::DisplayBlock(long block)
 {
     if (!helpRunning)

-       {
+  {

       if (!Run())
         return FALSE;
     }
       if (!Run())
         return FALSE;
     }


@@ -152,7 +160,7 @@ bool wxXLPHelpController::DisplayBlock(long block)
 bool wxXLPHelpController::KeywordSearch(const wxString& k)
 {
     if (!helpRunning)
 bool wxXLPHelpController::KeywordSearch(const wxString& k)
 {
     if (!helpRunning)

-       {
+  {

       if (!Run())
         return FALSE;
     }
       if (!Run())
         return FALSE;
     }


@@ -180,7 +188,7 @@ bool wxXLPHelpController::Run(void)
   if (!helpFile || !helpHost || helpRunning)
     return FALSE;
 #endif
   if (!helpFile || !helpHost || helpRunning)
     return FALSE;
 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   if (!helpFile || helpRunning)
     return FALSE;
 #endif
   if (!helpFile || helpRunning)
     return FALSE;
 #endif


@@ -199,7 +207,7 @@ bool wxXLPHelpController::Run(void)
 
   char server[32];
   sprintf(server, "%d", helpServer);
 
   char server[32];
   sprintf(server, "%d", helpServer);

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   // Only one instance of wxHelp under Windows.
   // See if there's already an instance of wxHelp
   if ((helpConnection = (wxXLPHelpConnection *)helpClient.MakeConnection(helpHost, server, "WXHELP")))
   // Only one instance of wxHelp under Windows.
   // See if there's already an instance of wxHelp
   if ((helpConnection = (wxXLPHelpConnection *)helpClient.MakeConnection(helpHost, server, "WXHELP")))


@@ -254,4 +262,4 @@ bool wxXLPHelpConnection::OnDisconnect(void)
   return TRUE;
 }
 
   return TRUE;
 }
 

-#endif // USE_HELP
+#endif // wxUSE_HELP