GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 9622355ff6aa3a2aa4d007e428cf535b4d6e2903..9fceec27544169ec24982a37715d504b72a5228f 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,13 +1,30 @@
-#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"
+#if wxUSE_HELP
+
+#include "wx/helpbase.h"
+
+#ifdef __WXMSW__
+    #include "wx/msw/helpwin.h"
+
+    #define wxHelpController wxWinHelpController
+    #define sm_classwxHelpController sm_classwxWinHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController
+    #define sm_classwxHelpController sm_classwxHtmlHelpController

 #else
 #else

-#include "wx/generic/helpxlp.h"
+    #include "wx/generic/helpext.h"
+    #define wxHelpController wxExtHelpController
+    #define sm_classwxHelpController sm_classwxExtHelpController

 #endif
 
 #endif
 

+#endif // MSW/!MSW
+
+#endif // wxUSE_HELP
+

 #endif
 #endif

-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_