From 5fae57de3aac82d13204d825e2901cdd45c1adda Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 13 Apr 2005 18:52:43 +0000
Subject: [PATCH] wxBestHelpController now used as default on Windows Change
 log updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt           | 24 +++++++++++++++++-------
 docs/latex/wx/helpinst.tex |  3 ++-
 include/wx/help.h          |  5 +++--
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 48f64b8ff6..6045b4c16b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,18 +1,28 @@
--------------------------------------------------------------------
-wxWidgets 2.5 Change Log - For more verbose changes, see the manual
--------------------------------------------------------------------
+---------------------------------------------------------------
+wxWidgets Change Log - For more verbose changes, see the manual
+---------------------------------------------------------------
 
-2.6
+2.6.0
 -----
 
 All:
 
 - wxPathExists deprecated, use wxDirExists instead.
 
+All (GUI):
+
+- Fixed ~wxStatusBar and ~wxToolBar which tried to check
+  non-existent wxFrameBase RTTI, causing a crash if not in a frame.
+
 wxMSW:
 
-- fixed static box border when the label is empty
-- fixed SetBackgroundColour() to change only label background, not entire box
+- Fixed static box border when the label is empty.
+- Fixed SetBackgroundColour() to change only label background, not entire box.
+- wxHelpController is now aliased to wxBestHelpController.
+
+wxWinCE:
+
+- Fixed device origin setting and clipping region setting.
 
 2.5.5
 -----
@@ -42,7 +52,7 @@ All (GUI):
 - Added wxTE_BESTWRAP (based on patch by Mart Raudsepp).
 - wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED is now only sent once at the end of
   splitter dragging and not after each CHANGING event (Jacobo Vilella Vilahur).
-- Added wxImage::IsTransparent()
+- Added wxImage::IsTransparent().
 
 Unix:
 
diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index 974c2fbb71..c7f478064b 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -18,7 +18,8 @@ names of the form wxXXXHelpController or wxHelpControllerXXX. An
 appropriate class is aliased to the name wxHelpController for each platform, as follows:
 
 \begin{itemize}\itemsep=0pt
-\item On Windows, wxWinHelpController is used.
+\item On desktop Windows, wxBestHelpController is used (MS HTML Help or WinHelp).
+\item On Windows CE, wxWinceHelpController is used.
 \item On all other platforms, wxHtmlHelpController is used if wxHTML is
 compiled into wxWidgets; otherwise wxExtHelpController is used (for invoking an external
 browser).
diff --git a/include/wx/help.h b/include/wx/help.h
index 267a4b4d13..440ba187f5 100644
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -27,9 +27,10 @@
 
     #define wxHelpController wxPalmHelpController
 #elif defined(__WXMSW__)
-    #include "wx/msw/helpwin.h"
+    #include "wx/msw/helpbest.h"
 
-    #define wxHelpController wxWinHelpController
+    // CHM or WinHelp, whichever is available
+    #define wxHelpController wxBestHelpController
 #else // !MSW
 
 #if wxUSE_WXHTML_HELP
-- 
2.45.2