New HTML help system. The old controller class has been split in
three parts; basic data, a frame and a controller. Docs will appear shortly... All Makefiles should be correctly updated. To be sure, I put an #error pragma in the old files, which will be removed in a few days. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
108
src/html/helpctrl.cpp
Normal file
108
src/html/helpctrl.cpp
Normal file
@@ -0,0 +1,108 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: helpctrl.cpp
|
||||
// Purpose: wxHtmlHelpController
|
||||
// Notes: Based on htmlhelp.cpp, implementing a monolithic
|
||||
// HTML Help controller class, by Vaclav Slavik
|
||||
// Author: Harm van der Heijden and Vaclav Slavik
|
||||
// Created:
|
||||
// RCS-ID:
|
||||
// Copyright: (c) Harm van der Heijden and Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "helpctrl.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HTML
|
||||
|
||||
#include "wx/html/helpctrl.h"
|
||||
#include "wx/wx.h"
|
||||
#include "wx/busyinfo.h"
|
||||
|
||||
BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
|
||||
EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
wxHtmlHelpController::wxHtmlHelpController()
|
||||
{
|
||||
m_helpFrame = NULL;
|
||||
m_Config = NULL;
|
||||
m_ConfigRoot = wxEmptyString;
|
||||
m_titleFormat = _("Help: %s");
|
||||
}
|
||||
|
||||
wxHtmlHelpController::~wxHtmlHelpController()
|
||||
{
|
||||
WriteCustomization(m_Config, m_ConfigRoot);
|
||||
if (m_helpFrame)
|
||||
m_helpFrame->Close();
|
||||
}
|
||||
|
||||
void wxHtmlHelpController::SetTitleFormat(const wxString& title)
|
||||
{
|
||||
m_titleFormat = title;
|
||||
if (m_helpFrame)
|
||||
m_helpFrame->SetTitleFormat(title);
|
||||
}
|
||||
|
||||
bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
|
||||
{
|
||||
wxBusyCursor cur;
|
||||
#if wxUSE_BUSYINFO
|
||||
wxBusyInfo* busy;
|
||||
wxString info;
|
||||
if (show_wait_msg) {
|
||||
info.Printf(_("Adding book %s"), book.c_str());
|
||||
busy = new wxBusyInfo(info);
|
||||
}
|
||||
#endif
|
||||
bool retval = m_helpData.AddBook(book);
|
||||
#if wxUSE_BUSYINFO
|
||||
if (show_wait_msg)
|
||||
delete busy;
|
||||
#endif
|
||||
return retval;
|
||||
}
|
||||
|
||||
void wxHtmlHelpController::CreateHelpWindow(bool show_progress)
|
||||
{
|
||||
if (m_helpFrame) {
|
||||
m_helpFrame->Raise();
|
||||
return;
|
||||
}
|
||||
m_helpFrame = new wxHtmlHelpFrame(&m_helpData);
|
||||
m_helpFrame->PushEventHandler(this);
|
||||
if (m_Config)
|
||||
m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
|
||||
m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME);
|
||||
m_helpFrame->RefreshLists(show_progress);
|
||||
m_helpFrame->SetTitleFormat(m_titleFormat);
|
||||
m_helpFrame->Show(TRUE);
|
||||
}
|
||||
|
||||
void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
|
||||
{
|
||||
/* should not be called by the user; call UseConfig, and the controller
|
||||
* will do the rest */
|
||||
if (m_helpFrame)
|
||||
m_helpFrame->ReadCustomization(cfg, path);
|
||||
}
|
||||
|
||||
void wxHtmlHelpController::WriteCustomization(wxConfigBase* cfg, const wxString& path)
|
||||
{
|
||||
/* typically called by the controllers OnCloseFrame handler */
|
||||
if (m_helpFrame)
|
||||
m_helpFrame->WriteCustomization(cfg, path);
|
||||
}
|
||||
|
||||
#endif
|
||||
577
src/html/helpdata.cpp
Normal file
577
src/html/helpdata.cpp
Normal file
@@ -0,0 +1,577 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: helpdata.cpp
|
||||
// Purpose: wxHtmlHelpData
|
||||
// Notes: Based on htmlhelp.cpp, implementing a monolithic
|
||||
// HTML Help controller class, by Vaclav Slavik
|
||||
// Author: Harm van der Heijden and Vaclav Slavik
|
||||
// Created:
|
||||
// RCS-ID:
|
||||
// Copyright: (c) Harm van der Heijden and Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "helpdata.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HTML
|
||||
|
||||
#ifndef WXPRECOMP
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#include "wx/html/helpdata.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "wx/wfstream.h"
|
||||
#include "wx/busyinfo.h"
|
||||
#include "wx/html/htmlparser.h"
|
||||
#include "wx/html/htmldefs.h"
|
||||
|
||||
#include "wx/arrimpl.cpp"
|
||||
WX_DEFINE_OBJARRAY(wxHtmlBookRecArray)
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// static helper functions
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
// Reads one line, stores it into buf and returns pointer to new line or NULL.
|
||||
static char* ReadLine(char *line, char *buf)
|
||||
{
|
||||
char *writeptr = buf, *readptr = line;
|
||||
|
||||
while (*readptr != 0 && *readptr != '\r' && *readptr != '\n') *(writeptr++) = *(readptr++);
|
||||
*writeptr = 0;
|
||||
while (*readptr == '\r' || *readptr == '\n') readptr++;
|
||||
if (*readptr == 0) return NULL;
|
||||
else return readptr;
|
||||
}
|
||||
|
||||
|
||||
static wxString SafeFileName(const wxString& s)
|
||||
{
|
||||
wxString res = s;
|
||||
res.Replace(":", "_", TRUE);
|
||||
res.Replace(" ", "_", TRUE);
|
||||
res.Replace("/", "_", TRUE);
|
||||
res.Replace("\\", "_", TRUE);
|
||||
res.Replace("#", "_", TRUE);
|
||||
res.Replace(".", "_", TRUE);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
static int IndexCompareFunc(const void *a, const void *b)
|
||||
{
|
||||
return strcmp(((wxHtmlContentsItem*)a) -> m_Name, ((wxHtmlContentsItem*)b) -> m_Name);
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// HP_Parser
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class HP_Parser : public wxHtmlParser
|
||||
{
|
||||
public:
|
||||
void AddText(const char* text) {}
|
||||
wxObject* GetProduct() {return NULL;}
|
||||
};
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// HP_TagHandler
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class HP_TagHandler : public wxHtmlTagHandler
|
||||
{
|
||||
private:
|
||||
wxString m_Name, m_Page;
|
||||
int m_Level;
|
||||
int m_ID;
|
||||
int m_Index;
|
||||
wxHtmlContentsItem *m_Items;
|
||||
int m_ItemsCnt;
|
||||
wxHtmlBookRecord *m_Book;
|
||||
|
||||
public:
|
||||
HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() {m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; m_Level = 0;}
|
||||
wxString GetSupportedTags() {return "UL,OBJECT,PARAM";}
|
||||
bool HandleTag(const wxHtmlTag& tag);
|
||||
void WriteOut(wxHtmlContentsItem*& array, int& size);
|
||||
void ReadIn(wxHtmlContentsItem* array, int size);
|
||||
};
|
||||
|
||||
|
||||
bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
|
||||
{
|
||||
if (tag.GetName() == "UL") {
|
||||
m_Level++;
|
||||
ParseInner(tag);
|
||||
m_Level--;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
else if (tag.GetName() == "OBJECT") {
|
||||
m_Name = m_Page = wxEmptyString;
|
||||
ParseInner(tag);
|
||||
if (m_Page != wxEmptyString) {
|
||||
if (m_ItemsCnt % HTML_REALLOC_STEP == 0)
|
||||
m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + HTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
|
||||
m_Items[m_ItemsCnt].m_Level = m_Level;
|
||||
m_Items[m_ItemsCnt].m_ID = m_ID;
|
||||
m_Items[m_ItemsCnt].m_Page = new char[m_Page.Length() + 1];
|
||||
strcpy(m_Items[m_ItemsCnt].m_Page, m_Page.c_str());
|
||||
m_Items[m_ItemsCnt].m_Name = new char [m_Name.Length() + 1];
|
||||
strcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str());
|
||||
m_Items[m_ItemsCnt].m_Book = m_Book;
|
||||
m_ItemsCnt++;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
else { // "PARAM"
|
||||
if (m_Name == wxEmptyString && tag.GetParam("NAME") == "Name") m_Name = tag.GetParam("VALUE");
|
||||
if (tag.GetParam("NAME") == "Local") m_Page = tag.GetParam("VALUE");
|
||||
if (tag.GetParam("NAME") == "ID") tag.ScanParam("VALUE", "%i", &m_ID);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void HP_TagHandler::WriteOut(wxHtmlContentsItem*& array, int& size)
|
||||
{
|
||||
array = m_Items;
|
||||
size = m_ItemsCnt;
|
||||
m_Items = NULL;
|
||||
m_ItemsCnt = 0;
|
||||
}
|
||||
|
||||
void HP_TagHandler::ReadIn(wxHtmlContentsItem* array, int size)
|
||||
{
|
||||
m_Items = array;
|
||||
m_ItemsCnt = size;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxHtmlHelpData
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject)
|
||||
|
||||
wxHtmlHelpData::wxHtmlHelpData()
|
||||
{
|
||||
m_TempPath = wxEmptyString;
|
||||
|
||||
m_Contents = NULL;
|
||||
m_ContentsCnt = 0;
|
||||
m_Index = NULL;
|
||||
m_IndexCnt = 0;
|
||||
}
|
||||
|
||||
wxHtmlHelpData::~wxHtmlHelpData()
|
||||
{
|
||||
int i;
|
||||
|
||||
m_BookRecords.Empty();
|
||||
if (m_Contents) {
|
||||
for (i = 0; i < m_ContentsCnt; i++) {
|
||||
delete[] m_Contents[i].m_Page;
|
||||
delete[] m_Contents[i].m_Name;
|
||||
}
|
||||
free(m_Contents);
|
||||
}
|
||||
if (m_Index) {
|
||||
for (i = 0; i < m_IndexCnt; i++) {
|
||||
delete[] m_Index[i].m_Page;
|
||||
delete[] m_Index[i].m_Name;
|
||||
}
|
||||
free(m_Index);
|
||||
}
|
||||
}
|
||||
|
||||
bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, const wxString& indexfile, const wxString& contentsfile)
|
||||
{
|
||||
wxFSFile *f;
|
||||
char *buf;
|
||||
int sz;
|
||||
wxString string;
|
||||
|
||||
HP_Parser parser;
|
||||
HP_TagHandler *handler = new HP_TagHandler(book);
|
||||
parser.AddTagHandler(handler);
|
||||
|
||||
f = ( contentsfile.IsEmpty() ? NULL : fsys.OpenFile(contentsfile) );
|
||||
if (f) {
|
||||
sz = f -> GetStream() -> GetSize();
|
||||
buf = new char[sz+1];
|
||||
buf[sz] = 0;
|
||||
f -> GetStream() -> Read(buf, sz);
|
||||
delete f;
|
||||
handler -> ReadIn(m_Contents, m_ContentsCnt);
|
||||
parser.Parse(buf);
|
||||
handler -> WriteOut(m_Contents, m_ContentsCnt);
|
||||
delete[] buf;
|
||||
}
|
||||
|
||||
f = ( indexfile.IsEmpty() ? NULL : fsys.OpenFile(indexfile) );
|
||||
if (f) {
|
||||
sz = f -> GetStream() -> GetSize();
|
||||
buf = new char[sz+1];
|
||||
buf[sz] = 0;
|
||||
f -> GetStream() -> Read(buf, sz);
|
||||
delete f;
|
||||
handler -> ReadIn(m_Index, m_IndexCnt);
|
||||
parser.Parse(buf);
|
||||
handler -> WriteOut(m_Index, m_IndexCnt);
|
||||
delete[] buf;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
|
||||
{
|
||||
int i, st;
|
||||
int x;
|
||||
|
||||
/* load contents : */
|
||||
|
||||
f -> Read(&x, sizeof(x));
|
||||
st = m_ContentsCnt;
|
||||
m_ContentsCnt += x;
|
||||
m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt / HTML_REALLOC_STEP + 1) * HTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
|
||||
for (i = st; i < m_ContentsCnt; i++) {
|
||||
f -> Read(&x, sizeof(x));
|
||||
m_Contents[i].m_Level = x;
|
||||
f -> Read(&x, sizeof(x));
|
||||
m_Contents[i].m_ID = x;
|
||||
f -> Read(&x, sizeof(x));
|
||||
m_Contents[i].m_Name = new char[x];
|
||||
f -> Read(m_Contents[i].m_Name, x);
|
||||
f -> Read(&x, sizeof(x));
|
||||
m_Contents[i].m_Page = new char[x];
|
||||
f -> Read(m_Contents[i].m_Page, x);
|
||||
m_Contents[i].m_Book = book;
|
||||
}
|
||||
|
||||
/* load index : */
|
||||
|
||||
f -> Read(&x, sizeof(x));
|
||||
st = m_IndexCnt;
|
||||
m_IndexCnt += x;
|
||||
m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / HTML_REALLOC_STEP + 1) * HTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
|
||||
for (i = st; i < m_IndexCnt; i++) {
|
||||
f -> Read(&x, sizeof(x));
|
||||
m_Index[i].m_Name = new char[x];
|
||||
f -> Read(m_Index[i].m_Name, x);
|
||||
f -> Read(&x, sizeof(x));
|
||||
m_Index[i].m_Page = new char[x];
|
||||
f -> Read(m_Index[i].m_Page, x);
|
||||
m_Index[i].m_Book = book;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
|
||||
{
|
||||
int i;
|
||||
int x;
|
||||
|
||||
/* save contents : */
|
||||
|
||||
x = 0;
|
||||
for (i = 0; i < m_ContentsCnt; i++) if (m_Contents[i].m_Book == book && m_Contents[i].m_Level > 0) x++;
|
||||
f -> Write(&x, sizeof(x));
|
||||
for (i = 0; i < m_ContentsCnt; i++) {
|
||||
if (m_Contents[i].m_Book != book || m_Contents[i].m_Level == 0) continue;
|
||||
x = m_Contents[i].m_Level;
|
||||
f -> Write(&x, sizeof(x));
|
||||
x = m_Contents[i].m_ID;
|
||||
f -> Write(&x, sizeof(x));
|
||||
x = strlen(m_Contents[i].m_Name) + 1;
|
||||
f -> Write(&x, sizeof(x));
|
||||
f -> Write(m_Contents[i].m_Name, x);
|
||||
x = strlen(m_Contents[i].m_Page) + 1;
|
||||
f -> Write(&x, sizeof(x));
|
||||
f -> Write(m_Contents[i].m_Page, x);
|
||||
}
|
||||
|
||||
/* save index : */
|
||||
|
||||
x = 0;
|
||||
for (i = 0; i < m_IndexCnt; i++) if (m_Index[i].m_Book == book && m_Index[i].m_Level > 0) x++;
|
||||
f -> Write(&x, sizeof(x));
|
||||
for (i = 0; i < m_IndexCnt; i++) {
|
||||
if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0) continue;
|
||||
x = strlen(m_Index[i].m_Name) + 1;
|
||||
f -> Write(&x, sizeof(x));
|
||||
f -> Write(m_Index[i].m_Name, x);
|
||||
x = strlen(m_Index[i].m_Page) + 1;
|
||||
f -> Write(&x, sizeof(x));
|
||||
f -> Write(m_Index[i].m_Page, x);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
void wxHtmlHelpData::SetTempDir(const wxString& path)
|
||||
{
|
||||
if (path == wxEmptyString) m_TempPath = path;
|
||||
else {
|
||||
if (wxIsAbsolutePath(path)) m_TempPath = path;
|
||||
else m_TempPath = wxGetCwd() + "/" + path;
|
||||
|
||||
if (m_TempPath[m_TempPath.Length() - 1] != '/')
|
||||
m_TempPath << "/";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool wxHtmlHelpData::AddBookParam(const wxString& title, const wxString& contfile,
|
||||
const wxString& indexfile, const wxString& deftopic,
|
||||
const wxString& path)
|
||||
{
|
||||
wxFileSystem fsys;
|
||||
wxFSFile *fi;
|
||||
wxHtmlBookRecord *bookr;
|
||||
wxString safetitle;
|
||||
|
||||
if (! path.IsEmpty())
|
||||
// workaround for bug in ChangePathTo(name, TRUE)
|
||||
fsys.ChangePathTo(path+"/gaga");
|
||||
|
||||
bookr = new wxHtmlBookRecord(path+'/', title, deftopic);
|
||||
|
||||
if (m_ContentsCnt % HTML_REALLOC_STEP == 0)
|
||||
m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + HTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
|
||||
m_Contents[m_ContentsCnt].m_Level = 0;
|
||||
m_Contents[m_ContentsCnt].m_ID = 0;
|
||||
m_Contents[m_ContentsCnt].m_Page = new char[deftopic.Length() + 1];
|
||||
strcpy(m_Contents[m_ContentsCnt].m_Page, deftopic.c_str());
|
||||
m_Contents[m_ContentsCnt].m_Name = new char [title.Length() + 1];
|
||||
strcpy(m_Contents[m_ContentsCnt].m_Name, title.c_str());
|
||||
m_Contents[m_ContentsCnt].m_Book = bookr;
|
||||
|
||||
// store the contents index for later
|
||||
int cont_start = m_ContentsCnt++;
|
||||
|
||||
// Try to find cached binary versions:
|
||||
safetitle = SafeFileName(title);
|
||||
fi = fsys.OpenFile(safetitle + ".cached");
|
||||
if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + ".cached");
|
||||
if ((fi == NULL) || (m_TempPath == wxEmptyString)) {
|
||||
LoadMSProject(bookr, fsys, indexfile, contfile);
|
||||
if (m_TempPath != wxEmptyString) {
|
||||
wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + ".cached");
|
||||
SaveCachedBook(bookr, outs);
|
||||
delete outs;
|
||||
}
|
||||
}
|
||||
else {
|
||||
LoadCachedBook(bookr, fi -> GetStream());
|
||||
delete fi;
|
||||
}
|
||||
|
||||
// Now store the contents range
|
||||
bookr->SetContentsRange(cont_start, m_ContentsCnt);
|
||||
|
||||
m_BookRecords.Add(bookr);
|
||||
if (m_IndexCnt > 0)
|
||||
qsort(m_Index, m_IndexCnt, sizeof(wxHtmlContentsItem), IndexCompareFunc);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
bool wxHtmlHelpData::AddBook(const wxString& book)
|
||||
{
|
||||
wxFSFile *fi;
|
||||
wxFileSystem fsys;
|
||||
wxInputStream *s;
|
||||
wxString bookFull;
|
||||
|
||||
int sz;
|
||||
char *buff, *lineptr;
|
||||
char linebuf[300];
|
||||
|
||||
wxString title = _("noname"),
|
||||
safetitle,
|
||||
start = wxEmptyString,
|
||||
contents = wxEmptyString, index = wxEmptyString;
|
||||
|
||||
if (wxIsAbsolutePath(book)) bookFull = book;
|
||||
else bookFull = wxGetCwd() + "/" + book;
|
||||
|
||||
fi = fsys.OpenFile(bookFull);
|
||||
if (fi == NULL) return FALSE;
|
||||
fsys.ChangePathTo(bookFull);
|
||||
s = fi -> GetStream();
|
||||
sz = s -> GetSize();
|
||||
buff = new char[sz+1];
|
||||
buff[sz] = 0;
|
||||
s -> Read(buff, sz);
|
||||
lineptr = buff;
|
||||
delete fi;
|
||||
|
||||
while ((lineptr = ReadLine(lineptr, linebuf)) != NULL) {
|
||||
if (strstr(linebuf, "Title=") == linebuf)
|
||||
title = linebuf + strlen("Title=");
|
||||
if (strstr(linebuf, "Default topic=") == linebuf)
|
||||
start = linebuf + strlen("Default topic=");
|
||||
if (strstr(linebuf, "Index file=") == linebuf)
|
||||
index = linebuf + strlen("Index file=");
|
||||
if (strstr(linebuf, "Contents file=") == linebuf)
|
||||
contents = linebuf + strlen("Contents file=");
|
||||
}
|
||||
delete[] buff;
|
||||
|
||||
return AddBookParam(title, contents, index, start, fsys.GetPath());
|
||||
}
|
||||
|
||||
wxString wxHtmlHelpData::FindPageByName(const wxString& x)
|
||||
{
|
||||
int cnt;
|
||||
int i;
|
||||
wxFileSystem fsys;
|
||||
wxFSFile *f;
|
||||
wxString url(wxEmptyString);
|
||||
|
||||
/* 1. try to open given file: */
|
||||
|
||||
cnt = m_BookRecords.GetCount();
|
||||
for (i = 0; i < cnt; i++) {
|
||||
f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x);
|
||||
if (f) {
|
||||
url = m_BookRecords[i].GetBasePath() + x;
|
||||
delete f;
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* 2. try to find a book: */
|
||||
|
||||
for (i = 0; i < cnt; i++) {
|
||||
if (m_BookRecords[i].GetTitle() == x) {
|
||||
url = m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart();
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
/* 3. try to find in contents: */
|
||||
|
||||
cnt = m_ContentsCnt;
|
||||
for (i = 0; i < cnt; i++) {
|
||||
if (strcmp(m_Contents[i].m_Name, x) == 0) {
|
||||
url = m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page;
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* 4. try to find in index: */
|
||||
|
||||
cnt = m_IndexCnt;
|
||||
for (i = 0; i < cnt; i++) {
|
||||
if (strcmp(m_Index[i].m_Name, x) == 0) {
|
||||
url = m_Index[i].m_Book -> GetBasePath() + m_Index[i].m_Page;
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
wxString wxHtmlHelpData::FindPageById(int id)
|
||||
{
|
||||
int i;
|
||||
wxString url(wxEmptyString);
|
||||
|
||||
for (i = 0; i < m_ContentsCnt; i++) {
|
||||
if (m_Contents[i].m_ID == id) {
|
||||
url = m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page;
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
// wxHtmlSearchStatus functions
|
||||
//----------------------------------------------------------------------------------
|
||||
|
||||
wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& keyword,
|
||||
const wxString& book = wxEmptyString)
|
||||
{
|
||||
m_Data = data;
|
||||
m_Keyword = keyword;
|
||||
wxHtmlBookRecord* bookr = NULL;
|
||||
if (book != wxEmptyString) {
|
||||
// we have to search in a specific book. Find it first
|
||||
int i,cnt = data->m_BookRecords.GetCount();
|
||||
for (i=0; i<cnt; i++)
|
||||
if (data->m_BookRecords[i].GetTitle() == book) {
|
||||
bookr = &(data->m_BookRecords[i]);
|
||||
m_CurIndex = bookr->GetContentsStart();
|
||||
m_MaxIndex = bookr->GetContentsEnd();
|
||||
break;
|
||||
}
|
||||
// check; we won't crash if the book doesn't exist, but it's Bad Anyway.
|
||||
wxASSERT(bookr);
|
||||
}
|
||||
if (! bookr) {
|
||||
// no book specified; search all books
|
||||
m_CurIndex = 0;
|
||||
m_MaxIndex = m_Data->m_ContentsCnt;
|
||||
}
|
||||
m_Engine.LookFor(keyword);
|
||||
m_Active = (m_CurIndex < m_MaxIndex);
|
||||
m_LastPage = wxEmptyString;
|
||||
}
|
||||
|
||||
bool wxHtmlSearchStatus::Search()
|
||||
{
|
||||
wxFileSystem fsys;
|
||||
wxFSFile *file;
|
||||
int i = m_CurIndex; // shortcut
|
||||
bool found = FALSE;
|
||||
|
||||
if (! m_Active) {
|
||||
// sanity check. Illegal use, but we'll try to prevent a crash anyway
|
||||
wxASSERT(0);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
m_ContentsItem = NULL;
|
||||
m_Name = wxEmptyString;
|
||||
|
||||
file = fsys.OpenFile(m_Data->m_Contents[i].m_Book -> GetBasePath() +
|
||||
m_Data->m_Contents[i].m_Page);
|
||||
if (file) {
|
||||
if (m_LastPage != file->GetLocation()) {
|
||||
m_LastPage = file->GetLocation();
|
||||
if (m_Engine.Scan(file -> GetStream())) {
|
||||
m_Name = m_Data->m_Contents[i].m_Name;
|
||||
m_ContentsItem = m_Data->m_Contents + i;
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
delete file;
|
||||
}
|
||||
m_Active = (++m_CurIndex < m_MaxIndex);
|
||||
return found;
|
||||
}
|
||||
|
||||
#endif
|
||||
652
src/html/helpfrm.cpp
Normal file
652
src/html/helpfrm.cpp
Normal file
@@ -0,0 +1,652 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: helpfrm.cpp
|
||||
// Purpose: wxHtmlHelpFrame
|
||||
// Notes: Based on htmlhelp.cpp, implementing a monolithic
|
||||
// HTML Help controller class, by Vaclav Slavik
|
||||
// Author: Harm van der Heijden and Vaclav Slavik
|
||||
// Created:
|
||||
// RCS-ID:
|
||||
// Copyright: (c) Harm van der Heijden and Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "helpfrm.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HTML
|
||||
|
||||
#ifndef WXPRECOMP
|
||||
#include <wx/wx.h>
|
||||
#endif
|
||||
|
||||
#include "wx/html/helpfrm.h"
|
||||
#include "wx/notebook.h"
|
||||
#include "wx/imaglist.h"
|
||||
#include "wx/treectrl.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "wx/wfstream.h"
|
||||
#include "wx/html/htmlwin.h"
|
||||
#include "wx/busyinfo.h"
|
||||
#include "wx/progdlg.h"
|
||||
|
||||
// Bitmaps:
|
||||
|
||||
#ifndef __WXMSW__
|
||||
#include "bitmaps/panel.xpm"
|
||||
#include "bitmaps/back.xpm"
|
||||
#include "bitmaps/forward.xpm"
|
||||
#include "bitmaps/book.xpm"
|
||||
#include "bitmaps/folder.xpm"
|
||||
#include "bitmaps/page.xpm"
|
||||
#endif
|
||||
|
||||
#include "wx/stream.h"
|
||||
|
||||
// number of times that the contents/index creation progress dialog
|
||||
// is updated.
|
||||
static const int PROGRESS_STEP = 40;
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// wxHtmlHelpTreeItemData
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
class wxHtmlHelpTreeItemData : public wxTreeItemData
|
||||
{
|
||||
private:
|
||||
wxString m_Page;
|
||||
|
||||
public:
|
||||
wxHtmlHelpTreeItemData(wxHtmlContentsItem *it) : wxTreeItemData()
|
||||
{
|
||||
m_Page = it -> m_Book -> GetBasePath() + it -> m_Page;
|
||||
}
|
||||
const wxString& GetPage() {return m_Page;}
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxHtmlHelpFrame
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
|
||||
|
||||
wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
|
||||
int style, wxHtmlHelpData* data)
|
||||
{
|
||||
Init(data);
|
||||
Create(parent, id, title, style);
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
|
||||
{
|
||||
if (data) {
|
||||
m_Data = data;
|
||||
m_DataCreated = FALSE;
|
||||
}
|
||||
else {
|
||||
m_Data = new wxHtmlHelpData();
|
||||
m_DataCreated = TRUE;
|
||||
}
|
||||
|
||||
m_ContentsImageList = new wxImageList(12, 12);
|
||||
m_ContentsImageList -> Add(wxICON(book));
|
||||
m_ContentsImageList -> Add(wxICON(folder));
|
||||
m_ContentsImageList -> Add(wxICON(page));
|
||||
|
||||
m_ContentsBox = NULL;
|
||||
m_IndexBox = NULL;
|
||||
m_SearchList = NULL;
|
||||
m_SearchButton = NULL;
|
||||
m_SearchText = NULL;
|
||||
m_SearchChoice = NULL;
|
||||
m_Splitter = NULL;
|
||||
m_NavigPan = NULL;
|
||||
m_HtmlWin = NULL;
|
||||
m_Config = NULL;
|
||||
m_ConfigRoot = wxEmptyString;
|
||||
|
||||
m_Cfg.x = m_Cfg.y = 0;
|
||||
m_Cfg.w = 700; m_Cfg.h = 480;
|
||||
m_Cfg.sashpos = 240;
|
||||
m_Cfg.navig_on = TRUE;
|
||||
m_Cfg.titleformat = _("Help: %s");
|
||||
m_Cfg.style = wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH;
|
||||
}
|
||||
|
||||
/* Create: builds the GUI components.
|
||||
* with the style flag it's possible to toggle the toolbar, contents, index and search
|
||||
* controls.
|
||||
* m_HtmlWin will *always* be created, but it's important to realize that
|
||||
* m_ContentsBox, m_IndexBox, m_SearchList, m_SearchButton, m_SearchText and
|
||||
* m_SearchButton may be NULL.
|
||||
* moreover, if no contents, index or searchpage is needed, m_Splitter and
|
||||
* m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
|
||||
*/
|
||||
bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& title,
|
||||
int style)
|
||||
{
|
||||
// Do the config in two steps. We read the HtmlWindow customization after we
|
||||
// create the window.
|
||||
if (m_Config)
|
||||
ReadCustomization(m_Config, m_ConfigRoot);
|
||||
|
||||
wxFrame::Create(parent, id, "", wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
|
||||
|
||||
if (style == wxHF_DEFAULTSTYLE)
|
||||
style = m_Cfg.style;
|
||||
|
||||
if (! title.IsEmpty()) // overridden?
|
||||
m_Cfg.titleformat = title;
|
||||
|
||||
int notebook_page = 0;
|
||||
|
||||
CreateStatusBar();
|
||||
|
||||
// toolbar?
|
||||
if (style & wxHF_TOOLBAR) {
|
||||
wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT |
|
||||
wxTB_DOCKABLE);
|
||||
toolBar -> SetMargins(2, 2);
|
||||
wxBitmap* toolBarBitmaps[3];
|
||||
|
||||
#ifdef __WXMSW__
|
||||
toolBarBitmaps[0] = new wxBitmap("panel");
|
||||
toolBarBitmaps[1] = new wxBitmap("back");
|
||||
toolBarBitmaps[2] = new wxBitmap("forward");
|
||||
int width = 24;
|
||||
#else
|
||||
toolBarBitmaps[0] = new wxBitmap(panel_xpm);
|
||||
toolBarBitmaps[1] = new wxBitmap(back_xpm);
|
||||
toolBarBitmaps[2] = new wxBitmap(forward_xpm);
|
||||
int width = 16;
|
||||
#endif
|
||||
|
||||
int currentX = 5;
|
||||
|
||||
toolBar -> AddTool(wxID_HTML_PANEL, *(toolBarBitmaps[0]), wxNullBitmap,
|
||||
FALSE, currentX, -1, (wxObject *) NULL,
|
||||
_("Show/hide navigation panel"));
|
||||
currentX += width + 5;
|
||||
toolBar -> AddSeparator();
|
||||
toolBar -> AddTool(wxID_HTML_BACK, *(toolBarBitmaps[1]), wxNullBitmap,
|
||||
FALSE, currentX, -1, (wxObject *) NULL,
|
||||
_("Go back to the previous HTML page"));
|
||||
currentX += width + 5;
|
||||
toolBar -> AddTool(wxID_HTML_FORWARD, *(toolBarBitmaps[2]), wxNullBitmap,
|
||||
FALSE, currentX, -1, (wxObject *) NULL,
|
||||
_("Go forward to the next HTML page"));
|
||||
currentX += width + 5;
|
||||
|
||||
toolBar -> Realize();
|
||||
|
||||
// Can delete the bitmaps since they're reference counted
|
||||
for (int i = 0; i < 3; i++)
|
||||
delete toolBarBitmaps[i];
|
||||
}
|
||||
|
||||
if (style & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH)) {
|
||||
// traditional help controller; splitter window with html page on the
|
||||
// right and a notebook containing various pages on the left
|
||||
m_Splitter = new wxSplitterWindow(this);
|
||||
|
||||
m_HtmlWin = new wxHtmlWindow(m_Splitter);
|
||||
m_NavigPan = new wxNotebook(m_Splitter, wxID_HTML_NOTEBOOK,
|
||||
wxDefaultPosition, wxDefaultSize);
|
||||
}
|
||||
else { // only html window, no notebook with index,contents etc
|
||||
m_HtmlWin = new wxHtmlWindow(this);
|
||||
}
|
||||
|
||||
m_HtmlWin -> SetRelatedFrame(this, m_TitleFormat);
|
||||
m_HtmlWin -> SetRelatedStatusBar(0);
|
||||
if (m_Config)
|
||||
m_HtmlWin -> ReadCustomization(m_Config, m_ConfigRoot);
|
||||
|
||||
// contents tree panel?
|
||||
if (style & wxHF_CONTENTS) {
|
||||
m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL,
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
|
||||
m_ContentsBox -> SetImageList(m_ContentsImageList);
|
||||
m_NavigPan -> AddPage(m_ContentsBox, _("Contents"));
|
||||
m_ContentsPage = notebook_page++;
|
||||
}
|
||||
|
||||
// index listbox panel?
|
||||
if (style & wxHF_INDEX) {
|
||||
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
|
||||
wxLayoutConstraints *b1 = new wxLayoutConstraints;
|
||||
b1 -> top.SameAs (dummy, wxTop, 0);
|
||||
b1 -> left.SameAs (dummy, wxLeft, 0);
|
||||
b1 -> width.PercentOf (dummy, wxWidth, 100);
|
||||
b1 -> bottom.SameAs (dummy, wxBottom, 0);
|
||||
m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition,
|
||||
wxDefaultSize, 0, NULL, wxLB_SINGLE |wxLB_ALWAYS_SB);
|
||||
m_IndexBox -> SetConstraints(b1);
|
||||
dummy -> SetAutoLayout(TRUE);
|
||||
m_NavigPan -> AddPage(dummy, _("Index"));
|
||||
m_IndexPage = notebook_page++;
|
||||
}
|
||||
|
||||
// search list panel?
|
||||
if (style & wxHF_SEARCH) {
|
||||
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
|
||||
|
||||
wxLayoutConstraints *b1 = new wxLayoutConstraints;
|
||||
m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT);
|
||||
b1 -> top.SameAs (dummy, wxTop, 10);
|
||||
b1 -> left.SameAs (dummy, wxLeft, 10);
|
||||
b1 -> right.SameAs (dummy, wxRight, 10);
|
||||
b1 -> height.AsIs();
|
||||
m_SearchText -> SetConstraints(b1);
|
||||
|
||||
wxLayoutConstraints *b2 = new wxLayoutConstraints;
|
||||
m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
|
||||
b2 -> top.Below (m_SearchText, 10);
|
||||
b2 -> left.SameAs (dummy, wxLeft, 10);
|
||||
b2 -> width.AsIs();
|
||||
b2 -> height.AsIs();
|
||||
m_SearchButton -> SetConstraints(b2);
|
||||
|
||||
wxLayoutConstraints *b3 = new wxLayoutConstraints;
|
||||
m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
|
||||
b3 -> top.Below (m_SearchButton, 10);
|
||||
b3 -> left.SameAs (dummy, wxLeft, 0);
|
||||
b3 -> right.SameAs (dummy, wxRight, 0);
|
||||
b3 -> bottom.SameAs (dummy, wxBottom, 0);
|
||||
m_SearchList -> SetConstraints(b3);
|
||||
|
||||
wxLayoutConstraints *b4 = new wxLayoutConstraints;
|
||||
m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE, wxDefaultPosition,
|
||||
wxDefaultSize);
|
||||
b4 -> top.Below (m_SearchText, 10);
|
||||
b4 -> left.SameAs (m_SearchButton, wxRight, 10);
|
||||
b4 -> right.SameAs (dummy, wxRight, 10);
|
||||
b4 -> height.AsIs();
|
||||
m_SearchChoice -> SetConstraints(b4);
|
||||
|
||||
dummy -> SetAutoLayout(TRUE);
|
||||
dummy -> Layout();
|
||||
m_NavigPan -> AddPage(dummy, _("Search"));
|
||||
m_SearchPage = notebook_page++;
|
||||
}
|
||||
|
||||
//RefreshLists();
|
||||
|
||||
// showtime
|
||||
if (m_NavigPan && m_Splitter) {
|
||||
m_NavigPan -> Show(TRUE);
|
||||
m_Splitter -> SetMinimumPaneSize(20);
|
||||
if (m_Cfg.navig_on)
|
||||
m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
|
||||
}
|
||||
m_HtmlWin -> Show(TRUE);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
wxHtmlHelpFrame::~wxHtmlHelpFrame()
|
||||
{
|
||||
delete m_ContentsImageList;
|
||||
if (m_DataCreated)
|
||||
delete m_Data;
|
||||
}
|
||||
|
||||
bool wxHtmlHelpFrame::Display(const wxString& x)
|
||||
{
|
||||
wxString url = m_Data->FindPageByName(x);
|
||||
if (! url.IsEmpty()) {
|
||||
m_HtmlWin->LoadPage(url);
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool wxHtmlHelpFrame::Display(const int id)
|
||||
{
|
||||
wxString url = m_Data->FindPageById(id);
|
||||
if (! url.IsEmpty()) {
|
||||
m_HtmlWin->LoadPage(url);
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool wxHtmlHelpFrame::DisplayContents()
|
||||
{
|
||||
if (! m_ContentsBox)
|
||||
return FALSE;
|
||||
if (!m_Splitter -> IsSplit()) {
|
||||
m_NavigPan -> Show(TRUE);
|
||||
m_HtmlWin -> Show(TRUE);
|
||||
m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
|
||||
}
|
||||
m_NavigPan -> SetSelection(0);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool wxHtmlHelpFrame::DisplayIndex()
|
||||
{
|
||||
if (! m_IndexBox)
|
||||
return FALSE;
|
||||
if (!m_Splitter -> IsSplit()) {
|
||||
m_NavigPan -> Show(TRUE);
|
||||
m_HtmlWin -> Show(TRUE);
|
||||
m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
|
||||
}
|
||||
m_NavigPan -> SetSelection(1);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
|
||||
{
|
||||
if (! (m_SearchList && m_SearchButton && m_SearchText && m_SearchChoice))
|
||||
return FALSE;
|
||||
|
||||
int foundcnt = 0;
|
||||
wxString foundstr;
|
||||
wxString book = wxEmptyString;
|
||||
|
||||
if (!m_Splitter -> IsSplit()) {
|
||||
m_NavigPan -> Show(TRUE);
|
||||
m_HtmlWin -> Show(TRUE);
|
||||
m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
|
||||
}
|
||||
m_NavigPan -> SetSelection(m_SearchPage);
|
||||
m_SearchList -> Clear();
|
||||
m_SearchText -> SetValue(keyword);
|
||||
m_SearchButton -> Enable(FALSE);
|
||||
|
||||
if (m_SearchChoice->GetSelection() != 0)
|
||||
book = m_SearchChoice->GetStringSelection();
|
||||
|
||||
wxHtmlSearchStatus status(m_Data, keyword, book);
|
||||
|
||||
wxProgressDialog progress(_("Searching..."), _("No matching page found yet"),
|
||||
status.GetMaxIndex(), this,
|
||||
wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
|
||||
|
||||
while (status.IsActive()) {
|
||||
if (progress.Update(status.GetCurIndex()) == FALSE)
|
||||
break;
|
||||
if (status.Search()) {
|
||||
foundstr.Printf(_("Found %i matches"), ++foundcnt);
|
||||
progress.Update(status.GetCurIndex(), foundstr);
|
||||
m_SearchList -> Append(status.GetName(), status.GetContentsItem());
|
||||
}
|
||||
wxYield();
|
||||
}
|
||||
|
||||
m_SearchButton -> Enable(TRUE);
|
||||
m_SearchText -> SetSelection(0, keyword.Length());
|
||||
m_SearchText -> SetFocus();
|
||||
if (foundcnt) {
|
||||
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList -> GetClientData(0);
|
||||
if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
|
||||
}
|
||||
return (foundcnt > 0);
|
||||
}
|
||||
|
||||
#define MAX_ROOTS 64
|
||||
|
||||
void wxHtmlHelpFrame::CreateContents(bool show_progress)
|
||||
{
|
||||
if (! m_ContentsBox)
|
||||
return;
|
||||
|
||||
wxProgressDialog *progress;
|
||||
wxString proginfo;
|
||||
|
||||
m_ContentsBox->Clear();
|
||||
|
||||
int cnt = m_Data->GetContentsCnt();
|
||||
int div = (cnt / PROGRESS_STEP) + 1;
|
||||
int i;
|
||||
|
||||
wxHtmlContentsItem *it = m_Data->GetContents();
|
||||
|
||||
if (show_progress)
|
||||
progress = new wxProgressDialog(_("Building contents tree..."), wxEmptyString,
|
||||
cnt, this, wxPD_APP_MODAL | wxPD_CAN_ABORT |
|
||||
wxPD_AUTO_HIDE);
|
||||
|
||||
wxTreeItemId roots[MAX_ROOTS];
|
||||
bool imaged[MAX_ROOTS];
|
||||
|
||||
m_ContentsBox -> DeleteAllItems();
|
||||
roots[0] = m_ContentsBox -> AddRoot(_("(Help)"));
|
||||
imaged[0] = TRUE;
|
||||
|
||||
for (i = 0; i < cnt; i++, it++) {
|
||||
if (show_progress && ((i % div) == 0)) {
|
||||
proginfo.Printf("Added %d/%d items", i, cnt);
|
||||
if (! progress->Update(i, proginfo))
|
||||
break;
|
||||
wxYield();
|
||||
}
|
||||
roots[it -> m_Level + 1] = m_ContentsBox -> AppendItem(
|
||||
roots[it -> m_Level], it -> m_Name, IMG_Page, -1,
|
||||
new wxHtmlHelpTreeItemData(it));
|
||||
|
||||
if (it -> m_Level == 0) {
|
||||
m_ContentsBox -> SetItemBold(roots[1], TRUE);
|
||||
m_ContentsBox -> SetItemImage(roots[1], IMG_Book);
|
||||
m_ContentsBox -> SetItemSelectedImage(roots[1], IMG_Book);
|
||||
imaged[1] = TRUE;
|
||||
}
|
||||
else imaged[it -> m_Level + 1] = FALSE;
|
||||
|
||||
if (!imaged[it -> m_Level]) {
|
||||
m_ContentsBox -> SetItemImage(roots[it -> m_Level], IMG_Folder);
|
||||
m_ContentsBox -> SetItemSelectedImage(roots[it -> m_Level], IMG_Folder);
|
||||
imaged[it -> m_Level] = TRUE;
|
||||
}
|
||||
}
|
||||
if (show_progress)
|
||||
delete progress;
|
||||
m_ContentsBox -> Expand(roots[0]);
|
||||
}
|
||||
|
||||
|
||||
void wxHtmlHelpFrame::CreateIndex(bool show_progress)
|
||||
{
|
||||
if (! m_IndexBox)
|
||||
return;
|
||||
|
||||
wxProgressDialog *progress;
|
||||
wxString proginfo;
|
||||
|
||||
m_IndexBox->Clear();
|
||||
|
||||
int cnt = m_Data->GetIndexCnt();
|
||||
int div = (cnt / PROGRESS_STEP) + 1;
|
||||
|
||||
wxHtmlContentsItem* index = m_Data->GetIndex();
|
||||
|
||||
if (show_progress)
|
||||
progress = new wxProgressDialog(_("Building index list..."), wxEmptyString,
|
||||
cnt, this, wxPD_APP_MODAL | wxPD_CAN_ABORT |
|
||||
wxPD_AUTO_HIDE);
|
||||
for (int i = 0; i < cnt; i++) {
|
||||
if (show_progress && ((i % div) == 0)) {
|
||||
proginfo.Printf("Added %d/%d items", i, cnt);
|
||||
if (! progress->Update(i, proginfo))
|
||||
break;
|
||||
wxYield();
|
||||
}
|
||||
m_IndexBox -> Append(index[i].m_Name, (char*)(index + i));
|
||||
}
|
||||
|
||||
if (show_progress)
|
||||
delete progress;
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::CreateSearch()
|
||||
{
|
||||
if (! (m_SearchList && m_SearchChoice))
|
||||
return;
|
||||
m_SearchList -> Clear();
|
||||
m_SearchChoice -> Clear();
|
||||
m_SearchChoice -> Append(_("all books"));
|
||||
const wxHtmlBookRecArray& bookrec = m_Data->GetBookRecArray();
|
||||
int i, cnt = bookrec.GetCount();
|
||||
for (i=0; i<cnt; i++)
|
||||
m_SearchChoice->Append(bookrec[i].GetTitle());
|
||||
m_SearchChoice->SetSelection(0);
|
||||
}
|
||||
|
||||
|
||||
void wxHtmlHelpFrame::RefreshLists(bool show_progress)
|
||||
{
|
||||
CreateContents(show_progress);
|
||||
CreateIndex(show_progress);
|
||||
CreateSearch();
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
|
||||
{
|
||||
wxString oldpath;
|
||||
wxString tmp;
|
||||
|
||||
if (path != wxEmptyString) {
|
||||
oldpath = cfg -> GetPath();
|
||||
cfg -> SetPath(path);
|
||||
}
|
||||
|
||||
m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0;
|
||||
m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos);
|
||||
m_Cfg.x = cfg -> Read("hcX", m_Cfg.x);
|
||||
m_Cfg.y = cfg -> Read("hcY", m_Cfg.y);
|
||||
m_Cfg.w = cfg -> Read("hcW", m_Cfg.w);
|
||||
m_Cfg.h = cfg -> Read("hcH", m_Cfg.h);
|
||||
m_Cfg.titleformat = cfg -> Read("hcTitleFormat", m_Cfg.titleformat);
|
||||
m_Cfg.style = (int)cfg -> Read("hcStyle", (long)m_Cfg.style);
|
||||
|
||||
if (m_HtmlWin)
|
||||
m_HtmlWin->ReadCustomization(cfg, path);
|
||||
|
||||
if (path != wxEmptyString)
|
||||
cfg -> SetPath(oldpath);
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path)
|
||||
{
|
||||
wxString oldpath;
|
||||
wxString tmp;
|
||||
//printf("wxHtmlHelpFrame. Writing config to %s\n", (const char*)path);
|
||||
|
||||
if (path != wxEmptyString) {
|
||||
oldpath = cfg -> GetPath();
|
||||
cfg -> SetPath(path);
|
||||
}
|
||||
|
||||
cfg -> Write("hcNavigPanel", m_Cfg.navig_on);
|
||||
cfg -> Write("hcSashPos", (long)m_Cfg.sashpos);
|
||||
cfg -> Write("hcX", (long)m_Cfg.x);
|
||||
cfg -> Write("hcY", (long)m_Cfg.y);
|
||||
cfg -> Write("hcW", (long)m_Cfg.w);
|
||||
cfg -> Write("hcH", (long)m_Cfg.h);
|
||||
cfg -> Write("hcTitleFormat", m_Cfg.titleformat);
|
||||
cfg -> Write("hcStyle", (long)m_Cfg.style);
|
||||
|
||||
if (m_HtmlWin)
|
||||
m_HtmlWin->WriteCustomization(cfg, path);
|
||||
|
||||
if (path != wxEmptyString)
|
||||
cfg -> SetPath(oldpath);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
EVENT HANDLING :
|
||||
*/
|
||||
|
||||
|
||||
void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
|
||||
{
|
||||
switch (event.GetId()) {
|
||||
case wxID_HTML_BACK :
|
||||
m_HtmlWin -> HistoryBack();
|
||||
break;
|
||||
case wxID_HTML_FORWARD :
|
||||
m_HtmlWin -> HistoryForward();
|
||||
break;
|
||||
case wxID_HTML_PANEL :
|
||||
if (! (m_Splitter && m_NavigPan))
|
||||
return;
|
||||
if (m_Splitter -> IsSplit()) {
|
||||
m_Cfg.sashpos = m_Splitter -> GetSashPosition();
|
||||
m_Splitter -> Unsplit(m_NavigPan);
|
||||
}
|
||||
else {
|
||||
m_NavigPan -> Show(TRUE);
|
||||
m_HtmlWin -> Show(TRUE);
|
||||
m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
|
||||
{
|
||||
wxHtmlHelpTreeItemData *pg;
|
||||
|
||||
pg = (wxHtmlHelpTreeItemData*) m_ContentsBox -> GetItemData(event.GetItem());
|
||||
if (pg) m_HtmlWin -> LoadPage(pg -> GetPage());
|
||||
}
|
||||
|
||||
|
||||
|
||||
void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& event)
|
||||
{
|
||||
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
|
||||
if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& event)
|
||||
{
|
||||
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList -> GetClientData(m_SearchList -> GetSelection());
|
||||
if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::OnSearch(wxCommandEvent& event)
|
||||
{
|
||||
wxString sr = m_SearchText -> GetLineText(0);
|
||||
|
||||
if (sr != wxEmptyString) KeywordSearch(sr);
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
|
||||
{
|
||||
if (m_Config)
|
||||
WriteCustomization(m_Config, m_ConfigRoot);
|
||||
evt.Skip();
|
||||
}
|
||||
|
||||
BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
|
||||
EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_FORWARD, wxHtmlHelpFrame::OnToolbar)
|
||||
EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpFrame::OnContentsSel)
|
||||
EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpFrame::OnIndexSel)
|
||||
EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpFrame::OnSearchSel)
|
||||
EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpFrame::OnSearch)
|
||||
EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpFrame::OnSearch)
|
||||
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#endif
|
||||
@@ -5,6 +5,10 @@
|
||||
// Licence: wxWindows Licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#error This file should not be compiled! Update your build system! \
|
||||
(configure users, rerun configure to get a new Makefile) \
|
||||
Instead of htmlhelp[_io], use helpdata, helpfrm and helpctrl. This \
|
||||
file is only left to point out the problem and will be removed r.s.n.
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "htmlhelp.h"
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
// Licence: wxWindows Licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#error This file should not be compiled! Update your build system! \
|
||||
(configure users, rerun configure to get a new Makefile) \
|
||||
Instead of htmlhelp[_io], use helpdata, helpfrm and helpctrl. This \
|
||||
file is only left to point out the problem and will be removed r.s.n.
|
||||
|
||||
|
||||
//#ifdef __GNUG__
|
||||
//#pragma implementation "htmlhelp.h"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <wx/wx.h>
|
||||
#endif
|
||||
|
||||
#include "search.h"
|
||||
#include "wx/html/helpdata.h"
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
# This file was automatically generated by tmake at 15:37, 1999/09/05
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
|
||||
|
||||
#
|
||||
@@ -231,6 +231,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
||||
$(MSWDIR)\frame.obj \
|
||||
$(MSWDIR)\gauge95.obj \
|
||||
$(MSWDIR)\gdiobj.obj \
|
||||
$(MSWDIR)\gsocket.obj \
|
||||
$(MSWDIR)\helpwin.obj \
|
||||
$(MSWDIR)\icon.obj \
|
||||
$(MSWDIR)\imaglist.obj \
|
||||
@@ -408,6 +409,8 @@ $(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
# This file was automatically generated by tmake at 16:27, 1999/08/29
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
|
||||
|
||||
#
|
||||
@@ -130,10 +130,6 @@ COMMONOBJS = \
|
||||
$(MSWDIR)\imagbmp.obj \
|
||||
$(MSWDIR)\image.obj \
|
||||
$(MSWDIR)\imaggif.obj \
|
||||
$(MSWDIR)\imagjpeg.obj \
|
||||
$(MSWDIR)\imagpcx.obj \
|
||||
$(MSWDIR)\imagpng.obj \
|
||||
$(MSWDIR)\imagpnm.obj \
|
||||
$(MSWDIR)\intl.obj \
|
||||
$(MSWDIR)\ipcbase.obj \
|
||||
$(MSWDIR)\layout.obj \
|
||||
@@ -207,6 +203,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
||||
$(MSWDIR)\frame.obj \
|
||||
$(MSWDIR)\gaugemsw.obj \
|
||||
$(MSWDIR)\gdiobj.obj \
|
||||
$(MSWDIR)\gsocket.obj \
|
||||
$(MSWDIR)\helpwin.obj \
|
||||
$(MSWDIR)\icon.obj \
|
||||
$(MSWDIR)\iniconf.obj \
|
||||
@@ -224,7 +221,6 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
||||
$(MSWDIR)\palette.obj \
|
||||
$(MSWDIR)\pen.obj \
|
||||
$(MSWDIR)\penwin.obj \
|
||||
$(MSWDIR)\pnghand.obj \
|
||||
$(MSWDIR)\printdlg.obj \
|
||||
$(MSWDIR)\printwin.obj \
|
||||
$(MSWDIR)\radiobox.obj \
|
||||
@@ -345,6 +341,8 @@ $(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
|
||||
|
||||
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
|
||||
@@ -379,8 +377,6 @@ $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\pnghand.obj: $(MSWDIR)\pnghand.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
|
||||
@@ -492,14 +488,6 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\imagpcx.obj: $(COMMDIR)\imagpcx.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
|
||||
|
||||
$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
|
||||
@@ -735,7 +723,7 @@ cleanall: clean
|
||||
|
||||
|
||||
MFTYPE=bcc
|
||||
#makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
|
||||
# cd $(WXWIN)\distrib\msw\tmake
|
||||
# tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
|
||||
# copy makefile.$(MFTYPE) $(WXWIN)\src\msw
|
||||
makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
|
||||
cd $(WXWIN)\distrib\msw\tmake
|
||||
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
|
||||
copy makefile.$(MFTYPE) $(WXWIN)\src\msw
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
# This file was automatically generated by tmake at 22:42, 1999/09/05
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
|
||||
|
||||
#
|
||||
@@ -190,6 +190,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
||||
$(MSWDIR)\frame.obj \
|
||||
$(MSWDIR)\gaugemsw.obj \
|
||||
$(MSWDIR)\gdiobj.obj \
|
||||
$(MSWDIR)\gsocket.obj \
|
||||
$(MSWDIR)\helpwin.obj \
|
||||
$(MSWDIR)\icon.obj \
|
||||
$(MSWDIR)\iniconf.obj \
|
||||
@@ -466,6 +467,11 @@ $(MSWDIR)/gdiobj.obj: $*.$(SRCSUFF)
|
||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
$(MSWDIR)/gsocket.obj: $*.$(SRCSUFF)
|
||||
cl @<<
|
||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
$(MSWDIR)/helpwin.obj: $*.$(SRCSUFF)
|
||||
cl @<<
|
||||
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
# This file was automatically generated by tmake at 16:27, 1999/08/29
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
|
||||
|
||||
#
|
||||
@@ -143,10 +143,11 @@ COMMONOBJS = \
|
||||
$(COMMDIR)/zstream.$(OBJSUFF)
|
||||
|
||||
HTMLOBJS = \
|
||||
$(HTMLDIR)/htmlcell.$(OBJSUFF) \
|
||||
$(HTMLDIR)/helpctrl.$(OBJSUFF) \
|
||||
$(HTMLDIR)/helpdata.$(OBJSUFF) \
|
||||
$(HTMLDIR)/helpfrm.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmlcell.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmlfilter.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmlhelp.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmlhelp_io.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmlparser.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmltag.$(OBJSUFF) \
|
||||
$(HTMLDIR)/htmlwin.$(OBJSUFF) \
|
||||
@@ -196,6 +197,7 @@ MSWOBJS = \
|
||||
$(MSWDIR)/frame.$(OBJSUFF) \
|
||||
$(MSWDIR)/gauge95.$(OBJSUFF) \
|
||||
$(MSWDIR)/gdiobj.$(OBJSUFF) \
|
||||
$(MSWDIR)/gsocket.$(OBJSUFF) \
|
||||
$(MSWDIR)/helpwin.$(OBJSUFF) \
|
||||
$(MSWDIR)/icon.$(OBJSUFF) \
|
||||
$(MSWDIR)/imaglist.$(OBJSUFF) \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
# This file was automatically generated by tmake at 16:27, 1999/08/29
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
|
||||
|
||||
# Symantec C++ makefile for the msw objects
|
||||
@@ -172,6 +172,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
|
||||
$(MSWDIR)\gauge95.obj \
|
||||
$(MSWDIR)\gaugemsw.obj \
|
||||
$(MSWDIR)\gdiobj.obj \
|
||||
$(MSWDIR)\gsocket.obj \
|
||||
$(MSWDIR)\helpwin.obj \
|
||||
$(MSWDIR)\icon.obj \
|
||||
$(MSWDIR)\iniconf.obj \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# This file was automatically generated by tmake at 15:14, 1999/08/18
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
|
||||
|
||||
# File: makefile.vc
|
||||
@@ -114,6 +114,7 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
|
||||
..\generic\$D\notebook.obj \
|
||||
..\generic\$D\printps.obj \
|
||||
..\generic\$D\prntdlgg.obj \
|
||||
..\generic\$D\statline.obj \
|
||||
..\generic\$D\treectrl.obj
|
||||
|
||||
COMMONOBJS = \
|
||||
@@ -241,6 +242,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
|
||||
..\msw\$D\frame.obj \
|
||||
..\msw\$D\gauge95.obj \
|
||||
..\msw\$D\gdiobj.obj \
|
||||
..\msw\$D\gsocket.obj \
|
||||
..\msw\$D\helpwin.obj \
|
||||
..\msw\$D\icon.obj \
|
||||
..\msw\$D\imaglist.obj \
|
||||
@@ -294,10 +296,11 @@ MSWOBJS = ..\msw\$D\accel.obj \
|
||||
..\msw\$D\xpmhand.obj
|
||||
|
||||
HTMLOBJS = \
|
||||
..\html\$D\helpdata.obj \
|
||||
..\html\$D\helpfrm.obj \
|
||||
..\html\$D\helpctrl.obj \
|
||||
..\html\$D\htmlcell.obj \
|
||||
..\html\$D\htmlfilter.obj \
|
||||
..\html\$D\htmlhelp.obj \
|
||||
..\html\$D\htmlhelp_io.obj \
|
||||
..\html\$D\htmlparser.obj \
|
||||
..\html\$D\htmltag.obj \
|
||||
..\html\$D\htmlwin.obj \
|
||||
@@ -314,7 +317,7 @@ HTMLOBJS = \
|
||||
|
||||
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
|
||||
# Add $(HTMLOBJS) if wanting wxHTML classes
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
|
||||
|
||||
# Normal, static library
|
||||
all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
|
||||
@@ -689,8 +692,8 @@ $(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
|
||||
|
||||
$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
|
||||
cd $(DOCDIR)\latex\proplist
|
||||
-copy *.bmp $(DOCDIR)\pdf
|
||||
-copy *.wmf $(DOCDIR)\pdf
|
||||
-copy *.bmp $(DOCDIR)\pdf
|
||||
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
|
||||
cd $(THISDIR)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
# This file was automatically generated by tmake at 16:27, 1999/08/29
|
||||
# This file was automatically generated by tmake at 13:13, 1999/09/12
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
|
||||
|
||||
#!/binb/wmake.exe
|
||||
@@ -68,6 +68,7 @@ NONESSENTIALOBJS= caret.obj &
|
||||
notebook.obj &
|
||||
printps.obj &
|
||||
prntdlgg.obj &
|
||||
statline.obj &
|
||||
treectrl.obj
|
||||
|
||||
COMMONOBJS = &
|
||||
@@ -196,6 +197,7 @@ MSWOBJS = accel.obj &
|
||||
gauge95.obj &
|
||||
gaugemsw.obj &
|
||||
gdiobj.obj &
|
||||
gsocket.obj &
|
||||
helpwin.obj &
|
||||
icon.obj &
|
||||
iniconf.obj &
|
||||
@@ -391,6 +393,9 @@ gaugemsw.obj: $(MSWDIR)\gaugemsw.cpp
|
||||
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
|
||||
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
gsocket.obj: $(MSWDIR)\gsocket.cpp
|
||||
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
helpwin.obj: $(MSWDIR)\helpwin.cpp
|
||||
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
|
||||
|
||||
|
||||
Reference in New Issue
Block a user