Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerated FL docs; applied patch [ #511363 ] Dialogs no longer need wx.rc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-01-31 20:57:31 +00:00
parent 807d848702
commit 6e8515a3e3
79 changed files with 314 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/docs/latex/fl/baglayout.tex
View File

@@ -16,7 +16,7 @@ top to bottom.
\wxheading{Include files} \wxheading{Include files}
<dyntbar.h> <wx/fl/dyntbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/bariterator.tex
View File

@@ -15,7 +15,7 @@ No base class
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

45
contrib/docs/latex/fl/body.tex
View File

@@ -212,3 +212,48 @@ MyFrame::~MyFrame()
} }
\end{verbatim} \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.

2
contrib/docs/latex/fl/cbantiflickerplugin.tex
View File

@@ -19,7 +19,7 @@ Locking for multithreaded applications is not yet implemented.
\wxheading{Include files} \wxheading{Include files}
<antiflickpl.h> <wx/fl/antiflickpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbbardimhandlerbase.tex
View File

@@ -19,7 +19,7 @@ Specific handlers can be hooked up to specific types of bar.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbbardragplugin.tex
View File

@@ -15,7 +15,7 @@ Plugin class implementing bar dragging.
\wxheading{Include files} \wxheading{Include files}
<bardragpl.h> <wx/fl/bardragpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbbarhintsplugin.tex
View File

@@ -16,7 +16,7 @@ around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
\wxheading{Include files} \wxheading{Include files}
<barhintspl.h> <wx/fl/barhintspl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbbarinfo.tex
View File

@@ -16,7 +16,7 @@ Holds and manages bar information.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbbarshapedata.tex
View File

@@ -16,7 +16,7 @@ option is turned on.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbbarspy.tex
View File

@@ -16,7 +16,7 @@ and forwarding them to the frame layout.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbclosebox.tex
View File

@@ -15,7 +15,7 @@ cbCloseBox is a window close button, used in a wxToolWindow titlebar.
\wxheading{Include files} \wxheading{Include files}
<toolwnd.h> <wx/fl/toolwnd.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbcollapsebox.tex
View File

@@ -15,7 +15,7 @@ cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
\wxheading{Include files} \wxheading{Include files}
<toolwnd.h> <wx/fl/toolwnd.h>
\wxheading{Data structures} \wxheading{Data structures}

43
contrib/docs/latex/fl/cbcommonpaneproperties.tex
View File

@@ -3,13 +3,12 @@
% controlbar.h at 21/Jan/02 21:14:14 % controlbar.h at 21/Jan/02 21:14:14
% %
\section{\class{cbCommonPaneProperties}}\label{cbcommonpaneproperties} \section{\class{cbCommonPaneProperties}}\label{cbcommonpaneproperties}
A structure holding configuration options, A structure holding configuration options,
which are usually the same for all panes in 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{Derived from}
@@ -17,7 +16,43 @@ a frame layout.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \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}

2
contrib/docs/latex/fl/cbcustomizebarevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar customization events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbcustomizelayoutevent.tex
View File

@@ -15,7 +15,7 @@ Class for layout customization events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdiminfo.tex
View File

@@ -16,7 +16,7 @@ Holds and manages information about bar dimensions.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdockbox.tex
View File

@@ -15,7 +15,7 @@ cbDockBox is a window dock button, used in a wxToolWindow titlebar.
\wxheading{Include files} \wxheading{Include files}
<toolwnd.h> <wx/fl/toolwnd.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdockpane.tex
View File

@@ -16,7 +16,7 @@ along one of the four edges of the parent frame.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawbardecorevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar decoration drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawbarhandlesevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar handles drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawhintrectevent.tex
View File

@@ -15,7 +15,7 @@ Class for hint-rectangle drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex
View File

@@ -15,7 +15,7 @@ Class for pane background drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawpanedecorevent.tex
View File

