commented out wxCrtSetDbgFlag for WXUSINGDLL=1 (ie building apps using dll linkage)

[wxWidgets.git] / src / msw / helpwin.cpp

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index dab0ab53960ee64c02b1ce3b349167729725059a..068165f21edd5d773fbc90ff568a5c75331a2bfc 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -26,10 +26,10 @@
 
 #include "wx/msw/helpwin.h"
 
 
 #include "wx/msw/helpwin.h"
 

-#if USE_HELP
+#if wxUSE_HELP

 #include <time.h>
 
 #include <time.h>
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include <wx/msw/private.h>
 #endif
 
 #include <wx/msw/private.h>
 #endif
 


@@ -54,7 +54,7 @@ wxWinHelpController::~wxWinHelpController(void)
 {
 }
 
 {
 }
 

-bool wxWinHelpController::Initialize(const wxString& filename, int server)
+bool wxWinHelpController::Initialize(const wxString& filename)

 {
   m_helpFile = filename;
   return TRUE;
 {
   m_helpFile = filename;
   return TRUE;


@@ -96,7 +96,7 @@ bool wxWinHelpController::DisplaySection(int section)
 bool wxWinHelpController::DisplayBlock(long block)
 {
     // Use context number -- a very rough equivalent to block id!
 bool wxWinHelpController::DisplayBlock(long block)
 {
     // Use context number -- a very rough equivalent to block id!

-    if (!m_helpFile) return FALSE;
+    if (m_helpFile == "") return FALSE;

 
     char buf[_MAXPATHLEN];
     strcpy(buf, m_helpFile);
 
     char buf[_MAXPATHLEN];
     strcpy(buf, m_helpFile);


@@ -145,4 +145,4 @@ void wxWinHelpController::OnQuit(void)
 {
 }
 
 {
 }
 

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