Added wxMSW wxBitmapComboBox::DoGetBestSize(), which takes bitmap size into account.

[wxWidgets.git] / include / wx / msw / helpbest.h

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index b62979af4d0dc278ae11853e66f34e32788c18b5..d5f78ffb5f23fee9ee96f01e5d3bda232f491f91 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -16,6 +16,7 @@
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/helpbase.h"
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/helpbase.h"

+#include "wx/html/helpfrm.h"        // for wxHF_DEFAULT_STYLE

 
 class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase
 {
 
 class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase
 {


@@ -119,7 +120,7 @@ protected:
     int m_style;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)
     int m_style;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)

-    DECLARE_NO_COPY_CLASS(wxBestHelpController)
+    wxDECLARE_NO_COPY_CLASS(wxBestHelpController);

 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP
 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP