partially reverted Robert's changes, did it more cleanly

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 8b6a9c1ddbc529bf42f90620b77488d71723261d..8fd7026427507f80744164a09b01b7b5e9d043a4 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -5,21 +5,22 @@
 
 #include "wx/helpbase.h"
 
 
 #include "wx/helpbase.h"
 

-#ifdef __WXMSW__
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
+
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXMSW__)

     #include "wx/msw/helpwin.h"
 
     #define wxHelpController wxWinHelpController
     #include "wx/msw/helpwin.h"
 
     #define wxHelpController wxWinHelpController

-    #define sm_classwxHelpController sm_classwxWinHelpController

 #else // !MSW
 
 #if wxUSE_WXHTML_HELP
 #else // !MSW
 
 #if wxUSE_WXHTML_HELP

-    #include "wx/generic/helpwxht.h"
-    #define wxHelpController wxHelpControllerHtml
-    #define sm_classwxHelpController sm_classwxHelpControllerHtml
+    #include "wx/html/helpctrl.h"
+    #define wxHelpController wxHtmlHelpController

 #else
     #include "wx/generic/helpext.h"
     #define wxHelpController wxExtHelpController
 #else
     #include "wx/generic/helpext.h"
     #define wxHelpController wxExtHelpController

-    #define sm_classwxHelpController sm_classwxExtHelpController

 #endif
 
 #endif // MSW/!MSW
 #endif
 
 #endif // MSW/!MSW