diff --git a/Makefile.in b/Makefile.in index 1802718852..88ebdf77dc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3330,7 +3330,6 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR = \ wx/osx/fontdlg.h \ wx/osx/frame.h \ wx/osx/gauge.h \ - wx/osx/helpxxxx.h \ wx/osx/icon.h \ wx/osx/imaglist.h \ wx/osx/listbox.h \ @@ -3432,7 +3431,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ wx/osx/fontdlg.h \ wx/osx/frame.h \ wx/osx/gauge.h \ - wx/osx/helpxxxx.h \ wx/osx/icon.h \ wx/osx/imaglist.h \ wx/osx/listbox.h \ @@ -3539,7 +3537,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ wx/osx/fontdlg.h \ wx/osx/frame.h \ wx/osx/gauge.h \ - wx/osx/helpxxxx.h \ wx/osx/icon.h \ wx/osx/imaglist.h \ wx/osx/listbox.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 1018d5eba6..c13cbedee6 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2354,7 +2354,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/fontdlg.h wx/osx/frame.h wx/osx/gauge.h - wx/osx/helpxxxx.h wx/osx/icon.h wx/osx/imaglist.h wx/osx/listbox.h diff --git a/build/files b/build/files index 50b98fb473..ec7d69276f 100644 --- a/build/files +++ b/build/files @@ -1998,7 +1998,6 @@ OSX_SHARED_HDR = wx/osx/fontdlg.h wx/osx/frame.h wx/osx/gauge.h - wx/osx/helpxxxx.h wx/osx/icon.h wx/osx/imaglist.h wx/osx/listbox.h diff --git a/include/wx/osx/helpxxxx.h b/include/wx/osx/helpxxxx.h deleted file mode 100644 index f5d889570b..0000000000 --- a/include/wx/osx/helpxxxx.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/osx/helpxxxx.h -// Purpose: Help system: native implementation for your system. Replace -// XXXX with suitable name. -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPXXXX_H_ -#define _WX_HELPXXXX_H_ - -#include "wx/wx.h" - -#include "wx/helpbase.h" - -class WXDLLIMPEXP_CORE wxXXXXHelpController: public wxHelpControllerBase -{ - wxDECLARE_CLASS(wxXXXXHelpController); - - public: - wxXXXXHelpController(); - virtual ~wxXXXXHelpController(); - - // Must call this to set the filename and server name - virtual bool Initialize(const wxString& file); - - // If file is "", reloads file given in Initialize - virtual bool LoadFile(const wxString& file = ""); - virtual bool DisplayContents(); - virtual bool DisplaySection(int sectionNo); - virtual bool DisplayBlock(long blockNo); - virtual bool KeywordSearch(const wxString& k, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); - - virtual bool Quit(); - virtual void OnQuit(); - - inline wxString GetHelpFile() const { return m_helpFile; } - -protected: - wxString m_helpFile; -}; - -#endif - // _WX_HELPXXXX_H_ diff --git a/src/osx/carbon/helpxxxx.cpp b/src/osx/carbon/helpxxxx.cpp deleted file mode 100644 index 7ebb399c62..0000000000 --- a/src/osx/carbon/helpxxxx.cpp +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/helpxxxx.cpp -// Purpose: Help system: native implementation -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#include "wx/stubs/helpxxxx.h" - -#include - -wxIMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase); - -wxXXXXHelpController::wxXXXXHelpController() -{ - m_helpFile = ""; -} - -wxXXXXHelpController::~wxXXXXHelpController() -{ -} - -bool wxXXXXHelpController::Initialize(const wxString& filename) -{ - m_helpFile = filename; - // TODO any other inits - return TRUE; -} - -bool wxXXXXHelpController::LoadFile(const wxString& file) -{ - m_helpFile = file; - // TODO - return TRUE; -} - -bool wxXXXXHelpController::DisplayContents() -{ - // TODO - return FALSE; -} - -bool wxXXXXHelpController::DisplaySection(int section) -{ - // TODO - return FALSE; -} - -bool wxXXXXHelpController::DisplayBlock(long block) -{ - // TODO - return FALSE; -} - -bool wxXXXXHelpController::KeywordSearch(const wxString& k, - wxHelpSearchMode WXUNUSED(mode)) -{ - if (m_helpFile == "") return FALSE; - - // TODO - return FALSE; -} - -// Can't close the help window explicitly in WinHelp -bool wxXXXXHelpController::Quit() -{ - // TODO - return FALSE; -} - -void wxXXXXHelpController::OnQuit() -{ -} -