This commit was manufactured by cvs2svn to create tag 'oglgdiptr'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/oglgdiptr@12492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/configure.in

@@ -1,79 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id$)dnl
-
-AC_INIT(Makefile.in)
-
-dnl ---------------
-dnl MMedia specific
-dnl ---------------
-
-dnl Check for ESD
-
-ESD_LINK=
-AC_CHECK_HEADER(esd.h, [
-  AC_CHECK_LIB(esd, esd_close, [
-    ESD_LINK="-lesd"
-  ])
-])
-
-if test "$ESD_LINK" != "" ; then
-  echo "ESound detected"
-fi
-
-dnl -----------
-dnl Final subst
-
-PATH_IFS=$wx_cv_path_ifs
-WX_TARGET_LIBRARY=$wx_cv_target_library
-WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype
-
-AC_SUBST(PATH_IFS)
-AC_SUBST(ESD_LINK)
-AC_SUBST(WX_TARGET_LIBRARY)
-AC_SUBST(WX_TARGET_LIBRARY_TYPE)
-
-dnl -----------
-dnl File output
-
-
-AC_OUTPUT([
-            src/Makefile
-            src/ogl/Makefile
-            src/mmedia/Makefile
-            src/stc/Makefile
-            src/xrc/Makefile
-            src/canvas/Makefile
-            src/gizmos/Makefile
-            src/plot/Makefile
-            src/applet/Makefile
-            src/fl/Makefile
-            src/net/Makefile
-            samples/Makefile
-            samples/mmedia/Makefile
-            samples/ogl/Makefile
-            samples/ogl/ogledit/Makefile
-            samples/ogl/studio/Makefile
-            samples/stc/Makefile
-            samples/canvas/Makefile
-            samples/canvas/test/Makefile
-            samples/canvas/simple/Makefile
-            samples/gizmos/Makefile
-            samples/gizmos/multicell/Makefile
-            samples/gizmos/splittree/Makefile
-            samples/gizmos/editlbox/Makefile
-            samples/gizmos/dynsash/Makefile
-            samples/gizmos/dynsash_switch/Makefile
-            samples/xrc/Makefile
-            samples/plot/Makefile
-            samples/applet/Makefile
-            samples/fl/Makefile
-            samples/fl/fl_demo1/Makefile
-            samples/fl/fl_demo2/Makefile
-            samples/fl/fl_sample1/Makefile
-            samples/fl/fl_sample2/Makefile
-            samples/fl/fl_sample3/Makefile
-            utils/Makefile
-            utils/wxrc/Makefile
-            utils/wxrcedit/Makefile
-            utils/convertrc/Makefile
-         ])

contrib/docs/latex/ogl/bugs.tex

@@ -0,0 +1,11 @@
+\chapter{Bugs}\label{bugs}%
+\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+
+These are the known bugs.
+
+\begin{itemize}\itemsep=0pt
+\item In the OGLEdit sample, .dia files are output double-spaced
+due to an unidentified bug in the way a stream is converted to a file.
+\end{itemize}
+

contrib/docs/latex/ogl/changes.tex

@@ -0,0 +1,19 @@
+\chapter{Change log}
+\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+
+Version 3.0, September 8th 1998
+
+\begin{itemize}\itemsep=0pt
+\item Version for wxWindows 2.0.
+\item Various enhancements especially to wxDrawnShape
+(multiple metafiles, for different orientations).
+\item More ability to override functions e.g. OnSizeDragLeft, so events can be
+intercepted for Do/Undo.
+\end{itemize}
+
+Version 2.0, June 1st 1996
+
+\begin{itemize}\itemsep=0pt
+\item First publicly released version.
+\end{itemize}

contrib/docs/latex/ogl/intro.tex

@@ -0,0 +1,47 @@
+\chapter{Introduction}
+\pagenumbering{arabic}%
+\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+
+Object Graphics Library (\ogl) is a C++ library supporting the creation and
+manipulation of simple and complex graphic images on a canvas.
+
+It can be found in the directory {\tt utils/ogl/src} in the
+wxWindows distribution. The file {\tt ogl.h} must be included to make use
+of the library.
+
+Please see \helpref{OGL overview}{ogloverview} for a general description how the object library works. For details,
+please see the \helpref{class reference}{classref}.
+
+\section{File structure}
+
+These are the files that comprise the \ogl\ library.
+
+\begin{description}\itemsep=0pt
+\item[basic.h] Header for basic objects such as wxShape and wxRectangleShape.
+\item[basic.cpp] Basic objects implementation (1).
+\item[basic2.cpp] Basic objects implementation (2).
+\item[bmpshape.h] wxBitmapShape class header.
+\item[bmpshape.cpp] wxBitmapShape implementation.
+\item[canvas.h] wxShapeCanvas class header.
+\item[canvas.cpp] wxShapeCanvas class implementation.
+\item[composit.h] Composite object class header.
+\item[composit.cpp] Composite object class implementation.
+\item[constrnt.h] Constraint classes header.
+\item[constrnt.cpp] Constraint classes implementation.
+\item[divided.h] Divided object class header.
+\item[divided.cpp] Divided object class implementation.
+\item[drawn.h] Drawn (metafile) object class header.
+\item[drawn.cpp] Drawn (metafile) object class implementation.
+\item[graphics.h] Main include file.
+\item[lines.h] wxLineShape class header.
+\item[lines.cpp] wxLineShape class implementation.
+\item[misc.h] Miscellaneous graphics functions header.
+\item[misc.cpp] Miscellaneous graphics functions implementation.
+\item[ogldiag.h] wxDiagram class header.
+\item[ogldiag.cpp] wxDiagram implementation.
+\item[mfutils.h] Metafile utilities header.
+\item[mfutils.cpp] Metafile utilities implementation.
+\end{description}
+
+

contrib/docs/latex/ogl/ogl.hpj

@@ -0,0 +1,17 @@
+[OPTIONS]
+BMROOT=d:\wx2\wxwind~1\contrib\docs\latex\ogl ; Assume that bitmaps are where the source is
+TITLE=OGL Manual
+CONTENTS=Contents
+COMPRESS=HIGH
+
+[FILES]
+ogl.rtf
+
+[CONFIG]
+CreateButton("Up", "&Up", "JumpId(`ogl.hlp', `Contents')")
+BrowseButtons()
+
+[MAP]
+
+[BITMAPS]
+

contrib/docs/latex/ogl/ogl.tex

@@ -0,0 +1,46 @@
+\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}
+\newcommand{\ogl}[0]{{OGL}}%
+\definecolour{black}{0}{0}{0}%
+\definecolour{cyan}{0}{255}{255}%
+\definecolour{green}{0}{255}{0}%
+\definecolour{magenta}{255}{0}{255}%
+\definecolour{red}{255}{0}{0}%
+\definecolour{blue}{0}{0}{200}%
+\definecolour{yellow}{255}{255}{0}%
+\definecolour{white}{255}{255}{255}%
+\input psbox.tex
+\parindent 0pt
+\parskip 11pt
+\title{Object Graphics Library 3.0}
+\author{Julian Smart}
+\date{September 1998}
+
+\makeindex
+\begin{document}
+\maketitle
+
+\pagestyle{fancyplain}
+\bibliographystyle{plain}
+\pagenumbering{roman}
+\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
+\setfooter{\thepage}{}{}{}{}{\thepage}
+\tableofcontents%
+
+\input{intro.tex}
+%
+\input{sample.tex}
+%
+\input{classes.tex}
+%
+\input{topics.tex}
+%
+\input{bugs.tex}
+%
+\input{changes.tex}
+
+%
+\addcontentsline{toc}{chapter}{Index}
+\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}
+\setfooter{\thepage}{}{}{}{}{\thepage}%
+\printindex
+\end{document}

contrib/docs/latex/ogl/sample.tex

@@ -0,0 +1,87 @@
+\chapter{OGLEdit: a sample OGL application}\label{ogledit}%
+\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+
+OGLEdit is a sample OGL application that allows the user to draw, edit,
+save and load a few shapes. It should clarify aspects of OGL usage, and
+can act as a template for similar applications. OGLEdit can be found in\rtfsp
+{\tt samples/ogledit} in the OGL distribution.
+
+$$\image{10cm;0cm}{ogledit.eps}$$\par
+
+The wxWindows document/view model has been used in OGL, to reduce the amount of
+housekeeping logic required to get it up and running. OGLEdit also provides
+a demonstration of the Undo/Redo capability supported by the document/view classes,
+and how a typical application might implement this feature.
+
+\section{OGLEdit files}
+
+OGLEdit comprises the following source files.
+
+\begin{itemize}\itemsep=0pt
+\item doc.h, doc.cpp: MyDiagram, DiagramDocument, DiagramCommand, MyEvtHandler
+classes related to diagram functionality and documents.
+\item view.h, view.cpp: MyCanvas, DiagramView classes related to visualisation of
+the diagram.
+\item ogledit.h, ogledit.cpp: MyFrame, MyApp classes related to the overall application.
+\item palette.h, palette.cpp: EditorToolPalette implementing the shape palette.
+\end{itemize}
+
+\section{How OGLEdit works}
+
+OGLEdit defines a DiagramDocument class, each of instance of which holds a MyDiagram
+member which itself contains the shapes.
+
+In order to implement specific mouse behaviour for shapes, a class MyEvtHandler is
+defined which is `plugged into' each shape when it is created, instead of overriding each shape class
+individually. This event handler class also holds a label string.
+
+The DiagramCommand class is the key to implementing Undo/Redo. Each instance of DiagramCommand
+stores enough information about an operation (create, delete, change colour etc.) to allow
+it to carry out (or undo) its command. In DiagramView::OnMenuCommand, when the user initiates the
+command, a new DiagramCommand instance is created which is then sent to the document's
+command processor (see wxWindows manual for more information about doc/view and command
+processing).
+
+Apart from menu commands, another way commands are initiated is by the user left-clicking on
+the canvas or right-dragging on a node. MyCanvas::OnLeftClick in view.cpp shows how
+the appropriate wxClassInfo is passed to a DiagramCommand, to allow DiagramCommand::Do
+to create a new shape given the wxClassInfo.
+
+The MyEvtHandler right-drag methods in doc.cpp implement drawing a line between
+two shapes, detecting where the right mouse button was released and looking for a second
+shape. Again, a new DiagramCommand instance is created and passed to the command
+processor to carry out the command.
+
+DiagramCommand::Do and DiagramCommand::Undo embody much of the
+interesting interaction with the OGL library. A complication of note
+when implementing undo is the problem of deleting a node shape which has
+one or more arcs attached to it. If you delete the node, the arc(s)
+should be deleted too. But multiple arc deletion represents more information
+that can be incorporated in the existing DiagramCommand scheme. OGLEdit
+copes with this by treating each arc deletion as a separate command, and
+sending Cut commands recursively, providing an undo path. Undoing such a
+Cut will only undo one command at a time - not a one to one
+correspondence with the original command - but it's a reasonable
+compromise and preserves Do/Undo whilst keeping our DiagramCommand class
+simple.
+
+\section{Possible enhancements}
+
+OGLEdit is very simplistic and does not employ the more advanced features
+of OGL, such as:
+
+\begin{itemize}\itemsep=0pt
+\item attachment points (arcs are drawn to particular points on a shape)
+\item metafile and bitmaps shapes
+\item divided rectangles
+\item composite shapes, and constraints
+\item creating labels in shape regions
+\item arc labels (OGL has support for three movable labels per arc)
+\item spline and multiple-segment line arcs
+\item adding annotations to node and arc shapes
+\item line-straightening (supported by OGL) and alignment (not supported directly by OGL)
+\end{itemize}
+
+These could be added to OGLEdit, at the risk of making it a less
+useful example for beginners.

contrib/docs/latex/ogl/tex2rtf.ini

@@ -0,0 +1,35 @@
+;    Last change:  JAC  13 Oct 100    5:11 pm
+runTwice = yes
+titleFontSize = 12
+authorFontSize = 10
+chapterFontSize = 12
+sectionFontSize = 12
+subsectionFontSize = 12
+headerRule = yes
+footerRule = yes
+useHeadingStyles = yes
+listItemIndent=40
+generateHPJ = no
+htmlBrowseButtons = bitmap
+winHelpVersion = 3
+winHelpContents = yes
+winHelpTitle = "OGL Manual"
+truncateFilenames = yes
+combineSubSections = yes
+\overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}}
+\htmlonly{\image{}{books.gif}}\helpref{#1}{#2}
+\sethotspotcolour{on}\sethotspotunderline{on}}
+\docparam [2]{\parskip{0}{\it #1}\htmlignore{\par}\parskip{10}\indented{1cm}{#2}}
+\wxheading [1]{{\bf \htmlignore{\fcol{blue}{#1}}\htmlonly{\fcol{red}{#1}}}}
+\const [0] {{\bf const}}
+\constfunc [3] {{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
+\windowstyle [1] {{\bf #1}\index{#1}}
+
+;;
+;; These two are for generating MS HTML Help project, contents and index files.
+;;
+htmlWorkshopFiles = true
+htmlIndex = true
+\pythonnote [1] {{\bf \fcol{blue}{wxPython note:}} #1}
+%\pythonnote [1] {}
+

contrib/docs/latex/ogl/texhelp.sty

@@ -0,0 +1,298 @@
+% LaTeX style file
+% Name:   texhelp.sty
+% Author: Julian Smart
+%
+% Purpose
+% -------
+% Style file to enable the simultaneous preparation of printed LaTeX and on-line
+% hypertext manuals.
+% Use in conjunction with Tex2RTF (see Tex2RTF documentation).
+%
+% Note that if a non-ASCII character starts a newline and there should be a space
+% between the last word on the previous line and the first word on this line,
+% you need to use \rtfsp to generate a space in Windows Help. \rtfsp is ignored
+% in all other formats.
+%
+% Julian Smart
+% Artificial Intelligence Applications Institute
+%
+%
+% ============== C++/CLIPS Documentation Facilities ==============
+%
+% Each class definition should be typeset with e.g.
+%
+% \section{\class{Name}: Parent}
+%
+% followed by a description of the class.
+% Each member should follow:
+%
+% \membersection{wxName::Member}
+%
+% with a description of what this member does.
+% Then, one (or more if overloaded) member (function) in detail:
+%
+% \func{return type}{name}{args}
+% or
+% \member{type}{name}
+%
+% where args is a list of \param{type}{name}, ...
+
+% Function, e.g.
+% e.g. to typeset
+%
+% void DoIt(char *string);
+%
+% write:
+%
+% \func{void}{DoIt}{\param{char *}{string}}
+%
+
+\newcommand{\func}[3]{\hangafter=1\noindent\hangindent=10mm
+{{\it #1} {\bf #2}\index{#2}}(#3)}
+
+% For function/type definition where the name is a pointer,
+% e.g. to typeset
+%
+% typedef void (*wxFunction)(wxObject&)
+%
+% write:
+%
+% \pfunc{typedef void}{wxFunction}{param{wxObject&}}
+
+\newcommand{\pfunc}[3]{\hangafter=1\noindent\hangindent=10mm
+{{\it #1} ({\bf *#2})\index{#2}}(#3)}
+
+% Use an ordinary \section command for class name definitions.
+
+% This is used for a member, such as wxBitmap: GetDepth
+\newcommand{\membersection}[1]{\subsection*{#1}\index{#1}}
+
+% CLIPS function
+\newcommand{\clipsfunc}[3]{\hangafter=1\noindent\hangindent=10mm
+{{\bf #1} ({\bf #2}\index{#2}}#3)}
+
+\newcommand{\clipssection}[1]{\chapter{#1}}
+
+% This is used for a CLIPS function name
+\newcommand{\functionsection}[1]{\subsection*{#1}}
+
+% Member: a type and a name
+\newcommand{\member}[2]{{\bf #1 \it #2}}
+
+% C++ Parameter: a type and a name (no intervening space)
+\newcommand{\param}[2]{{\it #1}{\bf #2}}
+
+% CLIPS Parameter: a type and a name (one intervening space)
+\newcommand{\cparam}[2]{{\bf #1} {\it #2}}
+
+% Class: puts in index
+\newcommand{\class}[1]{#1\index{#1}}
+
+%\newcommand{\docparam}[2]{\parskip=0pt {\it #1}\par\parskip=10pt\begin{indented}{1cm}{#2}\end{indented}}
+
+% Void type
+\newcommand{\void}{{\it void}}
+
+% Typeset destructor
+\newcommand{\destruct}[1]{{$\sim$}#1}
+
+% Typeset insert/extract operators
+\newcommand{\cinsert}{$<<$}
+\newcommand{\cextract}{$>>$}
+
+
+% =================== Hypertext facilities ===================
+%
+% To insert hyperlinks (or references, in Latex), \label the sections
+% or membersections \label{ref-label} immediately after the section, on the same line,
+% and use \helpref{text-to-show}{ref-label} to make a reference.
+%
+
+% Type text with section reference
+\newcommand{\helpref}[2]{{\it #1} (p.\ \pageref{#2}) }
+
+% Type text with URL in verbatim mode
+\newcommand{\urlref}[2]{#1 (\verb$#2$)}
+
+% Don't typeset section number in LaTeX
+\newcommand{\helprefn}[2]{{\it #1}}
+
+% Like helpref, but popup text in WinHelp instead of hyperlinked
+\newcommand{\popref}[2]{{\it #1}}
+
+% Like footnote, but popup text.
+\newcommand{\footnotepopup}[2]{{\it #1}\footnote{#2}}
+
+% =================== On-line help specific macros ===================
+%
+
+% Global document font size/family, help only.
+\newcommand{\helpfontsize}[1]{}
+\newcommand{\helpfontfamily}[1]{}
+
+% Ignore in all on-line help
+\newcommand{\helpignore}[1]{#1}
+% Only print in all on-line help
+\newcommand{\helponly}[1]{}
+
+% Ignore in LaTeX
+\newcommand{\latexignore}[1]{}
+% Only print in LaTeX
+\newcommand{\latexonly}[1]{#1}
+
+% Ignore in linear RTF
+\newcommand{\rtfignore}[1]{#1}
+% Only print in linear RTF
+\newcommand{\rtfonly}[1]{}
+
+% Ignore in WinHelp RTF
+\newcommand{\winhelpignore}[1]{#1}
+% Only print in WinHelp RTF
+\newcommand{\winhelponly}[1]{}
+
+% Ignore in wxHelp
+\newcommand{\xlpignore}[1]{#1}
+% Only print in wxHelp
+\newcommand{\xlponly}[1]{}
+
+% Ignore in HTML
+\newcommand{\htmlignore}[1]{#1}
+% Only print in HTML
+\newcommand{\htmlonly}[1]{}
+
+% Input a file only for help system (binder thickness is not a limitation
+% in help systems!)
+\newcommand{\helpinput}[1]{}
+
+\newcommand{\rtfsp}{ } % Force a space in RTF, ignore in Latex
+
+% =================== Miscellaneous macros ===================
+%
+% Headings consistent with generated ones
+\newcommand{\myheading}[1]{\vspace*{25pt}
+\begin{flushleft}
+{\LARGE \bf #1}
+\end{flushleft}
+\vskip 20pt
+}
+
+% Heading with entry in contents page.
+\newcommand{\chapterheading}[1]{\myheading{#1}
+\addcontentsline{toc}{chapter}{#1}}
+
+\newcommand{\sectionheading}[1]{\myheading{#1}
+\addcontentsline{toc}{section}{#1}}
+
+% Glossary environment
+\newenvironment{helpglossary}{\newpage\chapterheading{Glossary}\begin{description}}{\end{description}}
+
+% Glossary entry
+\newcommand{\gloss}[1]{\item[#1]\index{#1}}
+
+% Image: EPS in Latex, BMP or MF (whatever's available) in RTF. Requires psbox.
+\newcommand{\image}[2]{\psboxto(#1){#2}}
+
+% Image, left aligned (HTML)
+\newcommand{\imager}[2]{\psboxto(#1){#2}}
+
+% Image, right aligned (HTML)
+\newcommand{\imagel}[2]{\psboxto(#1){#2}}
+
+% Imagemap: principally for HTML only. In Latex,
+% acts like \image.
+\newcommand{\imagemap}[3]{\psboxto(#1){#2}}
+
+% Headers and footers
+% \setheader{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
+% {OddPageLeft}{OddPageCentre}{OddPageRight}
+\newcommand{\setheader}[6]{
+\lhead[\fancyplain{}{#1}]{\fancyplain{}{#4}}
+\chead[\fancyplain{}{#2}]{\fancyplain{}{#5}}
+\rhead[\fancyplain{}{#3}]{\fancyplain{}{#6}}
+}
+
+% \setfooter{EvenPageLeft}{EvenPageCentre}{EvenPageRight}
+% {OddPageLeft}{OddPageCentre}{OddPageRight}
+\newcommand{\setfooter}[6]{
+\lfoot[\fancyplain{#1}{#1}]{\fancyplain{#4}{#4}}
+\cfoot[\fancyplain{#2}{#2}]{\fancyplain{#5}{#5}}
+\rfoot[\fancyplain{#3}{#3}]{\fancyplain{#6}{#6}}
+}
+
+% Needed for telling RTF where margin paragraph should go
+% in mirrored margins mode.
+\newcommand{\marginpareven}[1]{\hspace*{0pt}\marginpar{#1}}
+\newcommand{\marginparodd}[1]{\hspace*{0pt}\marginpar{#1}}
+
+% Environment for two-column table popular in WinHelp and manuals.
+\newcommand{\twocolwidtha}[1]{\def\twocolwidthaval{#1}}
+\newcommand{\twocolwidthb}[1]{\def\twocolwidthbval{#1}}
+\newcommand{\twocolspacing}[1]{\def\twocolspacingval{#1}}
+
+\twocolwidtha{3cm}
+\twocolwidthb{8.5cm}
+\twocolspacing{2}
+
+\newcommand{\twocolitem}[2]{#1 & #2\\}
+\newcommand{\twocolitemruled}[2]{#1 & #2\\\hline}
+
+\newenvironment{twocollist}{\renewcommand{\arraystretch}{\twocolspacingval}\begin{tabular}{lp{\twocolwidthbval}}}%
+{\end{tabular}\renewcommand{\arraystretch}{1}}
+
+% Specifying table rows for RTF compatibility
+\newcommand{\row}[1]{#1\\}
+
+% Use for the last ruled row for correct RTF generation.
+\newcommand{\ruledrow}[1]{#1\\\hline}
+
+% Indentation environment. Arg1 is left margin size
+\newenvironment{indented}[1]{\begin{list}{}{\leftmargin=#1}\item[]}%
+{\end{list}}
+
+% Framed box of text, normal formatting.
+\newcommand{\normalbox}[1]{\fbox{\vbox{#1}}}
+% Double-framed box of text.
+\newcommand{\normalboxd}[1]{\fbox{\fbox{\vbox{#1}}}}
+
+% WITHDRAWN -- can't do in RTF, easily.
+% Framed box of text, horizontally centred. Ragged right within box.
+% \newcommand{\centeredbox}[2]{\begin{center}\fbox{\parbox{#1}{\raggedright#2}}\end{center}}
+% Double-framed box of text, horizontally centred. Ragged right within box.
+% \newcommand{\centeredboxd}[2]{\begin{center}\fbox{\fbox{\parbox{#1}{\raggedright#2}}}\end{center}}
+
+% toocomplex environment: simply prints the argument in LaTeX,
+% comes out verbatim in all generated formats.
+\newenvironment{toocomplex}{}{}
+
+% Colour: dummy commands since LaTeX doesn't support colour.
+% \definecolour{name}{red}{blue}{green}
+% \fcol{name}{text} ; Foreground
+% \bcol{name}{text} ; Background
+\newcommand{\definecolour}[4]{}
+\newcommand{\definecolor}[4]{}
+\newcommand{\fcol}[2]{#2}
+\newcommand{\bcol}[2]{#2}
+\newcommand{\sethotspotcolour}[1]{}
+\newcommand{\sethotspotunderline}[1]{}
+\newcommand{\settransparency}[1]{}
+\newcommand{\backslashraw}[0]{}
+\newcommand{\lbraceraw}[0]{}
+\newcommand{\rbraceraw}[0]{}
+\newcommand{\registered}[0]{(r)}
+\newcommand{\background}[1]{}
+\newcommand{\textcolour}[1]{}
+\newcommand{\overview}[2]{See \helpref{#1}{#2}.}
+\newcommand{\docparam}[2]{{\it #1}\begin{list}{}{\leftmargin=1cm}\item[]
+#2%
+\end{list}}
+\newcommand{\wxheading}[1]{{\bf #1}}
+\newcommand{\const}[0]{{\bf const}}
+\newcommand{\constfunc}[3]{{\bf #1} {\bf #2}(#3) {\bf const}\index{#2}}
+\newcommand{\windowstyle}[1]{{\bf #1}\index{#1}}
+
+\addtolength{\textwidth}{1in}
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\topmargin}{-0.5in}
+\addtolength{\textheight}{1in}
+\sloppy
+

contrib/docs/latex/ogl/topics.tex

@@ -0,0 +1,161 @@
+\chapter{Topic overviews}
+\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+
+The following sections describe particular topics.
+
+\section{OGL overview}\label{ogloverview}
+
+\helpref{wxShapeCanvas}{wxshapecanvas}, derived from {\bf wxCanvas}, is the drawing area
+for a number of \helpref{wxShape}{wxshape} instances. Everything drawn on a
+wxShapeCanvas is derived from wxShape, which provides virtual
+member functions for redrawing, creating and destroying
+resize/selection `handles', movement and erasing behaviour, mouse
+click behaviour, calculating the bounding box of the shape, linking
+nodes with arcs, and so on.
+
+The way a client application copes with `damage' to the canvas is to
+erase (white out) anything should no longer be displayed, redraw the shape,
+and then redraw everything on the canvas to repair any damage. If quick edit
+mode is on for the canvas, the complete should be omitted by OGL and the
+application.
+
+Selection handles (called control points in the code) are implemented as
+wxRectangleShapes.
+
+Events are passed to shapes by the canvas in a high-level form, for example {\bf OnLeftClick},
+{\bf OnBeginDragLeft}, {\bf OnDragLeft}, {\bf OnEndDragLeft}. The canvas decides
+what is a click and what is a drag, whether it is on a shape or the canvas itself,
+and (by interrogating the shape) which attachment point the click is associated with.
+
+In order to provide event-handling flexibility, each shapes has an `event handler' associated with it,
+which by default is the shape itself (all shapes derive from wxShapeEvtHandler).
+An application can modify the event-handling behaviour simply by plugging a new
+event handler into the shape. This can avoid the need for multiple inheritance when
+new properties and behaviour are required for a number of different shape classes: instead
+of overriding each class, one new event handler class can be defined and used for all
+existing shape classes.
+
+A range of shapes have been predefined in the library, including rectangles, ellipses,
+polygons. A client application can derive from these shapes and/or derive entirely
+new shapes from wxShape.
+
+Instances of a class called \helpref{wxDiagram}{wxdiagram} organise collections of
+shapes, providing default file input and output behaviour.
+
+\section{wxDividedShape overview}\label{dividedshapeoverview}
+
+Classes: \helpref{wxDividedShape}{wxdividedshape}
+
+A wxDividedShape is a rectangle with a number of vertical divisions. Each
+division may have its text formatted with independent characteristics, and
+the size of each division relative to the whole image may be specified.
+
+Once a wxDividedShape has been created, the user may move the divisions with the
+mouse. By pressing Ctrl while right-clicking, the region attributes can be edited.
+
+Here are examples of creating wxDividedShape objects:
+
+{\small
+\begin{verbatim}
+  /*
+   * Divided rectangle with 3 regions
+   *
+   */
+
+  wxDividedShape *dividedRect = new wxDividedShape(50, 60);
+
+  wxShapeRegion *region = new wxShapeRegion;
+  region->SetProportions(0.0, 0.25);
+  dividedRect->AddRegion(region);
+
+  region = new wxShapeRegion;
+  region->SetProportions(0.0, 0.5);
+  dividedRect->AddRegion(region);
+
+  region = new wxShapeRegion;
+  region->SetProportions(0.0, 0.25);
+  dividedRect->AddRegion(region);
+  
+  dividedRect->SetSize(50, 60); // Allow it to calculate region sizes
+  dividedRect->SetPen(wxBLACK_PEN);
+  dividedRect->SetBrush(wxWHITE_BRUSH);
+  dividedRect->Show(TRUE);
+  dividedRect->NameRegions();
+
+  /*
+   * Divided rectangle with 3 regions, rounded
+   *
+   */
+
+  wxDividedShape *dividedRect3 = new wxDividedShape(50, 60);
+  dividedRect3->SetCornerRadius(-0.4);
+
+  region = new wxShapeRegion;
+  region->SetProportions(0.0, 0.25);
+  dividedRect3->AddRegion(region);
+
+  region = new wxShapeRegion;
+  region->SetProportions(0.0, 0.5);
+  dividedRect3->AddRegion(region);
+
+  region = new wxShapeRegion;
+  region->SetProportions(0.0, 0.25);
+  dividedRect3->AddRegion(region);
+  
+  dividedRect3->SetSize(50, 60); // Allow it to calculate region sizes
+  dividedRect3->SetPen(wxBLACK_PEN);
+  dividedRect3->SetBrush(wxWHITE_BRUSH);
+  dividedRect3->Show(TRUE);
+  dividedRect3->NameRegions();
+\end{verbatim}
+}
+
+\section{wxCompositeShape overview}\label{compositeshapeoverview}
+
+Classes: \helpref{wxCompositeShape}{wxcompositeshape}, \helpref{wxOGLConstraint}{wxoglconstraint}
+
+The wxCompositeShape allows fairly complex shapes to be created, and maintains
+a set of constraints which specify the layout and proportions of child shapes.
+
+Add child shapes to a wxCompositeShape using \helpref{AddChild}{wxcompositeshapeaddchild}, and
+add constraints using \helpref{AddConstraint}{wxcompositeshapeaddconstraint}.
+
+After children and shapes have been added, call \helpref{Recompute}{wxcompositeshaperecompute} which
+will return TRUE is the constraints could be satisfied, FALSE otherwise. If
+constraints have been correctly and consistently specified, this call will succeed.
+
+If there is more than one child, constraints must be specified: OGL cannot calculate
+the size and position of children otherwise. Don't assume that children will simply
+move relative to the parent without the use of constraints.
+
+To specify a constraint, you need three things:
+
+\begin{enumerate}\itemsep=0pt
+\item a constraint type, such as gyCONSTRAINT\_CENTRED\_VERTICALLY;
+\item a reference shape, with respect to which other shapes are going to be positioned - the\rtfsp
+{\it constraining} shape;
+\item a list of one or more shapes to be constrained: the {\it constrained} shapes.
+\end{enumerate}
+
+The constraining shape can be either the parent of the constrained shapes, or a sibling. The
+constrained shapes must all be siblings of each other.
+
+For an exhaustive list and description of the available constraint types, see the \helpref{wxOGLConstraint constructor}{wxoglconstraintconstr}.
+Note that most constraints operate in one dimension only (vertically or horizontally), so you will
+usually need to specify constraints in pairs.
+
+You can set the spacing between constraining and constrained shapes by
+calling \helpref{wxOGLConstraint::SetSpacing}{wxoglconstraintsetspacing}.
+
+Finally, a wxCompositeShape can have {\it divisions}, which are special child shapes of class
+wxDivisionShape (not to be confused with wxDividedShape). The purpose of this is to allow
+the composite to be divided into user-adjustable regions (divisions) into which other shapes
+can be dropped dynamically, given suitable application code. Divisons allow the child
+shapes to have an identity of their own - they can be manipulated independently of their container -
+but to behave as if they are contained with the division, moving with the parent shape.
+Divisions boundaries can themselves be moved using the mouse.
+
+To create an initial division, call \helpref{wxCompositeShape::MakeContainer}{wxcompositeshapemakecontainer}.
+Make further divisions by calling \helpref{wxDivisionShape::Divide}{wxdivisionshapedivide}.
+

