X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..748fbf95a859df3b1b9f8b95ee8cd0cc4d205a85:/src/generic/helpxlp.cpp

diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp
index 4fd7ed0a2f..532fc03bcf 100644
--- 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
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -53,7 +53,6 @@
 
 #include "wx/generic/helpxlp.h"
 
-#if !USE_SHARED_LIBRARY
 
 #ifdef __WXMSW__
 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
@@ -64,11 +63,10 @@ IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection)
 #endif
 
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
-#endif
 
 // suppress annoying warning "'this' used in base member init list" (so what?)
-#ifdef _MSC_VER
-#pragma warning(disable: 4355)
+#ifdef __VISUALC__
+    #pragma warning(disable: 4355)
 #endif // Visual C++
 
 wxXLPHelpController::wxXLPHelpController(void)
@@ -78,8 +76,8 @@ wxXLPHelpController::wxXLPHelpController(void)
   helpRunning = FALSE; helpConnection = NULL;
 }
 
-#ifdef _MSC_VER
-#pragma warning(default: 4355)
+#ifdef __VISUALC__
+    #pragma warning(default: 4355)
 #endif // Visual C++
 
 wxXLPHelpController::~wxXLPHelpController(void)
@@ -97,7 +95,6 @@ bool wxXLPHelpController::Initialize(const wxString& filename, int server)
 
   helpFile = filename;
   helpServer = server;
-  wxIPCInitialize();
   return TRUE;
 }
 
@@ -119,21 +116,21 @@ bool wxXLPHelpController::LoadFile(const wxString& file)
 
 bool wxXLPHelpController::DisplayContents(void)
 {
-	if (!helpRunning)
-	{
+  if (!helpRunning)
+  {
       if (!Run())
         return FALSE;
     }
     if (helpConnection)
-      	return helpConnection->Execute("s -1");
+        return helpConnection->Execute("s -1");
     else
-	    return FALSE;
+      return FALSE;
 }
 
 bool wxXLPHelpController::DisplaySection(int section)
 {
     if (!helpRunning)
-	{
+  {
       if (!Run())
         return FALSE;
     }
@@ -147,7 +144,7 @@ bool wxXLPHelpController::DisplaySection(int section)
 bool wxXLPHelpController::DisplayBlock(long block)
 {
     if (!helpRunning)
-	{
+  {
       if (!Run())
         return FALSE;
     }
@@ -161,7 +158,7 @@ bool wxXLPHelpController::DisplayBlock(long block)
 bool wxXLPHelpController::KeywordSearch(const wxString& k)
 {
     if (!helpRunning)
-	{
+  {
       if (!Run())
         return FALSE;
     }