fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/help.h b/include/wx/help.h
index 8b6a9c1ddbc529bf42f90620b77488d71723261d..5dbb79b3085ffc84c3cb17eb2a00f213819e3f9b 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,25 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/help.h
+// Purpose:     wxHelpController base header
+// Author:      wxWidgets Team
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_HELP_H_BASE_
 #define _WX_HELP_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_HELP
 
 #include "wx/helpbase.h"
 
-#ifdef __WXMSW__
-    #include "wx/msw/helpwin.h"
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/helpwce.h"
+
+    #define wxHelpController wxWinceHelpController
+#elif defined(__WXMSW__)
+    #include "wx/msw/helpchm.h"
 
-    #define wxHelpController wxWinHelpController
-    #define sm_classwxHelpController sm_classwxWinHelpController
+    #define wxHelpController wxCHMHelpController
 #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
-    #define sm_classwxHelpController sm_classwxExtHelpController
 #endif
 
 #endif // MSW/!MSW