contrib/include/wx/ogl/basic.h

@@ -0,0 +1,744 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        basic.h
+// Purpose:     Basic OGL classes and definitions
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_BASIC_H_
+#define _OGL_BASIC_H_
+
+#ifdef __GNUG__
+#pragma interface "basic.h"
+#endif
+
+#define OGL_VERSION     2.0
+
+#ifndef DEFAULT_MOUSE_TOLERANCE
+#define DEFAULT_MOUSE_TOLERANCE 3
+#endif
+
+// Edit these lines if you positively don't want PROLOGIO support
+#ifndef PROLOGIO
+#define PROLOGIO
+#endif
+
+// Key identifiers
+#define KEY_SHIFT 1
+#define KEY_CTRL  2
+
+// Arrow styles
+
+#define ARROW_NONE         0
+#define ARROW_END          1
+#define ARROW_BOTH         2
+#define ARROW_MIDDLE       3
+#define ARROW_START        4
+
+// Control point types
+// Rectangle and most other shapes
+#define CONTROL_POINT_VERTICAL   1
+#define CONTROL_POINT_HORIZONTAL 2
+#define CONTROL_POINT_DIAGONAL   3
+
+// Line
+#define CONTROL_POINT_ENDPOINT_TO 4
+#define CONTROL_POINT_ENDPOINT_FROM 5
+#define CONTROL_POINT_LINE       6
+
+// Types of formatting: can be combined in a bit list
+#define FORMAT_NONE           0
+                                // Left justification
+#define FORMAT_CENTRE_HORIZ   1
+                                // Centre horizontally
+#define FORMAT_CENTRE_VERT    2
+                                // Centre vertically
+#define FORMAT_SIZE_TO_CONTENTS 4
+                                // Resize shape to contents
+
+// Shadow mode
+#define SHADOW_NONE           0
+#define SHADOW_LEFT           1
+#define SHADOW_RIGHT          2
+
+/*
+ * Declare types
+ *
+ */
+
+#define SHAPE_BASIC           wxTYPE_USER + 1
+#define SHAPE_RECTANGLE       wxTYPE_USER + 2
+#define SHAPE_ELLIPSE         wxTYPE_USER + 3
+#define SHAPE_POLYGON         wxTYPE_USER + 4
+#define SHAPE_CIRCLE          wxTYPE_USER + 5
+#define SHAPE_LINE            wxTYPE_USER + 6
+#define SHAPE_DIVIDED_RECTANGLE wxTYPE_USER + 8
+#define SHAPE_COMPOSITE       wxTYPE_USER + 9
+#define SHAPE_CONTROL_POINT   wxTYPE_USER + 10
+#define SHAPE_DRAWN           wxTYPE_USER + 11
+#define SHAPE_DIVISION        wxTYPE_USER + 12
+#define SHAPE_LABEL_OBJECT    wxTYPE_USER + 13
+#define SHAPE_BITMAP          wxTYPE_USER + 14
+#define SHAPE_DIVIDED_OBJECT_CONTROL_POINT   wxTYPE_USER + 15
+
+#define OBJECT_REGION         wxTYPE_USER + 20
+
+#define OP_CLICK_LEFT  1
+#define OP_CLICK_RIGHT 2
+#define OP_DRAG_LEFT 4
+#define OP_DRAG_RIGHT 8
+
+#define OP_ALL (OP_CLICK_LEFT | OP_CLICK_RIGHT | OP_DRAG_LEFT | OP_DRAG_RIGHT)
+
+// Attachment modes
+#define ATTACHMENT_MODE_NONE        0
+#define ATTACHMENT_MODE_EDGE        1
+#define ATTACHMENT_MODE_BRANCHING   2
+
+// Sub-modes for branching attachment mode
+#define BRANCHING_ATTACHMENT_NORMAL 1
+#define BRANCHING_ATTACHMENT_BLOB   2
+
+class wxShapeTextLine;
+class wxShapeCanvas;
+class wxLineShape;
+class wxControlPoint;
+class wxShapeRegion;
+class wxShape;
+
+#ifdef PROLOGIO
+class WXDLLEXPORT wxExpr;
+class WXDLLEXPORT wxExprDatabase;
+#endif
+
+// Round up
+#define WXROUND(x) ( (long) (x + 0.5) )
+
+
+// logical function to use when drawing rubberband boxes, etc.
+#define OGLRBLF         wxINVERT
+
+
+
+class wxShapeEvtHandler: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxShapeEvtHandler)
+
+ public:
+  wxShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL);
+  virtual ~wxShapeEvtHandler();
+
+  inline void SetShape(wxShape *sh) { m_handlerShape = sh; }
+  inline wxShape *GetShape() const { return m_handlerShape; }
+
+  inline void SetPreviousHandler(wxShapeEvtHandler* handler) { m_previousHandler = handler; }
+  inline wxShapeEvtHandler* GetPreviousHandler() const { return m_previousHandler; }
+
+  // This is called when the _shape_ is deleted.
+  virtual void OnDelete();
+  virtual void OnDraw(wxDC& dc);
+  virtual void OnDrawContents(wxDC& dc);
+  virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE);
+  virtual void OnMoveLinks(wxDC& dc);
+  virtual void OnErase(wxDC& dc);
+  virtual void OnEraseContents(wxDC& dc);
+  virtual void OnHighlight(wxDC& dc);
+  virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+  virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+  virtual void OnSize(double x, double y);
+  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+
+  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
+  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
+  virtual void OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+  virtual void OnDrawControlPoints(wxDC& dc);
+  virtual void OnEraseControlPoints(wxDC& dc);
+  virtual void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+
+  // Control points ('handles') redirect control to the actual shape, to make it easier
+  // to override sizing behaviour.
+  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
+  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+
+  virtual void OnBeginSize(double WXUNUSED(w), double WXUNUSED(h)) { }
+  virtual void OnEndSize(double WXUNUSED(w), double WXUNUSED(h)) { }
+
+  // Can override this to prevent or intercept line reordering.
+  virtual void OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering);
+
+  // Creates a copy of this event handler.
+  wxShapeEvtHandler *CreateNewCopy();
+
+  // Does the copy - override for new event handlers which might store
+  // app-specific data.
+  virtual void CopyData(wxShapeEvtHandler& copy) {};
+
+ private:
+  wxShapeEvtHandler*    m_previousHandler;
+  wxShape*              m_handlerShape;
+};
+
+class wxShape: public wxShapeEvtHandler
+{
+ DECLARE_ABSTRACT_CLASS(wxShape)
+
+ public:
+
+  wxShape(wxShapeCanvas *can = NULL);
+  virtual ~wxShape();
+  virtual void GetBoundingBoxMax(double *width, double *height);
+  virtual void GetBoundingBoxMin(double *width, double *height) = 0;
+  virtual bool GetPerimeterPoint(double x1, double y1,
+                                 double x2, double y2,
+                                 double *x3, double *y3);
+  inline wxShapeCanvas *GetCanvas() { return m_canvas; }
+  void SetCanvas(wxShapeCanvas *the_canvas);
+  virtual void AddToCanvas(wxShapeCanvas *the_canvas, wxShape *addAfter = NULL);
+  virtual void InsertInCanvas(wxShapeCanvas *the_canvas);
+
+  virtual void RemoveFromCanvas(wxShapeCanvas *the_canvas);
+  inline double GetX() const { return m_xpos; }
+  inline double GetY() const { return m_ypos; }
+  inline void SetX(double x) { m_xpos = x; }
+  inline void SetY(double y) { m_ypos = y; }
+
+  inline wxShape *GetParent() const { return m_parent; }
+  inline void SetParent(wxShape *p) { m_parent = p; }
+  wxShape *GetTopAncestor();
+  inline wxList& GetChildren() { return m_children; }
+
+  virtual void OnDraw(wxDC& dc);
+  virtual void OnDrawContents(wxDC& dc);
+  virtual void OnMoveLinks(wxDC& dc);
+  virtual void Unlink() { };
+  void SetDrawHandles(bool drawH);
+  inline bool GetDrawHandles() { return m_drawHandles; }
+  virtual void OnErase(wxDC& dc);
+  virtual void OnEraseContents(wxDC& dc);
+  virtual void OnHighlight(wxDC& dc);
+  virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+  virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0) {}
+  virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+  virtual void OnSize(double x, double y);
+  virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  virtual void OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+
+  virtual void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
+  virtual void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
+  virtual void OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+  virtual void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+  virtual void OnDrawControlPoints(wxDC& dc);
+  virtual void OnEraseControlPoints(wxDC& dc);
+
+  virtual void OnBeginSize(double WXUNUSED(w), double WXUNUSED(h)) { }
+  virtual void OnEndSize(double WXUNUSED(w), double WXUNUSED(h)) { }
+
+  // Control points ('handles') redirect control to the actual shape, to make it easier
+  // to override sizing behaviour.
+  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0); // Erase if draw false
+  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+
+  virtual void MakeControlPoints();
+  virtual void DeleteControlPoints(wxDC *dc = NULL);
+  virtual void ResetControlPoints();
+
+  inline wxShapeEvtHandler *GetEventHandler() { return m_eventHandler; }
+  inline void SetEventHandler(wxShapeEvtHandler *handler) { m_eventHandler = handler; }
+
+  // Mandatory control points, e.g. the divided line moving handles
+  // should appear even if a child of the 'selected' image
+  virtual void MakeMandatoryControlPoints();
+  virtual void ResetMandatoryControlPoints();
+
+  inline virtual bool Recompute() { return TRUE; };
+  // Calculate size recursively, if size changes. Size might depend on children.
+  inline virtual void CalculateSize() { };
+  virtual void Select(bool select = TRUE, wxDC* dc = NULL);
+  virtual void SetHighlight(bool hi = TRUE, bool recurse = FALSE);
+  inline virtual bool IsHighlighted() const { return m_highlighted; };
+  virtual bool Selected() const;
+  virtual bool AncestorSelected() const;
+  void SetSensitivityFilter(int sens = OP_ALL, bool recursive = FALSE);
+  int GetSensitivityFilter() const { return m_sensitivity; }
+  void SetDraggable(bool drag, bool recursive = FALSE);
+  inline  void SetFixedSize(bool x, bool y) { m_fixedWidth = x; m_fixedHeight = y; };
+  inline  void GetFixedSize(bool *x, bool *y) const { *x = m_fixedWidth; *y = m_fixedHeight; };
+  inline  bool GetFixedWidth() const { return m_fixedWidth; }
+  inline  bool GetFixedHeight() const { return m_fixedHeight; }
+  inline  void SetSpaceAttachments(bool sp) { m_spaceAttachments = sp; };
+  inline  bool GetSpaceAttachments() const { return m_spaceAttachments; };
+  void SetShadowMode(int mode, bool redraw = FALSE);
+  inline int GetShadowMode() const { return m_shadowMode; }
+  virtual bool HitTest(double x, double y, int *attachment, double *distance);
+  inline void SetCentreResize(bool cr) { m_centreResize = cr; }
+  inline bool GetCentreResize() const { return m_centreResize; }
+  inline void SetMaintainAspectRatio(bool ar) { m_maintainAspectRatio = ar; }
+  inline bool GetMaintainAspectRatio() const { return m_maintainAspectRatio; }
+  inline wxList& GetLines() const { return (wxList&) m_lines; }
+  inline void SetDisableLabel(bool flag) { m_disableLabel = flag; }
+  inline bool GetDisableLabel() const { return m_disableLabel; }
+  inline void SetAttachmentMode(int mode) { m_attachmentMode = mode; }
+  inline int GetAttachmentMode() const { return m_attachmentMode; }
+  inline void SetId(long i) { m_id = i; }
+  inline long GetId() const { return m_id; }
+
+  void SetPen(wxPen *pen);
+  void SetBrush(wxBrush *brush);
+  inline void SetClientData(wxObject *client_data) { m_clientData = client_data; };
+  inline wxObject *GetClientData() const { return m_clientData; };
+
+  virtual void Show(bool show);
+  virtual bool IsShown() const { return m_visible; }
+  virtual void Move(wxDC& dc, double x1, double y1, bool display = TRUE);
+  virtual void Erase(wxDC& dc);
+  virtual void EraseContents(wxDC& dc);
+  virtual void Draw(wxDC& dc);
+  virtual void Flash();
+  virtual void MoveLinks(wxDC& dc);
+  virtual void DrawContents(wxDC& dc);  // E.g. for drawing text label
+  virtual void SetSize(double x, double y, bool recursive = TRUE);
+  virtual void SetAttachmentSize(double x, double y);
+  void Attach(wxShapeCanvas *can);
+  void Detach();
+
+  inline virtual bool Constrain() { return FALSE; } ;
+
+  void AddLine(wxLineShape *line, wxShape *other,
+               int attachFrom = 0, int attachTo = 0,
+               // The line ordering
+               int positionFrom = -1, int positionTo = -1);
+
+  // Return the zero-based position in m_lines of line.
+  int GetLinePosition(wxLineShape* line);
+
+  void AddText(const wxString& string);
+
+  inline wxPen *GetPen() const { return m_pen; }
+  inline wxBrush *GetBrush() const { return m_brush; }
+
+  /*
+   * Region-specific functions (defaults to the default region
+   * for simple objects
+   */
+
+  // Set the default, single region size to be consistent
+  // with the object size
+  void SetDefaultRegionSize();
+  virtual void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
+  virtual void SetFormatMode(int mode, int regionId = 0);
+  virtual int GetFormatMode(int regionId = 0) const;
+  virtual void SetFont(wxFont *font, int regionId = 0);
+  virtual wxFont *GetFont(int regionId = 0) const;
+  virtual void SetTextColour(const wxString& colour, int regionId = 0);
+  virtual wxString GetTextColour(int regionId = 0) const;
+  virtual inline int GetNumberOfTextRegions() const { return m_regions.Number(); }
+  virtual void SetRegionName(const wxString& name, int regionId = 0);
+
+  // Get the name representing the region for this image alone.
+  // I.e. this image's region ids go from 0 to N-1.
+  // But the names might be "0.2.0", "0.2.1" etc. depending on position in composite.
+  // So the last digit represents the region Id, the others represent positions
+  // in composites.
+  virtual wxString GetRegionName(int regionId);
+
+  // Gets the region corresponding to the name, or -1 if not found.
+  virtual int GetRegionId(const wxString& name);
+
+  // Construct names for regions, unique even for children of a composite.
+  virtual void NameRegions(const wxString& parentName = "");
+
+  // Get list of regions
+  inline wxList& GetRegions() const { return (wxList&) m_regions; }
+
+  virtual void AddRegion(wxShapeRegion *region);
+
+  virtual void ClearRegions();
+
+  // Assign new ids to this image and children (if composite)
+  void AssignNewIds();
+
+  // Returns actual image (same as 'this' if non-composite) and region id
+  // for given region name.
+  virtual wxShape *FindRegion(const wxString& regionName, int *regionId);
+
+  // Finds all region names for this image (composite or simple).
+  // Supply empty string list.
+  virtual void FindRegionNames(wxStringList& list);
+
+  virtual void ClearText(int regionId = 0);
+  void RemoveLine(wxLineShape *line);
+
+#ifdef PROLOGIO
+  // I/O
+  virtual void WriteAttributes(wxExpr *clause);
+  virtual void ReadAttributes(wxExpr *clause);
+
+  // In case the object has constraints it needs to read in in a different pass
+  inline virtual void ReadConstraints(wxExpr *WXUNUSED(clause), wxExprDatabase *WXUNUSED(database)) { };
+  virtual void WriteRegions(wxExpr *clause);
+  virtual void ReadRegions(wxExpr *clause);
+#endif
+
+  // Attachment code
+  virtual bool GetAttachmentPosition(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+  virtual int GetNumberOfAttachments() const;
+  virtual bool AttachmentIsValid(int attachment) const;
+
+  // Only get the attachment position at the _edge_ of the shape, ignoring
+  // branching mode. This is used e.g. to indicate the edge of interest, not the point
+  // on the attachment branch.
+  virtual bool GetAttachmentPositionEdge(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+
+  // Assuming the attachment lies along a vertical or horizontal line,
+  // calculate the position on that point.
+  virtual wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
+    int nth, int noArcs, wxLineShape* line);
+
+  // Returns TRUE if pt1 <= pt2 in the sense that one point comes before another on an
+  // edge of the shape.
+  // attachmentPoint is the attachment point (= side) in question.
+  virtual bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);
+
+  virtual void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
+  virtual void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
+
+  virtual bool MoveLineToNewAttachment(wxDC& dc, wxLineShape *to_move,
+                                       double x, double y);
+
+  // Reorders the lines coming into the node image at this attachment
+  // position, in the order in which they appear in linesToSort.
+  virtual void SortLines(int attachment, wxList& linesToSort);
+
+  // Apply an attachment ordering change
+  void ApplyAttachmentOrdering(wxList& ordering);
+
+  // Can override this to prevent or intercept line reordering.
+  virtual void OnChangeAttachment(int attachment, wxLineShape* line, wxList& ordering);
+
+  //// New banching attachment code, 24/9/98
+
+  //
+  //             |________|
+  //                 | <- root
+  //                 | <- neck
+  // shoulder1 ->---------<- shoulder2
+  //             | | | | |<- stem
+  //                      <- branching attachment point N-1
+
+  // This function gets the root point at the given attachment.
+  virtual wxRealPoint GetBranchingAttachmentRoot(int attachment);
+
+  // This function gets information about where branching connections go (calls GetBranchingAttachmentRoot)
+  virtual bool GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
+    wxRealPoint& shoulder1, wxRealPoint& shoulder2);
+
+  // n is the number of the adjoining line, from 0 to N-1 where N is the number of lines
+  // at this attachment point.
+  // attachmentPoint is where the arc meets the stem, and stemPoint is where the stem meets the
+  // shoulder.
+  virtual bool GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& attachmentPoint,
+    wxRealPoint& stemPoint);
+
+  // Get the number of lines at this attachment position.
+  virtual int GetAttachmentLineCount(int attachment) const;
+
+  // Draw the branches (not the actual arcs though)
+  virtual void OnDrawBranches(wxDC& dc, int attachment, bool erase = FALSE);
+  virtual void OnDrawBranches(wxDC& dc, bool erase = FALSE);
+
+  // Branching attachment settings
+  inline void SetBranchNeckLength(int len) { m_branchNeckLength = len; }
+  inline int GetBranchNeckLength() const { return m_branchNeckLength; }
+
+  inline void SetBranchStemLength(int len) { m_branchStemLength = len; }
+  inline int GetBranchStemLength() const { return m_branchStemLength; }
+
+  inline void SetBranchSpacing(int len) { m_branchSpacing = len; }
+  inline int GetBranchSpacing() const { return m_branchSpacing; }
+
+  // Further detail on branching style, e.g. blobs on interconnections
+  inline void SetBranchStyle(long style) { m_branchStyle = style; }
+  inline long GetBranchStyle() const { return m_branchStyle; }
+
+  // Rotate the standard attachment point from physical (0 is always North)
+  // to logical (0 -> 1 if rotated by 90 degrees)
+  virtual int PhysicalToLogicalAttachment(int physicalAttachment) const;
+
+  // Rotate the standard attachment point from logical
+  // to physical (0 is always North)
+  virtual int LogicalToPhysicalAttachment(int logicalAttachment) const;
+
+  // This is really to distinguish between lines and other images.
+  // For lines, want to pass drag to canvas, since lines tend to prevent
+  // dragging on a canvas (they get in the way.)
+  virtual bool Draggable() const { return TRUE; }
+
+  // Returns TRUE if image is a descendant of this image
+  bool HasDescendant(wxShape *image);
+
+  // Creates a copy of this shape.
+  wxShape *CreateNewCopy(bool resetMapping = TRUE, bool recompute = TRUE);
+
+  // Does the copying for this object
+  virtual void Copy(wxShape& copy);
+
+  // Does the copying for this object, including copying event
+  // handler data if any. Calls the virtual Copy function.
+  void CopyWithHandler(wxShape& copy);
+
+  // Rotate about the given axis by the given amount in radians.
+  virtual void Rotate(double x, double y, double theta);
+  virtual inline double GetRotation() const { return m_rotation; }
+
+  void ClearAttachments();
+
+  // Recentres all the text regions for this object
+  void Recentre(wxDC& dc);
+
+  // Clears points from a list of wxRealPoints
+  void ClearPointList(wxList& list);
+
+ private:
+  wxObject*             m_clientData;
+
+ protected:
+  wxShapeEvtHandler*    m_eventHandler;
+  bool                  m_formatted;
+  double                m_xpos, m_ypos;
+  wxPen*                m_pen;
+  wxBrush*              m_brush;
+  wxFont*               m_font;
+  wxColour*             m_textColour;
+  wxString              m_textColourName;
+  wxShapeCanvas*        m_canvas;
+  wxList                m_lines;
+  wxList                m_text;
+  wxList                m_controlPoints;
+  wxList                m_regions;
+  wxList                m_attachmentPoints;
+  bool                  m_visible;
+  bool                  m_disableLabel;
+  long                  m_id;
+  bool                  m_selected;
+  bool                  m_highlighted;      // Different from selected: user-defined highlighting,
+                                            // e.g. thick border.
+  double                m_rotation;
+  int                   m_sensitivity;
+  bool                  m_draggable;
+  int                   m_attachmentMode;   // 0 for no attachments, 1 if using normal attachments,
+                                            // 2 for branching attachments
+  bool                  m_spaceAttachments; // TRUE if lines at one side should be spaced
+  bool                  m_fixedWidth;
+  bool                  m_fixedHeight;
+  bool                  m_centreResize;    // Default is to resize keeping the centre constant (TRUE)
+  bool                  m_drawHandles;     // Don't draw handles if FALSE, usually TRUE
+  wxList                m_children;      // In case it's composite
+  wxShape*              m_parent;      // In case it's a child
+  int                   m_formatMode;
+  int                   m_shadowMode;
+  wxBrush*              m_shadowBrush;
+  int                   m_shadowOffsetX;
+  int                   m_shadowOffsetY;
+  int                   m_textMarginX;    // Gap between text and border
+  int                   m_textMarginY;
+  wxString              m_regionName;
+  bool                  m_maintainAspectRatio;
+  int                   m_branchNeckLength;
+  int                   m_branchStemLength;
+  int                   m_branchSpacing;
+  long                  m_branchStyle;
+};
+
+class wxPolygonShape: public wxShape
+{
+ DECLARE_DYNAMIC_CLASS(wxPolygonShape)
+ public:
+  wxPolygonShape();
+  ~wxPolygonShape();
+
+  // Takes a list of wxRealPoints; each point is an OFFSET from the centre.
+  // Deletes user's points in destructor.
+  virtual void Create(wxList *points);
+  virtual void ClearPoints();
+
+  void GetBoundingBoxMin(double *w, double *h);
+  void CalculateBoundingBox();
+  bool GetPerimeterPoint(double x1, double y1,
+                                 double x2, double y2,
+                                 double *x3, double *y3);
+  bool HitTest(double x, double y, int *attachment, double *distance);
+  void SetSize(double x, double y, bool recursive = TRUE);
+  void OnDraw(wxDC& dc);
+  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+
+  // Control points ('handles') redirect control to the actual shape, to make it easier
+  // to override sizing behaviour.
+  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+
+  // A polygon should have a control point at each vertex,
+  // with the option of moving the control points individually
+  // to change the shape.
+  void MakeControlPoints();
+  void ResetControlPoints();
+
+  // If we've changed the shape, must make the original
+  // points match the working points
+  void UpdateOriginalPoints();
+
+  // Add a control point after the given point
+  virtual void AddPolygonPoint(int pos = 0);
+
+  // Delete a control point
+  virtual void DeletePolygonPoint(int pos = 0);
+
+  // Recalculates the centre of the polygon
+  virtual void CalculatePolygonCentre();
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+
+  int GetNumberOfAttachments() const;
+  bool GetAttachmentPosition(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+  bool AttachmentIsValid(int attachment);
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  inline wxList *GetPoints() { return m_points; }
+
+  // Rotate about the given axis by the given amount in radians
+  virtual void Rotate(double x, double y, double theta);
+
+ private:
+  wxList*       m_points;
+  wxList*       m_originalPoints;
+  double        m_boundWidth;
+  double        m_boundHeight;
+  double        m_originalWidth;
+  double        m_originalHeight;
+};
+
+class wxRectangleShape: public wxShape
+{
+ DECLARE_DYNAMIC_CLASS(wxRectangleShape)
+ public:
+  wxRectangleShape(double w = 0.0, double h = 0.0);
+  void GetBoundingBoxMin(double *w, double *h);
+  bool GetPerimeterPoint(double x1, double y1,
+                                 double x2, double y2,
+                                 double *x3, double *y3);
+  void OnDraw(wxDC& dc);
+  void SetSize(double x, double y, bool recursive = TRUE);
+  void SetCornerRadius(double rad); // If > 0, rounded corners
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+
+  int GetNumberOfAttachments() const;
+  bool GetAttachmentPosition(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  inline double GetWidth() const { return m_width; }
+  inline double GetHeight() const { return m_height; }
+  inline void SetWidth(double w) { m_width = w; }
+  inline void SetHeight(double h) { m_height = h; }
+
+protected:
+  double m_width;
+  double m_height;
+  double m_cornerRadius;
+};
+
+class wxTextShape: public wxRectangleShape
+{
+ DECLARE_DYNAMIC_CLASS(wxTextShape)
+ public:
+  wxTextShape(double width = 0.0, double height = 0.0);
+
+  void OnDraw(wxDC& dc);
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+#endif
+
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+};
+
+class wxEllipseShape: public wxShape
+{
+ DECLARE_DYNAMIC_CLASS(wxEllipseShape)
+ public:
+  wxEllipseShape(double w = 0.0, double h = 0.0);
+
+  void GetBoundingBoxMin(double *w, double *h);
+  bool GetPerimeterPoint(double x1, double y1,
+                                 double x2, double y2,
+                                 double *x3, double *y3);
+
+  void OnDraw(wxDC& dc);
+  void SetSize(double x, double y, bool recursive = TRUE);
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+
+  int GetNumberOfAttachments() const;
+  bool GetAttachmentPosition(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  inline double GetWidth() const { return m_width; }
+  inline double GetHeight() const { return m_height; }
+
+  inline void SetWidth(double w) { m_width = w; }
+  inline void SetHeight(double h) { m_height = h; }
+
+protected:
+  double m_width;
+  double m_height;
+};
+
+class wxCircleShape: public wxEllipseShape
+{
+ DECLARE_DYNAMIC_CLASS(wxCircleShape)
+ public:
+  wxCircleShape(double w = 0.0);
+
+  bool GetPerimeterPoint(double x1, double y1,
+                                 double x2, double y2,
+                                 double *x3, double *y3);
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+};
+
+#endif
+ // _OGL_BASIC_H_

contrib/include/wx/ogl/basicp.h

@@ -0,0 +1,223 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        basicp.h
+// Purpose:     Private OGL classes and definitions
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_BASICP_H_
+#define _OGL_BASICP_H_
+
+#ifdef __GNUG__
+#pragma interface "basicp.h"
+#endif
+
+#define CONTROL_POINT_SIZE       6
+
+class wxShapeTextLine: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
+public:
+   wxShapeTextLine(double the_x = 0.0, double the_y = 0.0, const wxString& the_line = "");
+   ~wxShapeTextLine();
+
+   inline double GetX() const { return m_x; }
+   inline double GetY() const { return m_y; }
+
+   inline void SetX(double x) { m_x = x; }
+   inline void SetY(double y) { m_y = y; }
+
+   inline void SetText(const wxString& text) { m_line = text; }
+   inline wxString GetText() const { return m_line; }
+
+protected:
+   wxString     m_line;
+   double        m_x;
+   double        m_y;
+};
+
+class wxShape;
+class wxControlPoint: public wxRectangleShape
+{
+ DECLARE_DYNAMIC_CLASS(wxControlPoint)
+
+ friend class wxShapeEvtHandler;
+ friend class wxShape;
+
+ public:
+  wxControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, double the_xoffset = 0.0,
+    double the_yoffset = 0.0, int the_type = 0);
+  ~wxControlPoint();
+
+  void OnDraw(wxDC& dc);
+  void OnErase(wxDC& dc);
+  void OnDrawContents(wxDC& dc);
+  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+
+  bool GetAttachmentPosition(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+  int GetNumberOfAttachments() const;
+
+  inline void SetEraseObject(bool er) { m_eraseObject = er; }
+
+public:
+  int           m_type;
+  double         m_xoffset;
+  double         m_yoffset;
+  wxShape*      m_shape;
+  wxCursor*     m_oldCursor;
+  bool          m_eraseObject; // If TRUE, erases object before dragging handle.
+
+/*
+ * Store original top-left, bottom-right coordinates
+ * in case we're doing non-vertical resizing.
+ */
+  static double sm_controlPointDragStartX;
+  static double sm_controlPointDragStartY;
+  static double sm_controlPointDragStartWidth;
+  static double sm_controlPointDragStartHeight;
+  static double sm_controlPointDragEndWidth;
+  static double sm_controlPointDragEndHeight;
+  static double sm_controlPointDragPosX;
+  static double sm_controlPointDragPosY;
+};
+
+class wxPolygonShape;
+class wxPolygonControlPoint: public wxControlPoint
+{
+ DECLARE_DYNAMIC_CLASS(wxPolygonControlPoint)
+  friend class wxPolygonShape;
+ public:
+  wxPolygonControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, wxRealPoint *vertex = NULL,
+    double the_xoffset = 0.0, double the_yoffset = 0.0);
+  ~wxPolygonControlPoint();
+
+  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+
+  // Calculate what new size would be, at end of resize
+  virtual void CalculateNewSize(double x, double y);
+
+  // Get new size
+  inline wxRealPoint GetNewSize() const { return m_newSize; };
+
+public:
+  wxRealPoint*      m_polygonVertex;
+  wxRealPoint       m_originalSize;
+  double             m_originalDistance;
+  wxRealPoint       m_newSize;
+};
+
+/*
+ * Object regions.
+ * Every shape has one or more text regions with various
+ * properties. Not all of a region's properties will be used
+ * by a shape.
+ *
+ */
+
+class wxShapeRegion: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxShapeRegion)
+
+ public:
+  // Constructor
+  wxShapeRegion();
+  // Copy constructor
+  wxShapeRegion(wxShapeRegion& region);
+  // Destructor
+  ~wxShapeRegion();
+
+  // Accessors
+  inline void SetText(const wxString& s) { m_regionText = s; }
+  void SetFont(wxFont *f);
+  void SetMinSize(double w, double h);
+  void SetSize(double w, double h);
+  void SetPosition(double x, double y);
+  void SetProportions(double x, double y);
+  void SetFormatMode(int mode);
+  inline void SetName(const wxString& s) { m_regionName = s; };
+  void SetColour(const wxString& col); // Text colour
+
+  inline wxString GetText() const { return m_regionText; }
+  inline wxFont *GetFont() const { return m_font; }
+  inline void GetMinSize(double *x, double *y) const { *x = m_minWidth; *y = m_minHeight; }
+  inline void GetProportion(double *x, double *y) const { *x = m_regionProportionX; *y = m_regionProportionY; }
+  inline void GetSize(double *x, double *y) const { *x = m_width; *y = m_height; }
+  inline void GetPosition(double *xp, double *yp) const { *xp = m_x; *yp = m_y; }
+  inline int GetFormatMode() const { return m_formatMode; }
+  inline wxString GetName() const { return m_regionName; }
+  inline wxString GetColour() const { return m_textColour; }
+  wxColour *GetActualColourObject();
+  inline wxList& GetFormattedText() { return m_formattedText; }
+  inline wxString GetPenColour() const { return m_penColour; }
+  inline int GetPenStyle() const { return m_penStyle; }
+  inline void SetPenStyle(int style) { m_penStyle = style; m_actualPenObject = NULL; }
+  void SetPenColour(const wxString& col);
+  wxPen *GetActualPen();
+  inline double GetWidth() const { return m_width; }
+  inline double GetHeight() const { return m_height; }
+
+  void ClearText();
+
+public:
+  wxString              m_regionText;
+  wxList                m_formattedText;   // List of wxShapeTextLines
+  wxFont*               m_font;
+  double                 m_minHeight;        // If zero, hide region.
+  double                 m_minWidth;        // If zero, hide region.
+  double                 m_width;
+  double                 m_height;
+  double                 m_x;
+  double                 m_y;
+
+  double                 m_regionProportionX; // Proportion of total object size;
+                                             // -1.0 indicates equal proportion
+  double                 m_regionProportionY; // Proportion of total object size;
+                                             // -1.0 indicates equal proportion
+
+  int                   m_formatMode;        // FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT | FORMAT_NONE
+  wxString              m_regionName;
+  wxString              m_textColour;
+  wxColour*             m_actualColourObject; // For speed purposes
+
+  // New members for specifying divided rectangle division colour/style 30/6/94
+  wxString              m_penColour;
+  int                   m_penStyle;
+  wxPen*                m_actualPenObject;
+
+};
+
+/*
+ * User-defined attachment point
+ */
+
+class wxAttachmentPoint: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxAttachmentPoint)
+
+public:
+  inline wxAttachmentPoint()
+  {
+    m_id = 0; m_x = 0.0; m_y = 0.0;
+  }
+  inline wxAttachmentPoint(int id, double x, double y)
+  {
+    m_id = id; m_x = x; m_y = y;
+  }
+
+public:
+  int            m_id;           // Identifier
+  double         m_x;            // x offset from centre of object
+  double         m_y;            // y offset from centre of object
+};
+
+#endif
+  // _OGL_BASICP_H_

