fixed (rare but fatal) bug in wxWindowDisabler

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

diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp
index 13d43fbb6360476f6889cc3ccaf52d1a73d0326f..532fc03bcf2633cde92c82127efbefa28b8e2e72 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__


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

-#if !USE_SHARED_LIBRARY

 
 #ifdef __WXMSW__
 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
 
 #ifdef __WXMSW__
 IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)


@@ -64,11 +63,10 @@ IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection)
 #endif
 
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
 #endif
 
 IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)

-#endif

 
 // suppress annoying warning "'this' used in base member init list" (so what?)
 
 // 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)
 #endif // Visual C++
 
 wxXLPHelpController::wxXLPHelpController(void)


@@ -78,8 +76,8 @@ wxXLPHelpController::wxXLPHelpController(void)
   helpRunning = FALSE; helpConnection = NULL;
 }
 
   helpRunning = FALSE; helpConnection = NULL;
 }
 

-#ifdef _MSC_VER
-#pragma warning(default: 4355)
+#ifdef __VISUALC__
+    #pragma warning(default: 4355)

 #endif // Visual C++
 
 wxXLPHelpController::~wxXLPHelpController(void)
 #endif // Visual C++
 
 wxXLPHelpController::~wxXLPHelpController(void)


@@ -118,21 +116,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;
     }


@@ -146,7 +144,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;
     }


@@ -160,7 +158,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;
     }