From 2d1df0fc585f03cca4b194d1f9159b49a5711da6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 3 Oct 2008 15:16:01 +0000 Subject: [PATCH] merged docvwmdi sample into docview one to avoid having 2 almost identical samples; and modernized and cleaned up the code in the process git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/doxygen/mainpages/samples.h | 13 +- samples/docview/chart.xpm | 49 + samples/docview/doc.cpp | 361 +-- samples/docview/doc.h | 186 +- samples/docview/doc.xpm | 43 + samples/docview/docview.cpp | 469 ++-- samples/docview/docview.h | 96 +- samples/docview/docview.rc | 7 +- samples/docview/docview_vc7.vcproj | 577 ++-- samples/docview/notepad.xpm | 43 + samples/docview/view.cpp | 261 +- samples/docview/view.h | 97 +- samples/docvwmdi/Makefile.in | 205 -- samples/docvwmdi/chart.ico | Bin 766 -> 0 bytes samples/docvwmdi/doc.cpp | 358 --- samples/docvwmdi/doc.h | 107 - samples/docvwmdi/doc.ico | Bin 766 -> 0 bytes samples/docvwmdi/docview.cpp | 242 -- samples/docvwmdi/docview.h | 63 - samples/docvwmdi/docview.rc | 6 - samples/docvwmdi/docvwmdi.bkl | 13 - samples/docvwmdi/docvwmdi.dsp | 272 -- samples/docvwmdi/docvwmdiM5.xml | 3793 -------------------------- samples/docvwmdi/docvwmdi_vc7.vcproj | 647 ----- samples/docvwmdi/docvwmdi_vc8.vcproj | 810 ------ samples/docvwmdi/makefile.bcc | 249 -- samples/docvwmdi/makefile.gcc | 249 -- samples/docvwmdi/makefile.unx | 118 - samples/docvwmdi/makefile.vc | 325 --- samples/docvwmdi/makefile.wat | 274 -- samples/docvwmdi/notepad.ico | Bin 766 -> 0 bytes samples/docvwmdi/view.cpp | 285 -- samples/docvwmdi/view.h | 85 - samples/makefile.bcc | 12 +- samples/makefile.gcc | 8 +- samples/makefile.vc | 10 +- samples/makefile.wat | 10 +- samples/samples.bkl | 1 - samples/samples.dsw | 12 - 39 files changed, 1143 insertions(+), 9213 deletions(-) create mode 100644 samples/docview/chart.xpm create mode 100644 samples/docview/doc.xpm create mode 100644 samples/docview/notepad.xpm delete mode 100644 samples/docvwmdi/Makefile.in delete mode 100644 samples/docvwmdi/chart.ico delete mode 100644 samples/docvwmdi/doc.cpp delete mode 100644 samples/docvwmdi/doc.h delete mode 100644 samples/docvwmdi/doc.ico delete mode 100644 samples/docvwmdi/docview.cpp delete mode 100644 samples/docvwmdi/docview.h delete mode 100644 samples/docvwmdi/docview.rc delete mode 100644 samples/docvwmdi/docvwmdi.bkl delete mode 100644 samples/docvwmdi/docvwmdi.dsp delete mode 100644 samples/docvwmdi/docvwmdiM5.xml delete mode 100644 samples/docvwmdi/docvwmdi_vc7.vcproj delete mode 100644 samples/docvwmdi/docvwmdi_vc8.vcproj delete mode 100644 samples/docvwmdi/makefile.bcc delete mode 100644 samples/docvwmdi/makefile.gcc delete mode 100644 samples/docvwmdi/makefile.unx delete mode 100644 samples/docvwmdi/makefile.vc delete mode 100644 samples/docvwmdi/makefile.wat delete mode 100644 samples/docvwmdi/notepad.ico delete mode 100644 samples/docvwmdi/view.cpp delete mode 100644 samples/docvwmdi/view.h diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h index 7334903ff7..5587d73e0c 100644 --- a/docs/doxygen/mainpages/samples.h +++ b/docs/doxygen/mainpages/samples.h @@ -71,7 +71,6 @@ TODO: Organize them in a more human-readable way. @li @sample{display} @li @sample{dnd} @li @sample{docview} -@li @sample{docvwmdi} @li @sample{dragimag} @li @sample{drawing} @li @sample{editlbox} @@ -346,15 +345,7 @@ wxDataObject to achieve this. @sampledir{docview} -@see @sample{docvwmdi}, @sample{mdi} - -@section page_samples_docvwmdi Document/View MDI Sample - -@sampleabout{@ref overview_docview in MDI} - -@see @sample{docview}, @sample{mdi} - -@sampledir{docvwmdi} +@see @sample{mdi} @section page_samples_dragimag Drag Image Sample @@ -564,7 +555,7 @@ The sample also provides some timings for adding/deleting/sorting a lot of @sampleabout{MDI} -@see @sample{docview}, @sample{docvwmdi} +@see @sample{docview} @sampledir{mdi} diff --git a/samples/docview/chart.xpm b/samples/docview/chart.xpm new file mode 100644 index 0000000000..c18cf87af9 --- /dev/null +++ b/samples/docview/chart.xpm @@ -0,0 +1,49 @@ +/* XPM */ +static char *chart[] = { +/* columns rows colors chars-per-pixel */ +"32 32 11 1", +" c black", +". c red", +"X c #00BF00", +"o c green", +"O c yellow", +"+ c blue", +"@ c #00BFBF", +"# c #808080", +"$ c #C0C0C0", +"% c gray100", +"& c None", +/* pixels */ +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", +"&& &&&&&&", +"&& ###################### &&&&&&", +"&& &&&&&&", +"&& %%%%%%%%%%%%%%%%%%%%%% &&&&&&", +"&& %%%%%%%.....%%%%%%%%%% &&&&&&", +"&& %%%%%%.......%%%%%%%%% &&&&&&", +"&& %%%%%........+%%%%%%%% &&&&&&", +"&& %%%%........+++%%%%%%% &&&&&&", +"&& %%%%.......++++%%%%%%% &&&&&&", +"&& %%%.......++++++%%%%%% &&&&&&", +"&& %%%.... ", +"&& %%%.... #################### ", +"&& %%%%... ", +"&& %%%%... %%%%%%%%%%%%%%%%%%%% ", +"&& %%%%%.. %%#%%++%%%%%%%%%%%%% ", +"&& %%%%%%. %%#%%++%%$$%%%%%%%%% ", +"&& %%%%%%% %%#%%++%%$$%%%%%%%%% ", +"&& %%%%%%% %%#oo++%%$$%%%% %%% ", +"&& %%%%%%% %%#oo++%%$$%%%% %%% ", +"&& %%#oo++%%$$%%%% %%% ", +"&&&&&&&&&& %%#oo++OO$$%%XX %%% ", +"&&&&&&&&&& %%#oo++OO$$%%XX %%% ", +"&&&&&&&&&& %%#oo++OO$$@@XX %%% ", +"&&&&&&&&&& %%#oo++OO$$@@XX %%% ", +"&&&&&&&&&& %%#oo++OO$$@@XX %%% ", +"&&&&&&&&&& %%#oo++OO$$@@XX %%% ", +"&&&&&&&&&& %%#################% ", +"&&&&&&&&&& %%%%%%%%%%%%%%%%%%%% ", +"&&&&&&&&&& %%%%%%%%%%%%%%%%%%%% ", +"&&&&&&&&&& ", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" +}; diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index 9c4db5a49f..1f1715d781 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -1,26 +1,32 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: doc.cpp +// Name: samples/docview/doc.cpp // Purpose: Implements document functionality // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include "wx/wx.h" +#if !wxUSE_DOC_VIEW_ARCHITECTURE + #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! #endif -#ifdef __WXMAC__ -#include "wx/filename.h" + +#ifndef WX_PRECOMP + #include "wx/wx.h" #endif #if wxUSE_STD_IOSTREAM @@ -29,302 +35,132 @@ #include "wx/txtstrm.h" #endif -#if !wxUSE_DOC_VIEW_ARCHITECTURE -#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! -#endif - #include "doc.h" #include "view.h" -IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) -DrawingDocument::~DrawingDocument(void) -{ - WX_CLEAR_LIST(wxList, m_doodleSegments) -} +// ---------------------------------------------------------------------------- +// DrawingDocument implementation +// ---------------------------------------------------------------------------- -#if wxUSE_STD_IOSTREAM -wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream) +IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) + +DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& stream) { wxDocument::SaveObject(stream); - wxInt32 n = m_doodleSegments.GetCount(); - stream << n << '\n'; + const wxInt32 count = m_doodleSegments.size(); + stream << count << '\n'; - wxList::compatibility_iterator node = m_doodleSegments.GetFirst(); - while (node) + for ( int n = 0; n < count; n++ ) { - DoodleSegment *segment = (DoodleSegment *)node->GetData(); - segment->SaveObject(stream); + m_doodleSegments[n].SaveObject(stream); stream << '\n'; - - node = node->GetNext(); } return stream; } -#else -wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream) -{ - wxDocument::SaveObject(stream); - wxTextOutputStream text_stream( stream ); +DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& stream) +{ + wxDocument::LoadObject(stream); - wxInt32 n = m_doodleSegments.GetCount(); - text_stream << n << '\n'; + wxInt32 count = 0; + stream >> count; - wxList::compatibility_iterator node = m_doodleSegments.GetFirst(); - while (node) + for ( int n = 0; n < count; n++ ) { - DoodleSegment *segment = (DoodleSegment *)node->GetData(); - segment->SaveObject(stream); - text_stream << '\n'; - - node = node->GetNext(); + DoodleSegment segment; + segment.LoadObject(stream); + m_doodleSegments.push_back(segment); } return stream; } -#endif -#if wxUSE_STD_IOSTREAM -wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream) +void DrawingDocument::DoUpdate() { - wxDocument::LoadObject(stream); - - wxInt32 n = 0; - stream >> n; + Modify(true); + UpdateAllViews(); +} - for (int i = 0; i < n; i++) - { - DoodleSegment *segment = new DoodleSegment; - segment->LoadObject(stream); - m_doodleSegments.Append(segment); - } +void DrawingDocument::AddDoodleSegment(const DoodleSegment& segment) +{ + m_doodleSegments.push_back(segment); - return stream; + DoUpdate(); } -#else -wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream) + +bool DrawingDocument::PopLastSegment(DoodleSegment *segment) { - wxDocument::LoadObject(stream); + if ( m_doodleSegments.empty() ) + return false; - wxTextInputStream text_stream( stream ); + if ( segment ) + *segment = m_doodleSegments.back(); - wxInt32 n = 0; - text_stream >> n; + m_doodleSegments.pop_back(); - for (int i = 0; i < n; i++) - { - DoodleSegment *segment = new DoodleSegment; - segment->LoadObject(stream); - m_doodleSegments.Append(segment); - } + DoUpdate(); - return stream; + return true; } -#endif - -DoodleSegment::DoodleSegment(const DoodleSegment& seg):wxObject() -{ - wxList::compatibility_iterator node = seg.m_lines.GetFirst(); - while (node) - { - DoodleLine *line = (DoodleLine *)node->GetData(); - DoodleLine *newLine = new DoodleLine; - newLine->x1 = line->x1; - newLine->y1 = line->y1; - newLine->x2 = line->x2; - newLine->y2 = line->y2; - - m_lines.Append(newLine); - node = node->GetNext(); - } -} +// ---------------------------------------------------------------------------- +// DoodleSegment implementation +// ---------------------------------------------------------------------------- -DoodleSegment::~DoodleSegment(void) +DocumentOstream& DoodleSegment::SaveObject(DocumentOstream& ostream) { - WX_CLEAR_LIST(wxList, m_lines) -} - #if wxUSE_STD_IOSTREAM -wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream) -{ - wxInt32 n = m_lines.GetCount(); - stream << n << '\n'; - - wxList::compatibility_iterator node = m_lines.GetFirst(); - while (node) - { - DoodleLine *line = (DoodleLine *)node->GetData(); - stream << line->x1 << " " << - line->y1 << " " << - line->x2 << " " << - line->y2 << "\n"; - node = node->GetNext(); - } - - return stream; -} + DocumentOstream& stream = ostream; #else -wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) -{ - wxTextOutputStream text_stream( stream ); + wxTextOutputStream stream(ostream); +#endif - wxInt32 n = m_lines.GetCount(); - text_stream << n << wxT("\n"); + const wxInt32 count = m_lines.size(); + stream << count << '\n'; - wxList::compatibility_iterator node = m_lines.GetFirst(); - while (node) + for ( int n = 0; n < count; n++ ) { - DoodleLine* line = (DoodleLine*)node->GetData(); - text_stream << line->x1 << wxT(" ") << - line->y1 << wxT(" ") << - line->x2 << wxT(" ") << - line->y2 << wxT("\n"); - node = node->GetNext(); + const DoodleLine& line = m_lines[n]; + stream + << line.x1 << ' ' + << line.y1 << ' ' + << line.x2 << ' ' + << line.y2 << '\n'; } return stream; } -#endif -#if wxUSE_STD_IOSTREAM -wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream) +DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream) { - wxInt32 n = 0; - stream >> n; - - for (int i = 0; i < n; i++) - { - DoodleLine *line = new DoodleLine; - stream >> line->x1 >> - line->y1 >> - line->x2 >> - line->y2; - m_lines.Append(line); - } - - return stream; -} +#if wxUSE_STD_IOSTREAM + DocumentIstream& stream = istream; #else -wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream) -{ - wxTextInputStream text_stream( stream ); + wxTextInputStream stream(istream); +#endif - wxInt32 n = 0; - text_stream >> n; + wxInt32 count = 0; + stream >> count; - for (int i = 0; i < n; i++) + for ( int n = 0; n < count; n++ ) { - DoodleLine *line = new DoodleLine; - text_stream >> line->x1 >> - line->y1 >> - line->x2 >> - line->y2; - m_lines.Append(line); + DoodleLine line; + stream + >> line.x1 + >> line.y1 + >> line.x2 + >> line.y2; + m_lines.push_back(line); } return stream; } -#endif - -void DoodleSegment::Draw(wxDC *dc) -{ - wxList::compatibility_iterator node = m_lines.GetFirst(); - while (node) - { - DoodleLine *line = (DoodleLine *)node->GetData(); - dc->DrawLine(line->x1, line->y1, line->x2, line->y2); - node = node->GetNext(); - } -} - -/* -* Implementation of drawing command -*/ - -DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument* doc, DoodleSegment* seg) : - wxCommand(true, name) -{ - m_doc = doc; - m_segment = seg; - m_cmd = command; -} -DrawingCommand::~DrawingCommand(void) -{ - if (m_segment) - delete m_segment; -} - -bool DrawingCommand::Do(void) -{ - switch (m_cmd) - { - case DOODLE_CUT: - { - // Cut the last segment - if (m_doc->GetDoodleSegments().GetCount() > 0) - { - wxList::compatibility_iterator node = m_doc->GetDoodleSegments().GetLast(); - if (m_segment) - delete m_segment; - - m_segment = (DoodleSegment*)node->GetData(); - m_doc->GetDoodleSegments().Erase(node); - - m_doc->Modify(true); - m_doc->UpdateAllViews(); - } - break; - } - case DOODLE_ADD: - { - m_doc->GetDoodleSegments().Append(new DoodleSegment(*m_segment)); - m_doc->Modify(true); - m_doc->UpdateAllViews(); - break; - } - } - return true; -} - -bool DrawingCommand::Undo(void) -{ - switch (m_cmd) - { - case DOODLE_CUT: - { - // Paste the segment - if (m_segment) - { - m_doc->GetDoodleSegments().Append(m_segment); - m_doc->Modify(true); - m_doc->UpdateAllViews(); - m_segment = NULL; - } - m_doc->Modify(true); - m_doc->UpdateAllViews(); - break; - } - case DOODLE_ADD: - { - // Cut the last segment - if (m_doc->GetDoodleSegments().GetCount() > 0) - { - wxList::compatibility_iterator node = m_doc->GetDoodleSegments().GetLast(); - DoodleSegment* seg = (DoodleSegment*)node->GetData(); - delete seg; - m_doc->GetDoodleSegments().Erase(node); - - m_doc->Modify(true); - m_doc->UpdateAllViews(); - } - } - } - return true; -} +// ---------------------------------------------------------------------------- +// TextEditDocument implementation +// ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) @@ -332,42 +168,33 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) // we override DoSave/OpenDocument instead of Save/LoadObject bool TextEditDocument::DoSaveDocument(const wxString& filename) { - TextEditView* view = GetFirstView(); - - if (!view->m_textsw->SaveFile(filename)) - return false; - - return true; + return GetFirstView()->GetText()->SaveFile(filename); } bool TextEditDocument::DoOpenDocument(const wxString& filename) { - TextEditView* view = GetFirstView(); - if (!view->m_textsw->LoadFile(filename)) - return false; - - return true; + return GetFirstView()->GetText()->LoadFile(filename); } -bool TextEditDocument::IsModified(void) const +bool TextEditDocument::IsModified() const { TextEditView* view = GetFirstView(); - return (wxDocument::IsModified() || (view && view->m_textsw->IsModified())); + return wxDocument::IsModified() || (view && view->GetText()->IsModified()); } -void TextEditDocument::Modify(bool mod) +void TextEditDocument::Modify(bool modified) { TextEditView* view = GetFirstView(); - wxDocument::Modify(mod); + wxDocument::Modify(modified); - if (!mod && view && view->m_textsw) - view->m_textsw->DiscardEdits(); + if ( !modified && view && view->GetText() ) + view->GetText()->DiscardEdits(); } TextEditView* TextEditDocument::GetFirstView() const { - wxView* view = wxDocument::GetFirstView(); - return view ? wxStaticCast(view, TextEditView) : NULL; + wxView* view = wxDocument::GetFirstView(); + return view ? wxStaticCast(view, TextEditView) : NULL; } diff --git a/samples/docview/doc.h b/samples/docview/doc.h index 66132371c3..a4547ec65f 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -1,107 +1,179 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: doc.h +// Name: samples/docview/doc.h // Purpose: Document classes // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __DOC_H__ -#define __DOC_H__ +#ifndef _WX_SAMPLES_DOCVIEW_DOC_H_ +#define _WX_SAMPLES_DOCVIEW_DOC_H_ #include "wx/docview.h" #include "wx/cmdproc.h" - -// Plots a line from one point to the other -class DoodleLine : public wxObject +#include "wx/vector.h" + +// This sample is written to build both with wxUSE_STD_IOSTREAM==0 and 1, which +// somewhat complicates its code but is necessary in order to support building +// it under all platforms and in all build configurations +// +// In your own code you would normally use std::stream classes only and so +// wouldn't need these typedefs +#if wxUSE_STD_IOSTREAM + typedef wxSTD istream DocumentIstream; + typedef wxSTD ostream DocumentOstream; +#else // !wxUSE_STD_IOSTREAM + typedef wxInputStream DocumentIstream; + typedef wxOutputStream DocumentOstream; +#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM + +// ---------------------------------------------------------------------------- +// The document class and its helpers +// ---------------------------------------------------------------------------- + +// Represents a line from one point to the other +struct DoodleLine { -public: + DoodleLine() { /* leave fields uninitialized */ } + + DoodleLine(const wxPoint& pt1, const wxPoint& pt2) + : x1(pt1.x), y1(pt1.y), x2(pt2.x), y2(pt2.y) + { + } + wxInt32 x1; wxInt32 y1; wxInt32 x2; wxInt32 y2; }; +typedef wxVector DoodleLines; + // Contains a list of lines: represents a mouse-down doodle -class DoodleSegment : public wxObject +class DoodleSegment { public: - wxList m_lines; - - DoodleSegment() : wxObject() {} - DoodleSegment(const DoodleSegment& seg); - virtual ~DoodleSegment(); + DocumentOstream& SaveObject(DocumentOstream& stream); + DocumentIstream& LoadObject(DocumentIstream& stream); - void Draw(wxDC *dc); -#if wxUSE_STD_IOSTREAM - wxSTD ostream& SaveObject(wxSTD ostream& text_stream); - wxSTD istream& LoadObject(wxSTD istream& text_stream); -#else - wxOutputStream& SaveObject(wxOutputStream& stream); - wxInputStream& LoadObject(wxInputStream& stream); -#endif + bool IsEmpty() const { return m_lines.empty(); } + void AddLine(const wxPoint& pt1, const wxPoint& pt2) + { + m_lines.push_back(DoodleLine(pt1, pt2)); + } + const DoodleLines& GetLines() const { return m_lines; } +private: + DoodleLines m_lines; }; +typedef wxVector DoodleSegments; + + +// The drawing document (model) class itself class DrawingDocument : public wxDocument { - DECLARE_DYNAMIC_CLASS(DrawingDocument) -private: public: - wxList m_doodleSegments; + DrawingDocument() : wxDocument() { } - DrawingDocument() : wxDocument() {} - virtual ~DrawingDocument(); + DocumentOstream& SaveObject(DocumentOstream& stream); + DocumentIstream& LoadObject(DocumentIstream& stream); -#if wxUSE_STD_IOSTREAM - wxSTD ostream& SaveObject(wxSTD ostream& text_stream); - wxSTD istream& LoadObject(wxSTD istream& text_stream); -#else - wxOutputStream& SaveObject(wxOutputStream& stream); - wxInputStream& LoadObject(wxInputStream& stream); -#endif - - inline wxList& GetDoodleSegments() const { return (wxList&) m_doodleSegments; }; + // add a new segment to the document + void AddDoodleSegment(const DoodleSegment& segment); + + // remove the last segment, if any, and copy it in the provided pointer if + // not NULL and return true or return false and do nothing if there are no + // segments + bool PopLastSegment(DoodleSegment *segment); + + // get direct access to our segments (for DrawingView) + const DoodleSegments& GetSegments() const { return m_doodleSegments; } + +private: + void DoUpdate(); + + DoodleSegments m_doodleSegments; + + DECLARE_DYNAMIC_CLASS(DrawingDocument) }; -#define DOODLE_CUT 1 -#define DOODLE_ADD 2 +// ---------------------------------------------------------------------------- +// Some operations (which can be done and undone by the view) on the document: +// ---------------------------------------------------------------------------- + +// Base class for all operations on DrawingDocument class DrawingCommand : public wxCommand { +public: + DrawingCommand(DrawingDocument *doc, + const wxString& name, + const DoodleSegment& segment = DoodleSegment()) + : wxCommand(true, name), + m_doc(doc), + m_segment(segment) + { + } + protected: - DoodleSegment* m_segment; - DrawingDocument* m_doc; - int m_cmd; + bool DoAdd() { m_doc->AddDoodleSegment(m_segment); return true; } + bool DoRemove() { return m_doc->PopLastSegment(&m_segment); } + +private: + DrawingDocument * const m_doc; + DoodleSegment m_segment; +}; + +// The command for adding a new segment +class DrawingAddSegmentCommand : public DrawingCommand +{ +public: + DrawingAddSegmentCommand(DrawingDocument *doc, const DoodleSegment& segment) + : DrawingCommand(doc, "Add new segment", segment) + { + } + + virtual bool Do() { return DoAdd(); } + virtual bool Undo() { return DoRemove(); } +}; + +// The command for removing the last segment +class DrawingRemoveSegmentCommand : public DrawingCommand +{ public: - DrawingCommand(const wxString& name, int cmd, DrawingDocument*, DoodleSegment*); - virtual ~DrawingCommand(); + DrawingRemoveSegmentCommand(DrawingDocument *doc) + : DrawingCommand(doc, "Remove last segment") + { + } - bool Do(void); - bool Undo(void); + virtual bool Do() { return DoRemove(); } + virtual bool Undo() { return DoAdd(); } }; + +// ---------------------------------------------------------------------------- +// A simple text document class +// ---------------------------------------------------------------------------- + class TextEditView; class TextEditDocument : public wxDocument { - DECLARE_DYNAMIC_CLASS(TextEditDocument) public: - TextEditDocument() : wxDocument() {} - virtual ~TextEditDocument() {} -/* - wxSTD ostream& SaveObject(wxSTD ostream&); - wxSTD istream& LoadObject(wxSTD istream&); -*/ - TextEditView* GetFirstView() const; + TextEditDocument() : wxDocument() { } + TextEditView *GetFirstView() const; virtual bool DoSaveDocument(const wxString& filename); virtual bool DoOpenDocument(const wxString& filename); - virtual bool IsModified(void) const; + virtual bool IsModified() const; virtual void Modify(bool mod); -}; + DECLARE_NO_COPY_CLASS(TextEditDocument) + DECLARE_DYNAMIC_CLASS(TextEditDocument) +}; -#endif +#endif // _WX_SAMPLES_DOCVIEW_DOC_H_ diff --git a/samples/docview/doc.xpm b/samples/docview/doc.xpm new file mode 100644 index 0000000000..1d4a703ff1 --- /dev/null +++ b/samples/docview/doc.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static char *doc[] = { +/* columns rows colors chars-per-pixel */ +"32 32 5 1", +" c black", +". c #808080", +"X c #C0C0C0", +"o c gray100", +"O c None", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOXXXXXXXXXXXXXXXXXXXOOOO", +"OOOOOOOOOXoooooooooooooooooX.OOO", +"OOOOOOOOOXoooooooooooooooooX.OOO", +"OOOOOOXXXXXXXXXXXXXXXXXXXooX.OOO", +"OOOOOOXoooooooooooooooooXooX.OOO", +"OOOOOOXoooooooooooooooooXooX.OOO", +"OOOXXXXXXXXXXXXXXXXXXXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoo .. . ooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoo oooooooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoo . ooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoo . oooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoooooooooooooooooXooXooX.OOO", +"OOOXoo . . ooXooXooX.OOO", +"OOOXoooooooooooooooooXooXXXX.OOO", +"OOOXoooooooooooooooooXooX....OOO", +"OOOXoo . . oXooX.OOOOOO", +"OOOXoooooooooooooooooXXXX.OOOOOO", +"OOOXoooooooooooooooooX....OOOOOO", +"OOOXoooooooooooooooooX.OOOOOOOOO", +"OOOXXXXXXXXXXXXXXXXXXX.OOOOOOOOO", +"OOOOO..................OOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp index e29218b6a9..3f0b6c747b 100644 --- a/samples/docview/docview.cpp +++ b/samples/docview/docview.cpp @@ -1,161 +1,226 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: docview.cpp +// Name: samples/docview/docview.cpp // Purpose: Document/view demo // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// /* -* Purpose: Document/view architecture demo for wxWidgets class library -* Run with no arguments for multiple top-level windows, -single -* for a single window. -*/ - + This sample show document/view support in wxWidgets. + + It can be run in several ways: + * With "--mdi" command line option to use multiple MDI child frames + for the multiple documents (this is the default). + * With "--sdi" command line option to use multiple top level windows + for the multiple documents + * With "--single" command line option to support opening a single + document only + + Notice that doing it like this somewhat complicates the code, you could + make things much simpler in your own programs by using either + wxDocParentFrame or wxDocMDIParentFrame unconditionally (and never using + the single mode) instead of supporting all of them as this sample does. + */ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" + #include "wx/stockitem.h" #endif #if !wxUSE_DOC_VIEW_ARCHITECTURE -#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! + #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! #endif #include "wx/docview.h" +#include "wx/docmdi.h" #include "docview.h" #include "doc.h" #include "view.h" + +#include "wx/cmdline.h" + #ifdef __WXMAC__ -#include "wx/filename.h" + #include "wx/filename.h" #endif -#include "wx/stockitem.h" -static MyFrame* frame = NULL; +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "doc.xpm" + #include "chart.xpm" + #include "notepad.xpm" +#endif -// In single window mode, don't have any child windows; use -// main window. -bool singleWindowMode = false; +// ---------------------------------------------------------------------------- +// MyApp implementation +// ---------------------------------------------------------------------------- IMPLEMENT_APP(MyApp) -MyApp::MyApp(void) +BEGIN_EVENT_TABLE(MyApp, wxApp) + EVT_MENU(wxID_ABOUT, MyApp::OnAbout) +END_EVENT_TABLE() + +MyApp::MyApp() { - m_docManager = NULL; +#if wxUSE_MDI_ARCHITECTURE + m_mode = Mode_MDI; +#else + m_mode = Mode_SDI; +#endif + + m_canvas = NULL; + m_menuEdit = NULL; } -bool MyApp::OnInit(void) +// constants for the command line options names +namespace CmdLineOption { - if ( !wxApp::OnInit() ) - return false; - SetAppName(wxT("DocView Demo")); +const char * const MDI = "mdi"; +const char * const SDI = "sdi"; +const char * const SINGLE = "single"; + +} // namespace CmdLineOption + +void MyApp::OnInitCmdLine(wxCmdLineParser& parser) +{ + wxApp::OnInitCmdLine(parser); + + parser.AddSwitch("", CmdLineOption::MDI, + "run in MDI mode: multiple documents, single window"); + parser.AddSwitch("", CmdLineOption::SDI, + "run in SDI mode: multiple documents, multiple windows"); + parser.AddSwitch("", CmdLineOption::SINGLE, + "run in single document mode"); +} + +bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser) +{ + int numModeOptions = 0; + +#if wxUSE_MDI_ARCHITECTURE + if ( parser.Found(CmdLineOption::MDI) ) + { + m_mode = Mode_MDI; + numModeOptions++; + } +#endif // wxUSE_MDI_ARCHITECTURE + + if ( parser.Found(CmdLineOption::SDI) ) + { + m_mode = Mode_SDI; + numModeOptions++; + } - //// Find out if we're: - //// multiple window: multiple windows, each view in a separate frame - //// single window: one view (within the main frame) and one document at a time, as in Windows Write. - //// In single window mode, we only allow one document type - if (argc > 1) + if ( parser.Found(CmdLineOption::SINGLE) ) { - if (wxStrcmp(argv[1], wxT("-single")) == 0) - { - singleWindowMode = true; - } + m_mode = Mode_Single; + numModeOptions++; } + if ( numModeOptions > 1 ) + { + wxLogError("Only a single option choosing the mode can be given."); + return false; + } + + return wxApp::OnCmdLineParsed(parser); +} + +bool MyApp::OnInit() +{ + if ( !wxApp::OnInit() ) + return false; + + SetAppName("DocView Sample"); + //// Create a document manager - m_docManager = new wxDocManager; + wxDocManager *docManager = new wxDocManager; //// Create a template relating drawing documents to their views - new wxDocTemplate(m_docManager, wxT("Drawing"), wxT("*.drw"), wxT(""), wxT("drw"), wxT("Drawing Doc"), wxT("Drawing View"), - CLASSINFO(DrawingDocument), CLASSINFO(DrawingView)); + new wxDocTemplate(docManager, "Drawing", "*.drw", "", "drw", + "Drawing Doc", "Drawing View", + CLASSINFO(DrawingDocument), CLASSINFO(DrawingView)); #ifdef __WXMAC__ - wxFileName::MacRegisterDefaultTypeAndCreator( wxT("drw") , 'WXMB' , 'WXMA' ) ; + wxFileName::MacRegisterDefaultTypeAndCreator("drw" , 'WXMB' , 'WXMA'); #endif - if (singleWindowMode) + if ( m_mode == Mode_Single ) { - // If we've only got one window, we only get to edit - // one document at a time. Therefore no text editing, just - // doodling. - m_docManager->SetMaxDocsOpen(1); + // If we've only got one window, we only get to edit one document at a + // time. Therefore no text editing, just doodling. + docManager->SetMaxDocsOpen(1); } - else + else // multiple documents mode: allow documents of different types { - //// Create a template relating text documents to their views - new wxDocTemplate(m_docManager, wxT("Text"), wxT("*.txt;*.text"), wxT(""), wxT("txt;text"), wxT("Text Doc"), wxT("Text View"), - CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); + // Create a template relating text documents to their views + new wxDocTemplate(docManager, "Text", "*.txt;*.text", "", "txt;text", + "Text Doc", "Text View", + CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); #ifdef __WXMAC__ - wxFileName::MacRegisterDefaultTypeAndCreator( wxT("txt") , 'TEXT' , 'WXMA' ) ; + wxFileName::MacRegisterDefaultTypeAndCreator("txt" , 'TEXT' , 'WXMA'); #endif } - //// Create the main frame window - frame = new MyFrame(m_docManager, NULL, wxID_ANY, GetAppDisplayName(), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); - - //// Give it an icon (this is ignored in MDI mode: uses resources) -#ifdef __WXMSW__ - frame->SetIcon(wxIcon(wxT("doc_icn"))); -#endif - - //// Make a menubar - wxMenu *file_menu = new wxMenu; - wxMenu *edit_menu = NULL; - - file_menu->Append(wxID_NEW); - file_menu->Append(wxID_OPEN); - - if (singleWindowMode) + // create the main frame window + wxFrame *frame; +#if wxUSE_MDI_ARCHITECTURE + if ( m_mode == Mode_MDI ) { - file_menu->Append(wxID_CLOSE); - file_menu->Append(wxID_SAVE); - file_menu->Append(wxID_SAVEAS); - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT); - file_menu->Append(wxID_PRINT_SETUP, wxT("Print &Setup...")); - file_menu->Append(wxID_PREVIEW); - - edit_menu = new wxMenu; - edit_menu->Append(wxID_UNDO); - edit_menu->Append(wxID_REDO); - edit_menu->AppendSeparator(); - edit_menu->Append(DOCVIEW_CUT, wxT("&Cut last segment")); - - frame->m_editMenu = edit_menu; + frame = new wxDocMDIParentFrame(docManager, NULL, wxID_ANY, + GetAppDisplayName(), + wxDefaultPosition, + wxSize(500, 400)); + } + else +#endif // wxUSE_MDI_ARCHITECTURE + { + frame = new wxDocParentFrame(docManager, NULL, wxID_ANY, + GetAppDisplayName(), + wxDefaultPosition, + wxSize(500, 400)); } - file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT); + // and its menu bar + wxMenu *menuFile = new wxMenu; - // A nice touch: a history of files visited. Use this menu. - m_docManager->FileHistoryUseMenu(file_menu); + menuFile->Append(wxID_NEW); + menuFile->Append(wxID_OPEN); - wxMenu *help_menu = new wxMenu; - help_menu->Append(DOCVIEW_ABOUT); + if ( m_mode == Mode_Single ) + AppendDocumentFileCommands(menuFile, true); - wxMenuBar *menu_bar = new wxMenuBar; + menuFile->AppendSeparator(); + menuFile->Append(wxID_EXIT); - menu_bar->Append(file_menu, wxGetStockLabel(wxID_FILE)); - if (edit_menu) - menu_bar->Append(edit_menu, wxGetStockLabel(wxID_EDIT)); - menu_bar->Append(help_menu, wxGetStockLabel(wxID_HELP)); + // A nice touch: a history of files visited. Use this menu. + docManager->FileHistoryUseMenu(menuFile); - if (singleWindowMode) - frame->m_canvas = frame->CreateCanvas(NULL, frame); + if ( m_mode == Mode_Single ) + { + m_canvas = new MyCanvas(NULL, frame); + m_menuEdit = CreateDrawingEditMenu(); + } - //// Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); + CreateMenuBarForFrame(frame, menuFile, m_menuEdit); + frame->SetIcon(wxICON(doc)); frame->Centre(wxBOTH); frame->Show(true); @@ -163,131 +228,153 @@ bool MyApp::OnInit(void) return true; } -int MyApp::OnExit(void) +int MyApp::OnExit() { - delete m_docManager; - return 0; + delete wxDocManager::GetDocumentManager(); + + return wxApp::OnExit(); } -/* -* Centralised code for creating a document frame. -* Called from view.cpp, when a view is created, but not used at all -* in 'single window' mode. -*/ +void MyApp::AppendDocumentFileCommands(wxMenu *menu, bool supportsPrinting) +{ + menu->Append(wxID_CLOSE); + menu->Append(wxID_SAVE); + menu->Append(wxID_SAVEAS); -wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas) + if ( supportsPrinting ) + { + menu->AppendSeparator(); + menu->Append(wxID_PRINT); + menu->Append(wxID_PRINT_SETUP, "Print &Setup..."); + menu->Append(wxID_PREVIEW); + } +} + +wxMenu *MyApp::CreateDrawingEditMenu() { - //// Make a child frame - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), wxID_ANY, wxT("Child Frame"), - wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); + wxMenu * const menu = new wxMenu; + menu->Append(wxID_UNDO); + menu->Append(wxID_REDO); + menu->AppendSeparator(); + menu->Append(wxID_CUT, "&Cut last segment"); -#ifdef __WXMSW__ - subframe->SetIcon(wxString(isCanvas ? wxT("chrt_icn") : wxT("notepad_icn"))); -#endif + return menu; +} - //// Make a menubar - wxMenu *file_menu = new wxMenu; +void MyApp::CreateMenuBarForFrame(wxFrame *frame, wxMenu *file, wxMenu *edit) +{ + wxMenuBar *menubar = new wxMenuBar; - file_menu->Append(wxID_NEW); - file_menu->Append(wxID_OPEN); - file_menu->Append(wxID_CLOSE); - file_menu->Append(wxID_SAVE); - file_menu->Append(wxID_SAVEAS); + menubar->Append(file, wxGetStockLabel(wxID_FILE)); - if (isCanvas) - { - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT); - file_menu->Append(wxID_PRINT_SETUP, wxT("Print &Setup...")); - file_menu->Append(wxID_PREVIEW); - } + if ( edit ) + menubar->Append(edit, wxGetStockLabel(wxID_EDIT)); - wxMenu *edit_menu = new wxMenu; + wxMenu *help= new wxMenu; + help->Append(wxID_ABOUT); + menubar->Append(help, wxGetStockLabel(wxID_HELP)); - if (isCanvas) - { - edit_menu->Append(wxID_UNDO); - edit_menu->Append(wxID_REDO); - edit_menu->AppendSeparator(); - edit_menu->Append(DOCVIEW_CUT, wxT("&Cut last segment")); + frame->SetMenuBar(menubar); +} - doc->GetCommandProcessor()->SetEditMenu(edit_menu); +wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas) +{ + // create a child frame of appropriate class for the current mode + wxFrame *subframe; +#if wxUSE_MDI_ARCHITECTURE + if ( GetMode() == Mode_MDI ) + { + subframe = new wxDocMDIChildFrame + ( + doc, + view, + wxStaticCast(GetTopWindow(), wxDocMDIParentFrame), + wxID_ANY, + "Child Frame", + wxDefaultPosition, + wxSize(300, 300) + ); } else +#endif // wxUSE_MDI_ARCHITECTURE { - edit_menu->Append(wxID_COPY); - edit_menu->Append(wxID_PASTE); - edit_menu->Append(wxID_SELECTALL); + subframe = new wxDocChildFrame + ( + doc, + view, + wxStaticCast(GetTopWindow(), wxDocParentFrame), + wxID_ANY, + "Child Frame", + wxDefaultPosition, + wxSize(300, 300) + ); + + subframe->Centre(wxBOTH); } - wxMenu *help_menu = new wxMenu; - help_menu->Append(DOCVIEW_ABOUT); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, wxGetStockLabel(wxID_FILE)); - menu_bar->Append(edit_menu, wxGetStockLabel(wxID_EDIT)); - menu_bar->Append(help_menu, wxGetStockLabel(wxID_HELP)); + wxMenu *menuFile = new wxMenu; - //// Associate the menu bar with the frame - subframe->SetMenuBar(menu_bar); + menuFile->Append(wxID_NEW); + menuFile->Append(wxID_OPEN); + AppendDocumentFileCommands(menuFile, isCanvas); + menuFile->AppendSeparator(); + menuFile->Append(wxID_EXIT); - subframe->Centre(wxBOTH); - - return subframe; -} + wxMenu *menuEdit; + if ( isCanvas ) + { + menuEdit = CreateDrawingEditMenu(); -/* -* This is the top-level window of the application. -*/ + doc->GetCommandProcessor()->SetEditMenu(menuEdit); + doc->GetCommandProcessor()->Initialize(); + } + else // text frame + { + menuEdit = new wxMenu; + menuEdit->Append(wxID_COPY); + menuEdit->Append(wxID_PASTE); + menuEdit->Append(wxID_SELECTALL); + } -IMPLEMENT_CLASS(MyFrame, wxDocParentFrame) -BEGIN_EVENT_TABLE(MyFrame, wxDocParentFrame) - EVT_MENU(DOCVIEW_ABOUT, MyFrame::OnAbout) -END_EVENT_TABLE() + CreateMenuBarForFrame(subframe, menuFile, menuEdit); -MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, const long type): -wxDocParentFrame(manager, frame, id, title, pos, size, type) -{ - // This pointer only needed if in single window mode - m_canvas = NULL; - m_editMenu = NULL; -} + subframe->SetIcon(isCanvas ? wxICON(chrt) : wxICON(notepad)); -void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) -{ - wxMessageBox(wxT("DocView Demo\nAuthor: Julian Smart\nUsage: docview.exe [-single]"), wxT("About DocView")); -/* - Better, but brings in adv lib - wxAboutDialogInfo info; - info.SetName(wxTheApp->GetAppDisplayName()); - info.AddDeveloper(wxT("Julian Smart")); - wxAboutBox(info); -*/ + return subframe; } -// Creates a canvas. Called either from view.cc when a new drawing -// view is created, or in OnInit as a child of the main window, -// if in 'single window' mode. -MyCanvas *MyFrame::CreateCanvas(DrawingView* view, wxFrame *parent) +void MyApp::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxSize size = parent->GetClientSize(); - - // Non-retained canvas - MyCanvas* canvas = new MyCanvas(view, parent, wxPoint(0, 0), size, 0); - canvas->SetCursor(wxCursor(wxCURSOR_PENCIL)); - - // Give it scrollbars - canvas->SetScrollbars(20, 20, 50, 50); - canvas->SetBackgroundColour(*wxWHITE); - canvas->ClearBackground(); - - return canvas; -} + wxString modeName; + switch ( m_mode ) + { +#if wxUSE_MDI_ARCHITECTURE + case Mode_MDI: + modeName = "MDI"; + break; +#endif // wxUSE_MDI_ARCHITECTURE + + case Mode_SDI: + modeName = "SDI"; + break; + + case Mode_Single: + modeName = "single document"; + break; + + default: + wxFAIL_MSG( "unknown mode "); + } -MyFrame *GetMainFrame(void) -{ - return frame; + wxLogMessage + ( + "This is the wxWidgets Document/View Sample\n" + "running in %s mode.\n" + "\n" + "Authors: Julian Smart, Vadim Zeitlin\n" + "\n" + "Usage: docview [--{mdi,sdi,single}]", + modeName + ); } diff --git a/samples/docview/docview.h b/samples/docview/docview.h index 4e60ba1ffa..81357a0a30 100644 --- a/samples/docview/docview.h +++ b/samples/docview/docview.h @@ -1,64 +1,88 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: docview.h +// Name: samples/docview/docview.h // Purpose: Document/view demo // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __DOCVIEW_H__ -#define __DOCVIEW_H__ +#ifndef _WX_SAMPLES_DOCVIEW_DOCVIEW_H_ +#define _WX_SAMPLES_DOCVIEW_DOCVIEW_H_ #include "wx/docview.h" -class wxDocManager; +class MyFrame; +class MyCanvas; +class DrawingView; // Define a new application class MyApp : public wxApp { public: - MyApp(void); - bool OnInit(void); - int OnExit(void); - + // this sample can be launched in several different ways: + enum Mode + { +#if wxUSE_MDI_ARCHITECTURE + Mode_MDI, // MDI mode: multiple documents, single top level window +#endif // wxUSE_MDI_ARCHITECTURE + Mode_SDI, // SDI mode: multiple documents, multiple top level windows + Mode_Single // single document mode (and hence single top level window) + }; + + MyApp(); + + // override some wxApp virtual methods + virtual bool OnInit(); + virtual int OnExit(); + + virtual void OnInitCmdLine(wxCmdLineParser& parser); + virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + + // our specific methods + Mode GetMode() const { return m_mode; } wxFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas); -protected: - wxDocManager* m_docManager; -}; + // these accessors should only be called in single document mode, otherwise + // the pointers are NULL and an assert is triggered + MyCanvas *GetMainWindowCanvas() const + { wxASSERT(m_canvas); return m_canvas; } + wxMenu *GetMainWindowEditMenu() const + { wxASSERT(m_menuEdit); return m_menuEdit; } -DECLARE_APP(MyApp) +private: + // append the standard document-oriented menu commands to this menu + void AppendDocumentFileCommands(wxMenu *menu, bool supportsPrinting); -// Define a new frame -class MyCanvas; -class DrawingView; -class MyFrame : public wxDocParentFrame -{ - DECLARE_CLASS(MyFrame) -public: - wxMenu* m_editMenu; + // create the edit menu for drawing documents + wxMenu *CreateDrawingEditMenu(); - // This pointer only needed if in single window mode - MyCanvas* m_canvas; + // create and associate with the given frame the menu bar containing the + // given file and edit (possibly NULL) menus as well as the standard help + // one + void CreateMenuBarForFrame(wxFrame *frame, wxMenu *file, wxMenu *edit); - MyFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, - const long type); - MyCanvas* CreateCanvas(DrawingView*, wxFrame *parent); - -protected: + // show the about box: as we can have different frames it's more + // convenient, even if somewhat less usual, to handle this in the + // application object itself void OnAbout(wxCommandEvent& event); - DECLARE_EVENT_TABLE() -}; -extern MyFrame *GetMainFrame(); -#define DOCVIEW_CUT 1 -#define DOCVIEW_ABOUT wxID_ABOUT + // the currently used mode + Mode m_mode; + + // only used if m_mode == Mode_Single + MyCanvas *m_canvas; + wxMenu *m_menuEdit; -extern bool singleWindowMode; + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(MyApp) +}; + +DECLARE_APP(MyApp) -#endif +#endif // _WX_SAMPLES_DOCVIEW_DOCVIEW_H_ diff --git a/samples/docview/docview.rc b/samples/docview/docview.rc index 19c382a856..335d7ba3c0 100644 --- a/samples/docview/docview.rc +++ b/samples/docview/docview.rc @@ -1,5 +1,6 @@ -doc_icn ICON "doc.ico" -chrt_icn ICON "chart.ico" -notepad_icn ICON "notepad.ico" #include "wx/msw/wx.rc" +doc ICON "doc.ico" +chrt ICON "chart.ico" +notepad ICON "notepad.ico" + diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj index 9631148e95..dbfece2e55 100644 --- a/samples/docview/docview_vc7.vcproj +++ b/samples/docview/docview_vc7.vcproj @@ -1,11 +1,4 @@ - - + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> - - + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - - - - - - - + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + Name="VCCustomBuildTool"/> + Name="VCMIDLTool"/> + + + Name="VCPreLinkEventTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Culture="1033" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCManagedWrapperGeneratorTool"/> + - + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + RelativePath=".\doc.cpp"> + + RelativePath=".\docview.cpp"> + + RelativePath=".\view.cpp"> + + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath=".\docview.rc"> + - - diff --git a/samples/docview/notepad.xpm b/samples/docview/notepad.xpm new file mode 100644 index 0000000000..53a21d434f --- /dev/null +++ b/samples/docview/notepad.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static char *notepad[] = { +/* columns rows colors chars-per-pixel */ +"32 32 5 1", +" c black", +". c #808080", +"X c #C0C0C0", +"o c gray100", +"O c None", +/* pixels */ +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOO.OO.OO.OO.OO.OOOOOOOOOO", +"OOOOOOXXX.XX.XX.XX.XX.XXXOOOOOOO", +"OOOOOOXoo.oo.oo.oo.oo.ooXOOOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoo .. . ooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoo oooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoo . ooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoo . oooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoo . . ooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoo . . oX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXoooooooooooooooooX.OOOOOO", +"OOOOOOXXXXXXXXXXXXXXXXXXX.OOOOOO", +"OOOOOOOO..................OOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" +}; diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp index 6fbd4103b4..d27e3f6a20 100644 --- a/samples/docview/view.cpp +++ b/samples/docview/view.cpp @@ -1,11 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: view.cpp -// Purpose: View classes +// Name: samples/docview/view.cpp +// Purpose: View classes implementation // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -13,56 +14,51 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" #endif #if !wxUSE_DOC_VIEW_ARCHITECTURE -#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! + #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! #endif #include "docview.h" #include "doc.h" #include "view.h" -IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView) +// ---------------------------------------------------------------------------- +// DrawingView implementation +// ---------------------------------------------------------------------------- -// For drawing lines in a canvas -static float xpos = -1; -static float ypos = -1; +IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView) BEGIN_EVENT_TABLE(DrawingView, wxView) - EVT_MENU(DOODLE_CUT, DrawingView::OnCut) + EVT_MENU(wxID_CUT, DrawingView::OnCut) END_EVENT_TABLE() // What to do when a view is created. Creates actual // windows for displaying the view. bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { - if (!singleWindowMode) + MyApp& app = wxGetApp(); + if ( app.GetMode() != MyApp::Mode_Single ) { - // Multiple windows - m_frame = wxGetApp().CreateChildFrame(doc, this, true); - m_frame->SetTitle(wxT("DrawingView")); - - m_canvas = GetMainFrame()->CreateCanvas(this, m_frame); -#ifdef __X__ - // X seems to require a forced resize - int x, y; - m_frame->GetSize(&x, &y); - m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y); -#endif + // create a new window and canvas inside it + m_frame = app.CreateChildFrame(doc, this, true); + m_frame->SetTitle("Drawing View"); + + m_canvas = new MyCanvas(this, m_frame); m_frame->Show(true); } - else + else // single document mode { - // Single-window mode - m_frame = GetMainFrame(); - m_canvas = GetMainFrame()->m_canvas; - m_canvas->m_view = this; + // reuse the existing window and canvas + m_frame = wxStaticCast(app.GetTopWindow(), wxFrame); + m_canvas = app.GetMainWindowCanvas(); + m_canvas->SetView(this); // Associate the appropriate frame with this view. SetFrame(m_frame); @@ -72,26 +68,34 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) Activate(true); // Initialize the edit menu Undo and Redo items - doc->GetCommandProcessor()->SetEditMenu(((MyFrame*)m_frame)->m_editMenu); + doc->GetCommandProcessor()->SetEditMenu(app.GetMainWindowEditMenu()); doc->GetCommandProcessor()->Initialize(); } return true; } -// Sneakily gets used for default print/preview -// as well as drawing on the screen. +// Sneakily gets used for default print/preview as well as drawing on the +// screen. void DrawingView::OnDraw(wxDC *dc) { - dc->SetFont(*wxNORMAL_FONT); dc->SetPen(*wxBLACK_PEN); - wxList::compatibility_iterator node = GetDocument()->GetDoodleSegments().GetFirst(); - while (node) + // simply draw all lines of all segments + const DoodleSegments& segments = GetDocument()->GetSegments(); + for ( DoodleSegments::const_iterator i = segments.begin(); + i != segments.end(); + ++i ) { - DoodleSegment *seg = (DoodleSegment *)node->GetData(); - seg->Draw(dc); - node = node->GetNext(); + const DoodleLines& lines = i->GetLines(); + for ( DoodleLines::const_iterator j = lines.begin(); + j != lines.end(); + ++j ) + { + const DoodleLine& line = *j; + + dc->DrawLine(line.x1, line.y1, line.x2, line.y2); + } } } @@ -102,58 +106,50 @@ DrawingDocument* DrawingView::GetDocument() void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)) { - if (m_canvas) + if ( m_canvas ) m_canvas->Refresh(); - -/* Is the following necessary? -#ifdef __WXMSW__ - if (canvas) - canvas->Refresh(); -#else - if (canvas) - { - wxClientDC dc(canvas); - dc.Clear(); - OnDraw(& dc); - } -#endif -*/ } // Clean up windows used for displaying the view. bool DrawingView::OnClose(bool deleteWindow) { - if (!GetDocument()->Close()) + if ( !GetDocument()->Close() ) return false; - // Clear the canvas in case we're in single-window mode, - // and the canvas stays. - m_canvas->ClearBackground(); - m_canvas->m_view = NULL; - m_canvas = NULL; - - wxString s(wxTheApp->GetAppDisplayName()); - if (m_frame) - m_frame->SetTitle(s); - - SetFrame(NULL); - Activate(false); - if (deleteWindow && !singleWindowMode) + // Clear the canvas in single-window mode in which it stays alive + if ( wxGetApp().GetMode() == MyApp::Mode_Single ) + { + m_canvas->ClearBackground(); + m_canvas->ResetView(); + m_canvas = NULL; + + if ( m_frame ) + m_frame->SetTitle(wxTheApp->GetAppDisplayName()); + } + else // not single window mode { - delete m_frame; - return true; + if ( deleteWindow ) + wxDELETE(m_frame); } + + SetFrame(NULL); + return true; } void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) ) { - DrawingDocument* doc = GetDocument(); - doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Cut Last Segment"), DOODLE_CUT, doc, NULL)); + DrawingDocument * const doc = GetDocument(); + + doc->GetCommandProcessor()->Submit(new DrawingRemoveSegmentCommand(doc)); } +// ---------------------------------------------------------------------------- +// TextEditView implementation +// ---------------------------------------------------------------------------- + IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) BEGIN_EVENT_TABLE(TextEditView, wxView) @@ -162,130 +158,127 @@ BEGIN_EVENT_TABLE(TextEditView, wxView) EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll) END_EVENT_TABLE() -bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) +bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags)) { m_frame = wxGetApp().CreateChildFrame(doc, this, false); + m_text = new wxTextCtrl(m_frame, wxID_ANY, "", + wxPoint(0, 0), m_frame->GetClientSize(), + wxTE_MULTILINE); - wxSize size = m_frame->GetClientSize(); - m_textsw = new MyTextWindow(this, m_frame, wxPoint(0, 0), size, wxTE_MULTILINE); - m_frame->SetTitle(wxT("TextEditView")); - -#ifdef __X__ - // X seems to require a forced resize - int x, y; - m_frame->GetSize(&x, &y); - m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y); -#endif - + m_frame->SetTitle("Text View"); m_frame->Show(true); + Activate(true); return true; } -// Handled by wxTextWindow -void TextEditView::OnDraw(wxDC *WXUNUSED(dc) ) -{ -} - -void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) +void TextEditView::OnDraw(wxDC *WXUNUSED(dc)) { + // nothing to do here, wxTextCtrl draws itself } bool TextEditView::OnClose(bool deleteWindow) { - if (!GetDocument()->Close()) + if ( !GetDocument()->Close() ) return false; Activate(false); - if (deleteWindow) + if ( wxGetApp().GetMode() == MyApp::Mode_Single ) { - wxDELETE(m_frame); + m_text->Clear(); } + else // not single window mode + { + if ( deleteWindow ) + wxDELETE(m_frame); + } + return true; } -/* -* Window implementations -*/ +// ---------------------------------------------------------------------------- +// MyCanvas implementation +// ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent) END_EVENT_TABLE() // Define a constructor for my canvas -MyCanvas::MyCanvas(DrawingView* view, wxFrame* frame, const wxPoint& pos, const wxSize& size, const long style): - wxScrolledWindow(frame, wxID_ANY, pos, size, style) +MyCanvas::MyCanvas(wxView *view, wxWindow *parent) + : wxScrolledWindow(parent, wxID_ANY, wxPoint(0, 0), parent->GetClientSize()) { m_view = view; + m_currentSegment = NULL; + m_lastMousePos = wxDefaultPosition; + + SetCursor(wxCursor(wxCURSOR_PENCIL)); + + // this is completely arbitrary and is done just for illustration purposes + SetVirtualSize(1000, 1000); + SetScrollRate(20, 20); + + SetBackgroundColour(*wxWHITE); +} + +MyCanvas::~MyCanvas() +{ + delete m_currentSegment; } // Define the repainting behaviour void MyCanvas::OnDraw(wxDC& dc) { - if (m_view) + if ( m_view ) m_view->OnDraw(& dc); } -// This implements a tiny doodling program. Drag the mouse using -// the left button. +// This implements a tiny doodling program. Drag the mouse using the left +// button. void MyCanvas::OnMouseEvent(wxMouseEvent& event) { - if (!m_view) + if ( !m_view ) return; - static DoodleSegment *currentSegment = NULL; - wxClientDC dc(this); PrepareDC(dc); dc.SetPen(*wxBLACK_PEN); - wxPoint pt(event.GetLogicalPosition(dc)); + const wxPoint pt(event.GetLogicalPosition(dc)); - if (currentSegment && event.LeftUp()) + // is this the end of the current segment? + if ( m_currentSegment && event.LeftUp() ) { - if (currentSegment->m_lines.GetCount() == 0) - { - delete currentSegment; - currentSegment = NULL; - } - else + if ( !m_currentSegment->IsEmpty() ) { // We've got a valid segment on mouse left up, so store it. - DrawingDocument* doc = m_view->GetDocument(); + DrawingDocument * const + doc = wxStaticCast(m_view->GetDocument(), DrawingDocument); - doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Add Segment"), DOODLE_ADD, doc, currentSegment)); + doc->GetCommandProcessor()->Submit( + new DrawingAddSegmentCommand(doc, *m_currentSegment)); - m_view->GetDocument()->Modify(true); - currentSegment = NULL; + doc->Modify(true); } + + delete m_currentSegment; + m_currentSegment = NULL; } - if ( (xpos > -1) && (ypos > -1) && event.Dragging()) + // is this the start of a new segment? + if ( m_lastMousePos != wxDefaultPosition && event.Dragging() ) { - if (!currentSegment) - currentSegment = new DoodleSegment; + if ( !m_currentSegment ) + m_currentSegment = new DoodleSegment; - DoodleLine *newLine = new DoodleLine; - newLine->x1 = (long)xpos; - newLine->y1 = (long)ypos; - newLine->x2 = pt.x; - newLine->y2 = pt.y; - currentSegment->m_lines.Append(newLine); + m_currentSegment->AddLine(m_lastMousePos, pt); - dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y); + dc.DrawLine(m_lastMousePos, pt); } - xpos = pt.x; - ypos = pt.y; -} -// Define a constructor for my text subwindow -MyTextWindow::MyTextWindow(wxView* view, wxFrame* frame, const wxPoint& pos, const wxSize& size, const long style): - wxTextCtrl(frame, wxID_ANY, wxEmptyString, pos, size, style) -{ - m_view = view; + m_lastMousePos = pt; } - diff --git a/samples/docview/view.h b/samples/docview/view.h index 3c3fd2c240..c7209f28fa 100644 --- a/samples/docview/view.h +++ b/samples/docview/view.h @@ -1,49 +1,73 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: view.h +// Name: samples/docview/view.h // Purpose: View classes // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart +// Copyright: (c) 1998 Julian Smart +// (c) 2008 Vadim Zeitlin // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __VIEW_H__ -#define __VIEW_H__ +#ifndef _WX_SAMPLES_DOCVIEW_VIEW_H_ +#define _WX_SAMPLES_DOCVIEW_VIEW_H_ #include "wx/docview.h" -class DrawingView; +// ---------------------------------------------------------------------------- +// Drawing view classes +// ---------------------------------------------------------------------------- + +// The window showing the drawing itself class MyCanvas : public wxScrolledWindow { public: - DrawingView* m_view; + // view may be NULL if we're not associated with one yet, but parent must + // be a valid pointer + MyCanvas(wxView *view, wxWindow *parent); + virtual ~MyCanvas(); - MyCanvas(DrawingView*, wxFrame*, const wxPoint& pos, const wxSize& size, const long style); virtual void OnDraw(wxDC& dc); -protected: + // in a normal multiple document application a canvas is associated with + // one view from the beginning until the end, but to support the single + // document mode in which all documents reuse the same MyApp::GetCanvas() + // we need to allow switching the canvas from one view to another one + + void SetView(wxView *view) + { + wxASSERT_MSG( !m_view, "shouldn't be already associated with a view" ); + + m_view = view; + } + + void ResetView() + { + wxASSERT_MSG( m_view, "should be associated with a view" ); + + m_view = NULL; + } + +private: void OnMouseEvent(wxMouseEvent& event); - DECLARE_EVENT_TABLE() -}; -class MyTextWindow: public wxTextCtrl -{ -public: - wxView* m_view; + wxView *m_view; + + // the segment being currently drawn or NULL if none + DoodleSegment *m_currentSegment; - MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); + // the last mouse press position + wxPoint m_lastMousePos; + + DECLARE_EVENT_TABLE() }; +// The view using MyCanvas to show its contents class DrawingView : public wxView { public: - wxFrame* m_frame; - MyCanvas* m_canvas; - - DrawingView() { m_canvas = NULL; m_frame = NULL; }; - virtual ~DrawingView() {}; + DrawingView() { m_canvas = NULL; m_frame = NULL; } virtual bool OnCreate(wxDocument *doc, long flags); virtual void OnDraw(wxDC *dc); @@ -52,35 +76,42 @@ public: DrawingDocument* GetDocument(); -protected: +private: void OnCut(wxCommandEvent& event); -private: + wxFrame *m_frame; + MyCanvas *m_canvas; + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(DrawingView) }; +// ---------------------------------------------------------------------------- +// Text view classes +// ---------------------------------------------------------------------------- + +// The view using a standard wxTextCtrl to show its contents class TextEditView : public wxView { public: - wxFrame* m_frame; - MyTextWindow* m_textsw; - - TextEditView(): wxView() { m_frame = NULL; m_textsw = NULL; } - virtual ~TextEditView() {} + TextEditView() : wxView() { m_frame = NULL; m_text = NULL; } virtual bool OnCreate(wxDocument *doc, long flags); virtual void OnDraw(wxDC *dc); - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); virtual bool OnClose(bool deleteWindow = true); + wxTextCtrl *GetText() const { return m_text; } + private: - void OnCopy(wxCommandEvent& WXUNUSED(event)) { m_textsw->Copy(); } - void OnPaste(wxCommandEvent& WXUNUSED(event)) { m_textsw->Paste(); } - void OnSelectAll(wxCommandEvent& WXUNUSED(event)) { m_textsw->SelectAll(); } + void OnCopy(wxCommandEvent& WXUNUSED(event)) { m_text->Copy(); } + void OnPaste(wxCommandEvent& WXUNUSED(event)) { m_text->Paste(); } + void OnSelectAll(wxCommandEvent& WXUNUSED(event)) { m_text->SelectAll(); } + + wxFrame *m_frame; + wxTextCtrl *m_text; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(TextEditView) }; -#endif +#endif // _WX_SAMPLES_DOCVIEW_VIEW_H_ diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in deleted file mode 100644 index 88840f497c..0000000000 --- a/samples/docvwmdi/Makefile.in +++ /dev/null @@ -1,205 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - -@MAKE_SET@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datarootdir = @datarootdir@ -INSTALL = @INSTALL@ -EXEEXT = @EXEEXT@ -WINDRES = @WINDRES@ -SETFILE = @SETFILE@ -NM = @NM@ -BK_DEPS = @BK_DEPS@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -LIBS = @LIBS@ -LDFLAGS_GUI = @LDFLAGS_GUI@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ -TOOLKIT = @TOOLKIT@ -TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ -EXTRALIBS = @EXTRALIBS@ -EXTRALIBS_GUI = @EXTRALIBS_GUI@ -CXXWARNINGS = @CXXWARNINGS@ -HOST_SUFFIX = @HOST_SUFFIX@ -SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ -SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ -wx_top_builddir = @wx_top_builddir@ - -### Variables: ### - -DESTDIR = -WX_RELEASE = 2.9 -WX_VERSION = $(WX_RELEASE).0 -LIBDIRNAME = $(wx_top_builddir)/lib -DOCVWMDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ - $(CPPFLAGS) $(CXXFLAGS) -DOCVWMDI_OBJECTS = \ - $(__docvwmdi_os2_lib_res) \ - docvwmdi_docview.o \ - docvwmdi_doc.o \ - docvwmdi_view.o \ - $(__docvwmdi___win32rc) - -### Conditionally set variables: ### - -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d -@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d -@COND_UNICODE_1@WXUNICODEFLAG = u -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) -@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_MAC_0@__docvwmdi___mac_setfilecmd = @true -@COND_PLATFORM_MAC_1@__docvwmdi___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL docvwmdi$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS -@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI -@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI -@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS -@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL -@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL -COND_PLATFORM_OS2_1___docvwmdi___os2_emxbindcmd = $(NM) docvwmdi$(EXEEXT) | if \ - grep -q pmwin.763 ; then emxbind -ep docvwmdi$(EXEEXT) ; fi -@COND_PLATFORM_OS2_1@__docvwmdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___docvwmdi___os2_emxbindcmd) -@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ -@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) -@COND_PLATFORM_OS2_1@__docvwmdi_os2_lib_res = \ -@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res -@COND_PLATFORM_MACOSX_1@__docvwmdi_app_Contents_PkgInfo___depname \ -@COND_PLATFORM_MACOSX_1@ = docvwmdi.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@__docvwmdi_bundle___depname = docvwmdi_bundle -@COND_TOOLKIT_MAC@____docvwmdi_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ $(__docvwmdi_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_CARBON@____docvwmdi_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_CARBON@ = $(__docvwmdi_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_COCOA@____docvwmdi_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_COCOA@ = $(__docvwmdi_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_OSX_IPHONE@____docvwmdi_BUNDLE_TGT_REF_DEP \ -@COND_TOOLKIT_OSX_IPHONE@ = $(__docvwmdi_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_COCOA@____docvwmdi_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_COCOA@ $(__docvwmdi_app_Contents_PkgInfo___depname) -COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) -COND_MONOLITHIC_0___WXLIB_BASE_p = \ - -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__docvwmdi___win32rc = docvwmdi_docview_rc.o -COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ - -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) -@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ -@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) - -### Targets: ### - -all: docvwmdi$(EXEEXT) $(__docvwmdi_bundle___depname) - -install: all - -uninstall: - -install-strip: install - -clean: - rm -rf ./.deps ./.pch - rm -f ./*.o - rm -f docvwmdi$(EXEEXT) - rm -rf docvwmdi.app - -distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile - -docvwmdi$(EXEEXT): $(DOCVWMDI_OBJECTS) $(__docvwmdi___win32rc) - $(CXX) -o $@ $(DOCVWMDI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) - - $(__docvwmdi___mac_setfilecmd) - $(__docvwmdi___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) - -@COND_PLATFORM_MACOSX_1@docvwmdi.app/Contents/PkgInfo: docvwmdi$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns -@COND_PLATFORM_MACOSX_1@ mkdir -p docvwmdi.app/Contents -@COND_PLATFORM_MACOSX_1@ mkdir -p docvwmdi.app/Contents/MacOS -@COND_PLATFORM_MACOSX_1@ mkdir -p docvwmdi.app/Contents/Resources -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/docvwmdi/" \ -@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >docvwmdi.app/Contents/Info.plist -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >docvwmdi.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ ln -f docvwmdi$(EXEEXT) docvwmdi.app/Contents/MacOS/docvwmdi -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns docvwmdi.app/Contents/Resources/wxmac.icns - -@COND_PLATFORM_MACOSX_1@docvwmdi_bundle: $(____docvwmdi_BUNDLE_TGT_REF_DEP) - -docvwmdi_docview.o: $(srcdir)/docview.cpp - $(CXXC) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(srcdir)/docview.cpp - -docvwmdi_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(srcdir)/doc.cpp - -docvwmdi_view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(srcdir)/view.cpp - -docvwmdi_docview_rc.o: $(srcdir)/docview.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - - -$(srcdir)/include/wx/stc/stc.h: \ -$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ -$(srcdir)/src/stc/stc.cpp.in \ -$(srcdir)/src/stc/stc.h.in \ -$(srcdir)/src/stc/gen_iface.py - cd $(srcdir)/src/stc && ./gen_iface.py -monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ -$(srcdir)/include/wx/stc/stc.h - -# Include dependency info, if present: -@IF_GNU_MAKE@-include .deps/*.d - -.PHONY: all install uninstall clean distclean docvwmdi_bundle diff --git a/samples/docvwmdi/chart.ico b/samples/docvwmdi/chart.ico deleted file mode 100644 index c0777b91e432f433931947d425339501838752de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmbtSF%H5o3_K76TbYy4eS9NX({bYvweeO>^n+;6J^N^dGJt=f_+#>!ya)lJLIYTti$teVa5RE`f&zEnh2ff5ziC zN>pS!w3|EXWfGUd`-fdd*m)7}nLgr0#F;>Z@*y4$ST(&~DY%Zf5u$tCxHzugwXwK) TghUnpg#|_l7TSrrS+l!eA?PSz diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp deleted file mode 100644 index 1cb8e4e1fc..0000000000 --- a/samples/docvwmdi/doc.cpp +++ /dev/null @@ -1,358 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: doc.cpp -// Purpose: Implements document functionality -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#if !wxUSE_DOC_VIEW_ARCHITECTURE -#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! -#endif - -#if wxUSE_STD_IOSTREAM - #include "wx/ioswrap.h" -#else - #include "wx/txtstrm.h" -#endif - -#include "doc.h" -#include "view.h" - -IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) - -DrawingDocument::~DrawingDocument(void) -{ - WX_CLEAR_LIST(wxList, m_doodleSegments) -} - -#if wxUSE_STD_IOSTREAM -wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream) -{ - wxDocument::SaveObject(stream); - - wxInt32 n = m_doodleSegments.GetCount(); - stream << n << wxT('\n'); - - wxList::compatibility_iterator node = m_doodleSegments.GetFirst(); - while (node) - { - DoodleSegment *segment = (DoodleSegment*)node->GetData(); - segment->SaveObject(stream); - stream << wxT('\n'); - - node = node->GetNext(); - } - return stream; -} -#else -wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream) -{ - wxDocument::SaveObject(stream); - - wxTextOutputStream text_stream( stream ); - - wxInt32 n = m_doodleSegments.GetCount(); - text_stream << n << wxT('\n'); - - wxList::compatibility_iterator node = m_doodleSegments.GetFirst(); - while (node) - { - DoodleSegment* segment = (DoodleSegment*)node->GetData(); - segment->SaveObject(stream); - text_stream << wxT('\n'); - - node = node->GetNext(); - } - - return stream; -} -#endif - -#if wxUSE_STD_IOSTREAM -wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream) -{ - wxDocument::LoadObject(stream); - - wxInt32 n = 0; - stream >> n; - - for (int i = 0; i < n; i++) - { - DoodleSegment *segment = new DoodleSegment; - segment->LoadObject(stream); - m_doodleSegments.Append(segment); - } - - return stream; -} -#else -wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream) -{ - wxDocument::LoadObject(stream); - - wxTextInputStream text_stream( stream ); - - wxInt32 n = 0; - text_stream >> n; - - for (int i = 0; i < n; i++) - { - DoodleSegment* segment = new DoodleSegment; - segment->LoadObject(stream); - m_doodleSegments.Append(segment); - } - - return stream; -} -#endif - -DoodleSegment::DoodleSegment(const DoodleSegment& seg) : wxObject() -{ - wxList::compatibility_iterator node = seg.m_lines.GetFirst(); - while (node) - { - DoodleLine* line = (DoodleLine*)node->GetData(); - DoodleLine* newLine = new DoodleLine; - newLine->x1 = line->x1; - newLine->y1 = line->y1; - newLine->x2 = line->x2; - newLine->y2 = line->y2; - - m_lines.Append(newLine); - - node = node->GetNext(); - } -} - -DoodleSegment::~DoodleSegment(void) -{ - WX_CLEAR_LIST(wxList, m_lines) -} - -#if wxUSE_STD_IOSTREAM -wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream) -{ - wxInt32 n = m_lines.GetCount(); - stream << n << wxT('\n'); - - wxList::compatibility_iterator node = m_lines.GetFirst(); - while (node) - { - DoodleLine *line = (DoodleLine *)node->GetData(); - stream << line->x1 << wxT(" ") << - line->y1 << wxT(" ") << - line->x2 << wxT(" ") << - line->y2 << wxT("\n"); - node = node->GetNext(); - } - - return stream; -} -#else -wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) -{ - wxTextOutputStream text_stream( stream ); - - wxInt32 n = m_lines.GetCount(); - text_stream << n << wxT('\n'); - - wxList::compatibility_iterator node = m_lines.GetFirst(); - while (node) - { - DoodleLine* line = (DoodleLine*)node->GetData(); - text_stream << line->x1 << wxT(" ") << - line->y1 << wxT(" ") << - line->x2 << wxT(" ") << - line->y2 << wxT("\n"); - node = node->GetNext(); - } - - return stream; -} -#endif - -#if wxUSE_STD_IOSTREAM -wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream) -{ - wxInt32 n = 0; - stream >> n; - - for (int i = 0; i < n; i++) - { - DoodleLine *line = new DoodleLine; - stream >> line->x1 >> - line->y1 >> - line->x2 >> - line->y2; - m_lines.Append(line); - } - - return stream; -} -#else -wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream) -{ - wxTextInputStream text_stream( stream ); - - wxInt32 n = 0; - text_stream >> n; - - for (int i = 0; i < n; i++) - { - DoodleLine* line = new DoodleLine; - text_stream >> line->x1 >> - line->y1 >> - line->x2 >> - line->y2; - m_lines.Append(line); - } - - return stream; -} -#endif -void DoodleSegment::Draw(wxDC *dc) -{ - wxList::compatibility_iterator node = m_lines.GetFirst(); - while (node) - { - DoodleLine* line = (DoodleLine*)node->GetData(); - dc->DrawLine(line->x1, line->y1, line->x2, line->y2); - node = node->GetNext(); - } -} - -/* - * Implementation of drawing command - */ - -DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument* doc, DoodleSegment* seg) : - wxCommand(true, name) -{ - m_doc = doc; - m_segment = seg; - m_cmd = command; -} - -DrawingCommand::~DrawingCommand(void) -{ - if (m_segment) - delete m_segment; -} - -bool DrawingCommand::Do(void) -{ - switch (m_cmd) - { - case DOODLE_CUT: - // Cut the last segment - if (m_doc->GetDoodleSegments().GetCount() > 0) - { - wxList::compatibility_iterator node = m_doc->GetDoodleSegments().GetLast(); - if (m_segment) - delete m_segment; - - m_segment = (DoodleSegment*)node->GetData(); - m_doc->GetDoodleSegments().Erase(node); - - m_doc->Modify(true); - m_doc->UpdateAllViews(); - } - break; - case DOODLE_ADD: - m_doc->GetDoodleSegments().Append(new DoodleSegment(*m_segment)); - m_doc->Modify(true); - m_doc->UpdateAllViews(); - break; - } - return true; -} - -bool DrawingCommand::Undo(void) -{ - switch (m_cmd) - { - case DOODLE_CUT: - { - // Paste the segment - if (m_segment) - { - m_doc->GetDoodleSegments().Append(m_segment); - m_doc->Modify(true); - m_doc->UpdateAllViews(); - m_segment = NULL; - } - m_doc->Modify(true); - m_doc->UpdateAllViews(); - break; - } - case DOODLE_ADD: - { - // Cut the last segment - if (m_doc->GetDoodleSegments().GetCount() > 0) - { - wxList::compatibility_iterator node = m_doc->GetDoodleSegments().GetLast(); - DoodleSegment* seg = (DoodleSegment*)node->GetData(); - delete seg; - m_doc->GetDoodleSegments().Erase(node); - - m_doc->Modify(true); - m_doc->UpdateAllViews(); - } - } - } - return true; -} - -IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument) - -// Since text windows have their own method for saving to/loading from files, -// we override DoSave/OpenDocument instead of Save/LoadObject -bool TextEditDocument::DoSaveDocument(const wxString& filename) -{ - return GetFirstView()->m_textsw->SaveFile(filename); -} - -bool TextEditDocument::DoOpenDocument(const wxString& filename) -{ - return GetFirstView()->m_textsw->LoadFile(filename); -} - -bool TextEditDocument::IsModified(void) const -{ - TextEditView *view = GetFirstView(); - return wxDocument::IsModified() || (view && view->m_textsw->IsModified()); -} - -void TextEditDocument::Modify(bool mod) -{ - TextEditView *view = GetFirstView(); - - wxDocument::Modify(mod); - - if (!mod && view && view->m_textsw) - { - view->m_textsw->DiscardEdits(); - } -} - -TextEditView* TextEditDocument::GetFirstView() const -{ - wxView* view = wxDocument::GetFirstView(); - return view ? wxStaticCast(view, TextEditView) : NULL; -} - diff --git a/samples/docvwmdi/doc.h b/samples/docvwmdi/doc.h deleted file mode 100644 index 2aa3201253..0000000000 --- a/samples/docvwmdi/doc.h +++ /dev/null @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: doc.h -// Purpose: Document classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -#ifndef __DOC_H__ -#define __DOC_H__ - -#include "wx/docview.h" -#include "wx/cmdproc.h" - -// Plots a line from one point to the other -class DoodleLine: public wxObject -{ -public: - wxInt32 x1; - wxInt32 y1; - wxInt32 x2; - wxInt32 y2; -}; - -// Contains a list of lines: represents a mouse-down doodle -class DoodleSegment: public wxObject -{ -public: - wxList m_lines; - - DoodleSegment() : wxObject() {} - DoodleSegment(const DoodleSegment&); - virtual ~DoodleSegment(); - - void Draw(wxDC* dc); - -#if wxUSE_STD_IOSTREAM - wxSTD ostream& SaveObject(wxSTD ostream&); - wxSTD istream& LoadObject(wxSTD istream&); -#else - wxOutputStream& SaveObject(wxOutputStream&); - wxInputStream& LoadObject(wxInputStream&); -#endif -}; - -class DrawingDocument: public wxDocument -{ - DECLARE_DYNAMIC_CLASS(DrawingDocument) -public: - wxList m_doodleSegments; - - DrawingDocument() : wxDocument() {} - virtual ~DrawingDocument(); - -#if wxUSE_STD_IOSTREAM - wxSTD ostream& SaveObject(wxSTD ostream&); - wxSTD istream& LoadObject(wxSTD istream&); -#else - wxOutputStream& SaveObject(wxOutputStream&); - wxInputStream& LoadObject(wxInputStream&); -#endif - - inline wxList& GetDoodleSegments() const { return (wxList&) m_doodleSegments; }; -}; - -#define DOODLE_CUT 1 -#define DOODLE_ADD 2 - -class DrawingCommand : public wxCommand -{ -protected: - DoodleSegment* m_segment; - DrawingDocument* m_doc; - int m_cmd; -public: - DrawingCommand(const wxString& name, int cmd, DrawingDocument*, DoodleSegment*); - virtual ~DrawingCommand(); - - bool Do(); - bool Undo(); -}; - -class TextEditView; -class TextEditDocument : public wxDocument -{ - DECLARE_DYNAMIC_CLASS(TextEditDocument) -public: -/* - wxSTD ostream& SaveObject(wxSTD ostream&); - wxSTD istream& LoadObject(wxSTD istream&); -*/ - TextEditView* GetFirstView() const; - - virtual bool DoSaveDocument(const wxString& filename); - virtual bool DoOpenDocument(const wxString& filename); - virtual bool IsModified() const; - virtual void Modify(bool mod); - - TextEditDocument() {} - virtual ~TextEditDocument() {} -}; - - -#endif diff --git a/samples/docvwmdi/doc.ico b/samples/docvwmdi/doc.ico deleted file mode 100644 index bf8a4f8a30b2f7da7fac1abfb62c02b05c6a8eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmbtQI}U>|41H9UV53uK#@?d6RoKXwTftEndjmRDa-Z{qmR17wCC}u=c8m=aTupPL zJ>q@<&HyfCL*7WeS6KSKqX)Rr_u)g!BZgsswU!R?8zOolx%5iS3YCkn-c_1}sF~$4 zeQM`4q0D~M28{~3Cy6@cOY8W=952Rr4XfexB%PL6_Bi>JHM|`CX zZ2tc=UK9ESx->!G?^@@C=wFP8^CISvMV&Le`^{*r2MQT8aUGFa^87cSd?QgTe=o4s F+Ar|1RRjP4 diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp deleted file mode 100644 index 69d4854260..0000000000 --- a/samples/docvwmdi/docview.cpp +++ /dev/null @@ -1,242 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: docview.cpp -// Purpose: Document/view demo -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -/* - * Purpose: Document/view architecture demo for wxWidgets class library - MDI - */ - - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#if !wxUSE_DOC_VIEW_ARCHITECTURE -#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! -#endif - -#if !wxUSE_MDI_ARCHITECTURE -#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h! -#endif - -#include "docview.h" -#include "doc.h" -#include "view.h" -#include "wx/stockitem.h" - -static MyFrame* frame = NULL; - -IMPLEMENT_APP(MyApp) - -MyApp::MyApp(void) -{ - m_docManager = NULL; -} - -bool MyApp::OnInit(void) -{ - if ( !wxApp::OnInit() ) - return false; - //// Create a document manager - SetAppName(wxT("DocView Demo")); - - //// Create a document manager - m_docManager = new wxDocManager; - - //// Create a template relating drawing documents to their views - new wxDocTemplate(m_docManager, wxT("Drawing"), wxT("*.drw"), wxT(""), wxT("drw"), wxT("Drawing Doc"), wxT("Drawing View"), - CLASSINFO(DrawingDocument), CLASSINFO(DrawingView)); - - //// Create a template relating text documents to their views - new wxDocTemplate(m_docManager, wxT("Text"), wxT("*.txt"), wxT(""), wxT("txt"), wxT("Text Doc"), wxT("Text View"), - CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); - - //// Create the main frame window - frame = new MyFrame(m_docManager, NULL, - GetAppDisplayName(), wxPoint(0, 0), wxSize(500, 400), - wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE); - - //// Give it an icon (this is ignored in MDI mode: uses resources) -#ifdef __WXMSW__ - frame->SetIcon(wxIcon(wxT("doc"))); -#endif - - //// Make a menubar - wxMenu *file_menu = new wxMenu; - wxMenu *edit_menu = NULL; - - file_menu->Append(wxID_NEW); - file_menu->Append(wxID_OPEN); - - file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT); - - // A nice touch: a history of files visited. Use this menu. - m_docManager->FileHistoryUseMenu(file_menu); - - wxMenu *help_menu = new wxMenu; - help_menu->Append(DOCVIEW_ABOUT); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, wxGetStockLabel(wxID_FILE)); - if (edit_menu) - menu_bar->Append(edit_menu, wxGetStockLabel(wxID_EDIT)); - menu_bar->Append(help_menu, wxGetStockLabel(wxID_HELP)); - -#ifdef __WXMAC__ - wxMenuBar::MacSetCommonMenuBar(menu_bar); -#endif //def __WXMAC__ - //// Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); - - frame->Centre(wxBOTH); -#ifndef __WXMAC__ - frame->Show(true); -#endif //ndef __WXMAC__ - - SetTopWindow(frame); - return true; -} - -int MyApp::OnExit(void) -{ - wxDELETE(m_docManager); - return 0; -} - -/* - * Centralised code for creating a document frame. - * Called from view.cpp, when a view is created. - */ - -wxMDIChildFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas) -{ - //// Make a child frame - wxDocMDIChildFrame *subframe = - new wxDocMDIChildFrame(doc, view, GetMainFrame(), wxID_ANY, wxT("Child Frame"), - wxPoint(10, 10), wxSize(300, 300), - wxDEFAULT_FRAME_STYLE | - wxNO_FULL_REPAINT_ON_RESIZE); - -#ifdef __WXMSW__ - subframe->SetIcon(wxString(isCanvas ? wxT("chart") : wxT("notepad"))); -#endif -#ifdef __X__ - subframe->SetIcon(wxIcon(wxT("doc.xbm"))); -#endif - - //// Make a menubar - wxMenu *file_menu = new wxMenu; - - file_menu->Append(wxID_NEW); - file_menu->Append(wxID_OPEN); - file_menu->Append(wxID_CLOSE); - file_menu->Append(wxID_SAVE); - file_menu->Append(wxID_SAVEAS); - - if (isCanvas) - { - file_menu->AppendSeparator(); - file_menu->Append(wxID_PRINT); - file_menu->Append(wxID_PRINT_SETUP, wxT("Print &Setup...")); - file_menu->Append(wxID_PREVIEW); - } - - file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT); - - wxMenu *edit_menu = new wxMenu; - if (isCanvas) - { - edit_menu->Append(wxID_UNDO); - edit_menu->Append(wxID_REDO); - edit_menu->AppendSeparator(); - edit_menu->Append(DOCVIEW_CUT, wxT("&Cut last segment")); - - doc->GetCommandProcessor()->SetEditMenu(edit_menu); - } - else - { - edit_menu->Append(wxID_COPY); - edit_menu->Append(wxID_PASTE); - edit_menu->Append(wxID_SELECTALL); - } - wxMenu *help_menu = new wxMenu; - help_menu->Append(DOCVIEW_ABOUT); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, wxGetStockLabel(wxID_FILE)); - menu_bar->Append(edit_menu, wxGetStockLabel(wxID_EDIT)); - menu_bar->Append(help_menu, wxGetStockLabel(wxID_HELP)); - - //// Associate the menu bar with the frame - subframe->SetMenuBar(menu_bar); - - return subframe; -} - -/* - * This is the top-level window of the application. - */ - -IMPLEMENT_CLASS(MyFrame, wxDocMDIParentFrame) -BEGIN_EVENT_TABLE(MyFrame, wxDocMDIParentFrame) - EVT_MENU(DOCVIEW_ABOUT, MyFrame::OnAbout) -END_EVENT_TABLE() - -MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, - const wxPoint& pos, const wxSize& size, long type): - wxDocMDIParentFrame(manager, frame, wxID_ANY, title, pos, size, type, wxT("myFrame")) -{ - m_editMenu = NULL; -} - -void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) -{ - wxMessageBox(wxT("DocView Demo\nAuthor: Julian Smart\nUsage: docview.exe"), wxT("About DocView")); -/* - Better, but brings in adv lib - wxAboutDialogInfo info; - info.SetName(wxTheApp->GetAppDisplayName()); - info.AddDeveloper(wxT("Julian Smart")); - wxAboutBox(info); -*/ -} - -// Creates a canvas. Called from view.cpp when a new drawing -// view is created. -MyCanvas* MyFrame::CreateCanvas(DrawingView* view, wxMDIChildFrame* parent) -{ - wxSize size = parent->GetClientSize(); - - // Non-retained canvas - MyCanvas *canvas = new MyCanvas(view, parent, wxPoint(0, 0), size, 0); - canvas->SetCursor(wxCursor(wxCURSOR_PENCIL)); - - // Give it scrollbars - canvas->SetScrollbars(20, 20, 50, 50); - - return canvas; -} - -MyFrame* GetMainFrame() -{ - return frame; -} - diff --git a/samples/docvwmdi/docview.h b/samples/docvwmdi/docview.h deleted file mode 100644 index 767e9eee87..0000000000 --- a/samples/docvwmdi/docview.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: docview.h -// Purpose: Document/view demo -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -#ifndef __DOCVIEW_H__ -#define __DOCVIEW_H__ - -#include "wx/mdi.h" -#include "wx/docview.h" -#include "wx/docmdi.h" - -class wxDocManager; - -// Define a new application -class MyApp: public wxApp -{ -public: - MyApp(void); - virtual bool OnInit(); - virtual int OnExit(); - - wxMDIChildFrame* CreateChildFrame(wxDocument*, wxView*, bool isCanvas); - -protected: - wxDocManager* m_docManager; -}; - -DECLARE_APP(MyApp) - -// Define a new frame -class MyCanvas; -class DrawingView; -class MyFrame: public wxDocMDIParentFrame -{ -public: - wxMenu* m_editMenu; - - MyFrame(wxDocManager*, wxFrame*, const wxString& title, const wxPoint&, const wxSize&, long type); - - MyCanvas* CreateCanvas(DrawingView*, wxMDIChildFrame*); - -protected: - void OnAbout(wxCommandEvent&); - - DECLARE_EVENT_TABLE() - DECLARE_CLASS(MyFrame) -}; - -extern MyFrame* GetMainFrame(); - -#define DOCVIEW_CUT 1 -#define DOCVIEW_ABOUT wxID_ABOUT - -extern bool singleWindowMode; - -#endif diff --git a/samples/docvwmdi/docview.rc b/samples/docvwmdi/docview.rc deleted file mode 100644 index b9880e453b..0000000000 --- a/samples/docvwmdi/docview.rc +++ /dev/null @@ -1,6 +0,0 @@ -doc ICON "doc.ico" -chart ICON "chart.ico" -notepad ICON "notepad.ico" - -#include "wx/msw/wx.rc" - diff --git a/samples/docvwmdi/docvwmdi.bkl b/samples/docvwmdi/docvwmdi.bkl deleted file mode 100644 index 294da208ee..0000000000 --- a/samples/docvwmdi/docvwmdi.bkl +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - docview.cpp doc.cpp view.cpp - core - base - docview.rc - - - diff --git a/samples/docvwmdi/docvwmdi.dsp b/samples/docvwmdi/docvwmdi.dsp deleted file mode 100644 index 97d7387757..0000000000 --- a/samples/docvwmdi/docvwmdi.dsp +++ /dev/null @@ -1,272 +0,0 @@ -# Microsoft Developer Studio Project File - Name="docvwmdi" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=docvwmdi - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "docvwmdi.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "docvwmdi.mak" CFG="docvwmdi - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "docvwmdi - Win32 DLL Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 DLL Release" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 DLL Debug" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "docvwmdi - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "docvwmdi - Win32 DLL Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivudll" -# PROP BASE Intermediate_Dir "vc_mswunivudll\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivudll" -# PROP Intermediate_Dir "vc_mswunivudll\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\docvwmdi.exe" /debug /pdb:"vc_mswunivudll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivudll\docvwmdi.exe" /debug /pdb:"vc_mswunivudll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 DLL Universal Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivuddll" -# PROP BASE Intermediate_Dir "vc_mswunivuddll\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivuddll" -# PROP Intermediate_Dir "vc_mswunivuddll\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\docvwmdi.exe" /debug /pdb:"vc_mswunivuddll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\docvwmdi.exe" /debug /pdb:"vc_mswunivuddll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswudll" -# PROP BASE Intermediate_Dir "vc_mswudll\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswudll" -# PROP Intermediate_Dir "vc_mswudll\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\docvwmdi.exe" /debug /pdb:"vc_mswudll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswudll\docvwmdi.exe" /debug /pdb:"vc_mswudll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 DLL Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswuddll" -# PROP BASE Intermediate_Dir "vc_mswuddll\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswuddll" -# PROP Intermediate_Dir "vc_mswuddll\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\docvwmdi.exe" /debug /pdb:"vc_mswuddll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswuddll\docvwmdi.exe" /debug /pdb:"vc_mswuddll\docvwmdi.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivu" -# PROP BASE Intermediate_Dir "vc_mswunivu\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivu" -# PROP Intermediate_Dir "vc_mswunivu\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\docvwmdi.exe" /debug /pdb:"vc_mswunivu\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivu\docvwmdi.exe" /debug /pdb:"vc_mswunivu\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 Universal Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivud" -# PROP BASE Intermediate_Dir "vc_mswunivud\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivud" -# PROP Intermediate_Dir "vc_mswunivud\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\docvwmdi.exe" /debug /pdb:"vc_mswunivud\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswunivud\docvwmdi.exe" /debug /pdb:"vc_mswunivud\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswu" -# PROP BASE Intermediate_Dir "vc_mswu\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswu" -# PROP Intermediate_Dir "vc_mswu\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\docvwmdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\docvwmdi.exe" /debug /pdb:"vc_mswu\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswu\docvwmdi.exe" /debug /pdb:"vc_mswu\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "docvwmdi - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswud" -# PROP BASE Intermediate_Dir "vc_mswud\docvwmdi" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswud" -# PROP Intermediate_Dir "vc_mswud\docvwmdi" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\docvwmdi.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\docvwmdi.exe" /debug /pdb:"vc_mswud\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /machine:i386 /out:"vc_mswud\docvwmdi.exe" /debug /pdb:"vc_mswud\docvwmdi.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ENDIF - -# Begin Target - -# Name "docvwmdi - Win32 DLL Universal Release" -# Name "docvwmdi - Win32 DLL Universal Debug" -# Name "docvwmdi - Win32 DLL Release" -# Name "docvwmdi - Win32 DLL Debug" -# Name "docvwmdi - Win32 Universal Release" -# Name "docvwmdi - Win32 Universal Debug" -# Name "docvwmdi - Win32 Release" -# Name "docvwmdi - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\doc.cpp -# End Source File -# Begin Source File - -SOURCE=.\docview.cpp -# End Source File -# Begin Source File - -SOURCE=.\docview.rc -# End Source File -# Begin Source File - -SOURCE=.\view.cpp -# End Source File -# End Group -# End Target -# End Project - diff --git a/samples/docvwmdi/docvwmdiM5.xml b/samples/docvwmdi/docvwmdiM5.xml deleted file mode 100644 index e34164d6ff..0000000000 --- a/samples/docvwmdi/docvwmdiM5.xml +++ /dev/null @@ -1,3793 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - Classic Release - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path:::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameClassic Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle1 - MWFrontEnd_C_prefixname/wx/wx_cw.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - ”×€ - =ÃH - =Ø: - - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfiledocvwmdi Classic Release - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - wx_PPC.lib - MacOS - Library - Debug - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - MSL C.PPC.Lib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - wx_PPC.rsrc - MacOS - Resource - - - - Name - tiff.lib - MacOS - Library - - - - Name - jpeg.lib - MacOS - Library - - - - Name - png.lib - MacOS - Library - - - - Name - zlib.lib - MacOS - Library - - - - Name - doc.cpp - MacOS - Text - - - - Name - docview.cpp - MacOS - Text - - - - Name - view.cpp - MacOS - Text - - - - Name - AppearanceLib - MacOS - Library - - - - Name - ATSUnicodeLib - MacOS - Library - - - - Name - CarbonAccessors.o - MacOS - Library - - - - Name - ControlsLib - MacOS - Library - - - - Name - CursorDevicesGlue.o - MacOS - Library - - - - Name - DialogsLib - MacOS - Library - - - - Name - DragLib - MacOS - Library - - - - Name - InterfaceLib - MacOS - Library - - - - Name - InternetConfigLib - MacOS - Library - - - - Name - WindowsLib - MacOS - Library - - - - Name - MathLib - MacOS - Library - - - - Name - MenusLib - MacOS - Library - - - - Name - NavigationLib - MacOS - Library - - - - Name - OpenTptAppleTalkLib - MacOS - Library - - - - Name - OpenTptATalkPPC.o - MacOS - Library - - - - Name - OpenTptInetPPC.o - MacOS - Library - - - - Name - OpenTptInternetLib - MacOS - Library - - - - Name - OpenTransportLib - MacOS - Library - - - - Name - OpenTransportAppPPC.o - MacOS - Library - - - - Name - PLStringFuncsPPC.lib - MacOS - Library - - - - Name - TextEncodingConverter - MacOS - Library - - - - Name - Textension - MacOS - Library - - - - Name - ThreadsLib - MacOS - Library - - - - Name - UnicodeConverter - MacOS - Library - - - - - - Name - wx_PPC.lib - MacOS - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - MSL C.PPC.Lib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - wx_PPC.rsrc - MacOS - - - Name - tiff.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - png.lib - MacOS - - - Name - zlib.lib - MacOS - - - Name - doc.cpp - MacOS - - - Name - docview.cpp - MacOS - - - Name - view.cpp - MacOS - - - Name - AppearanceLib - MacOS - - - Name - ATSUnicodeLib - MacOS - - - Name - CarbonAccessors.o - MacOS - - - Name - ControlsLib - MacOS - - - Name - CursorDevicesGlue.o - MacOS - - - Name - DialogsLib - MacOS - - - Name - DragLib - MacOS - - - Name - InterfaceLib - MacOS - - - Name - InternetConfigLib - MacOS - - - Name - WindowsLib - MacOS - - - Name - MathLib - MacOS - - - Name - MenusLib - MacOS - - - Name - NavigationLib - MacOS - - - Name - OpenTptAppleTalkLib - MacOS - - - Name - OpenTptATalkPPC.o - MacOS - - - Name - OpenTptInetPPC.o - MacOS - - - Name - OpenTptInternetLib - MacOS - - - Name - OpenTransportLib - MacOS - - - Name - OpenTransportAppPPC.o - MacOS - - - Name - PLStringFuncsPPC.lib - MacOS - - - Name - TextEncodingConverter - MacOS - - - Name - Textension - MacOS - - - Name - ThreadsLib - MacOS - - - Name - UnicodeConverter - MacOS - - - - - Classic Debug - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path:::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameClassic Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000E2D755010000000000001000E2D7E60 - 0002000000000000000000000E2D2DD000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cw_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma1 - MWWarning_C_warn_emptydecl1 - MWWarning_C_warn_possunwant1 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic1 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual1 - MWWarning_C_warn_implicitconv1 - MWWarning_C_warn_notinlined1 - MWWarning_C_warn_structclass1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - ”×€ - =ÃH - =Ø: - - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfiledocvwmdi Classic Debug - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - MSL C.PPC.Lib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - Debug - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - wx_PPC_d.lib - MacOS - Library - Debug - - - Name - wx_PPC.rsrc - MacOS - Resource - Debug - - - Name - zlib.lib - MacOS - Library - Debug - - - Name - png.lib - MacOS - Library - Debug - - - Name - tiffd.lib - MacOS - Library - Debug - - - Name - jpeg.lib - MacOS - Library - Debug - - - Name - doc.cpp - MacOS - Text - Debug - - - Name - docview.cpp - MacOS - Text - Debug - - - Name - view.cpp - MacOS - Text - Debug - - - Name - AppearanceLib - MacOS - Library - Debug - - - Name - ATSUnicodeLib - MacOS - Library - Debug - - - Name - CarbonAccessors.o - MacOS - Library - Debug - - - Name - ControlsLib - MacOS - Library - Debug - - - Name - CursorDevicesGlue.o - MacOS - Library - Debug - - - Name - DialogsLib - MacOS - Library - Debug - - - Name - DragLib - MacOS - Library - Debug - - - Name - InterfaceLib - MacOS - Library - Debug - - - Name - InternetConfigLib - MacOS - Library - Debug - - - Name - WindowsLib - MacOS - Library - Debug - - - Name - MathLib - MacOS - Library - Debug - - - Name - MenusLib - MacOS - Library - Debug - - - Name - NavigationLib - MacOS - Library - Debug - - - Name - OpenTptAppleTalkLib - MacOS - Library - Debug - - - Name - OpenTptATalkPPC.o - MacOS - Library - Debug - - - Name - OpenTptInetPPC.o - MacOS - Library - Debug - - - Name - OpenTptInternetLib - MacOS - Library - Debug - - - Name - OpenTransportLib - MacOS - Library - Debug - - - Name - OpenTransportAppPPC.o - MacOS - Library - Debug - - - Name - PLStringFuncsPPC.lib - MacOS - Library - Debug - - - Name - TextEncodingConverter - MacOS - Library - Debug - - - Name - Textension - MacOS - Library - Debug - - - Name - ThreadsLib - MacOS - Library - Debug - - - Name - UnicodeConverter - MacOS - Library - Debug - - - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - MSL C.PPC.Lib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - wx_PPC_d.lib - MacOS - - - Name - wx_PPC.rsrc - MacOS - - - Name - zlib.lib - MacOS - - - Name - png.lib - MacOS - - - Name - tiffd.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - doc.cpp - MacOS - - - Name - docview.cpp - MacOS - - - Name - view.cpp - MacOS - - - Name - AppearanceLib - MacOS - - - Name - ATSUnicodeLib - MacOS - - - Name - CarbonAccessors.o - MacOS - - - Name - ControlsLib - MacOS - - - Name - CursorDevicesGlue.o - MacOS - - - Name - DialogsLib - MacOS - - - Name - DragLib - MacOS - - - Name - InterfaceLib - MacOS - - - Name - InternetConfigLib - MacOS - - - Name - WindowsLib - MacOS - - - Name - MathLib - MacOS - - - Name - MenusLib - MacOS - - - Name - NavigationLib - MacOS - - - Name - OpenTptAppleTalkLib - MacOS - - - Name - OpenTptATalkPPC.o - MacOS - - - Name - OpenTptInetPPC.o - MacOS - - - Name - OpenTptInternetLib - MacOS - - - Name - OpenTransportLib - MacOS - - - Name - OpenTransportAppPPC.o - MacOS - - - Name - PLStringFuncsPPC.lib - MacOS - - - Name - TextEncodingConverter - MacOS - - - Name - Textension - MacOS - - - Name - ThreadsLib - MacOS - - - Name - UnicodeConverter - MacOS - - - - - Carbon Debug - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path:::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameCarbon Debug - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle0 - MWFrontEnd_C_prefixname/wx/wx_cwc_d.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma1 - MWWarning_C_warn_emptydecl1 - MWWarning_C_warn_possunwant1 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic1 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual1 - MWWarning_C_warn_implicitconv1 - MWWarning_C_warn_notinlined1 - MWWarning_C_warn_structclass1 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - ”×€ - =ÃH - =Ø: - - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesInline - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfiledocvwmdi Carbon Debug - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - Debug - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - wx_CARBON_d.lib - MacOS - Library - Debug - - - Name - MSL C.CARBON.Lib - MacOS - Library - Debug - - - Name - wx_CARBON.rsrc - MacOS - Resource - Debug - - - Name - tiffd.lib - MacOS - Library - Debug - - - Name - jpeg.lib - MacOS - Library - Debug - - - Name - png.lib - MacOS - Library - Debug - - - Name - zlib.lib - MacOS - Library - Debug - - - Name - doc.cpp - MacOS - Text - Debug - - - Name - docview.cpp - MacOS - Text - Debug - - - Name - view.cpp - MacOS - Text - Debug - - - Name - CarbonLib - MacOS - Library - Debug - - - Name - CarbonFrameworkLib - MacOS - Library - Debug - - - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - wx_CARBON_d.lib - MacOS - - - Name - MSL C.CARBON.Lib - MacOS - - - Name - wx_CARBON.rsrc - MacOS - - - Name - tiffd.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - png.lib - MacOS - - - Name - zlib.lib - MacOS - - - Name - doc.cpp - MacOS - - - Name - docview.cpp - MacOS - - - Name - view.cpp - MacOS - - - Name - CarbonLib - MacOS - - - Name - CarbonFrameworkLib - MacOS - - - - - Carbon Release - - - - UserSourceTrees - - - CustomColor1 - Red0 - Green32767 - Blue0 - - CustomColor2 - Red0 - Green32767 - Blue0 - - CustomColor3 - Red0 - Green32767 - Blue0 - - CustomColor4 - Red0 - Green32767 - Blue0 - - - - AlwaysSearchUserPathstrue - InterpretDOSAndUnixPathstrue - UserSearchPaths - - SearchPath - Path: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:::include: - PathFormatMacOS - PathRootProject - - Recursivefalse - HostFlagsAll - - - SearchPath - Path:::lib: - PathFormatMacOS - PathRootProject - - Recursivetrue - HostFlagsAll - - - SystemSearchPaths - - SearchPath - PathMSL - PathFormatWindows - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - SearchPath - Path:MacOS Support: - PathFormatMacOS - PathRootCodeWarrior - - Recursivetrue - HostFlagsAll - - - - - LinkerMacOS PPC Linker - PreLinker - PostLinker - TargetnameCarbon Release - OutputDirectory - Path: - PathFormatMacOS - PathRootProject - - SaveEntriesUsingRelativePathsfalse - - - FileMappings - - FileTypeAPPL - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeAppl - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeMMLB - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMPLF - FileExtension - CompilerLib Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeMWCD - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeRSRC - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.c++ - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cc - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.cpp - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.exp - Compiler - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.h - CompilerMW C/C++ PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMaketrue - - - FileTypeTEXT - FileExtension.pch - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.pch++ - CompilerMW C/C++ PPC - Precompiletrue - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeTEXT - FileExtension.r - CompilerRez - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypeXCOF - FileExtension - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypedocu - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypersrc - FileExtension - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileTypeshlb - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileTypestub - FileExtension - CompilerPEF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.doc - Compiler - Precompilefalse - Launchabletrue - ResourceFilefalse - IgnoredByMaketrue - - - FileExtension.o - CompilerXCOFF Import PPC - Precompilefalse - Launchablefalse - ResourceFilefalse - IgnoredByMakefalse - - - FileExtension.ppob - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - FileExtension.rsrc - Compiler - Precompilefalse - Launchabletrue - ResourceFiletrue - IgnoredByMakefalse - - - - - CacheModDatestrue - ActivateBrowsertrue - DumpBrowserInfofalse - CacheSubprojectstrue - UseThirdPartyDebuggerfalse - DebuggerCommandLine - Debugger Runtime - 0002000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000 - - - - LogSystemMessagestrue - AutoTargetDLLsfalse - StopAtWatchpointstrue - PauseWhileRunningfalse - PauseInterval5 - PauseUIFlags0 - AltExePath - Path - PathFormatGeneric - PathRootAbsolute - - StopAtTempBPOnLaunchtrue - CacheSymbolicstrue - TempBPFunctionNamemain - TempBPTypefalse - - - MWFrontEnd_C_cplusplus0 - MWFrontEnd_C_checkprotos0 - MWFrontEnd_C_arm0 - MWFrontEnd_C_trigraphs0 - MWFrontEnd_C_onlystdkeywords0 - MWFrontEnd_C_enumsalwaysint0 - MWFrontEnd_C_mpwpointerstyle1 - MWFrontEnd_C_prefixname/wx/wx_cwc.h - MWFrontEnd_C_ansistrict0 - MWFrontEnd_C_mpwcnewline1 - MWFrontEnd_C_wchar_type1 - MWFrontEnd_C_enableexceptions1 - MWFrontEnd_C_dontreusestrings0 - MWFrontEnd_C_poolstrings0 - MWFrontEnd_C_dontinline0 - MWFrontEnd_C_useRTTI1 - MWFrontEnd_C_multibyteaware0 - MWFrontEnd_C_unsignedchars1 - MWFrontEnd_C_autoinline0 - MWFrontEnd_C_booltruefalse1 - MWFrontEnd_C_direct_to_som0 - MWFrontEnd_C_som_env_check0 - MWFrontEnd_C_alwaysinline0 - MWFrontEnd_C_inlinelevel0 - MWFrontEnd_C_ecplusplus0 - MWFrontEnd_C_objective_c0 - MWFrontEnd_C_defer_codegen0 - - - MWWarning_C_warn_illpragma0 - MWWarning_C_warn_emptydecl0 - MWWarning_C_warn_possunwant0 - MWWarning_C_warn_unusedvar0 - MWWarning_C_warn_unusedarg0 - MWWarning_C_warn_extracomma0 - MWWarning_C_pedantic0 - MWWarning_C_warningerrors0 - MWWarning_C_warn_hidevirtual0 - MWWarning_C_warn_implicitconv0 - MWWarning_C_warn_notinlined0 - MWWarning_C_warn_structclass0 - - - MWMerge_MacOS_projectTypeApplication - MWMerge_MacOS_outputNameMerge Out - MWMerge_MacOS_outputCreator1061109567 - MWMerge_MacOS_outputType1095782476 - MWMerge_MacOS_suppressWarning0 - MWMerge_MacOS_copyFragments1 - MWMerge_MacOS_copyResources1 - MWMerge_MacOS_skipResources - - ”×€ - =ÃH - =Ø: - - - - MWCodeGen_PPC_structalignmentPPC - MWCodeGen_PPC_tracebacktablesNone - MWCodeGen_PPC_processorGeneric - MWCodeGen_PPC_readonlystrings0 - MWCodeGen_PPC_tocdata1 - MWCodeGen_PPC_profiler0 - MWCodeGen_PPC_fpcontract1 - MWCodeGen_PPC_schedule0 - MWCodeGen_PPC_peephole1 - MWCodeGen_PPC_processorspecific0 - MWCodeGen_PPC_altivec0 - MWCodeGen_PPC_vectortocdata0 - MWCodeGen_PPC_vrsave0 - - - MWDisassembler_PPC_showcode1 - MWDisassembler_PPC_extended1 - MWDisassembler_PPC_mix0 - MWDisassembler_PPC_nohex0 - MWDisassembler_PPC_showdata1 - MWDisassembler_PPC_showexceptions1 - MWDisassembler_PPC_showsym0 - MWDisassembler_PPC_shownames1 - - - GlobalOptimizer_PPC_optimizationlevelLevel0 - GlobalOptimizer_PPC_optforSpeed - - - MWLinker_PPC_linksym1 - MWLinker_PPC_symfullpath1 - MWLinker_PPC_linkmap0 - MWLinker_PPC_nolinkwarnings0 - MWLinker_PPC_dontdeadstripinitcode0 - MWLinker_PPC_permitmultdefs0 - MWLinker_PPC_linkmodeFast - MWLinker_PPC_initname - MWLinker_PPC_mainname__start - MWLinker_PPC_termname - PPC Mach-O CodeGen - 0001000001010000010000000001010101000000 - - PPC Mach-O Linker - 0001000000000100000100000000000000000000000000000000000000007374 - 6172740000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000 - - PPC Mach-O Target - 0001000005612E6F757400000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000 - - - - MWPEF_exportsNone - MWPEF_libfolder0 - MWPEF_sortcodeNone - MWPEF_expandbss0 - MWPEF_sharedata0 - MWPEF_olddefversion0 - MWPEF_oldimpversion0 - MWPEF_currentversion0 - MWPEF_fragmentname - MWPEF_collapsereloads0 - - - MWProject_PPC_typeApplication - MWProject_PPC_outfiledocvwmdi Carbon Release - MWProject_PPC_filecreator1061109567 - MWProject_PPC_filetype1095782476 - MWProject_PPC_size3840 - MWProject_PPC_minsize3840 - MWProject_PPC_stacksize64 - MWProject_PPC_flags22720 - MWProject_PPC_symfilename - MWProject_PPC_rsrcname - MWProject_PPC_rsrcheaderNative - MWProject_PPC_rsrctype1061109567 - MWProject_PPC_rsrcid0 - MWProject_PPC_rsrcflags0 - MWProject_PPC_rsrcstore0 - MWProject_PPC_rsrcmerge0 - - - MWAssembler_PPC_auxheader0 - MWAssembler_PPC_symmodeMac - MWAssembler_PPC_dialectPPC - MWAssembler_PPC_prefixfile - MWAssembler_PPC_typecheck0 - MWAssembler_PPC_warnings0 - MWAssembler_PPC_casesensitive0 - - - MWRez_Language_maxwidth80 - MWRez_Language_scriptRoman - MWRez_Language_alignmentAlign1 - MWRez_Language_filtermodeFilterSkip - MWRez_Language_suppresswarnings0 - MWRez_Language_escapecontrolchars1 - MWRez_Language_prefixname - MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' - - - - Name - MSL C++.PPC.Lib - MacOS - Library - Debug - - - Name - console.stubs.c - MacOS - Text - - - - Name - MSL RuntimePPC.Lib - MacOS - Library - Debug - - - Name - MSL C.CARBON.Lib - MacOS - Library - - - - Name - wx_CARBON.lib - MacOS - Library - - - - Name - wx_CARBON.rsrc - MacOS - Resource - - - - Name - tiff.lib - MacOS - Library - - - - Name - jpeg.lib - MacOS - Library - - - - Name - doc.cpp - MacOS - Text - - - - Name - docview.cpp - MacOS - Text - - - - Name - view.cpp - MacOS - Text - - - - Name - zlib.lib - MacOS - Library - - - - Name - png.lib - MacOS - Library - - - - Name - CarbonLib - MacOS - Library - - - - Name - CarbonFrameworkLib - MacOS - Library - - - - - - Name - MSL C++.PPC.Lib - MacOS - - - Name - console.stubs.c - MacOS - - - Name - MSL RuntimePPC.Lib - MacOS - - - Name - MSL C.CARBON.Lib - MacOS - - - Name - wx_CARBON.lib - MacOS - - - Name - wx_CARBON.rsrc - MacOS - - - Name - tiff.lib - MacOS - - - Name - jpeg.lib - MacOS - - - Name - doc.cpp - MacOS - - - Name - docview.cpp - MacOS - - - Name - view.cpp - MacOS - - - Name - zlib.lib - MacOS - - - Name - png.lib - MacOS - - - Name - CarbonLib - MacOS - - - Name - CarbonFrameworkLib - MacOS - - - - - - - Classic Release - Classic Debug - Carbon Debug - Carbon Release - - - - - Classic Release - Name - doc.cpp - MacOS - - - Classic Release - Name - docview.cpp - MacOS - - - Classic Release - Name - view.cpp - MacOS - - wx - - Carbon Release - Name - wx_CARBON.lib - MacOS - - - Carbon Debug - Name - wx_CARBON_d.lib - MacOS - - - Carbon Debug - Name - wx_CARBON.rsrc - MacOS - - - Classic Release - Name - wx_PPC.lib - MacOS - - - Classic Debug - Name - wx_PPC_d.lib - MacOS - - - Classic Release - Name - wx_PPC.rsrc - MacOS - - - Classic Release - Name - tiff.lib - MacOS - - - Classic Release - Name - zlib.lib - MacOS - - - Classic Release - Name - png.lib - MacOS - - - Classic Debug - Name - tiffd.lib - MacOS - - - Classic Release - Name - jpeg.lib - MacOS - - - MSL ANSI Libraries - - Classic Release - Name - console.stubs.c - MacOS - - - Classic Release - Name - MSL RuntimePPC.Lib - MacOS - - - Classic Release - Name - MSL C++.PPC.Lib - MacOS - - - Classic Release - Name - MSL C.PPC.Lib - MacOS - - - Carbon Debug - Name - MSL C.CARBON.Lib - MacOS - - - Win32 SDK - - MacOS - Carbon - - Carbon Debug - Name - CarbonLib - MacOS - - - Carbon Debug - Name - CarbonFrameworkLib - MacOS - - - Classic - - Classic Release - Name - AppearanceLib - MacOS - - - Classic Release - Name - ATSUnicodeLib - MacOS - - - Classic Release - Name - CarbonAccessors.o - MacOS - - - Classic Release - Name - ControlsLib - MacOS - - - Classic Release - Name - CursorDevicesGlue.o - MacOS - - - Classic Release - Name - DialogsLib - MacOS - - - Classic Release - Name - DragLib - MacOS - - - Classic Release - Name - InterfaceLib - MacOS - - - Classic Release - Name - InternetConfigLib - MacOS - - - Classic Release - Name - WindowsLib - MacOS - - - Classic Release - Name - MathLib - MacOS - - - Classic Release - Name - MenusLib - MacOS - - - Classic Release - Name - NavigationLib - MacOS - - - Classic Release - Name - OpenTptAppleTalkLib - MacOS - - - Classic Release - Name - OpenTptATalkPPC.o - MacOS - - - Classic Release - Name - OpenTptInetPPC.o - MacOS - - - Classic Release - Name - OpenTptInternetLib - MacOS - - - Classic Release - Name - OpenTransportLib - MacOS - - - Classic Release - Name - OpenTransportAppPPC.o - MacOS - - - Classic Release - Name - PLStringFuncsPPC.lib - MacOS - - - Classic Release - Name - TextEncodingConverter - MacOS - - - Classic Release - Name - Textension - MacOS - - - Classic Release - Name - ThreadsLib - MacOS - - - Classic Release - Name - UnicodeConverter - MacOS - - - - - - diff --git a/samples/docvwmdi/docvwmdi_vc7.vcproj b/samples/docvwmdi/docvwmdi_vc7.vcproj deleted file mode 100644 index 27b6f9e03b..0000000000 --- a/samples/docvwmdi/docvwmdi_vc7.vcproj +++ /dev/null @@ -1,647 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/docvwmdi/docvwmdi_vc8.vcproj b/samples/docvwmdi/docvwmdi_vc8.vcproj deleted file mode 100644 index 90999cf1ff..0000000000 --- a/samples/docvwmdi/docvwmdi_vc8.vcproj +++ /dev/null @@ -1,810 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc deleted file mode 100644 index 7c00963fc2..0000000000 --- a/samples/docvwmdi/makefile.bcc +++ /dev/null @@ -1,249 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DOCVWMDI_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ - -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -DOCVWMDI_OBJECTS = \ - $(OBJS)\docvwmdi_docview.obj \ - $(OBJS)\docvwmdi_doc.obj \ - $(OBJS)\docvwmdi_view.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_FLAG)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p = -D__WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p = -D__WXDEBUG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p_1 = -d__WXDEBUG__ -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\docvwmdi.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe - -if exist $(OBJS)\docvwmdi.tds del $(OBJS)\docvwmdi.tds - -if exist $(OBJS)\docvwmdi.ilc del $(OBJS)\docvwmdi.ilc - -if exist $(OBJS)\docvwmdi.ild del $(OBJS)\docvwmdi.ild - -if exist $(OBJS)\docvwmdi.ilf del $(OBJS)\docvwmdi.ilf - -if exist $(OBJS)\docvwmdi.ils del $(OBJS)\docvwmdi.ils - -$(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res - ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(DOCVWMDI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docvwmdi_docview.res -| - -$(OBJS)\docvwmdi_docview.obj: .\docview.cpp - $(CXX) -q -c -P -o$@ $(DOCVWMDI_CXXFLAGS) .\docview.cpp - -$(OBJS)\docvwmdi_doc.obj: .\doc.cpp - $(CXX) -q -c -P -o$@ $(DOCVWMDI_CXXFLAGS) .\doc.cpp - -$(OBJS)\docvwmdi_view.obj: .\view.cpp - $(CXX) -q -c -P -o$@ $(DOCVWMDI_CXXFLAGS) .\view.cpp - -$(OBJS)\docvwmdi_docview.res: .\docview.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\docview.rc - diff --git a/samples/docvwmdi/makefile.gcc b/samples/docvwmdi/makefile.gcc deleted file mode 100644 index 0e2640193a..0000000000 --- a/samples/docvwmdi/makefile.gcc +++ /dev/null @@ -1,249 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DOCVWMDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -DOCVWMDI_OBJECTS = \ - $(OBJS)\docvwmdi_docview.o \ - $(OBJS)\docvwmdi_doc.o \ - $(OBJS)\docvwmdi_view.o \ - $(OBJS)\docvwmdi_docview_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_FLAG),default) -WXDEBUGFLAG = d -endif -endif -ifeq ($(DEBUG_FLAG),1) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_FLAG),default) -__DEBUG_DEFINE_p = -D__WXDEBUG__ -endif -endif -ifeq ($(DEBUG_FLAG),1) -__DEBUG_DEFINE_p = -D__WXDEBUG__ -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_FLAG),default) -__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ -endif -endif -ifeq ($(DEBUG_FLAG),1) -__DEBUG_DEFINE_p_1 = --define __WXDEBUG__ -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_GDIPLUS),1) -__GDIPLUS_LIB_p = -lgdiplus -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\docvwmdi.exe - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe - -$(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview_rc.o - $(CXX) -o $@ $(DOCVWMDI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 - -$(OBJS)\docvwmdi_docview.o: ./docview.cpp - $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\docvwmdi_doc.o: ./doc.cpp - $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\docvwmdi_view.o: ./view.cpp - $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\docvwmdi_docview_rc.o: ./docview.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - -.PHONY: all clean - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/samples/docvwmdi/makefile.unx b/samples/docvwmdi/makefile.unx deleted file mode 100644 index e008bfb422..0000000000 --- a/samples/docvwmdi/makefile.unx +++ /dev/null @@ -1,118 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C++ compiler -CXX := g++ - -# Standard flags for C++ -CXXFLAGS := - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS := - -# Standard linker flags -LDFLAGS := - -# Location and arguments of wx-config script -WX_CONFIG := wx-config - -# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] -WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1) - -# Use DLL build of wx library to use? [0,1] -WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi) - -# Compile Unicode build of wxWidgets? [0,1] -WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/') - -# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] -WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/') - -# Version of the wx library to build against. -WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/') - - - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP -WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1) -WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2) -WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \ - $(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \ - --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -DOCVWMDI_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \ - $(CXXFLAGS) -DOCVWMDI_OBJECTS = \ - docvwmdi_docview.o \ - docvwmdi_doc.o \ - docvwmdi_view.o - -### Conditionally set variables: ### - -ifeq ($(WX_DEBUG),0) -WX_CONFIG_DEBUG_FLAG = --debug=no -endif -ifeq ($(WX_DEBUG),1) -WX_CONFIG_DEBUG_FLAG = --debug=yes -endif -ifeq ($(WX_UNICODE),0) -WX_CONFIG_UNICODE_FLAG = --unicode=no -endif -ifeq ($(WX_UNICODE),1) -WX_CONFIG_UNICODE_FLAG = --unicode=yes -endif -ifeq ($(WX_SHARED),0) -WX_CONFIG_SHARED_FLAG = --static=yes -endif -ifeq ($(WX_SHARED),1) -WX_CONFIG_SHARED_FLAG = --static=no -endif - - -### Targets: ### - -all: test_for_selected_wxbuild docvwmdi - -install: all - -uninstall: - -clean: - rm -f ./*.o - rm -f ./*.d - rm -f docvwmdi - -test_for_selected_wxbuild: - @$(WX_CONFIG) $(WX_CONFIG_FLAGS) - -docvwmdi: $(DOCVWMDI_OBJECTS) - $(CXX) -o $@ $(DOCVWMDI_OBJECTS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(LDFLAGS) - -docvwmdi_docview.o: ./docview.cpp - $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< - -docvwmdi_doc.o: ./doc.cpp - $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< - -docvwmdi_view.o: ./view.cpp - $(CXX) -c -o $@ $(DOCVWMDI_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all install uninstall clean - - -# Dependencies tracking: --include ./*.d diff --git a/samples/docvwmdi/makefile.vc b/samples/docvwmdi/makefile.vc deleted file mode 100644 index c7ad4f8238..0000000000 --- a/samples/docvwmdi/makefile.vc +++ /dev/null @@ -1,325 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DOCVWMDI_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\docvwmdi.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DOCVWMDI_OBJECTS = \ - $(OBJS)\docvwmdi_docview.obj \ - $(OBJS)\docvwmdi_doc.obj \ - $(OBJS)\docvwmdi_view.obj \ - $(OBJS)\docvwmdi_docview.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_FLAG)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\docvwmdi.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe - -if exist $(OBJS)\docvwmdi.ilk del $(OBJS)\docvwmdi.ilk - -if exist $(OBJS)\docvwmdi.pdb del $(OBJS)\docvwmdi.pdb - -$(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res - link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\docvwmdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< - $(DOCVWMDI_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib -<< - -$(OBJS)\docvwmdi_docview.obj: .\docview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DOCVWMDI_CXXFLAGS) .\docview.cpp - -$(OBJS)\docvwmdi_doc.obj: .\doc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DOCVWMDI_CXXFLAGS) .\doc.cpp - -$(OBJS)\docvwmdi_view.obj: .\view.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DOCVWMDI_CXXFLAGS) .\view.cpp - -$(OBJS)\docvwmdi_docview.res: .\docview.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\docview.rc - diff --git a/samples/docvwmdi/makefile.wat b/samples/docvwmdi/makefile.wat deleted file mode 100644 index 785f446b1e..0000000000 --- a/samples/docvwmdi/makefile.wat +++ /dev/null @@ -1,274 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.3 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! loaddll wlink wlink -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -WXDEBUGFLAG = d -!endif -!endif -!ifeq DEBUG_FLAG 1 -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq BUILD debug -!ifeq DEBUG_FLAG default -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -!endif -!ifeq DEBUG_FLAG 1 -__DEBUG_DEFINE_p = -d__WXDEBUG__ -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DOCVWMDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DOCVWMDI_OBJECTS = & - $(OBJS)\docvwmdi_docview.obj & - $(OBJS)\docvwmdi_doc.obj & - $(OBJS)\docvwmdi_view.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\docvwmdi.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe - -$(OBJS)\docvwmdi.exe : $(DOCVWMDI_OBJECTS) $(OBJS)\docvwmdi_docview.res - @%create $(OBJS)\docvwmdi.lbc - @%append $(OBJS)\docvwmdi.lbc option quiet - @%append $(OBJS)\docvwmdi.lbc name $^@ - @%append $(OBJS)\docvwmdi.lbc option caseexact - @%append $(OBJS)\docvwmdi.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' - @for %i in ($(DOCVWMDI_OBJECTS)) do @%append $(OBJS)\docvwmdi.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\docvwmdi.lbc library %i - @%append $(OBJS)\docvwmdi.lbc option resource=$(OBJS)\docvwmdi_docview.res - @for %i in () do @%append $(OBJS)\docvwmdi.lbc option stack=%i - wlink @$(OBJS)\docvwmdi.lbc - -$(OBJS)\docvwmdi_docview.obj : .AUTODEPEND .\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< - -$(OBJS)\docvwmdi_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< - -$(OBJS)\docvwmdi_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVWMDI_CXXFLAGS) $< - -$(OBJS)\docvwmdi_docview.res : .AUTODEPEND .\docview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - diff --git a/samples/docvwmdi/notepad.ico b/samples/docvwmdi/notepad.ico deleted file mode 100644 index 44d59db862122d736b0c2d6aba6c301459e0a5de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmcIhF%H5o3_K7+w=ywj;qn$w1$r*W2PU)i+r%15p3~ diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp deleted file mode 100644 index 51cfde610c..0000000000 --- a/samples/docvwmdi/view.cpp +++ /dev/null @@ -1,285 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: view.cpp -// Purpose: View classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#if !wxUSE_DOC_VIEW_ARCHITECTURE -#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h! -#endif - -#include "docview.h" -#include "doc.h" -#include "view.h" - -IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView) - -// For drawing lines in a canvas -static float xpos = -1; -static float ypos = -1; - -BEGIN_EVENT_TABLE(DrawingView, wxView) - EVT_MENU(DOODLE_CUT, DrawingView::OnCut) -END_EVENT_TABLE() - -// What to do when a view is created. Creates actual -// windows for displaying the view. -bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) -{ - m_frame = wxGetApp().CreateChildFrame(doc, this, true); - m_frame->SetTitle(wxT("DrawingView")); - - m_canvas = GetMainFrame()->CreateCanvas(this, m_frame); -#ifdef __X__ - // X seems to require a forced resize - int x, y; - m_frame->GetSize(&x, &y); - m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y); -#endif - m_frame->Show(true); - Activate(true); - - return true; -} - -DrawingDocument* DrawingView::GetDocument() -{ - return wxStaticCast(wxView::GetDocument(), DrawingDocument); -} - -// Sneakily gets used for default print/preview -// as well as drawing on the screen. -void DrawingView::OnDraw(wxDC *dc) -{ - dc->SetFont(*wxNORMAL_FONT); - dc->SetPen(*wxBLACK_PEN); - - wxList::compatibility_iterator node = GetDocument()->GetDoodleSegments().GetFirst(); - while (node) - { - DoodleSegment* seg = (DoodleSegment*)node->GetData(); - seg->Draw(dc); - node = node->GetNext(); - } -} - -void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)) -{ - if (m_canvas) - m_canvas->Refresh(); - -/* Is the following necessary? -#ifdef __WXMSW__ - if (canvas) - canvas->Refresh(); -#else - if (canvas) - { - wxClientDC dc(canvas); - dc.Clear(); - OnDraw(& dc); - } -#endif -*/ -} - -// Clean up windows used for displaying the view. -bool DrawingView::OnClose(bool deleteWindow) -{ - if (!GetDocument()->Close()) - return false; - - // Clear the canvas in case we're in single-window mode, - // and the canvas stays. - m_canvas->ClearBackground(); - m_canvas->m_view = NULL; - m_canvas = NULL; - - wxString s(wxTheApp->GetAppDisplayName()); - if (m_frame) - m_frame->SetTitle(s); - - SetFrame(NULL); - - Activate(false); - - if (deleteWindow) - { - delete m_frame; - return true; - } - return true; -} - -void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) ) -{ - DrawingDocument* doc = GetDocument(); - doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Cut Last Segment"), DOODLE_CUT, doc, NULL)); -} - -IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) - -BEGIN_EVENT_TABLE(TextEditView, wxView) - EVT_MENU(wxID_COPY, TextEditView::OnCopy) - EVT_MENU(wxID_PASTE, TextEditView::OnPaste) - EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll) -END_EVENT_TABLE() - -bool TextEditView::OnCreate(wxDocument* doc, long WXUNUSED(flags) ) -{ - m_frame = wxGetApp().CreateChildFrame(doc, this, false); - - wxSize size = m_frame->GetClientSize(); - m_textsw = new MyTextWindow(this, m_frame, wxPoint(0, 0), size, wxTE_MULTILINE); - m_frame->SetTitle(wxT("TextEditView")); - -#ifdef __X__ - // X seems to require a forced resize - int x, y; - m_frame->GetSize(&x, &y); - m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y); -#endif - - m_frame->Show(true); - Activate(true); - - return true; -} - -// Handled by wxTextWindow -void TextEditView::OnDraw(wxDC *WXUNUSED(dc) ) -{ -} - -void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) -{ -} - -bool TextEditView::OnClose(bool deleteWindow) -{ - if (!GetDocument()->Close()) - return false; - - Activate(false); - - if (deleteWindow) - { - delete m_frame; - return true; - } - return true; -} - -bool TextEditView::ProcessEvent(wxEvent& event) -{ - bool processed = false; - if (!processed) switch (event.GetId()) - { - case wxID_COPY: - case wxID_PASTE: - case wxID_SELECTALL: - processed = m_textsw->ProcessEvent(event); - break; - } - if (!processed) processed = wxView::ProcessEvent(event); - return processed; -} - -/* - * Window implementations - */ - -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) - EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent) -END_EVENT_TABLE() - -// Define a constructor for my canvas -MyCanvas::MyCanvas(DrawingView* view, wxMDIChildFrame* frame, const wxPoint& pos, const wxSize& size, long style): - wxScrolledWindow(frame, wxID_ANY, pos, size, style) -{ - m_view = view; -} - -// Define the repainting behaviour -void MyCanvas::OnDraw(wxDC& dc) -{ - if (m_view) - m_view->OnDraw(& dc); -} - -// This implements a tiny doodling program. Drag the mouse using -// the left button. -void MyCanvas::OnMouseEvent(wxMouseEvent& event) -{ - if (!m_view) - return; - - static DoodleSegment* currentSegment = NULL; - - wxClientDC dc(this); - PrepareDC(dc); - - dc.SetPen(*wxBLACK_PEN); - - wxPoint pt(event.GetLogicalPosition(dc)); - - if (currentSegment && event.LeftUp()) - { - if (currentSegment->m_lines.GetCount() == 0) - { - delete currentSegment; - currentSegment = NULL; - } - else - { - // We've got a valid segment on mouse left up, so store it. - DrawingDocument* doc = m_view->GetDocument(); - - doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Add Segment"), DOODLE_ADD, doc, currentSegment)); - - m_view->GetDocument()->Modify(true); - currentSegment = NULL; - } - } - - if ( (xpos > -1) && (ypos > -1) && event.Dragging()) - { - if (!currentSegment) - currentSegment = new DoodleSegment; - - DoodleLine *newLine = new DoodleLine; - newLine->x1 = (long)xpos; - newLine->y1 = (long)ypos; - newLine->x2 = pt.x; - newLine->y2 = pt.y; - currentSegment->m_lines.Append(newLine); - - dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y); - } - xpos = pt.x; - ypos = pt.y; -} - -// Define a constructor for my text subwindow -MyTextWindow::MyTextWindow(wxView* view, wxMDIChildFrame* frame, const wxPoint& pos, const wxSize& size, long style): - wxTextCtrl(frame, wxID_ANY, wxEmptyString, pos, size, style) -{ - m_view = view; -} - diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h deleted file mode 100644 index 8ac7c98ca9..0000000000 --- a/samples/docvwmdi/view.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: view.h -// Purpose: View classes -// Author: Julian Smart -// Modified by: -// Created: 04/01/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -#ifndef __VIEW_H__ -#define __VIEW_H__ - -#include "wx/docview.h" - -class DrawingView; -class MyCanvas : public wxScrolledWindow -{ -public: - DrawingView* m_view; - - MyCanvas(DrawingView*, wxMDIChildFrame*, const wxPoint&, const wxSize&, long style); - virtual void OnDraw(wxDC&); -protected: - void OnMouseEvent(wxMouseEvent&); - DECLARE_EVENT_TABLE() -}; - -class MyTextWindow: public wxTextCtrl -{ -public: - wxView* m_view; - - MyTextWindow(wxView*, wxMDIChildFrame*, const wxPoint&, const wxSize&, long style); -}; - -class DrawingDocument; -class DrawingView : public wxView -{ - DECLARE_DYNAMIC_CLASS(DrawingView) -public: - wxMDIChildFrame* m_frame; - MyCanvas* m_canvas; - - DrawingView() { m_canvas = NULL; m_frame = NULL; } - virtual ~DrawingView() {} - - virtual bool OnCreate(wxDocument *doc, long flags); - virtual void OnDraw(wxDC *dc); - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); - virtual bool OnClose(bool deleteWindow = true); - - DrawingDocument* GetDocument(); - -protected: - void OnCut(wxCommandEvent& event); - DECLARE_EVENT_TABLE() -}; - -class TextEditView: public wxView -{ -public: - wxMDIChildFrame* m_frame; - MyTextWindow* m_textsw; - - TextEditView() : wxView() { m_frame = NULL; m_textsw = NULL; } - virtual ~TextEditView() {} - - virtual bool OnCreate(wxDocument*, long flags); - virtual void OnDraw(wxDC* dc); - virtual void OnUpdate(wxView *sender, wxObject *hint = NULL); - virtual bool OnClose(bool deleteWindow = true); - virtual bool ProcessEvent(wxEvent&); - -private: - void OnCopy(wxCommandEvent& WXUNUSED(event)) { m_textsw->Copy(); } - void OnPaste(wxCommandEvent& WXUNUSED(event)) { m_textsw->Paste(); } - void OnSelectAll(wxCommandEvent& WXUNUSED(event)) { m_textsw->SelectAll(); } - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(TextEditView) -}; - -#endif diff --git a/samples/makefile.bcc b/samples/makefile.bcc index cb8ad7eef5..40ad637370 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc clean: -if exist .\*.obj del .\*.obj @@ -118,10 +118,6 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>docview.bat call docview.bat @del docview.bat - @echo cd docvwmdi >docvwmdi.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>docvwmdi.bat - call docvwmdi.bat - @del docvwmdi.bat @echo cd dragimag >dragimag.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dragimag.bat call dragimag.bat @@ -453,12 +449,6 @@ docview: call docview.bat @del docview.bat -docvwmdi: - @echo cd docvwmdi >docvwmdi.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>docvwmdi.bat - call docvwmdi.bat - @del docvwmdi.bat - dragimag: @echo cd dragimag >dragimag.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dragimag.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index edf6a69bf6..5e5f0961ff 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc clean: -if exist .\*.o del .\*.o @@ -57,7 +57,6 @@ clean: $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C docvwmdi -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean @@ -167,9 +166,6 @@ dnd: docview: $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) all -docvwmdi: - $(MAKE) -C docvwmdi -f makefile.gcc $(MAKEARGS) all - dragimag: $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) all @@ -341,7 +337,7 @@ wrapsizer: mfc: $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc SHELL := $(COMSPEC) diff --git a/samples/makefile.vc b/samples/makefile.vc index 11c3c513ab..83c3ca79cc 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ ### Targets: ### -all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_propgrid sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_mfc +all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_propgrid sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_mfc clean: -if exist .\*.obj del .\*.obj @@ -91,9 +91,6 @@ clean: cd docview $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" - cd docvwmdi - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" cd dragimag $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" @@ -351,11 +348,6 @@ sub_docview: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -sub_docvwmdi: - cd docvwmdi - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - sub_dragimag: cd dragimag $(MAKE) -f makefile.vc $(MAKEARGS) all diff --git a/samples/makefile.wat b/samples/makefile.wat index 66c2faa0a0..92e5acb772 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & ### Targets: ### -all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -107,9 +107,6 @@ clean : .SYMBOLIC cd docview wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) - cd docvwmdi - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) cd dragimag wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) @@ -367,11 +364,6 @@ docview : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) -docvwmdi : .SYMBOLIC - cd docvwmdi - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - dragimag : .SYMBOLIC cd dragimag wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all diff --git a/samples/samples.bkl b/samples/samples.bkl index b409f63696..72aa66c28f 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -27,7 +27,6 @@ - diff --git a/samples/samples.dsw b/samples/samples.dsw index df6b151ccf..6ce1382f75 100644 --- a/samples/samples.dsw +++ b/samples/samples.dsw @@ -159,18 +159,6 @@ Package=<4> ############################################################################### -Project: "docvwmdi"=.\docvwmdi\docvwmdi.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "dragimag"=.\dragimag\dragimag.dsp - Package Owner=<4> Package=<5> -- 2.45.2