contrib/include/wx/ogl/bmpshape.h

@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        bmpshape.h
+// Purpose:     wxBitmapShape
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_BITMAP_H_
+#define _OGL_BITMAP_H_
+
+#ifdef __GNUG__
+#pragma interface "bmpshape.h"
+#endif
+
+#include <wx/ogl/basic.h>
+
+class wxBitmapShape: public wxRectangleShape
+{
+ DECLARE_DYNAMIC_CLASS(wxBitmapShape)
+ public:
+  wxBitmapShape();
+  ~wxBitmapShape();
+
+  void OnDraw(wxDC& dc);
+
+#ifdef PROLOGIO
+  // I/O
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  void SetSize(double w, double h, bool recursive = TRUE);
+  inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+  void SetBitmap(const wxBitmap& bm);
+  inline void SetFilename(const wxString& f) { m_filename = f; };
+  inline wxString GetFilename() const { return m_filename; }
+
+private:
+  wxBitmap      m_bitmap;
+  wxString      m_filename;
+};
+
+#endif
+  // _OGL_BITMAP_H_
+
+

contrib/include/wx/ogl/canvas.h

@@ -0,0 +1,83 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        canvas.h
+// Purpose:     wxShapeCanvas
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_CANVAS_H_
+#define _OGL_CANVAS_H_
+
+#ifdef __GNUG__
+#pragma interface "canvas.h"
+#endif
+
+// Drag states
+#define NoDragging             0
+#define StartDraggingLeft      1
+#define ContinueDraggingLeft   2
+#define StartDraggingRight     3
+#define ContinueDraggingRight  4
+
+// When drag_count reaches 0, process drag message
+
+class wxDiagram;
+
+class wxShapeCanvas: public wxScrolledWindow
+{
+ DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
+ public:
+  wxShapeCanvas(wxWindow *parent = NULL, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+               long style = wxBORDER | wxRETAINED);
+  ~wxShapeCanvas();
+
+  inline void SetDiagram(wxDiagram *diag) { m_shapeDiagram = diag; }
+  inline wxDiagram *GetDiagram() const { return m_shapeDiagram; }
+
+  virtual void OnLeftClick(double x, double y, int keys = 0);
+  virtual void OnRightClick(double x, double y, int keys = 0);
+
+  virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
+  virtual void OnBeginDragLeft(double x, double y, int keys=0);
+  virtual void OnEndDragLeft(double x, double y, int keys=0);
+
+  virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
+  virtual void OnBeginDragRight(double x, double y, int keys=0);
+  virtual void OnEndDragRight(double x, double y, int keys=0);
+
+  // Find object for mouse click, of given wxClassInfo (NULL for any type).
+  // If notImage is non-NULL, don't find an object that is equal to or a descendant of notImage
+  virtual wxShape *FindShape(double x, double y, int *attachment, wxClassInfo *info = NULL, wxShape *notImage = NULL);
+  wxShape *FindFirstSensitiveShape(double x, double y, int *new_attachment, int op);
+  wxShape *FindFirstSensitiveShape1(wxShape *image, int op);
+  
+  // Redirect to wxDiagram object
+  virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
+  virtual void InsertShape(wxShape *object);
+  virtual void RemoveShape(wxShape *object);
+  virtual bool GetQuickEditMode();
+  virtual void Redraw(wxDC& dc);
+  void Snap(double *x, double *y);
+
+  // Events
+  void OnPaint(wxPaintEvent& event);
+  void OnMouseEvent(wxMouseEvent& event);
+
+ protected:
+  wxDiagram*        m_shapeDiagram;
+  int               m_dragState;
+  double             m_oldDragX, m_oldDragY;     // Previous drag coordinates
+  double             m_firstDragX, m_firstDragY; // INITIAL drag coordinates
+  bool              m_checkTolerance;           // Whether to check drag tolerance
+  wxShape*          m_draggedShape;
+  int               m_draggedAttachment;
+
+DECLARE_EVENT_TABLE()
+};
+
+#endif
+ // _OGL_CANVAS_H_

contrib/include/wx/ogl/composit.h

