\wxheading{Include files}
-<dyntbar.h>
+<wx/fl/dyntbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
}
\end{verbatim}
+\section{Controlling dragging behaviour}\label{controllingdragbehav}
+
+Various pane-dragging behaviours are supported. FL can
+show an outline of where the window would be docked
+if you stopped dragging at that point.
+
+This is a list of properties of interest in the cbCommonPaneProperties
+structure:
+
+\begin{verbatim}
+ bool mRealTimeUpdatesOn; // default: ON
+ bool mOutOfPaneDragOn; // default: ON
+ bool mExactDockPredictionOn; // default: OFF
+ bool mNonDestructFrictionOn; // default: OFF
+\end{verbatim}
+
+To get behaviour similar to Microsoft's DevStudio drag-ghost behaviour,
+mRealTimeUpdatesOn have to be set to FALSE, for example:
+
+\begin{verbatim}
+ cbCommonPaneProperties props;
+ ....
+ ....
+ props.mRealTimeUpdatesOn = FALSE;
+ fl->SetPaneProperties( props, wxALL_PANES );
+\end{verbatim}
+
+{\it mOutOfPaneDragOn} specifies whether bars can be dragged
+away from this pane. (Note: this may not currently be working.)
+
+{\it mExactDockPredictionOn} is only relevant when {\it mRealTimeUpdatesOn} is FALSE,
+and then the hint rectangle behaves a little jumpily. It tries to show
+exatly how the bar would look and where it would be docked if the dragging finished right
+now, i.e. the final position, with all the 'friction-physics' calculated.
+Otherwise the hint flies smothly above the surface only hinting whether the bar
+will be docked vertically or horizontally if dropped now.
+This is a feature you won't find anywhere else!
+
+{\it mNonDestructFirctionOn} causes the bars not being dragged
+to stay where they are, while the currently dragged one is 'diving'
+through the underlaying panes, docking itself in and out in real time.
+Otherwise the stationary bars would be pushed around messing up the composition permanently.
+This flag is irelevant when {\it mRealTimeUpdatesOn} is FALSE, as the ghost-rect
+does not do any docking until the drag finishes.
+
\wxheading{Include files}
-<antiflickpl.h>
+<wx/fl/antiflickpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<bardragpl.h>
+<wx/fl/bardragpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<barhintspl.h>
+<wx/fl/barhintspl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<toolwnd.h>
+<wx/fl/toolwnd.h>
\wxheading{Data structures}
\wxheading{Include files}
-<toolwnd.h>
+<wx/fl/toolwnd.h>
\wxheading{Data structures}
% controlbar.h at 21/Jan/02 21:14:14
%
-
\section{\class{cbCommonPaneProperties}}\label{cbcommonpaneproperties}
-
A structure holding configuration options,
which are usually the same for all panes in
-a frame layout.
+a frame layout. For an explanation of the data members, please
+see \helpref{Controlling dragging behaviour}{controllingdragbehav}.
\wxheading{Derived from}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
+\begin{verbatim}
+class cbCommonPaneProperties : public wxObject
+{
+ DECLARE_DYNAMIC_CLASS( cbCommonPaneProperties )
+
+ // Look-and-feel configuration
+
+ bool mRealTimeUpdatesOn; // default: ON
+ bool mOutOfPaneDragOn; // default: ON
+ bool mExactDockPredictionOn; // default: OFF
+ bool mNonDestructFrictionOn; // default: OFF
+
+ bool mShow3DPaneBorderOn; // default: ON
+
+ // The following properties are reserved for the "future"
+
+ bool mBarFloatingOn; // default: OFF
+ bool mRowProportionsOn; // default: OFF
+ bool mColProportionsOn; // default: ON
+ bool mBarCollapseIconsOn; // default: OFF
+ bool mBarDragHintsOn; // default: OFF
+
+ // Minimal dimensions for not-fixed bars in this pane (16x16 default)
+
+ wxSize mMinCBarDim;
+
+ // Width/height of resizing sash
+
+ int mResizeHandleSize;
+
+ // Default constructor.
+
+ cbCommonPaneProperties(void);
+};
+\end{verbatim}
+
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<toolwnd.h>
+<wx/fl/toolwnd.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<dyntbarhnd.h>
+<wx/fl/dyntbarhnd.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<toolwnd.h>
+<wx/fl/toolwnd.h>
\wxheading{Data structures}
\wxheading{Include files}
-<gcupdatesmgr.h>
+<wx/fl/gcupdatesmgr.h>
\wxheading{Data structures}
\wxheading{Include files}
-<rowdragpl.h>
+<wx/fl/rowdragpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<hintanimpl.h>
+<wx/fl/hintanimpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<hintanimpl.h>
+<wx/fl/hintanimpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<toolwnd.h>
+<wx/fl/toolwnd.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<panedrawpl.h>
+<wx/fl/panedrawpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<rowdragpl.h>
+<wx/fl/rowdragpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<rowlayoutpl.h>
+<wx/fl/rowlayoutpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<cbcustom.h>
+<wx/fl/cbcustom.h>
\wxheading{Data structures}
\wxheading{Include files}
-<updatesmgr.h>
+<wx/fl/updatesmgr.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<dyntbar.h>
+<wx/fl/dyntbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<dyntbar.h>
+<wx/fl/dyntbar.h>
\wxheading{Data structures}
--- /dev/null
+\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{report}
+% JACS: doesn't make it through Tex2RTF, sorry. I will put it into texhelp.sty
+% since Tex2RTF doesn't parse it.
+% BTW, style MUST be report for it to work for Tex2RTF.
+%KB:
+%\addtolength{\textwidth}{1in}
+%\addtolength{\oddsidemargin}{-0.5in}
+%\addtolength{\topmargin}{-0.5in}
+%\addtolength{\textheight}{1in}
+%\sloppy
+%end of my changes
+\newcommand{\indexit}[1]{#1\index{#1}}%
+\newcommand{\pipe}[0]{$\|$\ }%
+\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
+% Remove this for processing with dvi2ps instead of dvips
+%\special{!/@scaleunit 1 def}
+\parskip=10pt
+\parindent=0pt
+\title{FL: a Frame Layout Framework}
+\author{by Aleksandras Gluchovas and others}
+\date{January 2nd 2002}
+
+\makeindex
+\begin{document}
+\maketitle
+\pagestyle{fancyplain}
+\bibliographystyle{plain}
+\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
+\setfooter{\thepage}{}{}{}{}{\thepage}%
+\pagenumbering{roman}
+\tableofcontents
+
+\chapter{Copyright notice}
+\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}%
+
+FL is copyright Aleksandras Gluchovas, 2001-2002.
+
+The licence is the wxWindows Licence.
+
+\input{body.tex}
+\input{classes.tex}
+\input{category.tex}
+\input{topics.tex}
+
+\begin{comment}
+\bibliography{refs}
+\addcontentsline{toc}{chapter}{Bibliography}
+\setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}%
+
+\newpage
+% Note: In RTF, the \printindex must come before the
+% change of header/footer, since the \printindex inserts
+% the RTF \sect command which divides one chapter from
+% the next.
+\rtfonly{\printindex
+\addcontentsline{toc}{chapter}{Index}
+\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+}
+% In Latex, it must be this way around (I think)
+\latexonly{\addcontentsline{toc}{chapter}{Index}
+\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+\printindex
+}
+\end{comment}
+
+\end{document}
\wxheading{Include files}
-<controlbar.h>
+<wx/fl/controlbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<garbagec.h>
+<wx/fl/garbagec.h>
\wxheading{Data structures}
\wxheading{Include files}
-<garbagec.h>
+<wx/fl/garbagec.h>
\wxheading{Data structures}
\wxheading{Include files}
-<dyntbar.h>
+<wx/fl/dyntbar.h>
\wxheading{Data structures}
move fl.cnt $(DOCDIR)\winhelp\fl.cnt
cd $(THISDIR)
-$(THISDIR)/fl.rtf: $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/manual.tex
+$(THISDIR)/fl.rtf: $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/fl.tex
cd $(THISDIR)
- -start $(WAITFLAG) tex2rtf $(THISDIR)/manual.tex $(THISDIR)/fl.rtf -twice -winhelp
+ -start $(WAITFLAG) tex2rtf $(THISDIR)/fl.tex $(THISDIR)/fl.rtf -twice -winhelp
cd $(THISDIR)
-$(DOCDIR)/pdf/fl.rtf: $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/manual.tex
+$(DOCDIR)/pdf/fl.rtf: $(THISDIR)/classes.tex $(THISDIR)/body.tex $(THISDIR)/topics.tex $(THISDIR)/fl.tex
cd $(THISDIR)
-copy *.wmf $(DOCDIR)\pdf
-copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(THISDIR)/manual.tex $(DOCDIR)/pdf/fl.rtf -twice -rtf
+ -start $(WAITFLAG) tex2rtf $(THISDIR)/fl.tex $(DOCDIR)/pdf/fl.rtf -twice -rtf
cd $(THISDIR)
-$(DOCDIR)\html\fl\fl.htm: $(THISDIR)\classes.tex $(THISDIR)\body.tex $(THISDIR)/topics.tex $(THISDIR)\manual.tex
+$(DOCDIR)\html\fl\fl.htm: $(THISDIR)\classes.tex $(THISDIR)\body.tex $(THISDIR)/topics.tex $(THISDIR)\fl.tex
cd $(THISDIR)
-mkdir $(DOCDIR)\html\fl
copy *.gif $(DOCDIR)\html\fl
- -start $(WAITFLAG) tex2rtf $(THISDIR)\manual.tex $(DOCDIR)\html\fl\fl.htm -twice -html
+ -start $(WAITFLAG) tex2rtf $(THISDIR)\fl.tex $(DOCDIR)\html\fl\fl.htm -twice -html
-erase $(DOCDIR)\html\fl\*.con
-erase $(DOCDIR)\html\fl\*.ref
-erase $(THISDIR)\*.con
cd $(THISDIR)
# In order to force document reprocessing
-touchmanual:
- -touch $(WXDIR)\contrib\docs\latex\fl\manual.tex
+touchfl:
+ -touch $(WXDIR)\contrib\docs\latex\fl\fl.tex
-updatedocs: touchmanual alldocs
+updatedocs: touchfl alldocs
cleandocs:
-erase $(DOCDIR)\winhelp\fl.hlp
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
# Office StartUp folder, and PDFMaker should be installed.
-#updatepdf: # touchmanual pdfrtf
+#updatepdf: # touchfl pdfrtf
# start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\fl.rtf /mGeneratePDF"
+++ /dev/null
-\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{report}
-% JACS: doesn't make it through Tex2RTF, sorry. I will put it into texhelp.sty
-% since Tex2RTF doesn't parse it.
-% BTW, style MUST be report for it to work for Tex2RTF.
-%KB:
-%\addtolength{\textwidth}{1in}
-%\addtolength{\oddsidemargin}{-0.5in}
-%\addtolength{\topmargin}{-0.5in}
-%\addtolength{\textheight}{1in}
-%\sloppy
-%end of my changes
-\newcommand{\indexit}[1]{#1\index{#1}}%
-\newcommand{\pipe}[0]{$\|$\ }%
-\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
-% Remove this for processing with dvi2ps instead of dvips
-%\special{!/@scaleunit 1 def}
-\parskip=10pt
-\parindent=0pt
-\title{FL: a Frame Layout Framework}
-\author{by Aleksandras Gluchovas and others}
-\date{January 2nd 2002}
-
-\makeindex
-\begin{document}
-\maketitle
-\pagestyle{fancyplain}
-\bibliographystyle{plain}
-\setheader{{\it CONTENTS}}{}{}{}{}{{\it CONTENTS}}
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-\pagenumbering{roman}
-\tableofcontents
-
-\chapter{Copyright notice}
-\setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-FL is copyright Aleksandras Gluchovas, 2001-2002.
-
-The licence is the wxWindows Licence.
-
-\input{body.tex}
-\input{classes.tex}
-\input{category.tex}
-\input{topics.tex}
-
-\begin{comment}
-\bibliography{refs}
-\addcontentsline{toc}{chapter}{Bibliography}
-\setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
-
-\newpage
-% Note: In RTF, the \printindex must come before the
-% change of header/footer, since the \printindex inserts
-% the RTF \sect command which divides one chapter from
-% the next.
-\rtfonly{\printindex
-\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-}
-% In Latex, it must be this way around (I think)
-\latexonly{\addcontentsline{toc}{chapter}{Index}
-\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}
-\printindex
-}
-\end{comment}
-
-\end{document}
\wxheading{Include files}
-<hintanimpl.h>
+<wx/fl/hintanimpl.h>
\wxheading{Data structures}
\wxheading{Include files}
-<newbmpbtn.h>
+<wx/fl/newbmpbtn.h>
\wxheading{Data structures}
\wxheading{Include files}
-<dyntbar.h>
+<wx/fl/dyntbar.h>
\wxheading{Data structures}
\wxheading{Include files}
-<toolwnd.h>
+<wx/fl/toolwnd.h>
\wxheading{Data structures}
bool mRealTimeUpdatesOn; // default: ON
bool mOutOfPaneDragOn; // default: ON
bool mExactDockPredictionOn; // default: OFF
- bool mNonDestructFirctionOn; // default: OFF
+ bool mNonDestructFrictionOn; // default: OFF
bool mShow3DPaneBorderOn; // default: ON
// transient properties
wxList mRowShapeData; // shapes of bars of recently modified row,
- // stored when in "non-destructive-firction" mode
+ // stored when in "non-destructive-friction" mode
cbRowInfo* mpStoredRow; // row-info for which the shapes are stored
friend class wxFrameLayout;
: mRealTimeUpdatesOn ( TRUE ),
mOutOfPaneDragOn ( TRUE ),
mExactDockPredictionOn( FALSE ),
- mNonDestructFirctionOn( FALSE ),
+ mNonDestructFrictionOn( FALSE ),
mShow3DPaneBorderOn ( TRUE ),
mBarFloatingOn ( FALSE ),
mRowProportionsOn ( FALSE ),
void cbDockPane::RemoveBar( cbBarInfo* pBar )
{
- bool needsRestoring = mProps.mNonDestructFirctionOn &&
+ bool needsRestoring = mProps.mNonDestructFrictionOn &&
mpStoredRow == pBar->mpRow;
cbRemoveBarEvent evt( pBar, this );
{
pRow = mRows[rowNo];
- if ( mProps.mNonDestructFirctionOn == TRUE )
+ if ( mProps.mNonDestructFrictionOn == TRUE )
{
// store original shape of the row (before the bar is inserted)
!include $(WXWIN)\src\makelib.vc
+DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\fl
+DOCDIR=$(WXDIR)\docs
+THISDIR = $(WXDIR)\contrib\src\fl
+DOCSOURCES=$(DOCSOURCEDIR)\fl.tex \
+ $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\topics.tex
+
+html: $(DOCDIR)\html\fl\fl.htm
+htmlhelp: $(DOCDIR)\htmlhelp\fl.chm
+htb: $(DOCDIR)\htb\fl.htb
+hlp: $(DOCDIR)\winhelp\fl.hlp
+pdfrtf: $(DOCDIR)\pdf\fl.rtf
+ps: $(DOCDIR)\ps\fl.ps
+
+touchmanual:
+ touch $(DOCSOURCEDIR)\fl.tex
+
+$(DOCDIR)\winhelp\fl.hlp: $(DOCSOURCEDIR)\fl.rtf $(DOCSOURCEDIR)\fl.hpj
+ cd $(DOCSOURCEDIR)
+ -erase fl.ph
+ hc fl
+ move fl.hlp $(DOCDIR)\winhelp\fl.hlp
+ move fl.cnt $(DOCDIR)\winhelp\fl.cnt
+ cd $(THISDIR)
+
+$(DOCSOURCEDIR)\fl.rtf: $(DOCSOURCES)
+ cd $(DOCSOURCEDIR)
+ -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\fl.tex $(DOCSOURCEDIR)\fl.rtf -twice -winhelp
+ cd $(THISDIR)
+
+$(DOCDIR)\pdf\fl.rtf: $(DOCSOURCES)
+ cd $(DOCSOURCEDIR)
+ -copy *.bmp $(DOCDIR)\pdf
+ -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\fl.tex $(DOCDIR)\pdf\fl.rtf -twice -rtf
+ cd $(THISDIR)
+
+$(DOCDIR)\html\fl\fl.htm: $(DOCSOURCES)
+ cd $(DOCSOURCEDIR)
+ -mkdir $(DOCDIR)\html\fl
+ copy *.gif $(DOCDIR)\html\fl
+ -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\fl.tex $(DOCDIR)\html\fl\fl.htm -twice -html
+ -erase $(DOCDIR)\html\fl\*.con
+ -erase *.con
+ -erase $(DOCDIR)\html\fl\*.ref
+ cd $(THISDIR)
+
+$(DOCDIR)\htmlhelp\fl.chm: $(DOCDIR)\html\fl\fl.htm $(DOCDIR)\html\fl\fl.hhp
+ cd $(DOCDIR)\html\fl
+ -hhc fl.hhp
+ -erase $(DOCDIR)\htmlhelp\fl.chm
+ move fl.chm $(DOCDIR)\htmlhelp\fl.chm
+ cd $(THISDIR)
+
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\fl.htb: $(DOCDIR)\html\fl\fl.htm
+ cd $(DOCDIR)\html\fl
+ -erase fl.zip fl.htb
+ zip fl.zip *.htm *.gif *.hhp *.hhc *.hhk
+ -mkdir $(DOCDIR)\htb
+ -erase $(DOCDIR)\htb\fl.htb
+ -erase $(DOCDIR)\htb\fl.htb
+ move fl.zip $(DOCDIR)\htb\fl.htb
+ cd $(THISDIR)
+
+$(DOCSOURCEDIR)\fl.dvi: $(DOCSOURCES)
+ cd $(DOCSOURCEDIR)
+ -latex fl
+ -latex fl
+ -makeindx fl
+ -bibtex fl
+ -latex fl
+ -latex fl
+ cd $(THISDIR)
+
+$(WXDIR)\docs\ps\fl.ps: $(DOCSOURCEDIR)\fl.dvi
+ cd $(DOCSOURCEDIR)
+ -dvips32 -o fl.ps fl
+ move fl.ps $(WXDIR)\docs\ps\fl.ps
+ cd $(THISDIR)
+
THISDIR = $(WXDIR)\contrib\src\ogl
EXTRAFLAGS=/DPROLOGIO=1
DOCDIR=$(WXDIR)\contrib\docs
-LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\ogl
+DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\ogl
!include $(WXDIR)\src\makevc.env
-erase *.pdb
-erase $(LIBTARGET)
-DOCSOURCES=$(LOCALDOCDIR)\ogl.tex \
- $(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\
- $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\intro.tex\
- $(LOCALDOCDIR)\topics.tex $(LOCALDOCDIR)\sample.tex
+DOCSOURCES=$(DOCSOURCEDIR)\ogl.tex \
+ $(DOCSOURCEDIR)\bugs.tex $(DOCSOURCEDIR)\changes.tex\
+ $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\intro.tex\
+ $(DOCSOURCEDIR)\topics.tex $(DOCSOURCEDIR)\sample.tex
html: $(DOCDIR)\html\ogl\ogl.htm
htmlhelp: $(DOCDIR)\htmlhelp\ogl.chm
ps: $(DOCDIR)\ps\ogl.ps
touchmanual:
- touch $(LOCALDOCDIR)\ogl.tex
+ touch $(DOCSOURCEDIR)\ogl.tex
-
-$(DOCDIR)\winhelp\ogl.hlp: $(LOCALDOCDIR)\ogl.rtf $(LOCALDOCDIR)\ogl.hpj
- cd $(LOCALDOCDIR)
+$(DOCDIR)\winhelp\ogl.hlp: $(DOCSOURCEDIR)\ogl.rtf $(DOCSOURCEDIR)\ogl.hpj
+ cd $(DOCSOURCEDIR)
-erase ogl.ph
hc ogl
move ogl.hlp $(DOCDIR)\winhelp\ogl.hlp
move ogl.cnt $(DOCDIR)\winhelp\ogl.cnt
cd $(THISDIR)
-$(LOCALDOCDIR)\ogl.rtf: $(DOCSOURCES)
- cd $(LOCALDOCDIR)
- -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\ogl.tex $(LOCALDOCDIR)\ogl.rtf -twice -winhelp
+$(DOCSOURCEDIR)\ogl.rtf: $(DOCSOURCES)
+ cd $(DOCSOURCEDIR)
+ -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\ogl.tex $(DOCSOURCEDIR)\ogl.rtf -twice -winhelp
cd $(THISDIR)
$(DOCDIR)\pdf\ogl.rtf: $(DOCSOURCES)
- cd $(LOCALDOCDIR)
+ cd $(DOCSOURCEDIR)
-copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\ogl.tex $(DOCDIR)\pdf\ogl.rtf -twice -rtf
+ -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\ogl.tex $(DOCDIR)\pdf\ogl.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)\html\ogl\ogl.htm: $(DOCSOURCES)
- cd $(LOCALDOCDIR)
+ cd $(DOCSOURCEDIR)
-mkdir $(DOCDIR)\html\ogl
copy *.gif $(DOCDIR)\html\ogl
- -start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\ogl.tex $(DOCDIR)\html\ogl\ogl.htm -twice -html
+ -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\ogl.tex $(DOCDIR)\html\ogl\ogl.htm -twice -html
-erase $(DOCDIR)\html\ogl\*.con
-erase *.con
-erase $(DOCDIR)\html\ogl\*.ref
move ogl.zip $(DOCDIR)\htb\ogl.htb
cd $(THISDIR)
-$(LOCALDOCDIR)\ogl.dvi: $(DOCSOURCES)
- cd $(LOCALDOCDIR)
+$(DOCSOURCEDIR)\ogl.dvi: $(DOCSOURCES)
+ cd $(DOCSOURCEDIR)
-latex ogl
-latex ogl
-makeindx ogl
-latex ogl
cd $(THISDIR)
-$(WXDIR)\docs\ps\ogl.ps: $(LOCALDOCDIR)\ogl.dvi
- cd $(LOCALDOCDIR)
+$(WXDIR)\docs\ps\ogl.ps: $(DOCSOURCEDIR)\ogl.dvi
+ cd $(DOCSOURCEDIR)
-dvips32 -o ogl.ps ogl
move ogl.ps $(WXDIR)\docs\ps\ogl.ps
cd $(THISDIR)
alldocs: docs
hlp: wxhlp
wxhlp: $(DOCDIR)/winhelp/wx.hlp
-refhlp: $(DOCDIR)/winhelp/techref.hlp
rtf: $(DOCDIR)/winhelp/wx.rtf
pdfrtf: $(DOCDIR)/pdf/wx.rtf
-refpdfrtf: $(DOCDIR)/pdf/techref.rtf
html: wxhtml
htb: $(DOCDIR)\htb\wx.htb
wxhtml: $(DOCDIR)\html\wx\wx.htm
htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
-ps: wxps referencps
+ps: wxps
wxps: $(WXDIR)\docs\ps\wx.ps
-referencps: $(WXDIR)\docs\ps\referenc.ps
allhlp: wxhlp
cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc hlp
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc hlp
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc hlp
cd $(THISDIR)
allhtml: wxhtml
nmake -f makefile.vc html
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc html
+ cd $(WXDIR)\contrib\src\fl
cd $(THISDIR)
allhtmlhelp: htmlhelp
nmake -f makefile.vc htmlhelp
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htmlhelp
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc htmlhelp
cd $(THISDIR)
allhtb: htb
nmake -f makefile.vc htb
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htb
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc htb
cd $(THISDIR)
allps: wxps referencps
nmake -f makefile.vc ps
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc ps
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc ps
cd $(THISDIR)
allpdfrtf: pdfrtf
nmake -f makefile.vc pdfrtf
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc pdfrtf
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc pdfrtf
cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
move wx.cnt $(DOCDIR)\winhelp\wx.cnt
cd $(THISDIR)
-$(DOCDIR)/winhelp/techref.hlp: $(DOCDIR)/latex/techref/techref.rtf $(DOCDIR)/latex/techref/techref.hpj
- cd $(DOCDIR)/latex/techref
- -erase techref.ph
- hc techref
- move techref.hlp $(DOCDIR)\winhelp\techref.hlp
- move techref.cnt $(DOCDIR)\winhelp\techref.cnt
- cd $(THISDIR)
-
$(DOCDIR)/latex/wx/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
cd $(THISDIR)
-$(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
- cd $(DOCDIR)\latex\techref
- -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/latex/techref/techref.rtf -twice -winhelp
- cd $(THISDIR)
-
$(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
-copy *.wmf $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
-$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
- cd $(DOCDIR)\latex\techref
- -copy *.wmf $(DOCDIR)\pdf
- -copy *.bmp $(DOCDIR)\pdf
- -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
- cd $(THISDIR)
-
$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx
// create a new dialog using the given dialog template from resources,
// return FALSE if it couldn't be created
- bool CreateDialog(const wxChar *dlgTemplate,
+ bool CreateDialog(const void *dlgTemplate,
const wxString& title,
const wxPoint& pos,
const wxSize& size);
nmake -f makefile.vc hlp
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc hlp
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc hlp
cd $(THISDIR)
allhtml: wxhtml
nmake -f makefile.vc html
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc html
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc html
cd $(THISDIR)
allhtmlhelp: htmlhelp
nmake -f makefile.vc htmlhelp
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htmlhelp
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc htmlhelp
cd $(THISDIR)
allhtb: htb
nmake -f makefile.vc htb
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htb
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc htb
cd $(THISDIR)
allps: wxps referencps
nmake -f makefile.vc ps
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc ps
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc ps
cd $(THISDIR)
allpdfrtf: pdfrtf
nmake -f makefile.vc pdfrtf
cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc pdfrtf
+ cd $(WXDIR)\contrib\src\fl
+ nmake -f makefile.vc pdfrtf
cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
return msflags;
}
-bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
+bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
const wxString& title,
const wxPoint& pos,
const wxSize& size)
}
}
- m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(),
- dlgTemplate,
+ m_hWnd = (WXHWND)::CreateDialogIndirect(wxGetInstance(),
+ (DLGTEMPLATE*)dlgTemplate,
parent ? GetHwndOf(parent) : NULL,
(DLGPROC)wxDlgProc);
if ( !m_hWnd )
{
- wxFAIL_MSG(_("Did you forget to include wx/msw/wx.rc in your resources?"));
+ wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?"));
- wxLogSysError(_("Can't create dialog using template '%s'"), dlgTemplate);
+ wxLogSysError(_("Can't create dialog using memory template"));
return FALSE;
}
// with & without captions under MSWindows, resizeable or not (but a
// resizeable dialog always has caption - otherwise it would look too
// strange)
- const wxChar *dlgTemplate;
+ int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3);
+ DLGTEMPLATE* dlgTemplate = (DLGTEMPLATE*)malloc( dlgsize );
+ memset (dlgTemplate, 0, dlgsize );
+ dlgTemplate->x = 34;
+ dlgTemplate->y = 22;
+ dlgTemplate->cx = 144;
+ dlgTemplate->cy = 75;
+
if ( style & wxRESIZE_BORDER )
- dlgTemplate = wxT("wxResizeableDialog");
+ dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME;
else if ( style & wxCAPTION )
- dlgTemplate = wxT("wxCaptionDialog");
+ dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU;
else
- dlgTemplate = wxT("wxNoCaptionDialog");
+ dlgTemplate->style = WS_POPUP;
- return CreateDialog(dlgTemplate, title, pos, size);
+ bool ret = CreateDialog(dlgTemplate, title, pos, size);
+ free(dlgTemplate);
+ return ret;
}
else // !dialog
{
projects / wxWidgets.git / commitdiff