@@ -15,7 +15,7 @@ Class for pane decoration drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex
View File

@@ -15,7 +15,7 @@ Class for row background drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawrowdecorevent.tex
View File

@@ -15,7 +15,7 @@ Class for row decoration drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdrawrowhandlesevent.tex
View File

@@ -15,7 +15,7 @@ Class for row handles drawing events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbdyntoolbardimhandler.tex
View File

@@ -15,7 +15,7 @@ Dynamic toolbar dimension handler.
\wxheading{Include files} \wxheading{Include files}
<dyntbarhnd.h> <wx/fl/dyntbarhnd.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbfinishdrawinareaevent.tex
View File

@@ -15,7 +15,7 @@ Class for finish drawing in area events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbfloatedbarwindow.tex
View File

@@ -16,7 +16,7 @@ implementing floating toolbars.
\wxheading{Include files} \wxheading{Include files}
<toolwnd.h> <wx/fl/toolwnd.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbgcupdatesmgr.tex
View File

@@ -83,7 +83,7 @@ in some special cases of 'overlapping anomalies'.
\wxheading{Include files} \wxheading{Include files}
<gcupdatesmgr.h> <wx/fl/gcupdatesmgr.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbhiddenbarinfo.tex
View File

@@ -15,7 +15,7 @@ Internal helper class.
\wxheading{Include files} \wxheading{Include files}
<rowdragpl.h> <wx/fl/rowdragpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbhintanimationplugin.tex
View File

@@ -15,7 +15,7 @@ A plugin to draw animated hints when the user drags a pane.
\wxheading{Include files} \wxheading{Include files}
<hintanimpl.h> <wx/fl/hintanimpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbhintanimtimer.tex
View File

@@ -15,7 +15,7 @@ A private helper class.
\wxheading{Include files} \wxheading{Include files}
<hintanimpl.h> <wx/fl/hintanimpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbinsertbarevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar insertion events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cblayoutrowevent.tex
View File

@@ -15,7 +15,7 @@ Class for single row layout events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cblayoutrowsevent.tex
View File

@@ -15,7 +15,7 @@ Class for multiple rows layout events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbleftdclickevent.tex
View File

@@ -15,7 +15,7 @@ Class for mouse left double click events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbleftdownevent.tex
View File

@@ -15,7 +15,7 @@ Class for mouse left down events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbleftupevent.tex
View File

@@ -15,7 +15,7 @@ Class for mouse left up events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbminibutton.tex
View File

@@ -16,7 +16,7 @@ titlebar.
\wxheading{Include files} \wxheading{Include files}
<toolwnd.h> <wx/fl/toolwnd.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbmotionevent.tex
View File

@@ -15,7 +15,7 @@ Class for mouse motion events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbpanedrawplugin.tex
View File

@@ -20,7 +20,7 @@ would be enough for the frame layout to function properly
\wxheading{Include files} \wxheading{Include files}
<panedrawpl.h> <wx/fl/panedrawpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbpluginbase.tex
View File

@@ -18,7 +18,7 @@ this plugin is hooked).
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbpluginevent.tex
View File

@@ -16,7 +16,7 @@ This is not a dynamically-creatable class.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbremovebarevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar removal events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbresizebarevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar resize events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbresizerowevent.tex
View File

@@ -15,7 +15,7 @@ Class for row resize events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbrightdownevent.tex
View File

@@ -15,7 +15,7 @@ Class for mouse right down events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbrightupevent.tex
View File

@@ -15,7 +15,7 @@ Class for mouse right up events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbrowdragplugin.tex
View File

@@ -18,7 +18,7 @@ of the toolbar rows in Netscape Communicator 4.xx.
\wxheading{Include files} \wxheading{Include files}
<rowdragpl.h> <wx/fl/rowdragpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbrowinfo.tex
View File

@@ -16,7 +16,7 @@ Holds and manages information about bar rows.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbrowlayoutplugin.tex
View File