@@ -0,0 +1,238 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        composit.h
+// Purpose:     wxCompositeShape
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_COMPOSIT_H_
+#define _OGL_COMPOSIT_H_
+
+#ifdef __GNUG__
+#pragma interface "composit.h"
+#endif
+
+class wxDivisionShape;
+class wxOGLConstraint;
+
+/*
+ * A composite object is an invisible rectangle surrounding all children
+ *
+ */
+
+class wxCompositeShape: public wxRectangleShape
+{
+ DECLARE_DYNAMIC_CLASS(wxCompositeShape)
+public:
+
+  wxCompositeShape();
+  ~wxCompositeShape();
+
+  void OnDraw(wxDC& dc);
+  void OnDrawContents(wxDC& dc);
+  void OnErase(wxDC& dc);
+  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE);
+  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
+
+  void OnRightClick(double x, double y, int keys, int attachment = 0);
+
+  void SetSize(double w, double h, bool recursive = TRUE);
+
+  // Returns TRUE if it settled down
+  bool Recompute();
+
+  // New members
+  void AddChild(wxShape *child, wxShape *addAfter = NULL);
+  void RemoveChild(wxShape *child);
+
+  wxOGLConstraint *AddConstraint(wxOGLConstraint *constraint);
+  wxOGLConstraint *AddConstraint(int type, wxShape *constraining, wxList& constrained);
+  wxOGLConstraint *AddConstraint(int type, wxShape *constraining, wxShape *constrained);
+
+  void DeleteConstraint(wxOGLConstraint *constraint);
+
+  // Delete constraints that involve this child.
+  void DeleteConstraintsInvolvingChild(wxShape *child);
+
+  // Remove the image from any constraints involving it, but DON'T
+  // remove any constraints.
+  void RemoveChildFromConstraints(wxShape *child);
+
+  // Find constraint, also returning actual composite the constraint was in,
+  // in case it had to find it recursively.
+  wxOGLConstraint *FindConstraint(long id, wxCompositeShape **actualComposite = NULL);
+
+  // Returns TRUE if something changed
+  bool Constrain();
+
+  // Make this composite into a container by creating one wxDivisionShape
+  void MakeContainer();
+
+  // Calculates size and position of composite object based on children
+  void CalculateSize();
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+  // In case the object has constraints it needs to read in in a different pass
+  void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
+#endif
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  virtual wxDivisionShape *OnCreateDivision();
+
+  // Finds the image used to visualize a container. This is any child
+  // of the composite that is not in the divisions list.
+  wxShape *FindContainerImage();
+
+  // Returns TRUE if division is a descendant of this container
+  bool ContainsDivision(wxDivisionShape *division);
+
+  inline wxList& GetDivisions() const { return (wxList&) m_divisions; }
+  inline wxList& GetConstraints() const { return (wxList&) m_constraints; }
+
+protected:
+  double             m_oldX;
+  double             m_oldY;
+  wxList            m_constraints;
+  wxList            m_divisions; // In case it's a container
+};
+
+/*
+ * A division object is a composite with special properties,
+ * to be used for containment. It's a subdivision of a container.
+ * A containing node image consists of a composite with a main child shape
+ * such as rounded rectangle, plus a list of division objects.
+ * It needs to be a composite because a division contains pieces
+ * of diagram.
+ * NOTE a container has at least one wxDivisionShape for consistency.
+ * This can be subdivided, so it turns into two objects, then each of
+ * these can be subdivided, etc.
+ */
+#define DIVISION_SIDE_NONE      0
+#define DIVISION_SIDE_LEFT      1
+#define DIVISION_SIDE_TOP       2
+#define DIVISION_SIDE_RIGHT     3
+#define DIVISION_SIDE_BOTTOM    4
+
+class wxDivisionShape: public wxCompositeShape
+{
+ DECLARE_DYNAMIC_CLASS(wxDivisionShape)
+ public:
+
+  wxDivisionShape();
+  ~wxDivisionShape();
+
+  void OnDraw(wxDC& dc);
+  void OnDrawContents(wxDC& dc);
+  bool OnMovePre(wxDC& dc, double x, double y, double oldX, double oldY, bool display = TRUE);
+  void OnDragLeft(bool draw, double x, double y, int keys, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys, int attachment = 0);
+
+  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+
+  // Don't want this kind of composite to resize its subdiagrams, so
+  // override composite's SetSize.
+  void SetSize(double w, double h, bool recursive = TRUE);
+
+  // Similarly for calculating size: it's fixed at whatever SetSize
+  // set it to, not in terms of children.
+  void CalculateSize();
+
+  void MakeControlPoints();
+  void ResetControlPoints();
+  void MakeMandatoryControlPoints();
+  void ResetMandatoryControlPoints();
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  // Divide horizontally (wxHORIZONTAL) or vertically (wxVERTICAL)
+  bool Divide(int direction);
+
+  // Resize adjoining divisions at the given side. If test is TRUE,
+  // just see whether it's possible for each adjoining region,
+  // returning FALSE if it's not.
+  bool ResizeAdjoining(int side, double newPos, bool test);
+
+  // Adjust a side, returning FALSE if it's not physically possible.
+  bool AdjustLeft(double left, bool test);
+  bool AdjustTop(double top, bool test);
+  bool AdjustRight(double right, bool test);
+  bool AdjustBottom(double bottom, bool test);
+
+  // Edit style of left or top side
+  void EditEdge(int side);
+
+  // Popup menu
+  void PopupMenu(double x, double y);
+
+  inline void SetLeftSide(wxDivisionShape *shape) { m_leftSide = shape; }
+  inline void SetTopSide(wxDivisionShape *shape) { m_topSide = shape; }
+  inline void SetRightSide(wxDivisionShape *shape) { m_rightSide = shape; }
+  inline void SetBottomSide(wxDivisionShape *shape) { m_bottomSide = shape; }
+  inline wxDivisionShape *GetLeftSide() const { return m_leftSide; }
+  inline wxDivisionShape *GetTopSide() const { return m_topSide; }
+  inline wxDivisionShape *GetRightSide() const { return m_rightSide; }
+  inline wxDivisionShape *GetBottomSide() const { return m_bottomSide; }
+
+  inline void SetHandleSide(int side) { m_handleSide = side; }
+  inline int GetHandleSide() const { return m_handleSide; }
+
+  inline void SetLeftSidePen(wxPen *pen) { m_leftSidePen = pen; }
+  inline wxPen *GetLeftSidePen() const { return m_leftSidePen; }
+  inline void SetTopSidePen(wxPen *pen) { m_topSidePen = pen; }
+  inline wxPen *GetTopSidePen() const { return m_topSidePen; }
+
+  void SetLeftSideColour(const wxString& colour);
+  void SetTopSideColour(const wxString& colour);
+  void SetLeftSideStyle(const wxString& style);
+  void SetTopSideStyle(const wxString& style);
+
+  inline wxString GetLeftSideColour() const { return m_leftSideColour; }
+  inline wxString GetTopSideColour() const { return m_topSideColour; }
+  inline wxString GetLeftSideStyle() const { return m_leftSideStyle; }
+  inline wxString GetTopSideStyle() const { return m_topSideStyle; }
+
+ protected:
+  // Adjoining divisions. NULL indicates edge
+  // of container, and that side shouldn't be
+  // drawn.
+  wxDivisionShape*      m_leftSide;
+  wxDivisionShape*      m_rightSide;
+  wxDivisionShape*      m_topSide;
+  wxDivisionShape*      m_bottomSide;
+
+  int                   m_handleSide;       // Side at which handle is legal
+
+  wxPen*                m_leftSidePen;
+  wxPen*                m_topSidePen;
+  wxString              m_leftSideColour;
+  wxString              m_topSideColour;
+  wxString              m_leftSideStyle;
+  wxString              m_topSideStyle;
+};
+
+
+#define DIVISION_MENU_SPLIT_HORIZONTALLY    1
+#define DIVISION_MENU_SPLIT_VERTICALLY      2
+#define DIVISION_MENU_EDIT_LEFT_EDGE        3
+#define DIVISION_MENU_EDIT_TOP_EDGE         4
+#define DIVISION_MENU_EDIT_RIGHT_EDGE       5
+#define DIVISION_MENU_EDIT_BOTTOM_EDGE      6
+#define DIVISION_MENU_DELETE_ALL            7
+
+#endif
+ // _OGL_COMPOSIT_H_

contrib/include/wx/ogl/constrnt.h

@@ -0,0 +1,87 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        constrnt.h
+// Purpose:     OGL constraint definitions
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_CONSTRNT_H_
+#define _OGL_CONSTRNT_H_
+
+#ifdef __GNUG__
+#pragma interface "constrnt.h"
+#endif
+
+/*
+ * OGL Constraints
+ *
+ */
+
+class wxOGLConstraintType: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
+public:
+  wxOGLConstraintType(int type = 0, const wxString& name = "", const wxString& phrase = "");
+  ~wxOGLConstraintType();
+
+public:
+  int           m_type;     // E.g. gyCONSTRAINT_CENTRED_VERTICALLY
+  wxString      m_name;     // E.g. "Centre vertically"
+  wxString      m_phrase;   // E.g. "centred vertically with respect to", "left of"
+
+};
+
+extern wxList* wxOGLConstraintTypes;
+
+#define gyCONSTRAINT_CENTRED_VERTICALLY   1
+#define gyCONSTRAINT_CENTRED_HORIZONTALLY 2
+#define gyCONSTRAINT_CENTRED_BOTH         3
+#define gyCONSTRAINT_LEFT_OF              4
+#define gyCONSTRAINT_RIGHT_OF             5
+#define gyCONSTRAINT_ABOVE                6
+#define gyCONSTRAINT_BELOW                7
+#define gyCONSTRAINT_ALIGNED_TOP          8
+#define gyCONSTRAINT_ALIGNED_BOTTOM       9
+#define gyCONSTRAINT_ALIGNED_LEFT         10
+#define gyCONSTRAINT_ALIGNED_RIGHT        11
+
+// Like aligned, but with the objects centred on the respective edge
+// of the reference object.
+#define gyCONSTRAINT_MIDALIGNED_TOP       12
+#define gyCONSTRAINT_MIDALIGNED_BOTTOM    13
+#define gyCONSTRAINT_MIDALIGNED_LEFT      14
+#define gyCONSTRAINT_MIDALIGNED_RIGHT     15
+
+class wxOGLConstraint: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxOGLConstraint)
+ public:
+  wxOGLConstraint() { m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0; m_constraintName = ""; m_constraintId = 0;
+                        m_constrainingObject = NULL; }
+  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
+  ~wxOGLConstraint();
+
+  // Returns TRUE if anything changed
+  bool Evaluate();
+  inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
+  bool Equals(double a, double b);
+
+  double         m_xSpacing;
+  double         m_ySpacing;
+  int           m_constraintType;
+  wxString      m_constraintName;
+  long          m_constraintId;
+  wxShape*      m_constrainingObject;
+  wxList        m_constrainedObjects;
+
+};
+
+void OGLInitializeConstraintTypes();
+void OGLCleanUpConstraintTypes();
+
+#endif
+ // _OGL_CONSTRNT_H_

contrib/include/wx/ogl/divided.h

@@ -0,0 +1,75 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        divided.h
+// Purpose:     wxDividedShape
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_DIVIDED_H_
+#define _OGL_DIVIDED_H_
+
+#ifdef __GNUG__
+#pragma interface "basic.h"
+#endif
+
+/*
+ * Definition of a region
+ *
+ */
+
+/*
+ * Box divided into horizontal regions
+ *
+ */
+
+extern wxFont *g_oglNormalFont;
+class wxDividedShape: public wxRectangleShape
+{
+ DECLARE_DYNAMIC_CLASS(wxDividedShape)
+
+ public:
+  wxDividedShape(double w = 0.0, double h = 0.0);
+  ~wxDividedShape();
+
+  void OnDraw(wxDC& dc);
+  void OnDrawContents(wxDC& dc);
+
+  void SetSize(double w, double h, bool recursive = TRUE);
+
+  void MakeControlPoints();
+  void ResetControlPoints();
+
+  void MakeMandatoryControlPoints();
+  void ResetMandatoryControlPoints();
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+
+  void Copy(wxShape &copy);
+
+  // Set all region sizes according to proportions and
+  // this object total size
+  void SetRegionSizes();
+
+  // Edit region colours/styles
+  void EditRegions();
+
+  // Attachment points correspond to regions in the divided box
+  bool GetAttachmentPosition(int attachment, double *x, double *y,
+                                     int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
+  bool AttachmentIsValid(int attachment);
+  int GetNumberOfAttachments() const;
+
+  // Invoke editor on CTRL-right click
+  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+};
+
+#endif
+    // _OGL_DIVIDED_H_
+

contrib/include/wx/ogl/drawn.h

@@ -0,0 +1,227 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        drawn.h
+// Purpose:     wxDrawnShape
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_DRAWN_H_
+#define _OGL_DRAWN_H_
+
+#ifdef __GNUG__
+#pragma interface "drawn.h"
+#endif
+
+#include <wx/ogl/basic.h>
+
+#define oglMETAFLAGS_OUTLINE         1
+#define oglMETAFLAGS_ATTACHMENTS     2
+
+class wxDrawnShape;
+class wxPseudoMetaFile: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile)
+ public:
+  wxPseudoMetaFile();
+  wxPseudoMetaFile(wxPseudoMetaFile& mf);
+  ~wxPseudoMetaFile();
+
+  void Draw(wxDC& dc, double xoffset, double yoffset);
+
+#ifdef PROLOGIO
+  void WriteAttributes(wxExpr *clause, int whichAngle);
+  void ReadAttributes(wxExpr *clause, int whichAngle);
+#endif
+
+  void Clear();
+
+  void Copy(wxPseudoMetaFile& copy);
+
+  void Scale(double sx, double sy);
+  void ScaleTo(double w, double h); // Scale to fit size
+  void Translate(double x, double y);
+
+  // Rotate about the given axis by theta radians from the x axis.
+  void Rotate(double x, double y, double theta);
+
+  bool LoadFromMetaFile(char *filename, double *width, double *height);
+
+  void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
+
+  // Calculate size from current operations
+  void CalculateSize(wxDrawnShape* shape);
+
+  inline wxList& GetOutlineColours() const { return (wxList&) m_outlineColours; }
+  inline wxList& GetFillColours() const { return (wxList&) m_fillColours; }
+  inline void SetRotateable(bool rot) { m_rotateable = rot; }
+  inline bool GetRotateable() const { return m_rotateable; }
+
+  inline void SetSize(double w, double h) { m_width = w; m_height = h; }
+
+  inline void SetFillBrush(wxBrush* brush) { m_fillBrush = brush; }
+  inline wxBrush* GetFillBrush() const { return m_fillBrush; }
+
+  inline void SetOutlinePen(wxPen* pen) { m_outlinePen = pen; }
+  inline wxPen* GetOutlinePen() const { return m_outlinePen; }
+
+  inline void SetOutlineOp(int op) { m_outlineOp = op; }
+  inline int GetOutlineOp() const { return m_outlineOp; }
+
+  inline wxList& GetOps() const { return (wxList&) m_ops; }
+
+  // Is this a valid (non-empty) metafile?
+  inline bool IsValid() const { return (m_ops.Number() > 0); }
+
+public:
+  /// Set of functions for drawing into a pseudo metafile.
+  /// They use integers, but doubles are used internally for accuracy
+  /// when scaling.
+
+  virtual void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+  virtual void DrawRectangle(const wxRect& rect);
+  virtual void DrawRoundedRectangle(const wxRect& rect, double radius);
+  virtual void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
+  virtual void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
+  virtual void DrawEllipse(const wxRect& rect);
+  virtual void DrawPoint(const wxPoint& pt);
+  virtual void DrawText(const wxString& text, const wxPoint& pt);
+  virtual void DrawLines(int n, wxPoint pts[]);
+  // flags:
+  // oglMETAFLAGS_OUTLINE: will be used for drawing the outline and
+  //                       also drawing lines/arrows at the circumference.
+  // oglMETAFLAGS_ATTACHMENTS: will be used for initialising attachment points at
+  //                       the vertices (perhaps a rare case...)
+  virtual void DrawPolygon(int n, wxPoint pts[], int flags = 0);
+  virtual void DrawSpline(int n, wxPoint pts[]);
+
+  virtual void SetClippingRect(const wxRect& rect);
+  virtual void DestroyClippingRect();
+
+  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetFont(wxFont* font);
+  virtual void SetTextColour(const wxColour& colour);
+  virtual void SetBackgroundColour(const wxColour& colour);
+  virtual void SetBackgroundMode(int mode);
+
+public:
+  bool              m_rotateable;
+  double            m_width;
+  double            m_height;
+  wxList            m_ops; // List of drawing operations (see drawnp.h)
+  wxList            m_gdiObjects; // List of pens, brushes and fonts for this object.
+  int               m_outlineOp;  // The op representing the outline, if any
+
+  // Pen/brush specifying outline/fill colours
+  // to override operations.
+  wxPen*            m_outlinePen;
+  wxBrush*          m_fillBrush;
+  wxList            m_outlineColours; // List of the GDI operations that comprise the outline
+  wxList            m_fillColours; // List of the GDI operations that fill the shape
+  double             m_currentRotation;
+};
+
+#define oglDRAWN_ANGLE_0        0
+#define oglDRAWN_ANGLE_90       1
+#define oglDRAWN_ANGLE_180      2
+#define oglDRAWN_ANGLE_270      3
+
+class wxDrawnShape: public wxRectangleShape
+{
+ DECLARE_DYNAMIC_CLASS(wxDrawnShape)
+ public:
+  wxDrawnShape();
+  ~wxDrawnShape();
+
+  void OnDraw(wxDC& dc);
+
+#ifdef PROLOGIO
+  // I/O
+  void WriteAttributes(wxExpr *clause);
+  void ReadAttributes(wxExpr *clause);
+#endif
+
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  void Scale(double sx, double sy);
+  void Translate(double x, double y);
+  // Rotate about the given axis by theta radians from the x axis.
+  void Rotate(double x, double y, double theta);
+
+  // Get current rotation
+  inline double GetRotation() const { return m_rotation; }
+
+  void SetSize(double w, double h, bool recursive = TRUE);
+  bool LoadFromMetaFile(char *filename);
+
+  inline void SetSaveToFile(bool save) { m_saveToFile = save; }
+  inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; }
+
+  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+
+  // Get the perimeter point using the special outline op, if there is one,
+  // otherwise use default wxRectangleShape scheme
+  bool GetPerimeterPoint(double x1, double y1,
+                                     double x2, double y2,
+                                     double *x3, double *y3);
+
+  /// Set of functions for drawing into a pseudo metafile.
+  /// They use integers, but doubles are used internally for accuracy
+  /// when scaling.
+
+  virtual void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+  virtual void DrawRectangle(const wxRect& rect);
+  virtual void DrawRoundedRectangle(const wxRect& rect, double radius);
+  virtual void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
+  virtual void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
+  virtual void DrawEllipse(const wxRect& rect);
+  virtual void DrawPoint(const wxPoint& pt);
+  virtual void DrawText(const wxString& text, const wxPoint& pt);
+  virtual void DrawLines(int n, wxPoint pts[]);
+  virtual void DrawPolygon(int n, wxPoint pts[], int flags = 0);
+  virtual void DrawSpline(int n, wxPoint pts[]);
+
+  virtual void SetClippingRect(const wxRect& rect);
+  virtual void DestroyClippingRect();
+
+  virtual void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetDrawnFont(wxFont* font);
+  virtual void SetDrawnTextColour(const wxColour& colour);
+  virtual void SetDrawnBackgroundColour(const wxColour& colour);
+  virtual void SetDrawnBackgroundMode(int mode);
+
+  // Set the width/height according to the shapes in the metafile.
+  // Call this after drawing into the shape.
+  inline void CalculateSize() { m_metafiles[m_currentAngle].CalculateSize(this); }
+
+  inline void DrawAtAngle(int angle) { m_currentAngle = angle; };
+
+  inline int GetAngle() const { return m_currentAngle; }
+
+// Implementation
+protected:
+  // Which metafile do we use now? Based on current rotation and validity
+  // of metafiles.
+  int DetermineMetaFile(double rotation);
+
+private:
+  // One metafile for each 90 degree rotation (or just a single one).
+  wxPseudoMetaFile      m_metafiles[4];
+
+  // Don't save all wxDrawnShape metafiles to file: sometimes
+  // we take the metafile data from a symbol library.
+  bool                  m_saveToFile;
+
+  // Which angle are we using/drawing into?
+  int                   m_currentAngle;
+};
+
+#endif
+    // _DRAWN_H_
+

contrib/include/wx/ogl/drawnp.h

@@ -0,0 +1,205 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        drawnp.h
+// Purpose:     Private header for wxDrawnShape
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_DRAWNP_H_
+#define _OGL_DRAWNP_H_
+
+#ifdef __GNUG__
+#pragma interface "drawnp.h"
+#endif
+
+#include <wx/ogl/drawn.h>
+
+/*
+ * Drawing operations
+ *
+ */
+ 
+#define  DRAWOP_SET_PEN             1
+#define  DRAWOP_SET_BRUSH           2
+#define  DRAWOP_SET_FONT            3
+#define  DRAWOP_SET_TEXT_COLOUR     4
+#define  DRAWOP_SET_BK_COLOUR       5
+#define  DRAWOP_SET_BK_MODE         6
+#define  DRAWOP_SET_CLIPPING_RECT   7
+#define  DRAWOP_DESTROY_CLIPPING_RECT 8
+
+/*
+#define  DRAWOP_CREATE_PEN          10
+#define  DRAWOP_CREATE_BRUSH        11
+#define  DRAWOP_CREATE_FONT         12
+*/
+
+#define  DRAWOP_DRAW_LINE           20
+#define  DRAWOP_DRAW_POLYLINE       21
+#define  DRAWOP_DRAW_POLYGON        22
+#define  DRAWOP_DRAW_RECT           23
+#define  DRAWOP_DRAW_ROUNDED_RECT   24
+#define  DRAWOP_DRAW_ELLIPSE        25
+#define  DRAWOP_DRAW_POINT          26
+#define  DRAWOP_DRAW_ARC            27
+#define  DRAWOP_DRAW_TEXT           28
+#define  DRAWOP_DRAW_SPLINE         29
+#define  DRAWOP_DRAW_ELLIPTIC_ARC   30
+
+/*
+ * Base, virtual class
+ *
+ */
+ 
+class wxDrawOp: public wxObject
+{
+public:
+  inline wxDrawOp(int theOp) { m_op = theOp; }
+  inline ~wxDrawOp() {}
+  inline virtual void Scale(double xScale, double yScale) {};
+  inline virtual void Translate(double x, double y) {};
+  inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
+  virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
+  virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
+  virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
+  virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
+
+  inline int GetOp() const { return m_op; }
+
+  // Draw an outline using the current operation. By default, return FALSE (not drawn)
+  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
+    double oldW, double oldH) { return FALSE; }
+
+  // Get the perimeter point using this data
+  virtual bool GetPerimeterPoint(double x1, double y1,
+                                     double x2, double y2,
+                                     double *x3, double *y3,
+                                     double xOffset, double yOffset,
+                                     int attachmentMode)
+  { return FALSE; }
+
+protected:
+  int           m_op;
+
+};
+
+/*
+ * Set font, brush, text colour
+ *
+ */
+ 
+class wxOpSetGDI: public wxDrawOp
+{
+ public:
+  wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  int               m_mode;
+  int               m_gdiIndex;
+  wxPseudoMetaFile* m_image;
+  unsigned char     m_r;
+  unsigned char     m_g;
+  unsigned char     m_b;
+};
+
+/*
+ * Set/destroy clipping
+ *
+ */
+ 
+class wxOpSetClipping: public wxDrawOp
+{
+public:
+  wxOpSetClipping(int theOp, double theX1, double theY1, double theX2, double theY2);
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  void Scale(double xScale, double yScale);
+  void Translate(double x, double y);
+  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  double     m_x1;
+  double     m_y1;
+  double     m_x2;
+  double     m_y2;
+};
+
+/*
+ * Draw line, rectangle, rounded rectangle, ellipse, point, arc, text
+ *
+ */
+ 
+class wxOpDraw: public wxDrawOp
+{
+ public:
+  wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
+         double radius = 0.0, char *s = NULL);
+  ~wxOpDraw();
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  void Scale(double scaleX, double scaleY);
+  void Translate(double x, double y);
+  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
+  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  double     m_x1;
+  double     m_y1;
+  double     m_x2;
+  double     m_y2;
+  double     m_x3;
+  double     m_y3;
+  double     m_radius;
+  char*     m_textString;
+
+};
+
+/*
+ * Draw polyline, spline, polygon
+ *
+ */
+
+class wxOpPolyDraw: public wxDrawOp
+{
+public:
+  wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
+  ~wxOpPolyDraw();
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  void Scale(double scaleX, double scaleY);
+  void Translate(double x, double y);
+  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
+  wxDrawOp *Copy(wxPseudoMetaFile *newImage);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+  // Draw an outline using the current operation.
+  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
+    double oldW, double oldH);
+
+  // Get the perimeter point using this data
+  bool GetPerimeterPoint(double x1, double y1,
+                                     double x2, double y2,
+                                     double *x3, double *y3,
+                                     double xOffset, double yOffset,
+                                     int attachmentMode);
+
+public:
+  wxRealPoint*  m_points;
+  int           m_noPoints;
+  
+};
+
+#endif
+ // _OGL_DRAWNP_H_
+
+

contrib/include/wx/ogl/lines.h

