X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69108ccb4e8de4279ffa0fdd4e23ea3666f84e92..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/helpext.cpp?ds=sidebyside diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index d8649e494f..39ec7e094a 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) # pragma implementation "wxexthlp.h" #endif @@ -19,7 +19,7 @@ #pragma hdrstop #endif -#if wxUSE_HELP +#if wxUSE_HELP && !defined(__WXWINCE__) #ifndef WX_PRECOMP #include "wx/setup.h" @@ -27,6 +27,9 @@ #include "wx/utils.h" #include "wx/list.h" #include "wx/intl.h" + #include "wx/msgdlg.h" + #include "wx/choicdlg.h" + #include "wx/log.h" #endif #include "wx/helpbase.h" @@ -119,9 +122,8 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL) wxLogSysError(_("Cannot open URL '%s'"), relativeURL.c_str()); return false; } - else - return true; + return true; #elif defined(__WXPM__) wxString url; @@ -196,11 +198,11 @@ void wxExtHelpController::DeleteList() { if(m_MapList) { - wxNode *node = m_MapList->GetFirst(); + wxList::compatibility_iterator node = m_MapList->GetFirst(); while (node) { delete (wxExtHelpMapEntry *)node->GetData(); - delete node; + m_MapList->Erase(node); node = m_MapList->GetFirst(); } delete m_MapList; @@ -326,7 +328,7 @@ wxExtHelpController::DisplayContents() return FALSE; wxString contents; - wxNode *node = m_MapList->GetFirst(); + wxList::compatibility_iterator node = m_MapList->GetFirst(); wxExtHelpMapEntry *entry; while(node) { @@ -358,7 +360,7 @@ wxExtHelpController::DisplaySection(int sectionNo) return FALSE; wxBusyCursor b; // display a busy cursor - wxNode *node = m_MapList->GetFirst(); + wxList::compatibility_iterator node = m_MapList->GetFirst(); wxExtHelpMapEntry *entry; while(node) { @@ -399,7 +401,7 @@ wxExtHelpController::KeywordSearch(const wxString& k) int idx = 0, j; bool rc; bool showAll = k.IsEmpty(); - wxNode *node = m_MapList->GetFirst(); + wxList::compatibility_iterator node = m_MapList->GetFirst(); wxExtHelpMapEntry *entry; {