Include wx/dc.h according to precompiled headers of wx/wx.h (with other minor cleaning).

[wxWidgets.git] / src / common / cshelp.cpp

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 7e4d11a93bec3bc56a95fb4f4b292bd0b6b1c4a3..82f3383652a62e70bbb41441248757007d6fe52c 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -27,10 +27,10 @@
 #if wxUSE_HELP
 
 #ifndef WX_PRECOMP
 #if wxUSE_HELP
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

 #endif
 
 #include "wx/tipwin.h"
 #endif
 
 #include "wx/tipwin.h"

-#include "wx/app.h"

 #include "wx/module.h"
 #include "wx/cshelp.h"
 
 #include "wx/module.h"
 #include "wx/cshelp.h"
 


@@ -334,7 +334,7 @@ wxHelpProvider::~wxHelpProvider()
 
 wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
 {
 
 wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
 {

-    wxLongToStringHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window));
+    wxSimpleHelpProviderHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window));

 
     if ( it == m_hashWindows.end() )
     {
 
     if ( it == m_hashWindows.end() )
     {


@@ -354,7 +354,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 {

-    wxLongToStringHashMap::key_type key = (wxLongToStringHashMap::key_type)id;
+    wxSimpleHelpProviderHashMap::key_type key = (wxSimpleHelpProviderHashMap::key_type)id;

     m_hashIds.erase(key);
     m_hashIds[key] = text;
 }
     m_hashIds.erase(key);
     m_hashIds[key] = text;
 }