@@ -0,0 +1,296 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        lines.h
+// Purpose:     wxLineShape
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_LINES_H_
+#define _OGL_LINES_H_
+
+#ifdef __GNUG__
+#pragma interface "lines.h"
+#endif
+
+class wxLabelShape;
+class wxPseudoMetaFile;
+class wxLineControlPoint;
+/*
+ * Arcs with multiple arrowheads
+ *
+ */
+
+// Types of arrowhead
+// (i) Built-in
+#define ARROW_HOLLOW_CIRCLE   1
+#define ARROW_FILLED_CIRCLE   2
+#define ARROW_ARROW           3
+#define ARROW_SINGLE_OBLIQUE  4
+#define ARROW_DOUBLE_OBLIQUE  5
+// (ii) Custom
+#define ARROW_METAFILE        20
+
+// Position of arrow on line
+#define ARROW_POSITION_START  0
+#define ARROW_POSITION_END    1
+#define ARROW_POSITION_MIDDLE 2
+
+// Line alignment flags
+// Vertical by default
+#define LINE_ALIGNMENT_HORIZ              1
+#define LINE_ALIGNMENT_VERT               0
+#define LINE_ALIGNMENT_TO_NEXT_HANDLE     2
+#define LINE_ALIGNMENT_NONE               0
+
+class wxArrowHead: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxArrowHead)
+
+ public:
+  wxArrowHead(WXTYPE type = 0, int end = 0, double size = 0.0, double dist = 0.0, const wxString& name = "", wxPseudoMetaFile *mf = NULL,
+            long arrowId = -1);
+  ~wxArrowHead();
+  wxArrowHead(wxArrowHead& toCopy);
+
+  inline WXTYPE _GetType() const { return m_arrowType; }
+  inline int GetPosition() const { return m_arrowEnd; }
+  inline void SetPosition(int pos) { m_arrowEnd = pos; }
+  inline double GetXOffset() const { return m_xOffset; }
+  inline double GetYOffset() const { return m_yOffset; }
+  inline double GetSpacing() const { return m_spacing; }
+  inline double GetSize() const { return m_arrowSize; }
+  inline wxString GetName() const { return m_arrowName; }
+  inline void SetXOffset(double x) { m_xOffset = x; }
+  inline void SetYOffset(double y) { m_yOffset = y; }
+  inline wxPseudoMetaFile *GetMetaFile() const { return m_metaFile; }
+  inline long GetId() const { return m_id; }
+  inline int GetArrowEnd() const { return m_arrowEnd; }
+  inline double GetArrowSize() const { return m_arrowSize; }
+  void SetSize(double size);
+  inline void SetSpacing(double sp) { m_spacing = sp; }
+
+ protected:
+  WXTYPE            m_arrowType;
+  int               m_arrowEnd;         // Position on line
+  double             m_xOffset;          // Distance from arc start or end, w.r.t. point on arrowhead
+                                        // nearest start or end. If zero, use default spacing.
+  double             m_yOffset;          // vertical offset (w.r.t. a horizontal line). Normally zero.
+  double             m_spacing;          // Spacing from the last arrowhead
+  double             m_arrowSize;        // Length of arrowhead
+  wxString          m_arrowName;        // Name of arrow
+  bool              m_saveToFile;       // TRUE if we want to save custom arrowheads to file.
+  wxPseudoMetaFile* m_metaFile;         // Pseudo metafile if this is a custom arrowhead
+  long              m_id;               // identifier
+};
+
+// Line object
+class wxLabelShape;
+class wxLineShape: public wxShape
+{
+ DECLARE_DYNAMIC_CLASS(wxLineShape)
+
+ public:
+  wxLineShape();
+  ~wxLineShape();
+
+  // Called when a connected object has moved, to move the link to
+  // correct position
+  // moveControlPoints must be disabled when a control point is being
+  // dragged.
+  void OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+  void OnDraw(wxDC& dc);
+  void OnDrawContents(wxDC& dc);
+  void OnDrawControlPoints(wxDC& dc);
+  void OnEraseControlPoints(wxDC& dc);
+  void OnErase(wxDC& dc);
+  virtual bool OnMoveControlPoint(int WXUNUSED(which), double WXUNUSED(x), double WXUNUSED(y)) { return FALSE; }
+  virtual bool OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, const wxRealPoint& pt);
+  virtual bool OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display);
+  void OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+  void GetBoundingBoxMin(double *w, double *h);
+  void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
+  virtual void SetEnds(double x1, double y1, double x2, double y2);
+  virtual void GetEnds(double *x1, double *y1, double *x2, double *y2);
+  inline virtual wxShape *GetFrom() { return m_from; }
+  inline virtual wxShape *GetTo() { return m_to; }
+  inline virtual int GetAttachmentFrom() { return m_attachmentFrom; }
+  inline virtual int GetAttachmentTo() { return m_attachmentTo; }
+
+  virtual void SetFrom(wxShape *object);
+  virtual void SetTo(wxShape *object);
+  virtual void DrawArrows(wxDC& dc);
+
+  // Finds the x, y points at the two ends of the line.
+  // This function can be used by e.g. line-routing routines to
+  // get the actual points on the two node images where the lines will be drawn
+  // to/from.
+  void FindLineEndPoints(double *fromX, double *fromY, double *toX, double *toY);
+
+  // Format one region at this position
+  void DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
+
+  // Erase one region at this position
+  void EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
+
+  // Get the reference point for a label. Region x and y
+  // are offsets from this.
+  // position is 0 (middle), 1 (start), 2 (end)
+  void GetLabelPosition(int position, double *x, double *y);
+
+  // Can override this to create a different class of label shape
+  virtual wxLabelShape* OnCreateLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
+
+  // Straighten verticals and horizontals
+  virtual void Straighten(wxDC* dc = NULL);
+
+  // Not implemented
+  inline void SetMaintainStraightLines(bool flag) { m_maintainStraightLines = flag; }
+  inline bool GetMaintainStraightLines() const { return m_maintainStraightLines; }
+
+  // Make handle control points
+  void MakeControlPoints();
+  void ResetControlPoints();
+
+  // Make a given number of control points
+  virtual void MakeLineControlPoints(int n);
+  virtual wxNode *InsertLineControlPoint(wxDC* dc);
+  virtual bool DeleteLineControlPoint();
+  virtual void Initialise();
+  inline wxList *GetLineControlPoints() { return m_lineControlPoints; }
+
+  // Override dragging behaviour - don't want to be able to drag lines!
+  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+
+  // Control points ('handles') redirect control to the actual shape, to make it easier
+  // to override sizing behaviour.
+  virtual void OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+  virtual void OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+  virtual void OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+
+  // Override select, to create/delete temporary label-moving objects
+  void Select(bool select = TRUE, wxDC* dc = NULL);
+
+  // Set to spline (TRUE) or line (FALSE)
+  inline void SetSpline(bool spl) { m_isSpline = spl; }
+  inline bool IsSpline() const { return m_isSpline; }
+
+  void Unlink();
+  void SetAttachments(int from_attach, int to_attach);
+  inline void SetAttachmentFrom(int attach) { m_attachmentFrom = attach; }
+  inline void SetAttachmentTo(int attach) { m_attachmentTo = attach; }
+
+  bool HitTest(double x, double y, int *attachment, double *distance);
+
+#ifdef PROLOGIO
+  // I/O
+  virtual void WriteAttributes(wxExpr *clause);
+  virtual void ReadAttributes(wxExpr *clause);
+#endif
+
+  virtual void FindNth(wxShape *image, int *nth, int *no_arcs, bool incoming);
+
+  // Find which position we're talking about at this (x, y).
+  // Returns ARROW_POSITION_START, ARROW_POSITION_MIDDLE, ARROW_POSITION_END
+  int FindLinePosition(double x, double y);
+
+  // This is really to distinguish between lines and other images.
+  // For lines, want to pass drag to canvas, since lines tend to prevent
+  // dragging on a canvas (they get in the way.)
+  virtual bool Draggable() const { return FALSE; }
+
+  // Does the copying for this object
+  void Copy(wxShape& copy);
+
+  // Add an arrowhead.
+  wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
+                double arrowSize = 10.0, double xOffset = 0.0, const wxString& name = "",
+                wxPseudoMetaFile *mf = NULL, long arrowId = -1);
+
+  // Add an arrowhead in the position indicated by the reference
+  // list of arrowheads, which contains all legal arrowheads for this
+  // line, in the correct order.
+  // E.g. reference list:      a b c d e
+  //      Current line list:   a d
+  // Add c, then line list is: a c d
+  // If no legal arrowhead position, return FALSE.
+  // Assume reference list is for one end only, since it potentially defines
+  // the ordering for any one of the 3 positions. So we don't check
+  // the reference list for arrowhead position.
+  bool AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end);
+
+  // Delete arrowhead(s)
+  void ClearArrowsAtPosition(int end = -1);
+  bool ClearArrow(const wxString& name);
+  wxArrowHead *FindArrowHead(int position, const wxString& name);
+  wxArrowHead *FindArrowHead(long arrowId);
+  bool DeleteArrowHead(int position, const wxString& name);
+  bool DeleteArrowHead(long arrowId);
+  void DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset);
+  inline void SetIgnoreOffsets(bool ignore) { m_ignoreArrowOffsets = ignore; }
+  inline wxList& GetArrows() const { return (wxList&) m_arcArrows; }
+
+  // Find horizontal width for drawing a line with
+  // arrows in minimum space. Assume arrows at
+  // END only
+  double FindMinimumWidth();
+
+  // Set alignment flags. ALIGNMENT NOT IMPLEMENTED.
+  void SetAlignmentOrientation(bool isEnd, bool isHoriz);
+  void SetAlignmentType(bool isEnd, int alignType);
+  bool GetAlignmentOrientation(bool isEnd);
+  int GetAlignmentType(bool isEnd);
+
+  // Find next control point in line after the start/end point
+  // (depending on whether the node object is at start or end)
+  wxRealPoint *GetNextControlPoint(wxShape *nodeObject);
+  inline bool IsEnd(wxShape *nodeObject) const { return (m_to == nodeObject); }
+
+private:
+  bool              m_erasing;              // flag to say whether we're erasing or drawing
+                                            // this line (really so metafiles can draw a
+                                            // blank rectangle)
+  bool              m_ignoreArrowOffsets;   // Don't always want to draw arrowhead offsets
+                                            // because they may not work on tool palettes (for example)
+  bool              m_isSpline;
+  bool              m_maintainStraightLines;
+
+protected:
+  // Temporary list of line segment orientations
+  // so we know what direction the line is supposed to be dog-legging
+  // in. The values are integer: 0 for vertical, 1 for horizontal.
+  wxList            m_lineOrientations;
+
+  // Temporary pointers for start, middle and end label editing objects
+  // (active only when the line is selected)
+  wxLabelShape*     m_labelObjects[3];
+
+  // These define the segmented line - not to be confused with temporary control
+  // points which appear when object is selected (although in this case they'll
+  // probably be the same)
+  wxList*           m_lineControlPoints;
+
+  double            m_arrowSpacing; // Separation between adjacent arrows
+
+  wxShape*          m_to;
+  wxShape*          m_from;
+
+  int               m_attachmentTo;   // Attachment point at one end
+  int               m_attachmentFrom; // Attachment point at other end
+
+  // Alignment flags
+  int               m_alignmentStart;
+  int               m_alignmentEnd;
+
+  wxList            m_arcArrows;
+
+};
+
+#endif
+    // _OGL_LINES_H_

contrib/include/wx/ogl/linesp.h

@@ -0,0 +1,89 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        linesp.h
+// Purpose:     Lines private header file
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_LINESP_H_
+#define _OGL_LINESP_H_
+
+#ifdef __GNUG__
+#pragma interface "linesp.h"
+#endif
+
+class wxLineShape;
+class wxLineControlPoint: public wxControlPoint
+{
+  DECLARE_DYNAMIC_CLASS(wxLineControlPoint)
+  friend class wxLineShape;
+ public:
+
+  wxLineControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0,
+     double x = 0.0, double y = 0.0, int the_type = 0);
+  ~wxLineControlPoint();
+
+  void OnDraw(wxDC& dc);
+  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+
+  // Obsolete (left-dragging now moves attachment point to new relative position OR new
+  // attachment id)
+#if 0
+  void OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+  void OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+  void OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+#endif
+
+public:
+
+  int           m_type;
+  wxRealPoint*  m_point;  // Line point
+  wxRealPoint   m_originalPos;
+
+};
+
+/*
+ * Temporary arc label object
+ */
+ 
+class wxLabelShape: public wxRectangleShape
+{
+  DECLARE_DYNAMIC_CLASS(wxLabelShape)
+
+ public:
+  wxLabelShape(wxLineShape *parent = NULL, wxShapeRegion *region = NULL, double w = 0.0, double h = 0.0);
+  ~wxLabelShape();
+
+  void OnDraw(wxDC& dc);
+  void OnDrawContents(wxDC& dc);
+  void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+  void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+  void OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+  void OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+  void OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+  bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+
+public:
+  wxLineShape*      m_lineShape;
+  wxShapeRegion*    m_shapeRegion;
+
+};
+
+/*
+ * Get the point on the given line (x1, y1) (x2, y2)
+ * distance 'length' along from the end,
+ * returned values in x and y
+ */
+
+void GetPointOnLine(double x1, double y1, double x2, double y2,
+                    double length, double *x, double *y);
+
+#endif
+    // _OGL_LINESP_H_
+

contrib/include/wx/ogl/mfutils.h

@@ -0,0 +1,211 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        mfutils.h
+// Purpose:     Metafile utilities: reading a placeable metafile independently
+//              of Windows.
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MFUTILS_H_
+#define _MFUTILS_H_
+
+#ifdef __GNUG__
+#pragma interface "mfutils.h"
+#endif
+
+#include <wx/metafile.h>
+
+#ifndef GetRValue
+#define GetRValue(rgb)	    ((unsigned char)(rgb))
+#define GetGValue(rgb)      ((unsigned char)(((int)(rgb)) >> 8))
+#define GetBValue(rgb)	    ((unsigned char)((rgb)>>16))
+#endif
+
+/* Metafile Functions */
+/* Win32s/Borland need these macros, although META_SETBKCOLOR is defined */
+#if 1 // !defined(META_SETBKCOLOR) // || defined(WIN32)
+
+#define META_SETBKCOLOR		     0x0201
+#define META_SETBKMODE		     0x0102
+#define META_SETMAPMODE		     0x0103
+#define META_SETROP2		     0x0104
+#define META_SETRELABS		     0x0105
+#define META_SETPOLYFILLMODE	     0x0106
+#define META_SETSTRETCHBLTMODE	     0x0107
+#define META_SETTEXTCHAREXTRA	     0x0108
+#define META_SETTEXTCOLOR	     0x0209
+#define META_SETTEXTJUSTIFICATION    0x020A
+#define META_SETWINDOWORG	     0x020B
+#define META_SETWINDOWEXT	     0x020C
+#define META_SETVIEWPORTORG	     0x020D
+#define META_SETVIEWPORTEXT	     0x020E
+#define META_OFFSETWINDOWORG	     0x020F
+#define META_SCALEWINDOWEXT	     0x0410
+#define META_OFFSETVIEWPORTORG	     0x0211
+#define META_SCALEVIEWPORTEXT	     0x0412
+#define META_LINETO		     0x0213
+#define META_MOVETO		     0x0214
+#define META_EXCLUDECLIPRECT	     0x0415
+#define META_INTERSECTCLIPRECT	     0x0416
+#define META_ARC		     0x0817
+#define META_ELLIPSE		     0x0418
+#define META_FLOODFILL		     0x0419
+#define META_PIE		     0x081A
+#define META_RECTANGLE		     0x041B
+#define META_ROUNDRECT		     0x061C
+#define META_PATBLT		     0x061D
+#define META_SAVEDC		     0x001E
+#define META_SETPIXEL		     0x041F
+#define META_OFFSETCLIPRGN	     0x0220
+#define META_TEXTOUT		     0x0521
+#define META_BITBLT		     0x0922
+#define META_STRETCHBLT		     0x0B23
+#define META_POLYGON		     0x0324
+#define META_POLYLINE		     0x0325
+#define META_ESCAPE		     0x0626
+#define META_RESTOREDC		     0x0127
+#define META_FILLREGION		     0x0228
+#define META_FRAMEREGION	     0x0429
+#define META_INVERTREGION	     0x012A
+#define META_PAINTREGION	     0x012B
+#define META_SELECTCLIPREGION	     0x012C
+#define META_SELECTOBJECT	     0x012D
+#define META_SETTEXTALIGN	     0x012E
+#define META_DRAWTEXT		     0x062F
+
+#define	META_CHORD		     0x0830
+#define	META_SETMAPPERFLAGS	     0x0231
+#define	META_EXTTEXTOUT		     0x0a32
+#define	META_SETDIBTODEV	     0x0d33
+#define	META_SELECTPALETTE	     0x0234
+#define	META_REALIZEPALETTE	     0x0035
+#define	META_ANIMATEPALETTE	     0x0436
+#define	META_SETPALENTRIES	     0x0037
+#define	META_POLYPOLYGON	     0x0538
+#define	META_RESIZEPALETTE	     0x0139
+
+#define	META_DIBBITBLT		     0x0940
+#define	META_DIBSTRETCHBLT	     0x0b41
+#define	META_DIBCREATEPATTERNBRUSH   0x0142
+#define	META_STRETCHDIB		     0x0f43
+
+#define META_EXTFLOODFILL	     0x0548
+
+#define META_RESETDC		     0x014C
+#define META_STARTDOC		     0x014D
+#define META_STARTPAGE		     0x004F
+#define META_ENDPAGE		     0x0050
+#define META_ABORTDOC		     0x0052
+#define META_ENDDOC		     0x005E
+
+#define	META_DELETEOBJECT	     0x01f0
+
+#define	META_CREATEPALETTE	     0x00f7
+#define META_CREATEBRUSH	     0x00F8
+#define META_CREATEPATTERNBRUSH	     0x01F9
+#define META_CREATEPENINDIRECT	     0x02FA
+#define META_CREATEFONTINDIRECT	     0x02FB
+#define META_CREATEBRUSHINDIRECT     0x02FC
+#define META_CREATEBITMAPINDIRECT    0x02FD
+#define META_CREATEBITMAP	     0x06FE
+#define META_CREATEREGION	     0x06FF
+
+/* Background Modes */
+#define TRANSPARENT     1
+#define OPAQUE          2
+
+/* Pen Styles */
+#define PS_SOLID	    0
+#define PS_DASH             1
+#define PS_DOT              2
+#define PS_DASHDOT          3
+#define PS_DASHDOTDOT       4
+#define PS_NULL 	    5
+#define PS_INSIDEFRAME 	    6
+
+/* PitchAndFamily family values (high 4 bits) */
+/* Win32s/Borland don't need this */
+#ifndef FF_DONTCARE // !defined(__BORLANDC__) && !defined(WIN32)
+#define FF_DONTCARE         0x00
+#define FF_ROMAN            0x10
+#define FF_SWISS            0x20
+#define FF_MODERN           0x30
+#define FF_SCRIPT           0x40
+#define FF_DECORATIVE       0x50
+#endif
+
+/* Brush Styles */
+#define BS_SOLID	    0
+#define BS_NULL		    1
+#define BS_HOLLOW	    BS_NULL
+#define BS_HATCHED	    2
+#define BS_PATTERN	    3
+#define BS_INDEXED	    4
+#define	BS_DIBPATTERN	    5
+
+/* Hatch Styles */
+#define HS_HORIZONTAL       0
+#define HS_VERTICAL         1
+#define HS_FDIAGONAL        2
+#define HS_BDIAGONAL        3
+#define HS_CROSS            4
+#define HS_DIAGCROSS        5
+
+#endif // metafile functions
+
+class wxMetaRecord: public wxObject
+{
+  public:
+  int metaFunction;
+  long param1;
+  long param2;
+  long param3;
+  long param4;
+  long param5;
+  long param6;
+  long param7;
+  long param8;
+  char *stringParam;
+  wxRealPoint *points;
+  
+  wxMetaRecord(int fun)
+  {
+    metaFunction = fun; points = NULL; stringParam = NULL;
+    param1 = 0;
+  }
+  ~wxMetaRecord(void);
+};
+
+class wxXMetaFile: public wxObject
+{
+ public:
+  double lastX;
+  double lastY;
+  bool ok;
+
+  double left;
+  double top;
+  double right;
+  double bottom;
+
+  wxList metaRecords;
+  wxList gdiObjects; // List of wxMetaRecord objects created with Create...,
+                     // referenced by position in list by SelectObject
+  wxXMetaFile(char *file = NULL);
+  ~wxXMetaFile(void);
+  
+  // After this is called, the metafile cannot be used for anything
+  // since it is now owned by the clipboard.
+  bool SetClipboard(int width = 0, int height = 0);
+
+  bool Play(wxDC *dc);
+  inline bool Ok(void) const { return ok; }
+  bool ReadFile(char *file);
+};
+
+#endif
+ // _MFUTILS_H_

contrib/include/wx/ogl/misc.h

@@ -0,0 +1,113 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        misc.h
+// Purpose:     Miscellaneous utilities for OGL
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_MISC_H_
+#define _OGL_MISC_H_
+
+#ifdef __GNUG__
+#pragma interface "misc.h"
+#endif
+
+// List to use when copying objects; may need to associate elements of new objects
+// with elements of old objects, e.g. when copying constraint.s
+extern wxList oglObjectCopyMapping;
+
+/*
+ * TEXT FORMATTING FUNCTIONS
+ *
+ */
+
+// Centres the given list of wxShapeTextLine strings in the given box
+// (changing the positions in situ). Doesn't actually draw into the DC.
+void oglCentreText(wxDC& dc, wxList *text, double m_xpos, double m_ypos,
+                double width, double height,
+                int formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
+
+// Given a string, returns a list of strings that fit within the given
+// width of box. Height is ignored.
+wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double height, int formatMode = 0);
+
+// Centres the list of wxShapeTextLine strings, doesn't clip.
+// Doesn't actually draw into the DC.
+void oglCentreTextNoClipping(wxDC& dc, wxList *text_list,
+                              double m_xpos, double m_ypos, double width, double height);
+
+// Gets the maximum width and height of the given list of wxShapeTextLines.
+void oglGetCentredTextExtent(wxDC& dc, wxList *text_list,
+                              double m_xpos, double m_ypos, double width, double height,
+                              double *actual_width, double *actual_height);
+
+// Actually draw the preformatted list of wxShapeTextLines.
+void oglDrawFormattedText(wxDC& context, wxList *text_list,
+                       double m_xpos, double m_ypos, double width, double height,
+                       int formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
+
+// Give it a list of points, finds the centre.
+void oglFindPolylineCentroid(wxList *points, double *x, double *y);
+
+void oglCheckLineIntersection(double x1, double y1, double x2, double y2, 
+                             double x3, double y3, double x4, double y4,
+                             double *ratio1, double *ratio2);
+
+void oglFindEndForPolyline(double n, double xvec[], double yvec[], 
+                           double x1, double y1, double x2, double y2, double *x3, double *y3);
+
+
+void oglFindEndForBox(double width, double height, 
+                      double x1, double y1,         // Centre of box (possibly)
+                      double x2, double y2,         // other end of line
+                      double *x3, double *y3);      // End on box edge
+
+void oglFindEndForCircle(double radius, 
+                         double x1, double y1,  // Centre of circle
+                         double x2, double y2,  // Other end of line
+                         double *x3, double *y3);
+
+void oglGetArrowPoints(double x1, double y1, double x2, double y2,
+                      double length, double width,
+                      double *tip_x, double *tip_y,
+                      double *side1_x, double *side1_y,
+                      double *side2_x, double *side2_y);
+
+/*
+ * Given an ellipse and endpoints of a line, returns the point at which
+ * the line touches the ellipse in values x4, y4.
+ * This function assumes that the centre of the ellipse is at x1, y1, and the
+ * ellipse has a width of a1 and a height of b1. It also assumes you are
+ * wanting to draw an arc FROM point x2, y2 TOWARDS point x3, y3.
+ * This function calculates the x,y coordinates of the intersection point of 
+ * the arc with the ellipse.
+ * Author: Ian Harrison
+ */
+
+void oglDrawArcToEllipse(double x1, double y1, double a1, double b1, double x2, double y2, double x3, double y3,
+  double *x4, double *y4);
+
+bool oglRoughlyEqual(double val1, double val2, double tol = 0.00001);
+
+extern wxFont*          g_oglNormalFont;
+extern wxPen*           g_oglBlackPen;
+extern wxPen*           g_oglWhiteBackgroundPen;
+extern wxPen*           g_oglTransparentPen;
+extern wxBrush*         g_oglWhiteBackgroundBrush;
+extern wxPen*           g_oglBlackForegroundPen;
+extern wxCursor*        g_oglBullseyeCursor;
+
+extern wxFont*          oglMatchFont(int point_size);
+
+extern wxString         oglColourToHex(const wxColour& colour);
+extern wxColour         oglHexToColour(const wxString& hex);
+extern void             oglDecToHex(unsigned int dec, char *buf);
+extern unsigned int     oglHexToDec(char* buf);
+
+
+#endif
+ // _OGL_MISC_H_

contrib/include/wx/ogl/ogl.h

@@ -0,0 +1,27 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ogl.h
+// Purpose:     OGL main include
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_OGL_H_
+#define _OGL_OGL_H_
+
+#include <wx/ogl/basic.h>      // Basic shapes
+#include <wx/ogl/lines.h>      // Lines and splines
+#include <wx/ogl/divided.h>    // Vertically-divided rectangle
+#include <wx/ogl/composit.h>   // Composite images
+#include <wx/ogl/canvas.h>     // wxShapeCanvas for displaying objects
+#include <wx/ogl/ogldiag.h>    // wxDiagram
+
+// TODO: replace with wxModule implementation
+extern void wxOGLInitialize();
+extern void wxOGLCleanUp();
+
+#endif
+ // _OGL_OGL_H_

contrib/include/wx/ogl/ogldiag.h

@@ -0,0 +1,124 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ogldiag.h
+// Purpose:     OGL - wxDiagram class
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGL_OGLDIAG_H_
+#define _OGL_OGLDIAG_H_
+
+#ifdef __GNUG__
+#pragma interface "ogldiag.h"
+#endif
+
+#include <wx/ogl/basic.h>
+
+class wxDiagram: public wxObject
+{
+ DECLARE_DYNAMIC_CLASS(wxDiagram)
+
+public:
+
+  wxDiagram();
+  virtual ~wxDiagram();
+
+  void SetCanvas(wxShapeCanvas *can);
+
+  inline wxShapeCanvas *GetCanvas() const { return m_diagramCanvas; }
+
+  virtual void Redraw(wxDC& dc);
+  virtual void Clear(wxDC& dc);
+  virtual void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
+
+  // Add object to end of object list (if addAfter is NULL)
+  // or just after addAfter.
+  virtual void AddShape(wxShape *object, wxShape *addAfter = NULL);
+
+  // Add object to front of object list
+  virtual void InsertShape(wxShape *object);
+
+  void SetSnapToGrid(bool snap);
+  void SetGridSpacing(double spacing);
+  inline double GetGridSpacing() const { return m_gridSpacing; }
+  inline bool GetSnapToGrid() const { return m_snapToGrid; }
+  void Snap(double *x, double *y);
+
+  inline void SetQuickEditMode(bool qem) { m_quickEditMode = qem; }
+  inline bool GetQuickEditMode() const { return m_quickEditMode; }
+
+  virtual void RemoveShape(wxShape *object);
+  virtual void RemoveAllShapes();
+  virtual void DeleteAllShapes();
+  virtual void ShowAll(bool show);
+
+  // Find a shape by its id
+  wxShape* FindShape(long id) const;
+
+  inline void SetMouseTolerance(int tol) { m_mouseTolerance = tol; }
+  inline int GetMouseTolerance() const { return m_mouseTolerance; }
+  inline wxList *GetShapeList() const { return m_shapeList; }
+  inline int GetCount() const { return m_shapeList->Number(); }
+
+  // Make sure all text that should be centred, is centred.
+  void RecentreAll(wxDC& dc);
+
+#ifdef PROLOGIO
+  virtual bool SaveFile(const wxString& filename);
+  virtual bool LoadFile(const wxString& filename);
+
+  virtual void ReadNodes(wxExprDatabase& database);
+  virtual void ReadLines(wxExprDatabase& database);
+  virtual void ReadContainerGeometry(wxExprDatabase& database);
+
+  // Allow for modifying file
+  virtual bool OnDatabaseLoad(wxExprDatabase& db);
+  virtual bool OnDatabaseSave(wxExprDatabase& db);
+  virtual bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+  virtual bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+  virtual bool OnHeaderSave(wxExprDatabase& db, wxExpr& expr);
+  virtual bool OnHeaderLoad(wxExprDatabase& db, wxExpr& expr);
+#endif
+
+protected:
+  wxShapeCanvas*        m_diagramCanvas;
+  bool                  m_quickEditMode;
+  bool                  m_snapToGrid;
+  double                m_gridSpacing;
+  int                   m_mouseTolerance;
+  wxList*               m_shapeList;
+};
+
+class wxLineCrossing: public wxObject
+{
+public:
+    wxLineCrossing() { m_lineShape1 = NULL; m_lineShape2 = NULL; }
+    wxRealPoint     m_pt1; // First line
+    wxRealPoint     m_pt2;
+    wxRealPoint     m_pt3; // Second line
+    wxRealPoint     m_pt4;
+    wxRealPoint     m_intersect;
+    wxLineShape*    m_lineShape1;
+    wxLineShape*    m_lineShape2;
+};
+
+class wxLineCrossings: public wxObject
+{
+public:
+    wxLineCrossings();
+    ~wxLineCrossings();
+
+    void FindCrossings(wxDiagram& diagram);
+    void DrawCrossings(wxDiagram& diagram, wxDC& dc);
+    void ClearCrossings();
+
+public:
+    wxList  m_crossings;
+};
+
+#endif
+ // _OGL_OGLDIAG_H_

contrib/samples/ogl/Makefile.in

@@ -0,0 +1,12 @@
+#
+# Makefile : Builds wxWindows utils for Unix.
+#
+
+OGL_SAMPLES=ogledit studio
+
+all:
+	@for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE)); done
+
+clean:
+	@for d in $(OGL_SAMPLES); do (cd $$d && $(MAKE) clean); done
+

