Various VC++ 1.5 and other corrections

[wxWidgets.git] / include / wx / help.h

diff --git a/include/wx/help.h b/include/wx/help.h
index f1ba186db5c35bc81eddb3c19d03a48da9e0ab08..98f7cee571d1bfbddebe130a9063073864539e5a 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,24 +1,16 @@
-#ifndef __HELPH_BASE__
-#define __HELPH_BASE__
+#ifndef _WX_HELP_H_BASE_
+#define _WX_HELP_H_BASE_

 
 

-#ifdef __WINDOWS__
-#include "wx/msw/helpwin.h"
-#elif defined(__GTK__)
-#include "wx/generic/helphtml.h"
-#else
-#include "wx/generic/helpxlp.h"
-#endif
+#include "wx/helpbase.h"

 
 

-#ifdef __WINDOWS__
-#define wxHelpController wxWinHelpController
-#define classwxHelpController classwxWinHelpController
-#elif defined(__GTK__)
-#define wxHelpController wxHTMLHelpController
-#define classwxHelpController classwxHTMLHelpController
-#else
-#define wxHelpController wxXLPHelpController
-#define classwxHelpController classwxXLPHelpController
-#endif
+#ifdef __WXMSW__
+    #include "wx/msw/helpwin.h"
+
+    #define wxHelpController wxWinHelpController
+    #define sm_classwxHelpController sm_classwxWinHelpController
+#else // !MSW
+    #include "wx/helpbase.h"
+#endif // MSW/!MSW

 
 #endif
 
 #endif

-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_