From e564aa153eb1dc5ebd9f8c9f5f055c2a49c15b05 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 22 Mar 2002 22:29:20 +0000 Subject: [PATCH] Removed helpwxht.h/cpp (old wxHelpControllerHtml class) and updated makefiles accordingly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 5 +- distrib/msw/tmake/filelist.txt | 2 - distrib/msw/tmake/makeall.bat | 6 +- include/wx/generic/helpwxht.h | 75 -------- samples/help/demo.cpp | 46 ----- src/generic/helpwxht.cpp | 327 --------------------------------- src/gtk/files.lst | 4 - src/gtk1/files.lst | 4 - src/mac/carbon/files.lst | 3 - src/mac/files.lst | 3 - src/mgl/files.lst | 3 - src/microwin/files.lst | 3 - src/motif/files.lst | 3 - src/msw/files.lst | 1 - src/msw/makebase.vc | 14 +- src/msw/makefile.vc | 1 - src/msw/makefile.wat | 1 - src/os2/files.lst | 16 +- src/wxUniv.dsp | 8 - src/wxWindows.dsp | 4 - src/x11/files.lst | 3 - 21 files changed, 25 insertions(+), 507 deletions(-) delete mode 100644 include/wx/generic/helpwxht.h delete mode 100644 src/generic/helpwxht.cpp diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index a8b6d50771..82506b59a0 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -33,10 +33,7 @@ distrib/gtk/* locale/*.po locale/*.mo -art/browser/*.xpm -art/framicon/*.xpm -art/toolbar/*.xpm -art/wxhtml/*.xpm +art/*.xpm docs/readme.txt docs/readme_vms.txt diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index b336c084b4..9b5f0fcf79 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -86,7 +86,6 @@ gridctrl.cpp Generic gridsel.cpp Generic helpext.cpp Generic Generic helphtml.cpp Generic Generic -helpwxht.cpp Generic Generic imaglist.cpp Generic NotWin32 laywin.cpp Generic listctrl.cpp Generic NotWin32 @@ -1464,7 +1463,6 @@ grid.h GenericH gridctrl.h GenericH gridg.h GenericH helpext.h GenericH -helpwxht.h GenericH helphtml.h GenericH imaglist.h GenericH laywin.h GenericH diff --git a/distrib/msw/tmake/makeall.bat b/distrib/msw/tmake/makeall.bat index c761ef7ec9..555802b9be 100755 --- a/distrib/msw/tmake/makeall.bat +++ b/distrib/msw/tmake/makeall.bat @@ -12,7 +12,9 @@ rem the root directory of wxWindows installation. TMAKE program should be in rem path or, alternatively, TMAKE environment variable should be set. rem set tmakecmd=E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -set tmakecmd=d:\programs\tmake\bin\tmake +Rem set tmakecmd=d:\programs\tmake\bin\tmake +Rem Let's assume that you have tmake in your PATH +set tmakecmd=tmake if "x%WX%" == "x" goto skip set WXDIR=%WX% @@ -63,7 +65,7 @@ echo Generating for Watcom C++... echo Generating for Unix and Configure... %tmakecmd% -t gtk wxwin.pro -o %WXDIR%\src\gtk\files.lst %tmakecmd% -t mgl wxwin.pro -o %WXDIR%\src\mgl\files.lst -%tmakecmd% -t micro wxwin.pro -o %WXDIR%\src\micro\files.lst +%tmakecmd% -t micro wxwin.pro -o %WXDIR%\src\microwin\files.lst %tmakecmd% -t univ wxwin.pro -o %WXDIR%\src\univ\files.lst %tmakecmd% -t msw wxwin.pro -o %WXDIR%\src\msw\files.lst %tmakecmd% -t mac wxwin.pro -o %WXDIR%\src\mac\files.lst diff --git a/include/wx/generic/helpwxht.h b/include/wx/generic/helpwxht.h deleted file mode 100644 index 62d3da59aa..0000000000 --- a/include/wx/generic/helpwxht.h +++ /dev/null @@ -1,75 +0,0 @@ -/*-*- c++ -*-******************************************************** - * helpwxht.h - a help controller using wxHTML * - * * - * (C) 1999 by Karsten Ballüder (Ballueder@usa.net) * - * * - * $Id$ - *******************************************************************/ - -#ifndef _WX_HELPWXHT_H_ -#define _WX_HELPWXHT_H_ - -#if wxUSE_HELP -#if wxUSE_HTML - -#ifdef __GNUG__ -# pragma interface "helpwxht.h" -#endif - -#include "wx/generic/helphtml.h" - - -/** - This class implements help via wxHTML. - It requires the name of a directory containing the documentation - and a file mapping numerical Section numbers to relative URLS. - - The map file contains two or three fields per line: - numeric_id relative_URL [; comment/documentation] - - The numeric_id is the id used to look up the entry in - DisplaySection()/DisplayBlock(). The relative_URL is a filename of - an html file, relative to the help directory. The optional - comment/documentation field (after a ';') is used for keyword - searches, so some meaningful text here does not hurt. - If the documentation itself contains a ';', only the part before - that will be displayed in the listbox, but all of it used for search. - - Lines starting with ';' will be ignored. -*/ - -class WXDLLEXPORT wxHelpControllerHtml : public wxHTMLHelpControllerBase -{ -DECLARE_CLASS(wxHelpControllerHtml) - public: - wxHelpControllerHtml(void); - ~wxHelpControllerHtml(void); - - /// Allows one to override the default settings for the help frame. - virtual void SetFrameParameters(const wxString &title, - const wxSize &size, - const wxPoint &pos = wxDefaultPosition, - bool newFrameEachTime = FALSE); - /// Obtains the latest settings used by the help frame. - virtual wxFrame * GetFrameParameters(wxSize *size = NULL, - wxPoint *pos = NULL, - bool *newFrameEachTime = NULL); - - -private: - /// Call the browser using a relative URL. - virtual bool DisplayHelp(const wxString &); -protected: - friend class wxHelpFrame; - class wxHelpFrame *m_Frame; - wxString m_FrameTitle; - wxPoint m_FramePosition; - wxSize m_FrameSize; - bool m_NewFrameEachTime; - size_t m_offset; -}; - -#endif // wxUSE_HELP -#endif // wxUSE_HTML - -#endif // _WX_HELPWXHT_H_ diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index 13a2fc414b..f88a1650bc 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -44,9 +44,6 @@ #define USE_HTML_HELP 1 -// Use old-style HTML help if 1 -#define USE_OLD_HTML_HELP 0 - #if !wxUSE_HTML #undef USE_HTML_HELP #define USE_HTML_HELP 0 @@ -56,10 +53,6 @@ #include "wx/filesys.h" #include "wx/fs_zip.h" -#if USE_OLD_HTML_HELP -#include "wx/generic/helpwxht.h" -#endif - #include "wx/html/helpctrl.h" #endif @@ -109,9 +102,6 @@ public: wxHelpController& GetHelpController() { return m_help; } #if USE_HTML_HELP -#if USE_OLD_HTML_HELP - wxHelpControllerHtml& GetHtmlHelpController() { return m_htmlHelp; } -#endif wxHtmlHelpController& GetAdvancedHtmlHelpController() { return m_advancedHtmlHelp; } #endif #if wxUSE_MS_HTML_HELP @@ -124,7 +114,6 @@ public: // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnHelp(wxCommandEvent& event); - void OnHtmlHelp(wxCommandEvent& event); void OnAdvancedHtmlHelp(wxCommandEvent& event); void OnMSHtmlHelp(wxCommandEvent& event); void OnBestHelp(wxCommandEvent& event); @@ -138,9 +127,6 @@ private: wxHelpController m_help; #if USE_HTML_HELP -#if USE_OLD_HTML_HELP - wxHelpControllerHtml m_htmlHelp; -#endif wxHtmlHelpController m_advancedHtmlHelp; #endif @@ -232,12 +218,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(HelpDemo_Help_ContextHelp, MyFrame::OnShowContextHelp) EVT_MENU(HelpDemo_Help_DialogContextHelp, MyFrame::OnShowDialogContextHelp) - EVT_MENU(HelpDemo_Html_Help_Index, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Classes, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Functions, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Help, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Search, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Advanced_Html_Help_Index, MyFrame::OnAdvancedHtmlHelp) EVT_MENU(HelpDemo_Advanced_Html_Help_Classes, MyFrame::OnAdvancedHtmlHelp) EVT_MENU(HelpDemo_Advanced_Html_Help_Functions, MyFrame::OnAdvancedHtmlHelp) @@ -333,17 +313,6 @@ bool MyApp::OnInit() #endif #if USE_HTML_HELP - // initialise the standard HTML help system: this means that the HTML docs are in the - // subdirectory doc for platforms using HTML help -#if USE_OLD_HTML_HELP - if ( !frame->GetHtmlHelpController().Initialize("doc") ) - { - wxLogError(wxT("Cannot initialize the HTML help system, aborting.")); - - return FALSE; - } -#endif - // initialise the advanced HTML help system: this means that the HTML docs are in .htb // (zipped) form if ( !frame->GetAdvancedHtmlHelpController().Initialize("doc") ) @@ -398,14 +367,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->Append(HelpDemo_Help_Help, "&About Help Demo..."); menuFile->Append(HelpDemo_Help_Search, "&Search help..."); #if USE_HTML_HELP -#if USE_OLD_HTML_HELP - menuFile->AppendSeparator(); - menuFile->Append(HelpDemo_Html_Help_Index, "HTML &Help Index..."); - menuFile->Append(HelpDemo_Html_Help_Classes, "HTML &Help on Classes..."); - menuFile->Append(HelpDemo_Html_Help_Functions, "HTML &Help on Functions..."); - menuFile->Append(HelpDemo_Html_Help_Help, "HTML &About Help Demo..."); - menuFile->Append(HelpDemo_Html_Help_Search, "HTML &Search help..."); -#endif menuFile->AppendSeparator(); menuFile->Append(HelpDemo_Advanced_Html_Help_Index, "Advanced HTML &Help Index..."); menuFile->Append(HelpDemo_Advanced_Html_Help_Classes, "Advanced HTML &Help on Classes..."); @@ -490,13 +451,6 @@ void MyFrame::OnShowDialogContextHelp(wxCommandEvent& event) dialog.ShowModal(); } -void MyFrame::OnHtmlHelp(wxCommandEvent& event) -{ -#if USE_HTML_HELP && USE_OLD_HTML_HELP - ShowHelp(event.GetId(), m_htmlHelp); -#endif -} - void MyFrame::OnAdvancedHtmlHelp(wxCommandEvent& event) { #if USE_HTML_HELP diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp deleted file mode 100644 index 0ee358cc5d..0000000000 --- a/src/generic/helpwxht.cpp +++ /dev/null @@ -1,327 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: helpwxht.cpp -// Purpose: A help controller using the wxHTML classes -// Author: Karsten Ballueder -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Karsten Ballueder -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -# pragma implementation "helpwxht.h" -#endif - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -# pragma hdrstop -#endif - -#if wxUSE_WXHTML_HELP - -#ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/utils.h" - #include "wx/list.h" - #include "wx/intl.h" - #include "wx/layout.h" - #include "wx/combobox.h" - #include "wx/button.h" -#endif - -#include "wx/helpbase.h" -#include "wx/generic/helpwxht.h" -#include "wx/html/htmlwin.h" - -#include -#include -#ifndef __MWERKS__ -#include -#endif - -#if !defined(__WINDOWS__) && !defined(__OS2__) -# include -#endif - -#ifdef __WXMAC__ - #include "wx/mac/private.h" -#endif - -IMPLEMENT_CLASS(wxHelpControllerHtml, wxHTMLHelpControllerBase) - -/** - This class implements help via wxHTML. - It requires the name of a directory containing the documentation - and a file mapping numerical Section numbers to relative URLS. -*/ - -class wxForceHtmlFilter : public wxHtmlFilter -{ -public: - virtual wxString ReadFile(const wxFSFile& file) const - { - wxInputStream *s = file.GetStream(); - char *src; - wxString doc; - - if (s == NULL) return wxEmptyString; - src = new char[s -> GetSize()+1]; - src[s -> GetSize()] = 0; - s -> Read(src, s -> GetSize()); - doc = src; - delete [] src; - return doc; - } - - virtual bool CanRead(const wxFSFile& file) const - { - wxString filename = file.GetLocation(); - if(filename.Length() >= 5 && - ( - filename.Right(4).MakeUpper() == ".HTM" || - filename.Right(5).MakeUpper() == ".HTML")) - return TRUE; - else - return FALSE; - } -}; - -#define FRAME_WIDTH 500 -#define FRAME_HEIGHT 400 -#define LAYOUT_X_MARGIN 2 -#define LAYOUT_Y_MARGIN 2 -#define OFFSET 10 -#define BUTTON_WIDTH 70 -#define MAX_COMBO_ENTRIES 25 - -class wxHelpFrame : public wxFrame -{ -public: - wxHelpFrame(wxWindow *parent, int id, const wxString &title, - const wxPoint &pos, const wxSize &size, - wxHelpControllerHtml *controller); - ~wxHelpFrame(); - void OnClose(wxCloseEvent &ev); - void OnButton(wxCommandEvent &ev); - bool LoadPage(const wxString &url) { return m_htmlwin->LoadPage(url); } -private: - wxHelpControllerHtml *m_controller; - wxHtmlWindow *m_htmlwin; - wxHtmlFilter *m_filter; - wxComboBox *m_combo; - long m_IdBack, m_IdFwd, m_IdContents, m_IdCombo, m_IdSearch; - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(wxHelpFrame, wxFrame) - EVT_CLOSE(wxHelpFrame::OnClose) - EVT_BUTTON(-1, wxHelpFrame::OnButton) -END_EVENT_TABLE() - - -void -wxHelpFrame::OnButton(wxCommandEvent &ev) -{ - long id =ev.GetId(); - - if(id == m_IdBack) - m_htmlwin->HistoryBack(); - else if(id == m_IdFwd) - m_htmlwin->HistoryForward(); - else if(id == m_IdContents) - m_controller->DisplayContents(); - else if(id == m_IdSearch) - { - wxString str = m_combo->GetValue(); - if(m_combo->FindString(str) == -1 && m_combo->GetCount() < MAX_COMBO_ENTRIES) - m_combo->Append(str); - m_controller->KeywordSearch(str); - } -} - -wxHelpFrame::wxHelpFrame(wxWindow *parent, int id, - const wxString &title, - const wxPoint &pos, const wxSize &size, - wxHelpControllerHtml *controller) - : wxFrame(parent, id, title, pos, size) -{ - - m_controller = controller; - m_htmlwin = new wxHtmlWindow(this,-1,wxDefaultPosition,wxSize(FRAME_WIDTH, - FRAME_HEIGHT)); - - m_IdBack = wxWindow::NewControlId(); - m_IdFwd = wxWindow::NewControlId(); - m_IdContents = wxWindow::NewControlId(); - m_IdCombo = wxWindow::NewControlId(); - m_IdSearch = wxWindow::NewControlId(); - - wxButton *btn_back = new wxButton(this, m_IdBack, _("Back")); - wxButton *btn_fwd = new wxButton(this, m_IdFwd, _("Forward")); - wxButton *btn_contents = new wxButton(this, m_IdContents, _("Contents")); - m_combo = new wxComboBox(this, m_IdCombo); - wxButton *btn_search = new wxButton(this, m_IdSearch, _("Search")); - - m_filter = new wxForceHtmlFilter; - - wxLayoutConstraints *c; - - c = new wxLayoutConstraints; - c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); - c->width.Absolute(BUTTON_WIDTH); - c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); - c->height.AsIs(); - btn_back->SetConstraints(c); - - c = new wxLayoutConstraints; - c->left.SameAs(btn_back, wxRight, 2*LAYOUT_X_MARGIN); - c->width.Absolute(BUTTON_WIDTH); - c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); - c->height.AsIs(); - btn_fwd->SetConstraints(c); - - c = new wxLayoutConstraints; - c->left.SameAs(btn_fwd, wxRight, 2*LAYOUT_X_MARGIN); - c->width.Absolute(BUTTON_WIDTH); - c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); - c->height.AsIs(); - btn_contents->SetConstraints(c); - - c = new wxLayoutConstraints; - c->left.SameAs(btn_contents, wxRight, 2*LAYOUT_X_MARGIN); - c->width.Absolute(3*BUTTON_WIDTH); - c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); - c->height.AsIs(); - m_combo->SetConstraints(c); - - c = new wxLayoutConstraints; - c->left.SameAs(m_combo, wxRight, 2*LAYOUT_X_MARGIN); - c->width.Absolute(BUTTON_WIDTH); - c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN); - c->height.AsIs(); - btn_search->SetConstraints(c); - - - c = new wxLayoutConstraints; - c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); - c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN); - c->top.SameAs(btn_back, wxBottom, 2*LAYOUT_Y_MARGIN); - c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN); - m_htmlwin->SetConstraints(c); - SetAutoLayout(TRUE); - CreateStatusBar(); - - m_htmlwin->SetRelatedFrame(this, title); - m_htmlwin->SetRelatedStatusBar(0); - m_htmlwin->AddFilter(m_filter); - -#ifdef __WXMOTIF__ - // Motif needs a nudge to get it to resize properly - // when shown - wxSizeEvent event(size, GetId()); - GetEventHandler()->ProcessEvent(event); -#endif - - Show(TRUE); -} - -wxHelpFrame::~wxHelpFrame() -{ -} - -void -wxHelpFrame::OnClose(wxCloseEvent &WXUNUSED(ev)) -{ - wxASSERT(m_controller); - m_controller->m_Frame = NULL; - bool newFrame; - int x,y; - GetPosition(&x,&y); - - m_controller->GetFrameParameters(NULL, NULL, &newFrame); - m_controller->SetFrameParameters(GetTitle(), GetSize(), - wxPoint(x,y), - newFrame); - Destroy(); -} - -wxHelpControllerHtml::wxHelpControllerHtml(void) -{ - m_Frame = NULL; - m_offset = 0; - - SetFrameParameters(_("Help: %s"), - wxSize(FRAME_WIDTH, FRAME_HEIGHT), - wxDefaultPosition); -} - -wxHelpControllerHtml::~wxHelpControllerHtml(void) -{ - if(m_Frame && ! m_NewFrameEachTime) - m_Frame->Close(); -} - - -#ifdef __WXMSW__ -# define SEP '\\' -#else -# define SEP '/' -#endif - -bool -wxHelpControllerHtml::DisplayHelp(const wxString &relativeURL) -{ - wxBusyCursor b; // display a busy cursor - - wxString url; - wxString mapfileurl = m_MapFile ; -#if defined(__WXMAC__) && !defined(__DARWIN__) - mapfileurl = wxMac2UnixFilename(m_MapFile) ; -#endif - url << mapfileurl << SEP<< relativeURL; - if(! m_Frame || m_NewFrameEachTime) - { - m_Frame = new wxHelpFrame(NULL, -1, m_FrameTitle, - m_FramePosition+wxPoint(m_offset,m_offset), - m_FrameSize, - this); - if(m_NewFrameEachTime) - { - m_offset += OFFSET; - if(m_offset > 200) - m_offset = 0; - } - - } - m_Frame->Raise(); - return m_Frame->LoadPage(url); -} - - -void -wxHelpControllerHtml::SetFrameParameters(const wxString &title, - const wxSize &size, - const wxPoint &pos, - bool newFrame) -{ - m_FrameTitle = title; - m_FrameSize = size; - m_FramePosition = pos; - m_NewFrameEachTime = newFrame; -} - -wxFrame * -wxHelpControllerHtml::GetFrameParameters(wxSize *size, - wxPoint *pos, - bool *newframe) -{ - if(size) *size = m_FrameSize; - if(pos) *pos = m_FramePosition; - if(newframe) *newframe = m_NewFrameEachTime; - return m_Frame; -} - -#endif // wxUSE_WXHTML_HELP - diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 6431a7cc7b..7a19cc618d 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -20,7 +20,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -580,7 +579,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -772,7 +770,6 @@ GUIOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ @@ -884,7 +881,6 @@ GUI_LOWLEVEL_OBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 6431a7cc7b..7a19cc618d 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -20,7 +20,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -580,7 +579,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -772,7 +770,6 @@ GUIOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ @@ -884,7 +881,6 @@ GUI_LOWLEVEL_OBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst index 5389101eda..bf5ba746c0 100644 --- a/src/mac/carbon/files.lst +++ b/src/mac/carbon/files.lst @@ -18,7 +18,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -607,7 +606,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -797,7 +795,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/mac/files.lst b/src/mac/files.lst index 5389101eda..bf5ba746c0 100644 --- a/src/mac/files.lst +++ b/src/mac/files.lst @@ -18,7 +18,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -607,7 +606,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -797,7 +795,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/mgl/files.lst b/src/mgl/files.lst index 8ed996e5d8..63dcae44fb 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -20,7 +20,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -480,7 +479,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -674,7 +672,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/microwin/files.lst b/src/microwin/files.lst index 77f08e251b..016627c6e9 100644 --- a/src/microwin/files.lst +++ b/src/microwin/files.lst @@ -19,7 +19,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -574,7 +573,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -766,7 +764,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 46d61faa3a..8664bf6791 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -18,7 +18,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -568,7 +567,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -758,7 +756,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/msw/files.lst b/src/msw/files.lst index 2048f454a6..fcd6a7f740 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -641,7 +641,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc index 557c57ab7e..9339fdb0ac 100644 --- a/src/msw/makebase.vc +++ b/src/msw/makebase.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 10:56, 2001/11/03 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T! # File: makebase.vc @@ -61,6 +61,7 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $< COMMONOBJS = \ ..\common\$D\y_tab.obj \ ..\common\$D\appcmn.obj \ + ..\common\$D\clntdata.obj \ ..\common\$D\cmdline.obj \ ..\common\$D\config.obj \ ..\common\$D\datetime.obj \ @@ -70,6 +71,7 @@ COMMONOBJS = \ ..\common\$D\dircmn.obj \ ..\common\$D\dynarray.obj \ ..\common\$D\dynlib.obj \ + ..\common\$D\dynload.obj \ ..\common\$D\encconv.obj \ ..\common\$D\event.obj \ ..\common\$D\extended.obj \ @@ -85,6 +87,7 @@ COMMONOBJS = \ ..\common\$D\fs_zip.obj \ ..\common\$D\ftp.obj \ ..\common\$D\hash.obj \ + ..\common\$D\hashmap.obj \ ..\common\$D\http.obj \ ..\common\$D\intl.obj \ ..\common\$D\ipcbase.obj \ @@ -96,7 +99,6 @@ COMMONOBJS = \ ..\common\$D\module.obj \ ..\common\$D\mstream.obj \ ..\common\$D\object.obj \ - ..\common\$D\objstrm.obj \ ..\common\$D\process.obj \ ..\common\$D\protocol.obj \ ..\common\$D\regex.obj \ @@ -104,12 +106,12 @@ COMMONOBJS = \ ..\common\$D\sckfile.obj \ ..\common\$D\sckipc.obj \ ..\common\$D\sckstrm.obj \ - ..\common\$D\serbase.obj \ ..\common\$D\socket.obj \ ..\common\$D\strconv.obj \ ..\common\$D\stream.obj \ ..\common\$D\string.obj \ ..\common\$D\sysopt.obj \ + ..\common\$D\textbuf.obj \ ..\common\$D\textfile.obj \ ..\common\$D\timercmn.obj \ ..\common\$D\tokenzr.obj \ @@ -135,7 +137,8 @@ MSWOBJS = ..\msw\$D\dde.obj \ ..\msw\$D\snglinst.obj \ ..\msw\$D\thread.obj \ ..\msw\$D\utils.obj \ - ..\msw\$D\utilsexc.obj + ..\msw\$D\utilsexc.obj \ + ..\msw\$D\volume.obj OBJECTS = $(COMMONOBJS) $(MSWOBJS) @@ -146,7 +149,6 @@ SETUP_H=$(ARCHINCDIR)\wx\setup.h #all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET) all: dirs $(SETUP_H) $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib $(LIBTARGET) - $(WXDIR)\include\wx\msw\setup.h: cd $(WXDIR)\include\wx\msw if not exist setup.h copy setup0.h setup.h @@ -191,7 +193,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ ..\common\lex_yy.c: ..\common\doslex.c copy "..\common"\doslex.c "..\common"\lex_yy.c -$(OBJECTS): $(SETUP_H) +$(OBJECTS): $(WXDIR)/include/wx/setup.h ..\common\$D\unzip.obj: ..\common\unzip.c cl @<< diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index dfc6f4a7f9..3a9008760a 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -127,7 +127,6 @@ NONESSENTIALOBJS= $(GENDIR)\$D\colrdlgg.obj \ $(GENDIR)\$D\fontdlgg.obj \ $(GENDIR)\$D\helpext.obj \ $(GENDIR)\$D\helphtml.obj \ - $(GENDIR)\$D\helpwxht.obj \ $(GENDIR)\$D\imaglist.obj \ $(GENDIR)\$D\listctrl.obj \ $(GENDIR)\$D\msgdlgg.obj \ diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index b1e4adf460..42f7bfeb8b 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -84,7 +84,6 @@ NONESSENTIALOBJS= accel.obj & fontdlgg.obj & helpext.obj & helphtml.obj & - helpwxht.obj & imaglist.obj & listctrl.obj & msgdlgg.obj & diff --git a/src/os2/files.lst b/src/os2/files.lst index f33d70e0b3..2310bdf97b 100644 --- a/src/os2/files.lst +++ b/src/os2/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 22:26, 2002/01/29 +# This file was automatically generated by tmake # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -6,6 +6,7 @@ ALL_SOURCES = \ generic/caret.cpp \ generic/choicdgg.cpp \ generic/colrdlgg.cpp \ + generic/dcbuffer.cpp \ generic/dcpsg.cpp \ generic/dirctrlg.cpp \ generic/fdrepdlg.cpp \ @@ -14,7 +15,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -42,6 +42,8 @@ ALL_SOURCES = \ generic/treelay.cpp \ generic/wizard.cpp \ common/appcmn.cpp \ + common/artprov.cpp \ + common/artstd.cpp \ common/choiccmn.cpp \ common/clipcmn.cpp \ common/clntdata.cpp \ @@ -269,6 +271,7 @@ ALL_HEADERS = \ accel.h \ app.h \ arrimpl.cpp \ + artprov.h \ bitmap.h \ bmpbuttn.h \ brush.h \ @@ -307,6 +310,7 @@ ALL_HEADERS = \ dbkeyg.h \ dbtable.h \ dc.h \ + dcbuffer.h \ dcclient.h \ dcmemory.h \ dcprint.h \ @@ -331,6 +335,7 @@ ALL_HEADERS = \ event.h \ expr.h \ fdrepdlg.h \ + features.h \ ffile.h \ file.h \ fileconf.h \ @@ -480,6 +485,7 @@ ALL_HEADERS = \ variant.h \ vector.h \ version.h \ + volume.h \ wave.h \ wfstream.h \ window.h \ @@ -585,7 +591,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -604,6 +609,7 @@ ALL_HEADERS = \ generic/statusbr.h \ generic/tabg.h \ generic/textdlgg.h \ + generic/timer.h \ generic/treectlg.h \ generic/wizard.h \ html/forcelnk.h \ @@ -627,6 +633,8 @@ ALL_HEADERS = \ COMMONOBJS = \ parser.o \ appcmn.o \ + artprov.o \ + artstd.o \ choiccmn.o \ clipcmn.o \ clntdata.o \ @@ -756,6 +764,7 @@ GENERICOBJS = \ caret.o \ choicdgg.o \ colrdlgg.o \ + dcbuffer.o \ dcpsg.o \ dirctrlg.o \ fdrepdlg.o \ @@ -764,7 +773,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index bd8ea64fd2..448d8e3775 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -673,10 +673,6 @@ SOURCE=.\generic\helphtml.cpp # End Source File # Begin Source File -SOURCE=.\generic\helpwxht.cpp -# End Source File -# Begin Source File - SOURCE=.\generic\laywin.cpp # End Source File # Begin Source File @@ -2235,10 +2231,6 @@ SOURCE=..\include\wx\generic\helphtml.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\helpwxht.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index bfadb9b130..d5552193a1 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -2884,10 +2884,6 @@ SOURCE=..\include\wx\generic\helphtml.h # End Source File # Begin Source File -SOURCE=..\include\wx\generic\helpwxht.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\generic\imaglist.h # End Source File # Begin Source File diff --git a/src/x11/files.lst b/src/x11/files.lst index cb99613800..6b316bb672 100644 --- a/src/x11/files.lst +++ b/src/x11/files.lst @@ -51,7 +51,6 @@ ALL_SOURCES = \ generic/gridsel.cpp \ generic/helpext.cpp \ generic/helphtml.cpp \ - generic/helpwxht.cpp \ generic/imaglist.cpp \ generic/laywin.cpp \ generic/listctrl.cpp \ @@ -559,7 +558,6 @@ ALL_HEADERS = \ generic/gridg.h \ generic/helpext.h \ generic/helphtml.h \ - generic/helpwxht.h \ generic/imaglist.h \ generic/laywin.h \ generic/listctrl.h \ @@ -786,7 +784,6 @@ GENERICOBJS = \ gridsel.o \ helpext.o \ helphtml.o \ - helpwxht.o \ imaglist.o \ laywin.o \ listctrl.o \ -- 2.45.2