contrib/samples/ogl/ogledit/Makefile.in

@@ -0,0 +1,16 @@
+# Makefile for OGLEdit example.
+# $Id$
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../../..
+program_dir = contrib/samples/ogl/ogledit
+
+PROGRAM=ogledit
+
+OBJECTS=$(PROGRAM).o doc.o view.o palette.o
+
+APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include
+
+include $(top_builddir)/src/makeprog.env
+

contrib/samples/ogl/ogledit/OGLEditVC.dsp

@@ -0,0 +1,251 @@
+# Microsoft Developer Studio Project File - Name="OGLEditVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=OGLEditVC - 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 "OGLEditVC.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 "OGLEditVC.mak" CFG="OGLEditVC - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "OGLEditVC - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "OGLEditVC - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "OGLEditVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "OGLEditVC - Win32 Release DLL" (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)" == "OGLEditVC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DebugDLL"
+# PROP BASE Intermediate_Dir "DebugDLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugDLL"
+# PROP Intermediate_Dir "DebugDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw232d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseDLL"
+# PROP BASE Intermediate_Dir "ReleaseDLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDLL"
+# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw232.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "OGLEditVC - Win32 Release"
+# Name "OGLEditVC - Win32 Debug"
+# Name "OGLEditVC - Win32 Debug DLL"
+# Name "OGLEditVC - Win32 Release DLL"
+# Begin Source File
+
+SOURCE=.\doc.cpp
+
+!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\doc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.cpp
+
+!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ogledit.rc
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
+# End Source File
+# Begin Source File
+
+SOURCE=.\palette.cpp
+
+!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.cpp
+
+!IF  "$(CFG)" == "OGLEditVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.h
+# End Source File
+# End Target
+# End Project

contrib/samples/ogl/ogledit/OGLEditVC.dsw

@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "OGLEditVC"=.\OGLEditVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

contrib/samples/ogl/ogledit/bitmaps/arrow.xpm

@@ -0,0 +1,44 @@
+/* XPM */
+static char *arrow_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c #c0c0c0",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"######################",
+"######################",
+"######################",
+"######################",
+"######################",
+"####### ##############",
+"#######  #############",
+"#######   ############",
+"#######    ###########",
+"#######     ##########",
+"#######      #########",
+"#######       ########",
+"#######        #######",
+"#######     ##########",
+"#######  #  ##########",
+"####### ###  #########",
+"###########  #########",
+"############  ########",
+"############  ########",
+"######################",
+"######################",
+"######################"
+};

contrib/samples/ogl/ogledit/bitmaps/tool1.xpm

@@ -0,0 +1,44 @@
+/* XPM */
+static char *tool1_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c #c0c0c0",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"######################",
+"######################",
+"#                   ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"#                   ##",
+"######################",
+"######################",
+"######################"
+};

contrib/samples/ogl/ogledit/bitmaps/tool2.xpm

@@ -0,0 +1,44 @@
+/* XPM */
+static char *tool2_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c #c0c0c0",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"######################",
+"######################",
+"####             #####",
+"### ::::::::::::: ####",
+"## ::::::::::::::: ###",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"## ::::::::::::::: ###",
+"### ::::::::::::: ####",
+"####             #####",
+"######################",
+"######################",
+"######################"
+};

contrib/samples/ogl/ogledit/bitmaps/tool3.xpm

@@ -0,0 +1,44 @@
+/* XPM */
+static char *tool3_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c #c0c0c0",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"######################",
+"######################",
+"######################",
+"######################",
+"#######       ########",
+"####   :::::::   #####",
+"### ::::::::::::: ####",
+"## ::::::::::::::: ###",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"# ::::::::::::::::: ##",
+"## ::::::::::::::: ###",
+"### ::::::::::::: ####",
+"####   :::::::   #####",
+"######        ########",
+"######################",
+"######################",
+"######################",
+"######################",
+"######################",
+"######################"
+};

contrib/samples/ogl/ogledit/bitmaps/tool4.xpm

@@ -0,0 +1,44 @@
+/* XPM */
+static char *tool4_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c #c0c0c0",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+"######################",
+"######################",
+"######################",
+"##########  ##########",
+"######### :: #########",
+"######## :::: ########",
+"####### :::::: #######",
+"###### :::::::: ######",
+"##### :::::::::: #####",
+"#### :::::::::::: ####",
+"### :::::::::::::: ###",
+"### :::::::::::::: ###",
+"#### :::::::::::: ####",
+"##### :::::::::: #####",
+"###### :::::::: ######",
+"####### :::::: #######",
+"######## :::: ########",
+"######### :: #########",
+"##########  ##########",
+"######################",
+"######################",
+"######################"
+};

contrib/samples/ogl/ogledit/doc.cpp

@@ -0,0 +1,611 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        doc.cpp
+// Purpose:     Implements document functionality in OGLEdit
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+// #pragma implementation
+#endif
+
+// For compilers that support precompilation, includes "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 wx_setup.h!
+#endif
+
+#include <wx/wxexpr.h>
+#include "ogledit.h"
+#include "doc.h"
+#include "view.h"
+
+#if wxUSE_STD_IOSTREAM
+#include <ioswrap.h>
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(DiagramDocument, wxDocument)
+
+DiagramDocument::DiagramDocument(void)
+{
+}
+
+DiagramDocument::~DiagramDocument(void)
+{
+}
+
+bool DiagramDocument::OnCloseDocument(void)
+{
+  diagram.DeleteAllShapes();
+  return TRUE;
+}
+
+#if wxUSE_STD_IOSTREAM
+wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
+{
+  wxDocument::SaveObject(stream);
+  
+  char buf[400];
+  (void) wxGetTempFileName("diag", buf);
+
+  diagram.SaveFile(buf);
+  wxTransferFileToStream(buf, stream);
+
+  wxRemoveFile(buf);
+  
+  return stream;
+}
+
+wxSTD istream& DiagramDocument::LoadObject(wxSTD istream& stream)
+{
+  wxDocument::LoadObject(stream);
+
+  char buf[400];
+  (void) wxGetTempFileName("diag", buf);
+
+  wxTransferStreamToFile(stream, buf);
+
+  diagram.DeleteAllShapes();
+  diagram.LoadFile(buf);
+  wxRemoveFile(buf);
+
+  return stream;
+}
+#else
+
+wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
+{
+  wxDocument::SaveObject(stream);
+  char buf[400];
+  (void) wxGetTempFileName("diag", buf);
+
+  diagram.SaveFile(buf);
+
+  wxTransferFileToStream(buf, stream);
+
+  wxRemoveFile(buf);
+  
+
+  return stream;
+}
+
+wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
+{
+  wxDocument::LoadObject(stream);
+
+
+  char buf[400];
+  (void) wxGetTempFileName("diag", buf);
+
+  wxTransferStreamToFile(stream, buf);
+
+  diagram.DeleteAllShapes();
+  diagram.LoadFile(buf);
+  wxRemoveFile(buf);
+
+  return stream;
+}
+
+#endif
+
+/*
+ * Implementation of drawing command
+ */
+
+DiagramCommand::DiagramCommand(char *name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
+  bool sel, wxShape *theShape, wxShape *fs, wxShape *ts):
+  wxCommand(TRUE, name)
+{
+  doc = ddoc;
+  cmd = command;
+  shape = theShape;
+  fromShape = fs;
+  toShape = ts;
+  shapeInfo = info;
+  shapeBrush = NULL;
+  shapePen = NULL;
+  x = xx;
+  y = yy;
+  selected = sel;
+  deleteShape = FALSE;
+}
+
+DiagramCommand::DiagramCommand(char *name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape):
+  wxCommand(TRUE, name)
+{
+  doc = ddoc;
+  cmd = command;
+  shape = theShape;
+  fromShape = NULL;
+  toShape = NULL;
+  shapeInfo = NULL;
+  x = 0.0;
+  y = 0.0;
+  selected = FALSE;
+  deleteShape = FALSE;
+  shapeBrush = backgroundColour;
+  shapePen = NULL;
+}
+
+DiagramCommand::DiagramCommand(char *name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape):
+  wxCommand(TRUE, name)
+{
+  doc = ddoc;
+  cmd = command;
+  shape = theShape;
+  fromShape = NULL;
+  toShape = NULL;
+  shapeInfo = NULL;
+  x = 0.0;
+  y = 0.0;
+  selected = FALSE;
+  deleteShape = FALSE;
+  shapeBrush = NULL;
+  shapePen = NULL;
+  shapeLabel = lab;
+}
+
+DiagramCommand::~DiagramCommand(void)
+{
+  if (shape && deleteShape)
+  {
+    shape->SetCanvas(NULL);
+    delete shape;
+  }
+}
+
+bool DiagramCommand::Do(void)
+{
+  switch (cmd)
+  {
+    case OGLEDIT_CUT:
+    {
+      if (shape)
+      {
+        deleteShape = TRUE;
+        
+        shape->Select(FALSE);
+        
+        // Generate commands to explicitly remove each connected line.
+        RemoveLines(shape);
+        
+        doc->GetDiagram()->RemoveShape(shape);
+        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
+        {
+          wxLineShape *lineShape = (wxLineShape *)shape;
+          fromShape = lineShape->GetFrom();
+          toShape = lineShape->GetTo();
+        }
+        shape->Unlink();
+        
+        doc->Modify(TRUE);
+        doc->UpdateAllViews();
+      }
+
+      break;
+    }
+    case OGLEDIT_ADD_SHAPE:
+    {
+      wxShape *theShape = NULL;
+      if (shape)
+        theShape = shape; // Saved from undoing the shape
+      else
+      {
+        theShape = (wxShape *)shapeInfo->CreateObject();
+        theShape->AssignNewIds();
+        theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxString("")));
+        theShape->SetCentreResize(FALSE);
+        theShape->SetPen(wxBLACK_PEN);
+        theShape->SetBrush(wxCYAN_BRUSH);
+      
+        theShape->SetSize(60, 60);
+      }
+      doc->GetDiagram()->AddShape(theShape);
+      theShape->Show(TRUE);
+
+      wxClientDC dc(theShape->GetCanvas());
+      theShape->GetCanvas()->PrepareDC(dc);
+
+      theShape->Move(dc, x, y);
+      
+      shape = theShape;
+      deleteShape = FALSE;
+
+      doc->Modify(TRUE);
+      doc->UpdateAllViews();
+      break;
+    }
+    case OGLEDIT_ADD_LINE:
+    {
+      wxShape *theShape = NULL;
+      if (shape)
+        theShape = shape; // Saved from undoing the line
+      else
+      {
+        theShape = (wxShape *)shapeInfo->CreateObject();
+        theShape->AssignNewIds();
+        theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxString("")));
+        theShape->SetPen(wxBLACK_PEN);
+        theShape->SetBrush(wxRED_BRUSH);
+
+        wxLineShape *lineShape = (wxLineShape *)theShape;
+
+        // Yes, you can have more than 2 control points, in which case
+        // it becomes a multi-segment line.
+        lineShape->MakeLineControlPoints(2);
+        lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_END, 10.0, 0.0, "Normal arrowhead");
+      }
+      
+      doc->GetDiagram()->AddShape(theShape);
+      
+      fromShape->AddLine((wxLineShape *)theShape, toShape);
+      
+      theShape->Show(TRUE);
+
+      wxClientDC dc(theShape->GetCanvas());
+      theShape->GetCanvas()->PrepareDC(dc);
+
+      // It won't get drawn properly unless you move both
+      // connected images
+      fromShape->Move(dc, fromShape->GetX(), fromShape->GetY());
+      toShape->Move(dc, toShape->GetX(), toShape->GetY());
+      
+      shape = theShape;
+      deleteShape = FALSE;
+
+      doc->Modify(TRUE);
+      doc->UpdateAllViews();
+      break;
+    }
+    case OGLEDIT_CHANGE_BACKGROUND_COLOUR:
+    {
+      if (shape)
+      {
+        wxClientDC dc(shape->GetCanvas());
+        shape->GetCanvas()->PrepareDC(dc);
+
+        wxBrush *oldBrush = shape->GetBrush();
+        shape->SetBrush(shapeBrush);
+        shapeBrush = oldBrush;
+        shape->Draw(dc);
+        
+        doc->Modify(TRUE);
+        doc->UpdateAllViews();
+      }
+
+      break;
+    }
+    case OGLEDIT_EDIT_LABEL:
+    {
+      if (shape)
+      {
+        MyEvtHandler *myHandler = (MyEvtHandler *)shape->GetEventHandler();
+        wxString oldLabel(myHandler->label);
+        myHandler->label = shapeLabel;
+        shapeLabel = oldLabel;
+
+        wxClientDC dc(shape->GetCanvas());
+        shape->GetCanvas()->PrepareDC(dc);
+
+        shape->FormatText(dc, (char*) (const char*) myHandler->label);
+        shape->Draw(dc);
+        
+        doc->Modify(TRUE);
+        doc->UpdateAllViews();
+      }
+
+      break;
+    }
+  }
+  return TRUE;
+}
+
+bool DiagramCommand::Undo(void)
+{
+  switch (cmd)
+  {
+    case OGLEDIT_CUT:
+    {
+      if (shape)
+      {
+        doc->GetDiagram()->AddShape(shape);
+        shape->Show(TRUE);
+
+        if (shape->IsKindOf(CLASSINFO(wxLineShape)))
+        {
+          wxLineShape *lineShape = (wxLineShape *)shape;
+
+          fromShape->AddLine(lineShape, toShape);
+        }
+        if (selected)
+          shape->Select(TRUE);
+
+        deleteShape = FALSE;
+      }
+      doc->Modify(TRUE);
+      doc->UpdateAllViews();
+      break;
+    }
+    case OGLEDIT_ADD_SHAPE:
+    case OGLEDIT_ADD_LINE:
+    {
+      if (shape)
+      {
+        wxClientDC dc(shape->GetCanvas());
+        shape->GetCanvas()->PrepareDC(dc);
+
+        shape->Select(FALSE, &dc);
+        doc->GetDiagram()->RemoveShape(shape);
+        shape->Unlink();
+        deleteShape = TRUE;
+      }
+      doc->Modify(TRUE);
+      doc->UpdateAllViews();
+      break;
+    }
+    case OGLEDIT_CHANGE_BACKGROUND_COLOUR:
+    {
+      if (shape)
+      {
+        wxClientDC dc(shape->GetCanvas());
+        shape->GetCanvas()->PrepareDC(dc);
+
+        wxBrush *oldBrush = shape->GetBrush();
+        shape->SetBrush(shapeBrush);
+        shapeBrush = oldBrush;
+        shape->Draw(dc);
+        
+        doc->Modify(TRUE);
+        doc->UpdateAllViews();
+      }
+      break;
+    }
+    case OGLEDIT_EDIT_LABEL:
+    {
+      if (shape)
+      {
+        MyEvtHandler *myHandler = (MyEvtHandler *)shape->GetEventHandler();
+        wxString oldLabel(myHandler->label);
+        myHandler->label = shapeLabel;
+        shapeLabel = oldLabel;
+
+        wxClientDC dc(shape->GetCanvas());
+        shape->GetCanvas()->PrepareDC(dc);
+
+        shape->FormatText(dc, (char*) (const char*) myHandler->label);
+        shape->Draw(dc);
+        
+        doc->Modify(TRUE);
+        doc->UpdateAllViews();
+      }
+
+      break;
+    }
+  }
+  return TRUE;
+}
+
+// Remove each individual line connected to a shape by sending a command.
+void DiagramCommand::RemoveLines(wxShape *shape)
+{
+  wxNode *node = shape->GetLines().First();
+  while (node)
+  {
+    wxLineShape *line = (wxLineShape *)node->Data();
+    doc->GetCommandProcessor()->Submit(new DiagramCommand("Cut", OGLEDIT_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
+    
+    node = shape->GetLines().First();
+  }
+}
+
+/*
+ * MyEvtHandler: an event handler class for all shapes
+ */
+ 
+void MyEvtHandler::OnLeftClick(double x, double y, int keys, int attachment)
+{
+  wxClientDC dc(GetShape()->GetCanvas());
+  GetShape()->GetCanvas()->PrepareDC(dc);
+
+  if (keys == 0)
+  {
+    // Selection is a concept the library knows about
+    if (GetShape()->Selected())
+    {
+      GetShape()->Select(FALSE, &dc);
+      GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
+    }
+    else
+    {
+      // Ensure no other shape is selected, to simplify Undo/Redo code
+      bool redraw = FALSE;
+      wxNode *node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->First();
+      while (node)
+      {
+        wxShape *eachShape = (wxShape *)node->Data();
+        if (eachShape->GetParent() == NULL)
+        {
+          if (eachShape->Selected())
+          {
+            eachShape->Select(FALSE, &dc);
+            redraw = TRUE;
+          }
+        }
+        node = node->Next();
+      }
+      GetShape()->Select(TRUE, &dc);
+      if (redraw)
+        GetShape()->GetCanvas()->Redraw(dc);
+    }
+  }
+  else if (keys & KEY_CTRL)
+  {
+    // Do something for CONTROL
+  }
+  else
+  {
+    wxGetApp().frame->SetStatusText(label);
+  }
+}
+
+/*
+ * Implement connection of two shapes by right-dragging between them.
+ */
+
+void MyEvtHandler::OnBeginDragRight(double x, double y, int keys, int attachment)
+{
+  // Force attachment to be zero for now. Eventually we can deal with
+  // the actual attachment point, e.g. a rectangle side if attachment mode is on.
+  attachment = 0;
+  
+  wxClientDC dc(GetShape()->GetCanvas());
+  GetShape()->GetCanvas()->PrepareDC(dc);
+
+  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  dc.SetLogicalFunction(OGLRBLF);
+  dc.SetPen(dottedPen);
+  double xp, yp;
+  GetShape()->GetAttachmentPosition(attachment, &xp, &yp);
+  dc.DrawLine((long) xp, (long) yp, (long) x, (long) y);
+  GetShape()->GetCanvas()->CaptureMouse();
+}
+
+void MyEvtHandler::OnDragRight(bool draw, double x, double y, int keys, int attachment)
+{
+  // Force attachment to be zero for now
+  attachment = 0;
+
+  wxClientDC dc(GetShape()->GetCanvas());
+  GetShape()->GetCanvas()->PrepareDC(dc);
+
+  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  dc.SetLogicalFunction(OGLRBLF);
+  dc.SetPen(dottedPen);
+  double xp, yp;
+  GetShape()->GetAttachmentPosition(attachment, &xp, &yp);
+  dc.DrawLine((long) xp, (long) yp, (long) x, (long) y);
+}
+
+void MyEvtHandler::OnEndDragRight(double x, double y, int keys, int attachment)
+{
+  GetShape()->GetCanvas()->ReleaseMouse();
+  MyCanvas *canvas = (MyCanvas *)GetShape()->GetCanvas();
+
+  // Check if we're on an object
+  int new_attachment;
+  wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
+  
+  if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
+  {
+    canvas->view->GetDocument()->GetCommandProcessor()->Submit(
+      new DiagramCommand("wxLineShape", OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),
+      0.0, 0.0, FALSE, NULL, GetShape(), otherShape));
+  }
+}
+
+void MyEvtHandler::OnEndSize(double x, double y)
+{
+  wxClientDC dc(GetShape()->GetCanvas());
+  GetShape()->GetCanvas()->PrepareDC(dc);
+
+  GetShape()->FormatText(dc, (char*) (const char*) label);
+}
+
+/*
+ * Diagram
+ */
+ 
+bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
+{
+  wxDiagram::OnShapeSave(db, shape, expr);
+  MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
+  expr.AddAttributeValueString("label", handler->label);
+  return TRUE;
+}
+
+bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
+{
+  wxDiagram::OnShapeLoad(db, shape, expr);
+  char *label = NULL;
+  expr.AssignAttributeValue("label", &label);
+  MyEvtHandler *handler = new MyEvtHandler(&shape, &shape, wxString(label));
+  shape.SetEventHandler(handler);
+  
+  if (label)
+    delete[] label;
+  return TRUE;
+}
+
+/*
+ * New shapes
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRoundedRectangleShape, wxRectangleShape)
+
+wxRoundedRectangleShape::wxRoundedRectangleShape(double w, double h):
+ wxRectangleShape(w, h)
+{
+  // 0.3 of the smaller rectangle dimension
+  SetCornerRadius((double) -0.3);
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxDiamondShape, wxPolygonShape)
+
+wxDiamondShape::wxDiamondShape(double w, double h):
+  wxPolygonShape()
+{
+  // wxPolygonShape::SetSize relies on the shape having non-zero
+  // size initially.
+  if (w == 0.0)
+    w = 60.0;
+  if (h == 0.0)
+    h = 60.0;
+    
+  wxList *thePoints = new wxList;
+  wxRealPoint *point = new wxRealPoint(0.0, (-h/2.0));
+  thePoints->Append((wxObject*) point);
+
+  point = new wxRealPoint((w/2.0), 0.0);
+  thePoints->Append((wxObject*) point);
+
+  point = new wxRealPoint(0.0, (h/2.0));
+  thePoints->Append((wxObject*) point);
+
+  point = new wxRealPoint((-w/2.0), 0.0);
+  thePoints->Append((wxObject*) point);
+
+  Create(thePoints);
+}

contrib/samples/ogl/ogledit/doc.h

@@ -0,0 +1,182 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        doc.h
+// Purpose:     Document classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGLSAMPLE_DOC_H_
+#define _OGLSAMPLE_DOC_H_
+
+#ifdef __GNUG__
+// #pragma interface
+#endif
+
+#include <wx/docview.h>
+#include <wx/cmdproc.h>
+#include <wx/string.h>
+#include <wx/wxexpr.h>
+
+#include <wx/ogl/ogl.h>
+
+#if wxUSE_STD_IOSTREAM
+ #include <iosfwd>
+#endif
+
+/*
+ * Override a few members for this application
+ */
+ 
+class MyDiagram: public wxDiagram
+{
+ public:
+  MyDiagram(void) {}
+  bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+  bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+};
+
+/*
+ * A few new shape classes so we have a 1:1 mapping
+ * between palette symbol and unique class
+ */
+ 
+class wxRoundedRectangleShape: public wxRectangleShape
+{
+  DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape)
+ private:
+ public:
+  wxRoundedRectangleShape(double w = 0.0, double h = 0.0);
+};
+
+class wxDiamondShape: public wxPolygonShape
+{
+  DECLARE_DYNAMIC_CLASS(wxDiamondShape)
+ private:
+ public:
+  wxDiamondShape(double w = 0.0, double h = 0.0);
+};
+
+/*
+ * All shape event behaviour is routed through this handler, so we don't
+ * have to derive from each shape class. We plug this in to each shape.
+ */
+ 
+class MyEvtHandler: public wxShapeEvtHandler
+{
+ public:
+  wxString label;
+  MyEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = ""):wxShapeEvtHandler(prev, shape)
+  {
+    label = lab;
+  }
+  ~MyEvtHandler(void)
+  {
+  }
+  void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+  void OnBeginDragRight(double x, double y, int keys = 0, int attachment = 0);
+  void OnDragRight(bool draw, double x, double y, int keys = 0, int attachment = 0);
+  void OnEndDragRight(double x, double y, int keys = 0, int attachment = 0);
+  void OnEndSize(double x, double y);
+};
+
+/*
+ * A diagram document, which contains a diagram.
+ */
+ 
+class DiagramDocument: public wxDocument
+{
+  DECLARE_DYNAMIC_CLASS(DiagramDocument)
+ private:
+ public:
+  MyDiagram diagram;
+  
+  DiagramDocument(void);
+  ~DiagramDocument(void);
+
+#if wxUSE_STD_IOSTREAM
+    virtual wxSTD ostream& SaveObject(wxSTD ostream& stream);
+    virtual wxSTD istream& LoadObject(wxSTD istream& stream);
+#else
+    virtual wxOutputStream& SaveObject(wxOutputStream& stream);
+    virtual wxInputStream& LoadObject(wxInputStream& stream);
+#endif
+  
+  inline wxDiagram *GetDiagram() { return &diagram; }
+  
+  bool OnCloseDocument(void);
+};
+
+/*
+ * Most user interface commands are routed through this, to give us the
+ * Undo/Redo mechanism. If you add more commands, such as changing the shape colour,
+ * you will need to add members to 'remember' what the user applied (for 'Do') and what the
+ * previous state was (for 'Undo').
+ * You can have one member for each property to be changed. Assume we also have
+ * a pointer member wxShape *shape, which is set to the shape being changed.
+ * Let's assume we're changing the shape colour. Our member for this is shapeColour.
+ *
+ * - In 'Do':
+ *   o Set a temporary variable 'temp' to the current colour for 'shape'.
+ *   o Change the colour to the new colour.
+ *   o Set shapeColour to the _old_ colour, 'temp'.
+ * - In 'Undo':
+ *   o Set a temporary variable 'temp' to the current colour for 'shape'.
+ *   o Change the colour to shapeColour (the old colour).
+ *   o Set shapeColour to 'temp'.
+ *
+ * So, as long as we have a pointer to the shape being changed,
+ * we only need one member variable for each property.
+ *
+ * PROBLEM: when an Add shape command is redone, the 'shape' pointer changes.
+ * Assume, as here, that we keep a pointer to the old shape so we reuse it
+ * when we recreate.
+ */
+ 
+class DiagramCommand: public wxCommand
+{
+ protected:
+  DiagramDocument *doc;
+  int cmd;
+  wxShape *shape; // Pointer to the shape we're acting on
+  wxShape *fromShape;
+  wxShape *toShape;
+  wxClassInfo *shapeInfo;
+  double x;
+  double y;
+  bool selected;
+  bool deleteShape;
+
+  // Storage for property commands
+  wxBrush *shapeBrush;
+  wxPen *shapePen;
+  wxString shapeLabel;
+ public:
+  // Multi-purpose constructor for creating, deleting shapes
+  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, wxClassInfo *shapeInfo = NULL,
+     double x = 0.0, double y = 0.0, bool sel = FALSE, wxShape *theShape = NULL, wxShape *fs = NULL, wxShape *ts = NULL);
+
+  // Property-changing command constructors
+  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape);
+  DiagramCommand(char *name, int cmd, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape);
+
+  ~DiagramCommand(void);
+
+  bool Do(void);
+  bool Undo(void);
+
+  inline void SetShape(wxShape *s) { shape = s; }
+  inline wxShape *GetShape(void) { return shape; }
+  inline wxShape *GetFromShape(void) { return fromShape; }
+  inline wxShape *GetToShape(void) { return toShape; }
+  inline wxClassInfo *GetShapeInfo(void) { return shapeInfo; }
+  inline bool GetSelected(void) { return selected; }
+
+  void RemoveLines(wxShape *shape);
+};
+
+#endif
+  // _OGLSAMPLE_DOC_H_

