reverted last (accidental) change

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

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 31af18593eccb88fb6c91207a4619f393198d0d6..7e4d11a93bec3bc56a95fb4f4b292bd0b6b1c4a3 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "cshelp.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -254,6 +250,8 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
  * to put the application into context help mode.
  */
 
  * to put the application into context help mode.
  */
 

+#ifndef __WXPM__
+

 static const char * csquery_xpm[] = {
 "12 11 2 1",
 "  c None",
 static const char * csquery_xpm[] = {
 "12 11 2 1",
 "  c None",


@@ -270,6 +268,8 @@ static const char * csquery_xpm[] = {
 "     ..     ",
 "            "};
 
 "     ..     ",
 "            "};
 

+#endif
+

 IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
 
 BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
 IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
 
 BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)


@@ -330,9 +330,11 @@ wxHelpProvider::~wxHelpProvider()
 // wxSimpleHelpProvider
 // ----------------------------------------------------------------------------
 
 // wxSimpleHelpProvider
 // ----------------------------------------------------------------------------
 

+#define WINHASH_KEY(w) wxPtrToUInt(w)
+

 wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
 {
 wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
 {

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

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


@@ -346,8 +348,8 @@ wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
 
 void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
 {
 
 void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
 {

-    m_hashWindows.erase((long)window);
-    m_hashWindows[(long)window] = text;
+    m_hashWindows.erase(WINHASH_KEY(window));
+    m_hashWindows[WINHASH_KEY(window)] = text;

 }
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 }
 
 void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)


@@ -360,7 +362,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 // removes the association
 void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window)
 {
 // removes the association
 void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window)
 {

-    m_hashWindows.erase((long)window);
+    m_hashWindows.erase(WINHASH_KEY(window));

 }
 
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 }
 
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)