@@ -16,7 +16,7 @@ requests sent from a frame layout.
\wxheading{Include files} \wxheading{Include files}
<rowlayoutpl.h> <wx/fl/rowlayoutpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbsimplecustomizationplugin.tex
View File

@@ -17,7 +17,7 @@ and horizontal/vertical alignment of the bar.
\wxheading{Include files} \wxheading{Include files}
<cbcustom.h> <wx/fl/cbcustom.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbsimpleupdatesmgr.tex
View File

@@ -16,7 +16,7 @@ the areas of frame layout that actually need to be updated.
\wxheading{Include files} \wxheading{Include files}
<updatesmgr.h> <wx/fl/updatesmgr.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbsizebarwndevent.tex
View File

@@ -15,7 +15,7 @@ Class for bar window resize events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbstartbardraggingevent.tex
View File

@@ -15,7 +15,7 @@ Class for start-bar-dragging events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbstartdrawinareaevent.tex
View File

@@ -15,7 +15,7 @@ Class for start drawing in area events.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbupdatemgrdata.tex
View File

@@ -17,7 +17,7 @@ auxiliary information to be used by its updating algorithm.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/cbupdatesmanagerbase.tex
View File

@@ -17,7 +17,7 @@ to implement a custom updating strategy.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/dynamictoolbar.tex
View File

@@ -15,7 +15,7 @@ wxDynamicToolBar manages containment and layout of tool windows.
\wxheading{Include files} \wxheading{Include files}
<dyntbar.h> <wx/fl/dyntbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/dyntoolinfo.tex
View File

@@ -15,7 +15,7 @@ This class holds dynamic toolbar item information.
\wxheading{Include files} \wxheading{Include files}
<dyntbar.h> <wx/fl/dyntbar.h>
\wxheading{Data structures} \wxheading{Data structures}

0
contrib/docs/latex/fl/manual.tex → contrib/docs/latex/fl/fl.tex
View File

2
contrib/docs/latex/fl/framelayout.tex
View File

@@ -17,7 +17,7 @@ parent frame.
\wxheading{Include files} \wxheading{Include files}
<controlbar.h> <wx/fl/controlbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/garbagecollector.tex
View File

@@ -15,7 +15,7 @@ No base class
\wxheading{Include files} \wxheading{Include files}
<garbagec.h> <wx/fl/garbagec.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/gcitem.tex
View File

@@ -12,7 +12,7 @@ No base class
\wxheading{Include files} \wxheading{Include files}
<garbagec.h> <wx/fl/garbagec.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/layoutmanagerbase.tex
View File

@@ -15,7 +15,7 @@ No base class
\wxheading{Include files} \wxheading{Include files}
<dyntbar.h> <wx/fl/dyntbar.h>
\wxheading{Data structures} \wxheading{Data structures}

20
contrib/docs/latex/fl/makefile.vc
View File

