made the log dialog resizeable (again?)

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 36c6b04e41f50aa29d3d994c0083fe130da10bf3..8b6a9c1ddbc529bf42f90620b77488d71723261d 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,24 +1,30 @@
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 

-#ifdef __WXMSW__
-#include "wx/msw/helpwin.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/helphtml.h"
-#else
-#include "wx/generic/helpxlp.h"
-#endif
+#if wxUSE_HELP
+
+#include "wx/helpbase.h"

 
 #ifdef __WXMSW__
 
 #ifdef __WXMSW__

-#define wxHelpController wxWinHelpController
-#define sm_classwxHelpController sm_classwxWinHelpController
-#elif defined(__WXGTK__)
-#define wxHelpController wxHTMLHelpController
-#define sm_classwxHelpController sm_classwxHTMLHelpController
+    #include "wx/msw/helpwin.h"
+
+    #define wxHelpController wxWinHelpController
+    #define sm_classwxHelpController sm_classwxWinHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+    #include "wx/generic/helpwxht.h"
+    #define wxHelpController wxHelpControllerHtml
+    #define sm_classwxHelpController sm_classwxHelpControllerHtml

 #else
 #else

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

 #endif
 
 #endif
 

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

 #endif
     // _WX_HELP_H_BASE_
 #endif
     // _WX_HELP_H_BASE_