contrib/samples/ogl/ogledit/makefile.b32

@@ -0,0 +1,17 @@
+#
+# File:		makefile.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=ogledit
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
+
+!include $(WXDIR)\src\makeprog.b32
+

contrib/samples/ogl/ogledit/makefile.bcc

@@ -0,0 +1,20 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=ogledit
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
+
+!include $(WXDIR)\src\makeprog.b32
+

contrib/samples/ogl/ogledit/makefile.dos

@@ -0,0 +1,88 @@
+#
+# File:		makefile.dos
+# Author:	Julian Smart
+# Created:	1995
+# Updated:	
+# Copyright:	(c) 1995, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds OGLEdit example (MSVC++ 1.5).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+WXDIR = $(WXWIN)
+
+!include $(WXDIR)\src\makemsc.env
+
+THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
+WXLIB = $(WXDIR)\lib\wx.lib
+OGLLIB = $(WXDIR)\lib\ogl.lib
+
+LIBS=$(WXLIB) $(OGLLIB) oldnames libw llibcew commdlg shell ddeml
+
+OBJECTS = ogledit.obj doc.obj view.obj palette.obj
+
+all:    ogledit.exe
+
+wx:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.dos
+        cd $(THISDIR)
+
+wxclean:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.dos clean
+        cd $(THISDIR)
+
+ogl:
+        cd $(OGLDIR)\src
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(THISDIR)
+
+prologio:
+        cd $(PROLOGDIR)\src
+        nmake -f makefile.dos FINAL=$(FINAL)
+        cd $(THISDIR)
+
+ogledit.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) $(OBJECTS) $(OGLLIB) ogledit.def ogledit.res
+        link $(LINKFLAGS) @<<
+$(WXDIR)\src\msw\dummy.obj $(OBJECTS),
+ogledit,
+NUL,
+$(LIBS),
+ogledit.def
+;
+<<
+        rc -30 -K ogledit.res
+
+ogledit.obj:      ogledit.h ogledit.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+view.obj:      view.h view.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+doc.obj:      doc.h doc.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+palette.obj:      view.h doc.h ogledit.h palette.$(SRCSUFF) $(DUMMYOBJ)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+ogledit.res :      ogledit.rc $(WXDIR)\include\msw\wx.rc
+    rc -r /dFAFA_LIB /i$(WXDIR)\include /i$(WXDIR)\contrib\include ogledit
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.sbr
+        -erase *.pdb

contrib/samples/ogl/ogledit/makefile.g95

@@ -0,0 +1,18 @@
+#
+# File:         makefile.g95
+# Author:       Julian Smart
+# Created:      1999
+# Updated:
+# Copyright:    (c) Julian Smart, 1999
+#
+# Makefile for wxWindows sample (Cygwin/Mingw32).
+
+WXDIR = ../../../..
+
+TARGET=ogledit
+# EXTRACPPFLAGS=-I../../src
+EXTRALIBS=-logl
+OBJECTS = $(TARGET).o doc.o view.o palette.o
+
+include $(WXDIR)/src/makeprog.g95
+

contrib/samples/ogl/ogledit/makefile.unx

@@ -0,0 +1,39 @@
+#
+# File:		Makefile
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:	(c) 2000 Julian Smart
+#
+# Makefile for OGL demo (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CPP = gcc -g
+CC = gcc
+WXCONFIG=../../../../wx-config
+WXINCLUDE=-I../../../../include -I../../../include
+WXLIB=-L../../../../lib -L../../../src/ogl
+
+OBJECTS=ogledit.o palette.o doc.o view.o
+
+ogledit: $(OBJECTS)
+	$(CPP) -o ogledit $(OBJECTS) `$(WXCONFIG) --libs` $(WXLIB) -logl
+
+ogledit.o: ogledit.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c ogledit.cpp
+
+palette.o: palette.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c palette.cpp
+
+doc.o: doc.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c doc.cpp
+
+view.o: view.cpp
+	$(CPP) `$(WXCONFIG) --cflags` -I../../src $(WXINCLUDE) -c view.cpp
+
+clean: 
+	rm -f *.o ogledit

contrib/samples/ogl/ogledit/makefile.vc

@@ -0,0 +1,29 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds ogledit example (MS VC++).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+PROGRAM=ogledit
+FINAL=0
+
+!if "$(FINAL)" == "0"
+EXTRALIBS=$(WXDIR)\lib\ogld.lib
+!else
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+!endif
+
+OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
+
+!include $(WXDIR)\src\makeprog.vc
+

contrib/samples/ogl/ogledit/makefile.vms

@@ -0,0 +1,44 @@
+#************************************************************************
+# Makefile for DOCVIEW under VMS
+# by Stefan Hammes
+# (incomplete) update history:
+# 09.06.95
+#************************************************************************
+
+#************************************************************************
+# Definition section
+# (cave: definitions and includes must begin with ',')
+#************************************************************************
+
+APPOPTS = 
+APPDEFS = 
+APPINCS = 
+
+#************************************************************************
+# Module section
+#************************************************************************
+
+# Name of main module
+MAIN = docview
+
+# Object modules of the application.
+OBJS = docview.obj view.obj doc.obj
+OBJLIST =docview.obj,view.obj,doc.obj
+
+.include [--.src]makevms.env
+
+# main dependency
+$(MAIN).exe : $(OBJS)
+    $(LINK) $(LINKFLAGS) /exec=$(MAIN).exe $(OBJLIST),$(WXLIB)/lib,$(OPTSFILE)/option
+    - purge *.exe
+
+#************************************************************************
+# Header file depedencies following
+#************************************************************************
+
+docview.$(OBJSUFF) :        docview.$(SRCSUFF) docview.h doc.h view.h
+
+doc.$(OBJSUFF) :        doc.$(SRCSUFF) doc.h
+
+view.$(OBJSUFF) :        view.$(SRCSUFF) view.h
+

contrib/samples/ogl/ogledit/makefile.wat

@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
+# 8 Nov 1994
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = ogledit
+EXTRALIBS = $(WXDIR)\lib\ogl.lib
+OBJECTS = $(PROGRAM).obj doc.obj view.obj palette.obj
+
+!include $(WXDIR)\src\makeprog.wat
+

contrib/samples/ogl/ogledit/ogl.xpm

@@ -0,0 +1,45 @@
+/* XPM */
+static char * ogl_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 7 1",
+/* colors */
+" 	s None	c None",
+".	c #000000",
+"+	c #000080",
+"@	c #ff0000",
+"#	c #00ff00",
+"$	c #00ffff",
+"%	c #ffffff",
+/* pixels */
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%............%%%%%%........%%%%%",
+"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
+"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
+"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
+"%.@@@@@@@@@@.+++.$$$$$$$$$$$$.%%",
+"%.@@@@@@@@@@.%%%.$$$$$$$$$$$$.%%",
+"%.@@@@@@@@@@.%%%%..$$$$$$$$..%%%",
+"%............%%%%%.........%%%%%",
+"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%++%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%+.%%%%%%%%%%%%%%++%%%%%%%%",
+"%%%%%%.+.%%%%%%%%%%%%.++..%%%%%%",
+"%%%%%.+++.%%%%%%%%%..#####..%%%%",
+"%%%%.+++++.%%%%%%%.#########.%%%",
+"%%%.+++++++.%%%%%%.#########.%%%",
+"%%.+++++++++.%%%%.###########.%%",
+"%.+++++++++++.++++###########.%%",
+"%%.+++++++++.+++++###########.%%",
+"%%%.+++++++.%%%%%%.#########.%%%",
+"%%%%.+++++.%%%%%%%.#########.%%%",
+"%%%%%.+++.%%%%%%%%%..#####..%%%%",
+"%%%%%%.+.%%%%%%%%%%%%.....%%%%%%",
+"%%%%%%%.%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"};

contrib/samples/ogl/ogledit/ogledit.cpp