@@ -40,23 +40,23 @@ $(DOCDIR)/winhelp/fl.hlp: $(THISDIR)/fl.rtf $(THISDIR)/fl.hpj
move fl.cnt $(DOCDIR)\winhelp\fl.cnt move fl.cnt $(DOCDIR)\winhelp\fl.cnt
cd $(THISDIR) 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) 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) 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) cd $(THISDIR)
-copy *.wmf $(DOCDIR)\pdf -copy *.wmf $(DOCDIR)\pdf
-copy *.bmp $(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) 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) cd $(THISDIR)
-mkdir $(DOCDIR)\html\fl -mkdir $(DOCDIR)\html\fl
copy *.gif $(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\*.con
-erase $(DOCDIR)\html\fl\*.ref -erase $(DOCDIR)\html\fl\*.ref
-erase $(THISDIR)\*.con -erase $(THISDIR)\*.con
@@ -84,10 +84,10 @@ $(DOCDIR)\htb\fl.htb: $(DOCDIR)\html\fl\fl.htm
cd $(THISDIR) cd $(THISDIR)
# In order to force document reprocessing # In order to force document reprocessing
touchmanual: touchfl:
-touch $(WXDIR)\contrib\docs\latex\fl\manual.tex -touch $(WXDIR)\contrib\docs\latex\fl\fl.tex
updatedocs: touchmanual alldocs updatedocs: touchfl alldocs
cleandocs: cleandocs:
-erase $(DOCDIR)\winhelp\fl.hlp -erase $(DOCDIR)\winhelp\fl.hlp
@@ -101,7 +101,7 @@ cleandocs:
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
# Office StartUp folder, and PDFMaker should be installed. # 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" # start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\fl.rtf /mGeneratePDF"

2
contrib/docs/latex/fl/morphinfot.tex
View File

@@ -15,7 +15,7 @@ No base class
\wxheading{Include files} \wxheading{Include files}
<hintanimpl.h> <wx/fl/hintanimpl.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/newbitmapbutton.tex
View File

@@ -16,7 +16,7 @@ in the implementation of dynamic toolbars.
\wxheading{Include files} \wxheading{Include files}
<newbmpbtn.h> <wx/fl/newbmpbtn.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/toollayoutitem.tex
View File

@@ -15,7 +15,7 @@ Tool layout item.
\wxheading{Include files} \wxheading{Include files}
<dyntbar.h> <wx/fl/dyntbar.h>
\wxheading{Data structures} \wxheading{Data structures}

2
contrib/docs/latex/fl/toolwindow.tex
View File

@@ -16,7 +16,7 @@ can be used to implement small floating windows.
\wxheading{Include files} \wxheading{Include files}
<toolwnd.h> <wx/fl/toolwnd.h>
\wxheading{Data structures} \wxheading{Data structures}

4
contrib/include/wx/fl/controlbar.h
View File

@@ -1002,7 +1002,7 @@ class cbCommonPaneProperties : public wxObject
bool mRealTimeUpdatesOn; // default: ON bool mRealTimeUpdatesOn; // default: ON
bool mOutOfPaneDragOn; // default: ON bool mOutOfPaneDragOn; // default: ON
bool mExactDockPredictionOn; // default: OFF bool mExactDockPredictionOn; // default: OFF
bool mNonDestructFirctionOn; // default: OFF bool mNonDestructFrictionOn; // default: OFF
bool mShow3DPaneBorderOn; // default: ON bool mShow3DPaneBorderOn; // default: ON
@@ -1068,7 +1068,7 @@ public: /* protected really */
// transient properties // transient properties
wxList mRowShapeData; // shapes of bars of recently modified row, 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 cbRowInfo* mpStoredRow; // row-info for which the shapes are stored
friend class wxFrameLayout; friend class wxFrameLayout;

6
contrib/src/fl/controlbar.cpp
View File

@@ -2043,7 +2043,7 @@ cbCommonPaneProperties::cbCommonPaneProperties(void)
: mRealTimeUpdatesOn ( TRUE ), : mRealTimeUpdatesOn ( TRUE ),
mOutOfPaneDragOn ( TRUE ), mOutOfPaneDragOn ( TRUE ),
mExactDockPredictionOn( FALSE ), mExactDockPredictionOn( FALSE ),
mNonDestructFirctionOn( FALSE ), mNonDestructFrictionOn( FALSE ),
mShow3DPaneBorderOn ( TRUE ), mShow3DPaneBorderOn ( TRUE ),
mBarFloatingOn ( FALSE ), mBarFloatingOn ( FALSE ),
mRowProportionsOn ( FALSE ), mRowProportionsOn ( FALSE ),
@@ -2303,7 +2303,7 @@ int cbDockPane::GetNotFixedBarsCount( cbRowInfo* pRow )
void cbDockPane::RemoveBar( cbBarInfo* pBar ) void cbDockPane::RemoveBar( cbBarInfo* pBar )
{ {
bool needsRestoring = mProps.mNonDestructFirctionOn && bool needsRestoring = mProps.mNonDestructFrictionOn &&
mpStoredRow == pBar->mpRow; mpStoredRow == pBar->mpRow;
cbRemoveBarEvent evt( pBar, this ); cbRemoveBarEvent evt( pBar, this );
@@ -2751,7 +2751,7 @@ void cbDockPane::DoInsertBar( cbBarInfo* pBar, int rowNo )
{ {
pRow = mRows[rowNo]; pRow = mRows[rowNo];
if ( mProps.mNonDestructFirctionOn == TRUE ) if ( mProps.mNonDestructFrictionOn == TRUE )
{ {
// store original shape of the row (before the bar is inserted) // store original shape of the row (before the bar is inserted)

82
contrib/src/fl/makefile.vc
View File

@@ -24,3 +24,85 @@ OBJECTS = $(FL_OBJECTS)
!include $(WXWIN)\src\makelib.vc !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)

39
contrib/src/ogl/makefile.vc
View File

@@ -19,7 +19,7 @@ OGLINC = $(WXDIR)\contrib\include\wx\ogl
THISDIR = $(WXDIR)\contrib\src\ogl THISDIR = $(WXDIR)\contrib\src\ogl
EXTRAFLAGS=/DPROLOGIO=1 EXTRAFLAGS=/DPROLOGIO=1
DOCDIR=$(WXDIR)\contrib\docs DOCDIR=$(WXDIR)\contrib\docs
LOCALDOCDIR=$(WXDIR)\contrib\docs\latex\ogl DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\ogl
!include $(WXDIR)\src\makevc.env !include $(WXDIR)\src\makevc.env
@@ -126,10 +126,10 @@ clean:
-erase *.pdb -erase *.pdb
-erase $(LIBTARGET) -erase $(LIBTARGET)
DOCSOURCES=$(LOCALDOCDIR)\ogl.tex \ DOCSOURCES=$(DOCSOURCEDIR)\ogl.tex \
$(LOCALDOCDIR)\bugs.tex $(LOCALDOCDIR)\changes.tex\ $(DOCSOURCEDIR)\bugs.tex $(DOCSOURCEDIR)\changes.tex\
$(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\intro.tex\ $(DOCSOURCEDIR)\classes.tex $(DOCSOURCEDIR)\intro.tex\
$(LOCALDOCDIR)\topics.tex $(LOCALDOCDIR)\sample.tex $(DOCSOURCEDIR)\topics.tex $(DOCSOURCEDIR)\sample.tex
html: $(DOCDIR)\html\ogl\ogl.htm html: $(DOCDIR)\html\ogl\ogl.htm
htmlhelp: $(DOCDIR)\htmlhelp\ogl.chm htmlhelp: $(DOCDIR)\htmlhelp\ogl.chm
@@ -139,33 +139,32 @@ pdfrtf: $(DOCDIR)\pdf\ogl.rtf
ps: $(DOCDIR)\ps\ogl.ps ps: $(DOCDIR)\ps\ogl.ps
touchmanual: touchmanual:
touch $(LOCALDOCDIR)\ogl.tex touch $(DOCSOURCEDIR)\ogl.tex
$(DOCDIR)\winhelp\ogl.hlp: $(DOCSOURCEDIR)\ogl.rtf $(DOCSOURCEDIR)\ogl.hpj
$(DOCDIR)\winhelp\ogl.hlp: $(LOCALDOCDIR)\ogl.rtf $(LOCALDOCDIR)\ogl.hpj cd $(DOCSOURCEDIR)
cd $(LOCALDOCDIR)
-erase ogl.ph -erase ogl.ph
hc ogl hc ogl
move ogl.hlp $(DOCDIR)\winhelp\ogl.hlp move ogl.hlp $(DOCDIR)\winhelp\ogl.hlp
move ogl.cnt $(DOCDIR)\winhelp\ogl.cnt move ogl.cnt $(DOCDIR)\winhelp\ogl.cnt
cd $(THISDIR) cd $(THISDIR)
$(LOCALDOCDIR)\ogl.rtf: $(DOCSOURCES) $(DOCSOURCEDIR)\ogl.rtf: $(DOCSOURCES)
cd $(LOCALDOCDIR) cd $(DOCSOURCEDIR)
-start $(WAITFLAG) tex2rtf $(LOCALDOCDIR)\ogl.tex $(LOCALDOCDIR)\ogl.rtf -twice -winhelp -start $(WAITFLAG) tex2rtf $(DOCSOURCEDIR)\ogl.tex $(DOCSOURCEDIR)\ogl.rtf -twice -winhelp
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)\pdf\ogl.rtf: $(DOCSOURCES) $(DOCDIR)\pdf\ogl.rtf: $(DOCSOURCES)
cd $(LOCALDOCDIR) cd $(DOCSOURCEDIR)
-copy *.bmp $(DOCDIR)\pdf -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) cd $(THISDIR)
$(DOCDIR)\html\ogl\ogl.htm: $(DOCSOURCES) $(DOCDIR)\html\ogl\ogl.htm: $(DOCSOURCES)
cd $(LOCALDOCDIR) cd $(DOCSOURCEDIR)
-mkdir $(DOCDIR)\html\ogl -mkdir $(DOCDIR)\html\ogl
copy *.gif $(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 $(DOCDIR)\html\ogl\*.con
-erase *.con -erase *.con
-erase $(DOCDIR)\html\ogl\*.ref -erase $(DOCDIR)\html\ogl\*.ref
@@ -192,8 +191,8 @@ $(DOCDIR)\htb\ogl.htb: $(DOCDIR)\html\ogl\ogl.htm
move ogl.zip $(DOCDIR)\htb\ogl.htb move ogl.zip $(DOCDIR)\htb\ogl.htb
cd $(THISDIR) cd $(THISDIR)
$(LOCALDOCDIR)\ogl.dvi: $(DOCSOURCES) $(DOCSOURCEDIR)\ogl.dvi: $(DOCSOURCES)
cd $(LOCALDOCDIR) cd $(DOCSOURCEDIR)
-latex ogl -latex ogl
-latex ogl -latex ogl
-makeindx ogl -makeindx ogl
@@ -202,8 +201,8 @@ $(LOCALDOCDIR)\ogl.dvi: $(DOCSOURCES)
-latex ogl -latex ogl
cd $(THISDIR) cd $(THISDIR)
$(WXDIR)\docs\ps\ogl.ps: $(LOCALDOCDIR)\ogl.dvi $(WXDIR)\docs\ps\ogl.ps: $(DOCSOURCEDIR)\ogl.dvi
cd $(LOCALDOCDIR) cd $(DOCSOURCEDIR)
-dvips32 -o ogl.ps ogl -dvips32 -o ogl.ps ogl
move ogl.ps $(WXDIR)\docs\ps\ogl.ps move ogl.ps $(WXDIR)\docs\ps\ogl.ps
cd $(THISDIR) cd $(THISDIR)

36
distrib/msw/tmake/vc.t
View File

@@ -505,23 +505,22 @@ docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp
alldocs: docs alldocs: docs
hlp: wxhlp hlp: wxhlp
wxhlp: $(DOCDIR)/winhelp/wx.hlp wxhlp: $(DOCDIR)/winhelp/wx.hlp
refhlp: $(DOCDIR)/winhelp/techref.hlp
rtf: $(DOCDIR)/winhelp/wx.rtf rtf: $(DOCDIR)/winhelp/wx.rtf
pdfrtf: $(DOCDIR)/pdf/wx.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf
refpdfrtf: $(DOCDIR)/pdf/techref.rtf
html: wxhtml html: wxhtml
htb: $(DOCDIR)\htb\wx.htb htb: $(DOCDIR)\htb\wx.htb
wxhtml: $(DOCDIR)\html\wx\wx.htm wxhtml: $(DOCDIR)\html\wx\wx.htm
htmlhelp: $(DOCDIR)\htmlhelp\wx.chm htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
ps: wxps referencps ps: wxps
wxps: $(WXDIR)\docs\ps\wx.ps wxps: $(WXDIR)\docs\ps\wx.ps
referencps: $(WXDIR)\docs\ps\referenc.ps
allhlp: wxhlp allhlp: wxhlp
cd $(WXDIR)\utils\dialoged\src cd $(WXDIR)\utils\dialoged\src
nmake -f makefile.vc hlp nmake -f makefile.vc hlp
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc hlp nmake -f makefile.vc hlp
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc hlp
cd $(THISDIR) cd $(THISDIR)
allhtml: wxhtml allhtml: wxhtml
@@ -529,6 +528,7 @@ allhtml: wxhtml
nmake -f makefile.vc html nmake -f makefile.vc html
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc html nmake -f makefile.vc html
cd $(WXDIR)\contrib\src\fl
cd $(THISDIR) cd $(THISDIR)
allhtmlhelp: htmlhelp allhtmlhelp: htmlhelp
@@ -536,6 +536,8 @@ allhtmlhelp: htmlhelp
nmake -f makefile.vc htmlhelp nmake -f makefile.vc htmlhelp
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htmlhelp nmake -f makefile.vc htmlhelp
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc htmlhelp
cd $(THISDIR) cd $(THISDIR)
allhtb: htb allhtb: htb
@@ -543,6 +545,8 @@ allhtb: htb
nmake -f makefile.vc htb nmake -f makefile.vc htb
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htb nmake -f makefile.vc htb
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc htb
cd $(THISDIR) cd $(THISDIR)
allps: wxps referencps allps: wxps referencps
@@ -550,6 +554,8 @@ allps: wxps referencps
nmake -f makefile.vc ps nmake -f makefile.vc ps
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc ps nmake -f makefile.vc ps
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc ps
cd $(THISDIR) cd $(THISDIR)
allpdfrtf: pdfrtf allpdfrtf: pdfrtf
@@ -557,6 +563,8 @@ allpdfrtf: pdfrtf
nmake -f makefile.vc pdfrtf nmake -f makefile.vc pdfrtf
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc pdfrtf nmake -f makefile.vc pdfrtf
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc pdfrtf
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
@@ -569,24 +577,11 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w
move wx.cnt $(DOCDIR)\winhelp\wx.cnt move wx.cnt $(DOCDIR)\winhelp\wx.cnt
cd $(THISDIR) 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 $(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 cd $(DOCDIR)\latex\wx
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/latex/wx/wx.rtf -twice -winhelp
cd $(THISDIR) 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 $(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 cd $(DOCDIR)\latex\wx
-copy *.wmf $(DOCDIR)\pdf -copy *.wmf $(DOCDIR)\pdf
@@ -594,13 +589,6 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR) 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 $(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 cd $(DOCDIR)\latex\wx
-mkdir $(DOCDIR)\html\wx -mkdir $(DOCDIR)\html\wx

2
include/wx/msw/toplevel.h
View File

@@ -80,7 +80,7 @@ protected:
// create a new dialog using the given dialog template from resources, // create a new dialog using the given dialog template from resources,
// return FALSE if it couldn't be created // return FALSE if it couldn't be created
bool CreateDialog(const wxChar *dlgTemplate, bool CreateDialog(const void *dlgTemplate,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size); const wxSize& size);

12
src/msw/makefile.vc
View File

@@ -752,6 +752,8 @@ allhlp: wxhlp
nmake -f makefile.vc hlp nmake -f makefile.vc hlp
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc hlp nmake -f makefile.vc hlp
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc hlp
cd $(THISDIR) cd $(THISDIR)
allhtml: wxhtml allhtml: wxhtml
@@ -759,6 +761,8 @@ allhtml: wxhtml
nmake -f makefile.vc html nmake -f makefile.vc html
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc html nmake -f makefile.vc html
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc html
cd $(THISDIR) cd $(THISDIR)
allhtmlhelp: htmlhelp allhtmlhelp: htmlhelp
@@ -766,6 +770,8 @@ allhtmlhelp: htmlhelp
nmake -f makefile.vc htmlhelp nmake -f makefile.vc htmlhelp
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htmlhelp nmake -f makefile.vc htmlhelp
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc htmlhelp
cd $(THISDIR) cd $(THISDIR)
allhtb: htb allhtb: htb
@@ -773,6 +779,8 @@ allhtb: htb
nmake -f makefile.vc htb nmake -f makefile.vc htb
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc htb nmake -f makefile.vc htb
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc htb
cd $(THISDIR) cd $(THISDIR)
allps: wxps referencps allps: wxps referencps
@@ -780,6 +788,8 @@ allps: wxps referencps
nmake -f makefile.vc ps nmake -f makefile.vc ps
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc ps nmake -f makefile.vc ps
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc ps
cd $(THISDIR) cd $(THISDIR)
allpdfrtf: pdfrtf allpdfrtf: pdfrtf
@@ -787,6 +797,8 @@ allpdfrtf: pdfrtf
nmake -f makefile.vc pdfrtf nmake -f makefile.vc pdfrtf
cd $(WXDIR)\utils\tex2rtf\src cd $(WXDIR)\utils\tex2rtf\src
nmake -f makefile.vc pdfrtf nmake -f makefile.vc pdfrtf
cd $(WXDIR)\contrib\src\fl
nmake -f makefile.vc pdfrtf
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj

35
src/msw/toplevel.cpp
View File

@@ -185,7 +185,7 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
return msflags; return msflags;
} }
bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size) const wxSize& size)
@@ -218,16 +218,16 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
} }
} }
m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(), m_hWnd = (WXHWND)::CreateDialogIndirect(wxGetInstance(),
dlgTemplate, (DLGTEMPLATE*)dlgTemplate,
parent ? GetHwndOf(parent) : NULL, parent ? GetHwndOf(parent) : NULL,
(DLGPROC)wxDlgProc); (DLGPROC)wxDlgProc);
if ( !m_hWnd ) 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; return FALSE;
} }
@@ -358,15 +358,24 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// with & without captions under MSWindows, resizeable or not (but a // with & without captions under MSWindows, resizeable or not (but a
// resizeable dialog always has caption - otherwise it would look too // resizeable dialog always has caption - otherwise it would look too
// strange) // strange)
const wxChar *dlgTemplate; int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3);
if ( style & wxRESIZE_BORDER ) DLGTEMPLATE* dlgTemplate = (DLGTEMPLATE*)malloc( dlgsize );
dlgTemplate = wxT("wxResizeableDialog"); memset (dlgTemplate, 0, dlgsize );
else if ( style & wxCAPTION ) dlgTemplate->x = 34;
dlgTemplate = wxT("wxCaptionDialog"); dlgTemplate->y = 22;
else dlgTemplate->cx = 144;
dlgTemplate = wxT("wxNoCaptionDialog"); dlgTemplate->cy = 75;
return CreateDialog(dlgTemplate, title, pos, size); if ( style & wxRESIZE_BORDER )
dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME;
else if ( style & wxCAPTION )
dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU;
else
dlgTemplate->style = WS_POPUP;
bool ret = CreateDialog(dlgTemplate, title, pos, size);
free(dlgTemplate);
return ret;
} }
else // !dialog else // !dialog
{ {