return name and extension by const ref, not by value, to prevent bugs as the one...

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 9fceec27544169ec24982a37715d504b72a5228f..5ea82acabd216a8ea53671e54540a671e9909032 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -5,21 +5,26 @@
 
 #include "wx/helpbase.h"
 
-#ifdef __WXMSW__
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
+
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/help.h"
+
+    #define wxHelpController wxPalmHelpController
+#elif defined(__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
     #include "wx/generic/helpext.h"
     #define wxHelpController wxExtHelpController
-    #define sm_classwxHelpController sm_classwxExtHelpController
 #endif
 
 #endif // MSW/!MSW