@@ -0,0 +1,213 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ogledit.cpp
+// Purpose:     OGLEdit sample app
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+// #pragma implementation
+#endif
+
+// For compilers that support precompilation, includes "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 wx_setup.h!
+#endif
+
+#include "ogledit.h"
+#include "palette.h"
+#include "doc.h"
+#include "view.h"
+
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#include "ogl.xpm"
+#endif
+
+// A macro needed for some compilers (AIX) that need 'main' to be defined
+// in the application itself.
+IMPLEMENT_APP(MyApp)
+
+MyApp::MyApp(void)
+{
+  frame = NULL;
+  myDocManager= NULL;
+}
+
+// The `main program' equivalent, creating the windows and returning the
+// main frame
+bool MyApp::OnInit(void)
+{
+  wxOGLInitialize();
+  
+  //// Create a document manager
+  myDocManager = new wxDocManager;
+
+  //// Create a template relating drawing documents to their views
+  (void) new wxDocTemplate(myDocManager, "Diagram", "*.dia", "", "dia", "Diagram Doc", "Diagram View",
+          CLASSINFO(DiagramDocument), CLASSINFO(DiagramView));
+
+  // If we've only got one window, we only get to edit
+  // one document at a time.
+  myDocManager->SetMaxDocsOpen(1);
+
+  //// Create the main frame window
+  frame = new MyFrame(myDocManager, NULL, "OGLEdit Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
+
+  //// Give it an icon
+  frame->SetIcon(wxICON(ogl));
+
+  //// Make a menubar
+  wxMenu *file_menu = new wxMenu;
+  wxMenu *edit_menu = NULL;
+
+  file_menu->Append(wxID_NEW, "&New...");
+  file_menu->Append(wxID_OPEN, "&Open...");
+
+  file_menu->Append(wxID_CLOSE, "&Close");
+  file_menu->Append(wxID_SAVE, "&Save");
+  file_menu->Append(wxID_SAVEAS, "Save &As...");
+  file_menu->AppendSeparator();
+  file_menu->Append(wxID_PRINT, "&Print...");
+  file_menu->Append(wxID_PRINT_SETUP, "Print &Setup...");
+  file_menu->Append(wxID_PREVIEW, "Print Pre&view");
+
+  edit_menu = new wxMenu;
+  edit_menu->Append(wxID_UNDO, "&Undo");
+  edit_menu->Append(wxID_REDO, "&Redo");
+  edit_menu->AppendSeparator();
+  edit_menu->Append(OGLEDIT_CUT, "&Cut");
+  edit_menu->AppendSeparator();
+  edit_menu->Append(OGLEDIT_CHANGE_BACKGROUND_COLOUR, "Change &background colour");
+  edit_menu->Append(OGLEDIT_EDIT_LABEL, "Edit &label");
+
+  frame->editMenu = edit_menu;
+  
+  file_menu->AppendSeparator();
+  file_menu->Append(wxID_EXIT, "E&xit");
+
+  // A nice touch: a history of files visited. Use this menu.
+  myDocManager->FileHistoryUseMenu(file_menu);
+
+  wxMenu *help_menu = new wxMenu;
+  help_menu->Append(OGLEDIT_ABOUT, "&About");
+
+  wxMenuBar *menu_bar = new wxMenuBar;
+
+  menu_bar->Append(file_menu, "&File");
+  if (edit_menu)
+    menu_bar->Append(edit_menu, "&Edit");
+  menu_bar->Append(help_menu, "&Help");
+
+  frame->canvas = frame->CreateCanvas(NULL, frame);
+  frame->palette = wxGetApp().CreatePalette(frame);
+  myDocManager->CreateDocument("", wxDOC_NEW);
+
+  //// Associate the menu bar with the frame
+  frame->SetMenuBar(menu_bar);
+
+  frame->CreateStatusBar(1);
+
+  frame->Centre(wxBOTH);
+  frame->Show(TRUE);
+
+  return TRUE;
+}
+
+int MyApp::OnExit(void)
+{
+    wxOGLCleanUp();
+    delete myDocManager;
+    return 0;
+}
+
+/*
+ * This is the top-level window of the application.
+ */
+
+IMPLEMENT_CLASS(MyFrame, wxDocParentFrame)
+
+BEGIN_EVENT_TABLE(MyFrame, wxDocParentFrame)
+    EVT_MENU(OGLEDIT_ABOUT, MyFrame::OnAbout)
+    EVT_SIZE(MyFrame::OnSize)
+    EVT_CLOSE(MyFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+MyFrame::MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
+    const wxPoint& pos, const wxSize& size, long type):
+  wxDocParentFrame(manager, frame, -1, title, pos, size, type)
+{
+  canvas = NULL;
+  palette = NULL;
+  editMenu = NULL;
+}
+
+void MyFrame::OnSize(wxSizeEvent& event)
+{
+  if (canvas && palette)
+  {
+    int cw, ch;
+    GetClientSize(&cw, &ch);
+    int paletteX = 0;
+    int paletteY = 0;
+    int paletteW = 30;
+    int paletteH = ch;
+    int canvasX = paletteX + paletteW;
+    int canvasY = 0;
+    int canvasW = cw - paletteW;
+    int canvasH = ch;
+    
+    palette->SetSize(paletteX, paletteY, paletteW, paletteH);
+    canvas->SetSize(canvasX, canvasY, canvasW, canvasH);
+  }
+}
+
+void MyFrame::OnCloseWindow(wxCloseEvent& event)
+{
+  wxDocParentFrame::OnCloseWindow(event);
+  if (!event.GetVeto())
+  {
+    wxOGLCleanUp();
+  }
+}
+
+// Intercept menu commands
+void MyFrame::OnAbout(wxCommandEvent& event)
+{
+      (void)wxMessageBox("OGLEdit Demo\nTo draw a shape, select a shape on the toolbar and left-click on the canvas.\nTo draw a line, right-drag between shapes.\nFor further details, see the OGL manual.\n (c) Julian Smart 1996", "About OGLEdit");
+}
+
+// Creates a canvas. Called by OnInit as a child of the main window
+MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
+{
+  int width, height;
+  parent->GetClientSize(&width, &height);
+
+  // Non-retained canvas
+  MyCanvas *canvas = new MyCanvas(view, parent, -1, wxPoint(0, 0), wxSize(width, height), 0);
+  canvas->SetCursor(wxCursor(wxCURSOR_HAND));
+
+  // Give it scrollbars
+  canvas->SetScrollbars(20, 20, 50, 50);
+
+  return canvas;
+}
+
+MyFrame *GetMainFrame(void)
+{
+  return wxGetApp().frame;
+}
+

contrib/samples/ogl/ogledit/ogledit.def

@@ -0,0 +1,8 @@
+NAME         OGLEdit
+DESCRIPTION  'OGL Editor Sample'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     1024
+STACKSIZE    8192

contrib/samples/ogl/ogledit/ogledit.h

@@ -0,0 +1,77 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ogledit.h
+// Purpose:     OGL sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+// #pragma interface
+#endif
+
+#ifndef _OGLSAMPLE_OGLEDIT_H_
+#define _OGLSAMPLE_OGLEDIT_H_
+
+#include <wx/docview.h>
+
+// Define a new application
+class MyFrame;
+class EditorToolPalette;
+class MyApp: public wxApp
+{
+ public:
+  MyFrame *frame;
+  wxDocManager* myDocManager;
+
+  MyApp(void);
+  bool OnInit(void);
+  int OnExit(void);
+
+  // Palette stuff
+  EditorToolPalette *CreatePalette(wxFrame *parent);
+};
+
+DECLARE_APP(MyApp)
+
+// Define a new frame
+class MyCanvas;
+class MyFrame: public wxDocParentFrame
+{
+  DECLARE_CLASS(MyFrame)
+ public:
+  wxMenu *editMenu;
+  
+  MyCanvas *canvas;
+  EditorToolPalette *palette;
+  
+  MyFrame(wxDocManager *manager, wxFrame *parent, const wxString& title,
+    const wxPoint& pos = wxDefaultPosition,
+    const wxSize& size = wxDefaultSize,
+    long style = wxDEFAULT_FRAME_STYLE);
+
+  MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  void OnSize(wxSizeEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
+  void OnAbout(wxCommandEvent& event);
+
+DECLARE_EVENT_TABLE()
+};
+
+extern MyFrame *GetMainFrame(void);
+
+// Menu/undo/redo commands
+
+#define OGLEDIT_CUT                         1
+#define OGLEDIT_ADD_SHAPE                   2
+#define OGLEDIT_ADD_LINE                    3
+#define OGLEDIT_EDIT_LABEL                  4
+#define OGLEDIT_CHANGE_BACKGROUND_COLOUR    5
+
+#define OGLEDIT_ABOUT   100
+
+#endif
+    // _OGLSAMPLE_OGLEDIT_H_

contrib/samples/ogl/ogledit/ogledit.rc

@@ -0,0 +1,10 @@
+ogl             ICON    ogl.ico
+
+TOOL1           BITMAP "bitmaps/tool1.bmp"
+TOOL2           BITMAP "bitmaps/tool2.bmp"
+TOOL3           BITMAP "bitmaps/tool3.bmp"
+TOOL4           BITMAP "bitmaps/tool4.bmp"
+ARROWTOOL       BITMAP "bitmaps/arrow.bmp"
+
+#include "wx/msw/wx.rc"
+

contrib/samples/ogl/ogledit/palette.cpp

@@ -0,0 +1,121 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        palette.cpp
+// Purpose:     OGLEdit palette
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+// #pragma implementation
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <wx/toolbar.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "doc.h"
+#include "view.h"
+#include "ogledit.h"
+#include "palette.h"
+
+// Include pixmaps
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#include "bitmaps/arrow.xpm"
+#include "bitmaps/tool1.xpm"
+#include "bitmaps/tool2.xpm"
+#include "bitmaps/tool3.xpm"
+#include "bitmaps/tool4.xpm"
+#endif
+
+/*
+ * Object editor tool palette
+ *
+ */
+
+EditorToolPalette::EditorToolPalette(wxWindow* parent, const wxPoint& pos, const wxSize& size,
+            long style):
+  TOOLPALETTECLASS(parent, -1, pos, size, style)
+{
+  currentlySelected = -1;
+
+#if 1 // ndef __WXGTK__
+  SetMaxRowsCols(1000, 1);
+#endif
+}
+
+bool EditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
+{
+  // BEGIN mutual exclusivity code
+  if (toggled && (currentlySelected != -1) && (toolIndex != currentlySelected))
+    ToggleTool(currentlySelected, FALSE);
+
+  if (toggled)
+    currentlySelected = toolIndex;
+  else if (currentlySelected == toolIndex)
+    currentlySelected = -1;
+  //  END mutual exclusivity code
+
+  return TRUE;
+}
+
+void EditorToolPalette::OnMouseEnter(int toolIndex)
+{
+}
+
+void EditorToolPalette::SetSize(int x, int y, int width, int height, int sizeFlags)
+{
+  TOOLPALETTECLASS::SetSize(x, y, width, height, sizeFlags);
+}
+
+EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
+{
+  // Load palette bitmaps
+#ifdef __WXMSW__
+  wxBitmap PaletteTool1("TOOL1");
+  wxBitmap PaletteTool2("TOOL2");
+  wxBitmap PaletteTool3("TOOL3");
+  wxBitmap PaletteTool4("TOOL4");
+  wxBitmap PaletteArrow("ARROWTOOL");
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+  wxBitmap PaletteTool1(tool1_xpm);
+  wxBitmap PaletteTool2(tool2_xpm);
+  wxBitmap PaletteTool3(tool3_xpm);
+  wxBitmap PaletteTool4(tool4_xpm);
+  wxBitmap PaletteArrow(arrow_xpm);
+#endif
+
+  EditorToolPalette *palette = new EditorToolPalette(parent, wxPoint(0, 0), wxSize(-1, -1), wxTB_HORIZONTAL);
+
+  palette->SetMargins(2, 2);
+  palette->SetToolBitmapSize(wxSize(22, 22));
+
+  palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, "Pointer");
+  palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 1");
+  palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 2");
+  palette->AddTool(PALETTE_TOOL3, PaletteTool3, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 3");
+  palette->AddTool(PALETTE_TOOL4, PaletteTool4, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 4");
+
+  palette->Realize();
+
+  palette->ToggleTool(PALETTE_ARROW, TRUE);
+  palette->currentlySelected = PALETTE_ARROW;
+  return palette;
+}
+

contrib/samples/ogl/ogledit/palette.h

@@ -0,0 +1,66 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        palette.h
+// Purpose:     OGL sample palette
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGLSAMPLE_PALETTE_H_
+#define _OGLSAMPLE_PALETTE_H_
+
+#ifdef __GNUG__
+// #pragma interface
+#endif
+
+#include <wx/wx.h>
+#include <wx/string.h>
+#if 0 // def __WXGTK__
+#include <wx/toolbar.h>
+#else
+#include <wx/tbarsmpl.h>
+#endif
+
+/*
+ * Object editor tool palette
+ *
+ */
+
+// TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
+// Needs to have a parent window...
+// So use a simple toolbar at present.
+#if 0 // def __WXGTK__
+#define TOOLPALETTECLASS    wxToolBar
+#else
+#define TOOLPALETTECLASS    wxToolBarSimple
+#endif
+
+class EditorToolPalette: public TOOLPALETTECLASS
+{
+ public:
+  int currentlySelected;
+
+  EditorToolPalette(wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
+    const wxSize& size = wxDefaultSize,
+    long style = wxTB_VERTICAL);
+  bool OnLeftClick(int toolIndex, bool toggled);
+  void OnMouseEnter(int toolIndex);
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+};
+
+#define PALETTE_TOOL1           1
+#define PALETTE_TOOL2           2
+#define PALETTE_TOOL3           3
+#define PALETTE_TOOL4           4
+#define PALETTE_TOOL5           5
+#define PALETTE_TOOL6           6
+#define PALETTE_TOOL7           7
+#define PALETTE_TOOL8           8
+#define PALETTE_TOOL9           9
+#define PALETTE_ARROW           10
+
+#endif
+    // _OGLSAMPLE_PALETTE_H_

contrib/samples/ogl/ogledit/view.cpp

@@ -0,0 +1,338 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        view.cpp
+// Purpose:     Implements view functionality in OGLEdit
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+// #pragma implementation
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <wx/colordlg.h>
+
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#endif
+
+#include "ogledit.h"
+#include "doc.h"
+#include "view.h"
+#include "palette.h"
+
+IMPLEMENT_DYNAMIC_CLASS(DiagramView, wxView)
+
+BEGIN_EVENT_TABLE(DiagramView, wxView)
+    EVT_MENU(OGLEDIT_CUT, DiagramView::OnCut)
+    EVT_MENU(OGLEDIT_CHANGE_BACKGROUND_COLOUR, DiagramView::OnChangeBackgroundColour)
+    EVT_MENU(OGLEDIT_EDIT_LABEL, DiagramView::OnEditLabel)
+END_EVENT_TABLE()
+
+// What to do when a view is created. Creates actual
+// windows for displaying the view.
+bool DiagramView::OnCreate(wxDocument *doc, long flags)
+{
+  frame = GetMainFrame();
+  canvas = GetMainFrame()->canvas;
+  canvas->view = this;
+
+  SetFrame(frame);
+  Activate(TRUE);
+
+  // Initialize the edit menu Undo and Redo items
+  doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
+  doc->GetCommandProcessor()->Initialize();
+
+  wxShapeCanvas *shapeCanvas = (wxShapeCanvas *)canvas;
+  DiagramDocument *diagramDoc = (DiagramDocument *)doc;
+  shapeCanvas->SetDiagram(diagramDoc->GetDiagram());
+  diagramDoc->GetDiagram()->SetCanvas(shapeCanvas);
+
+  return TRUE;
+}
+
+#define CENTER  FALSE // Place the drawing to the center of the page
+
+
+// Sneakily gets used for default print/preview
+// as well as drawing on the screen. 
+void DiagramView::OnDraw(wxDC *dc) 
+{ 
+
+  /* You might use THIS code if you were scaling 
+   * graphics of known size to fit on the page. 
+   */ 
+  int w, h; 
+
+  // We need to adjust for the graphic size, a formula will be added 
+  float maxX = 900; 
+  float maxY = 700; 
+  // A better way of find the maxium values would be to search through 
+  // the linked list 
+
+  // Let's have at least 10 device units margin 
+  float marginX = 10; 
+  float marginY = 10; 
+
+  // Add the margin to the graphic size 
+  maxX += (2 * marginX); 
+  maxY += (2 * marginY); 
+
+  // Get the size of the DC in pixels 
+  dc->GetSize (&w, &h); 
+
+  // Calculate a suitable scaling factor 
+  float scaleX = (float) (w / maxX); 
+  float scaleY = (float) (h / maxY); 
+
+  // Use x or y scaling factor, whichever fits on the DC 
+  float actualScale = wxMin (scaleX, scaleY); 
+
+  float posX, posY; 
+  // Calculate the position on the DC for centring the graphic 
+  if (CENTER == TRUE) // center the drawing 
+    { 
+      posX = (float) ((w - (200 * actualScale)) / 2.0); 
+      posY = (float) ((h - (200 * actualScale)) / 2.0); 
+    } 
+  else    // Use defined presets 
+    { 
+      posX = 10; 
+      posY = 35; 
+    } 
+  
+
+  // Set the scale and origin 
+  dc->SetUserScale (actualScale, actualScale); 
+  dc->SetDeviceOrigin ((long) posX, (long) posY); 
+
+  // This part was added to preform the print preview and printing functions 
+
+  dc->BeginDrawing(); // Allows optimization of drawing code under MS Windows. 
+  wxDiagram *diagram_p=((DiagramDocument*)GetDocument())->GetDiagram();  // Get the current diagram
+  if (diagram_p->GetShapeList()) 
+  { 
+    wxCursor *old_cursor = NULL; 
+    wxNode *current = diagram_p->GetShapeList()->First();
+
+    while (current) // Loop through the entire list of shapes 
+    {
+        wxShape *object = (wxShape *)current->Data();
+        if (!object->GetParent())
+        {
+            object->Draw(* dc); // Draw the shape onto our printing dc
+        }
+        current = current->Next();  // Procede to the next shape in the list
+    }
+  }
+  dc->EndDrawing(); // Allows optimization of drawing code under MS Windows. 
+}
+
+void DiagramView::OnUpdate(wxView *sender, wxObject *hint)
+{
+  if (canvas)
+    canvas->Refresh();
+}
+
+// Clean up windows used for displaying the view.
+bool DiagramView::OnClose(bool deleteWindow)
+{
+  if (!GetDocument()->Close())
+    return FALSE;
+
+  DiagramDocument *diagramDoc = (DiagramDocument *)GetDocument();
+  diagramDoc->GetDiagram()->SetCanvas(NULL);
+
+  canvas->Clear();
+  canvas->SetDiagram(NULL);
+  canvas->view = NULL;
+  canvas = NULL;
+
+  wxString s = wxTheApp->GetAppName();
+  if (frame)
+    frame->SetTitle(s);
+
+  SetFrame(NULL);
+
+  Activate(FALSE);
+  
+  return TRUE;
+}
+
+wxShape *DiagramView::FindSelectedShape(void)
+{
+  DiagramDocument *doc = (DiagramDocument *)GetDocument();
+  wxShape *theShape = NULL;
+  wxNode *node = doc->GetDiagram()->GetShapeList()->First();
+  while (node)
+  {
+    wxShape *eachShape = (wxShape *)node->Data();
+    if ((eachShape->GetParent() == NULL) && eachShape->Selected())
+    {
+      theShape = eachShape;
+      node = NULL;
+    }
+    else node = node->Next();
+  }
+  return theShape;
+}
+
+void DiagramView::OnCut(wxCommandEvent& event)
+{
+  DiagramDocument *doc = (DiagramDocument *)GetDocument();
+
+  wxShape *theShape = FindSelectedShape();
+  if (theShape)
+    doc->GetCommandProcessor()->Submit(new DiagramCommand("Cut", OGLEDIT_CUT, doc, NULL, 0.0, 0.0, TRUE, theShape));
+}
+
+void DiagramView::OnChangeBackgroundColour(wxCommandEvent& event)
+{
+      DiagramDocument *doc = (DiagramDocument *)GetDocument();
+
+      wxShape *theShape = FindSelectedShape();
+      if (theShape)
+      {
+        wxColourData data;
+        data.SetChooseFull(TRUE);
+        data.SetColour(theShape->GetBrush()->GetColour());
+
+        wxColourDialog *dialog = new wxColourDialog(frame, &data);
+        wxBrush *theBrush = NULL;
+        if (dialog->ShowModal() == wxID_OK)
+        {
+          wxColourData retData = dialog->GetColourData();
+          wxColour col = retData.GetColour();
+          theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
+        }
+        dialog->Close();
+
+        if (theBrush)
+          doc->GetCommandProcessor()->Submit(new DiagramCommand("Change colour", OGLEDIT_CHANGE_BACKGROUND_COLOUR, doc,
+            theBrush, theShape));
+      }
+}
+
+void DiagramView::OnEditLabel(wxCommandEvent& event)
+{
+      wxShape *theShape = FindSelectedShape();
+      if (theShape)
+      {
+        wxString newLabel = wxGetTextFromUser("Enter new label", "Shape Label", ((MyEvtHandler *)theShape->GetEventHandler())->label);
+        GetDocument()->GetCommandProcessor()->Submit(new DiagramCommand("Edit label", OGLEDIT_EDIT_LABEL, (DiagramDocument*) GetDocument(), newLabel, theShape));
+      }
+}
+
+
+/*
+ * Window implementations
+ */
+
+BEGIN_EVENT_TABLE(MyCanvas, wxShapeCanvas)
+    EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
+    EVT_PAINT(MyCanvas::OnPaint)
+END_EVENT_TABLE()
+
+// Define a constructor for my canvas
+MyCanvas::MyCanvas(wxView *v, wxWindow *parent, wxWindowID id, const wxPoint& pos,
+    const wxSize& size, long style):
+ wxShapeCanvas(parent, id, pos, size, style)
+{
+  SetBackgroundColour(*wxWHITE);
+  view = v;
+}
+
+MyCanvas::~MyCanvas(void)
+{
+}
+
+void MyCanvas::OnLeftClick(double x, double y, int keys)
+{
+  EditorToolPalette *palette = wxGetApp().frame->palette;
+  wxClassInfo *info = NULL;
+  switch (palette->currentlySelected)
+  {
+    case PALETTE_TOOL1:
+    {
+      info = CLASSINFO(wxRectangleShape);
+      break;
+    }
+    case PALETTE_TOOL2:
+    {
+      info = CLASSINFO(wxRoundedRectangleShape);
+      break;
+    }
+    case PALETTE_TOOL3:
+    {
+      info = CLASSINFO(wxEllipseShape);
+      break;
+    }
+    case PALETTE_TOOL4:
+    {
+      info = CLASSINFO(wxDiamondShape);
+      break;
+    }
+    default:
+      break;
+  }
+  if (info)
+  {
+    view->GetDocument()->GetCommandProcessor()->Submit(
+      new DiagramCommand((char*) info->GetClassName(), OGLEDIT_ADD_SHAPE, (DiagramDocument *)view->GetDocument(), info,
+         x, y));
+  }
+}
+
+void MyCanvas::OnRightClick(double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnDragLeft(bool draw, double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnBeginDragLeft(double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnEndDragLeft(double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnDragRight(bool draw, double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnBeginDragRight(double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnEndDragRight(double x, double y, int keys)
+{
+}
+
+void MyCanvas::OnMouseEvent(wxMouseEvent& event)
+{
+    wxShapeCanvas::OnMouseEvent(event);
+}
+
+void MyCanvas::OnPaint(wxPaintEvent& event)
+{
+//  if (GetDiagram())
+    wxShapeCanvas::OnPaint(event);
+}

contrib/samples/ogl/ogledit/view.h

@@ -0,0 +1,79 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        view.h
+// Purpose:     View-related classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     12/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _OGLSAMPLE_VIEW_H_
+#define _OGLSAMPLE_VIEW_H_
+
+#ifdef __GNUG__
+// #pragma interface "view.h"
+#endif
+
+#include "doc.h"
+#include <wx/ogl/ogl.h>
+
+class MyCanvas: public wxShapeCanvas
+{
+// DECLARE_DYNAMIC_CLASS(wxShapeCanvas)
+ protected:
+ public:
+  wxView *view;
+
+  MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = -1,
+            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+            long style = wxRETAINED);
+  ~MyCanvas(void);
+
+  void OnMouseEvent(wxMouseEvent& event);
+  void OnPaint(wxPaintEvent& event);
+
+  virtual void OnLeftClick(double x, double y, int keys = 0);
+  virtual void OnRightClick(double x, double y, int keys = 0);
+
+  virtual void OnDragLeft(bool draw, double x, double y, int keys=0); // Erase if draw false
+  virtual void OnBeginDragLeft(double x, double y, int keys=0);
+  virtual void OnEndDragLeft(double x, double y, int keys=0);
+
+  virtual void OnDragRight(bool draw, double x, double y, int keys=0); // Erase if draw false
+  virtual void OnBeginDragRight(double x, double y, int keys=0);
+  virtual void OnEndDragRight(double x, double y, int keys=0);
+
+DECLARE_EVENT_TABLE()
+};
+
+class DiagramView: public wxView
+{
+  DECLARE_DYNAMIC_CLASS(DiagramView)
+ private:
+ public:
+  wxFrame *frame;
+  MyCanvas *canvas;
+  
+  DiagramView(void) { canvas = NULL; frame = NULL; };
+  ~DiagramView(void) {};
+
+  bool OnCreate(wxDocument *doc, long flags);
+  void OnDraw(wxDC *dc);
+  void OnUpdate(wxView *sender, wxObject *hint = NULL);
+  bool OnClose(bool deleteWindow = TRUE);
+
+  wxShape *FindSelectedShape(void);
+
+//  void OnMenuCommand(int cmd);
+
+  void OnCut(wxCommandEvent& event);
+  void OnChangeBackgroundColour(wxCommandEvent& event);
+  void OnEditLabel(wxCommandEvent& event);
+
+DECLARE_EVENT_TABLE()
+};
+
+#endif
+    // _OGLSAMPLE_VIEW_H_

contrib/samples/ogl/studio/Makefile.in

@@ -0,0 +1,19 @@
+# Makefile for OGL Studio.
+# $Id$
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../../..
+program_dir = contrib/samples/ogl/studio
+
+PROGRAM=studio
+
+DATAFILES=studio_resources.wxr
+
+OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
+  mainfrm.o project.o dialogs.o csprint.o
+
+APPEXTRALIBS=$(top_builddir)/lib/libogl.@WX_TARGET_LIBRARY_TYPE@
+APPEXTRADEFS=-I$(top_srcdir)/contrib/include -I$(top_srcdir)/$(program_dir)/bitmaps
+
+include $(top_builddir)/src/makeprog.env
+

contrib/samples/ogl/studio/StudioVC.dsp

@@ -0,0 +1,391 @@
+# Microsoft Developer Studio Project File - Name="StudioVC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=StudioVC - 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 "StudioVC.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 "StudioVC.mak" CFG="StudioVC - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "StudioVC - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "StudioVC - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "StudioVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
+!MESSAGE "StudioVC - Win32 Release DLL" (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)" == "StudioVC - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DebugDLL"
+# PROP BASE Intermediate_Dir "DebugDLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugDLL"
+# PROP Intermediate_Dir "DebugDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw232d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ReleaseDLL"
+# PROP BASE Intermediate_Dir "ReleaseDLL"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDLL"
+# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx232.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/studio.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "StudioVC - Win32 Release"
+# Name "StudioVC - Win32 Debug"
+# Name "StudioVC - Win32 Debug DLL"
+# Name "StudioVC - Win32 Release DLL"
+# Begin Source File
+
+SOURCE=.\cspalette.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\cspalette.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\csprint.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\dialogs.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\dialogs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\doc.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\doc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mainfrm.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\mainfrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\project.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\project.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\shapes.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\shapes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\studio.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\studio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\studio.rc
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809 /i "../../../../include" /i "../../../../contrib/include"
+# End Source File
+# Begin Source File
+
+SOURCE=.\symbols.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\symbols.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.cpp
+
+!IF  "$(CFG)" == "StudioVC - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Debug DLL"
+
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.h
+# End Source File
+# End Target
+# End Project

contrib/samples/ogl/studio/StudioVC.dsw

@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "StudioVC"=.\StudioVC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

contrib/samples/ogl/studio/bitmaps/alignb.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignb_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"        ........",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+" .....  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .....  ........",
+"                ",
+"                "
+};

contrib/samples/ogl/studio/bitmaps/alignl.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignl_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"   ......       ",
+"   .XXXX.       ",
+"   .XXXX.       ",
+"   .XXXX.       ",
+"   ......       ",
+"                ",
+"                ",
+"   ...........  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};

contrib/samples/ogl/studio/bitmaps/alignr.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignr_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"        ......  ",
+"        .XXXX.  ",
+"        .XXXX.  ",
+"        .XXXX.  ",
+"        ......  ",
+"                ",
+"                ",
+"   ...........  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};

contrib/samples/ogl/studio/bitmaps/alignt.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignt_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+" .....  ........",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .....  .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        ........",
+"                ",
+"                "
+};

contrib/samples/ogl/studio/bitmaps/arrow.xpm

@@ -0,0 +1,31 @@
+/* XPM */
+static char *arrow_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    22    22        2            1",
+/* colors */
+". c #000000",
+"# c #c0c0c0",
+/* pixels */
+"######################",
+"######################",
+"######################",
+"######################",
+"######################",
+"#######.##############",
+"#######..#############",
+"#######...############",
+"#######....###########",
+"#######.....##########",
+"#######......#########",
+"#######.......########",
+"#######........#######",
+"#######.....##########",
+"#######..#..##########",
+"#######.###..#########",
+"###########..#########",
+"############..########",
+"############..########",
+"######################",
+"######################",
+"######################"
+};

contrib/samples/ogl/studio/bitmaps/copy.xpm

@@ -0,0 +1,25 @@
+/* XPM */
+static char *copy_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"  c None",
+". c Black",
+"X c Gray100",
+"o c #000080",
+/* pixels */
+"                ",
+" ......         ",
+" .XXXX..        ",
+" .XXXX.X.       ",
+" .X..X.oooooo   ",
+" .XXXXXoXXXXoo  ",
+" .X....oXXXXoXo ",
+" .XXXXXoX..Xoooo",
+" .X....oXXXXXXXo",
+" .XXXXXoX.....Xo",
+" ......oXXXXXXXo",
+"       oX.....Xo",
+"       oXXXXXXXo",
+"       ooooooooo",
+"                "
+};

contrib/samples/ogl/studio/bitmaps/copysize.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *copysize_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+".......... ...  ",
+".XXXXXXXX.   .  ",
+".XXXXXXXX.   .  ",
+".XXXXXXXX. .....",
+".XXXXXXXX.  ... ",
+"..........   .  ",
+"                ",
+"    . . . . . . ",
+"                ",
+"    .  ...... . ",
+"       .XXXX.   ",
+"    .  ...... . ",
+"                ",
+"    . . . . . . "
+};

contrib/samples/ogl/studio/bitmaps/cut.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *cut_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c #000080",
+/* pixels */
+"                ",
+"     .   .      ",
+"     .   .      ",
+"     .   .      ",
+"     .. ..      ",
+"      . .       ",
+"      ...       ",
+"       .        ",
+"      X.X       ",
+"      X XXX     ",
+"    XXX X  X    ",
+"   X  X X  X    ",
+"   X  X X  X    ",
+"   X  X  XX     ",
+"    XX          "
+};

contrib/samples/ogl/studio/bitmaps/cutpoint.xpm

@@ -0,0 +1,25 @@
+/* XPM */
+static char *cutpoint_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        3            1",
+/* colors */
+". c #000000",
+"# c #800000",
+"a c #c0c0c0",
+/* pixels */
+"aaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaa",
+"aa#aaaaaaaaa#aaa",
+"aaa#aaaaaaa#aaaa",
+"aaaa#aaaaa#aaaaa",
+"aaaaa#...#aaaaaa",
+"aaaaaa#.#.aaaaaa",
+".......#........",
+"aaaaaa#.#.aaaaaa",
+"aaaaa#...#aaaaaa",
+"aaaa#aaaaa#aaaaa",
+"aaa#aaaaaaa#aaaa",
+"aa#aaaaaaaaa#aaa",
+"aaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaa"
+};

contrib/samples/ogl/studio/bitmaps/help.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *help_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c #008080",
+/* pixels */
+"                ",
+"     ......     ",
+"    .XXXXX..    ",
+"   .XX...XX..   ",
+"   .X..  .X..   ",
+"   .X.. .XX..   ",
+"    .. .XX..    ",
+"      .XX..     ",
+"      .X..      ",
+"      .X..      ",
+"      .X..      ",
+"       ..       ",
+"      .XX..     ",
+"      .XX..     ",
+"       ...      "
+};

contrib/samples/ogl/studio/bitmaps/helpcs.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *helpcs_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    16    15        2            1",
+/* colors */
+". c #000000",
+"# c #c0c0c0",
+/* pixels */
+"################",
+".########.....##",
+"..######..###..#",
+"...####..####...",
+"....###..####...",
+".....###..###..#",
+"......######..##",
+".......####..###",
+"........##..####",
+".....#####..####",
+"..#..###########",
+".###..####...###",
+"####..####...###",
+"#####..#########",
+"#####..#########"
+};

contrib/samples/ogl/studio/bitmaps/horiz.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static char *horiz_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"      .....     ",
+"      .XXX.     ",
+"      .XXX.     ",
+"      .XXX.     ",
+"      .....     ",
+"                ",
+"                ",
+"   ...........  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};