From 6e8515a3e39851ec562ee3def4ffcced182df110 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 31 Jan 2002 20:57:31 +0000 Subject: [PATCH] Regenerated FL docs; applied patch [ #511363 ] Dialogs no longer need wx.rc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/docs/latex/fl/baglayout.tex | 2 +- contrib/docs/latex/fl/bariterator.tex | 2 +- contrib/docs/latex/fl/body.tex | 45 ++++++++++ contrib/docs/latex/fl/cbantiflickerplugin.tex | 2 +- contrib/docs/latex/fl/cbbardimhandlerbase.tex | 2 +- contrib/docs/latex/fl/cbbardragplugin.tex | 2 +- contrib/docs/latex/fl/cbbarhintsplugin.tex | 2 +- contrib/docs/latex/fl/cbbarinfo.tex | 2 +- contrib/docs/latex/fl/cbbarshapedata.tex | 2 +- contrib/docs/latex/fl/cbbarspy.tex | 2 +- contrib/docs/latex/fl/cbclosebox.tex | 2 +- contrib/docs/latex/fl/cbcollapsebox.tex | 2 +- .../docs/latex/fl/cbcommonpaneproperties.tex | 43 +++++++++- contrib/docs/latex/fl/cbcustomizebarevent.tex | 2 +- .../docs/latex/fl/cbcustomizelayoutevent.tex | 2 +- contrib/docs/latex/fl/cbdiminfo.tex | 2 +- contrib/docs/latex/fl/cbdockbox.tex | 2 +- contrib/docs/latex/fl/cbdockpane.tex | 2 +- contrib/docs/latex/fl/cbdrawbardecorevent.tex | 2 +- .../docs/latex/fl/cbdrawbarhandlesevent.tex | 2 +- contrib/docs/latex/fl/cbdrawhintrectevent.tex | 2 +- .../docs/latex/fl/cbdrawpanebkgroundevent.tex | 2 +- .../docs/latex/fl/cbdrawpanedecorevent.tex | 2 +- .../docs/latex/fl/cbdrawrowbkgroundevent.tex | 2 +- contrib/docs/latex/fl/cbdrawrowdecorevent.tex | 2 +- .../docs/latex/fl/cbdrawrowhandlesevent.tex | 2 +- .../docs/latex/fl/cbdyntoolbardimhandler.tex | 2 +- .../docs/latex/fl/cbfinishdrawinareaevent.tex | 2 +- contrib/docs/latex/fl/cbfloatedbarwindow.tex | 2 +- contrib/docs/latex/fl/cbgcupdatesmgr.tex | 2 +- contrib/docs/latex/fl/cbhiddenbarinfo.tex | 2 +- .../docs/latex/fl/cbhintanimationplugin.tex | 2 +- contrib/docs/latex/fl/cbhintanimtimer.tex | 2 +- contrib/docs/latex/fl/cbinsertbarevent.tex | 2 +- contrib/docs/latex/fl/cblayoutrowevent.tex | 2 +- contrib/docs/latex/fl/cblayoutrowsevent.tex | 2 +- contrib/docs/latex/fl/cbleftdclickevent.tex | 2 +- contrib/docs/latex/fl/cbleftdownevent.tex | 2 +- contrib/docs/latex/fl/cbleftupevent.tex | 2 +- contrib/docs/latex/fl/cbminibutton.tex | 2 +- contrib/docs/latex/fl/cbmotionevent.tex | 2 +- contrib/docs/latex/fl/cbpanedrawplugin.tex | 2 +- contrib/docs/latex/fl/cbpluginbase.tex | 2 +- contrib/docs/latex/fl/cbpluginevent.tex | 2 +- contrib/docs/latex/fl/cbremovebarevent.tex | 2 +- contrib/docs/latex/fl/cbresizebarevent.tex | 2 +- contrib/docs/latex/fl/cbresizerowevent.tex | 2 +- contrib/docs/latex/fl/cbrightdownevent.tex | 2 +- contrib/docs/latex/fl/cbrightupevent.tex | 2 +- contrib/docs/latex/fl/cbrowdragplugin.tex | 2 +- contrib/docs/latex/fl/cbrowinfo.tex | 2 +- contrib/docs/latex/fl/cbrowlayoutplugin.tex | 2 +- .../latex/fl/cbsimplecustomizationplugin.tex | 2 +- contrib/docs/latex/fl/cbsimpleupdatesmgr.tex | 2 +- contrib/docs/latex/fl/cbsizebarwndevent.tex | 2 +- .../docs/latex/fl/cbstartbardraggingevent.tex | 2 +- .../docs/latex/fl/cbstartdrawinareaevent.tex | 2 +- contrib/docs/latex/fl/cbupdatemgrdata.tex | 2 +- .../docs/latex/fl/cbupdatesmanagerbase.tex | 2 +- contrib/docs/latex/fl/dynamictoolbar.tex | 2 +- contrib/docs/latex/fl/dyntoolinfo.tex | 2 +- contrib/docs/latex/fl/{manual.tex => fl.tex} | 0 contrib/docs/latex/fl/framelayout.tex | 2 +- contrib/docs/latex/fl/garbagecollector.tex | 2 +- contrib/docs/latex/fl/gcitem.tex | 2 +- contrib/docs/latex/fl/layoutmanagerbase.tex | 2 +- contrib/docs/latex/fl/makefile.vc | 20 ++--- contrib/docs/latex/fl/morphinfot.tex | 2 +- contrib/docs/latex/fl/newbitmapbutton.tex | 2 +- contrib/docs/latex/fl/toollayoutitem.tex | 2 +- contrib/docs/latex/fl/toolwindow.tex | 2 +- contrib/include/wx/fl/controlbar.h | 4 +- contrib/src/fl/controlbar.cpp | 6 +- contrib/src/fl/makefile.vc | 82 +++++++++++++++++++ contrib/src/ogl/makefile.vc | 39 +++++---- distrib/msw/tmake/vc.t | 36 +++----- include/wx/msw/toplevel.h | 2 +- src/msw/makefile.vc | 12 +++ src/msw/toplevel.cpp | 29 ++++--- 79 files changed, 311 insertions(+), 141 deletions(-) rename contrib/docs/latex/fl/{manual.tex => fl.tex} (100%) diff --git a/contrib/docs/latex/fl/baglayout.tex b/contrib/docs/latex/fl/baglayout.tex index 0e7224b185..1ac0d1d018 100644 --- a/contrib/docs/latex/fl/baglayout.tex +++ b/contrib/docs/latex/fl/baglayout.tex @@ -16,7 +16,7 @@ top to bottom. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/bariterator.tex b/contrib/docs/latex/fl/bariterator.tex index 3dca28c9f9..e8ed66afc6 100644 --- a/contrib/docs/latex/fl/bariterator.tex +++ b/contrib/docs/latex/fl/bariterator.tex @@ -15,7 +15,7 @@ No base class \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/body.tex b/contrib/docs/latex/fl/body.tex index 3f9576640b..0d3cac65f1 100644 --- a/contrib/docs/latex/fl/body.tex +++ b/contrib/docs/latex/fl/body.tex @@ -212,3 +212,48 @@ MyFrame::~MyFrame() } \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. + diff --git a/contrib/docs/latex/fl/cbantiflickerplugin.tex b/contrib/docs/latex/fl/cbantiflickerplugin.tex index 01217e839e..785892b3e3 100644 --- a/contrib/docs/latex/fl/cbantiflickerplugin.tex +++ b/contrib/docs/latex/fl/cbantiflickerplugin.tex @@ -19,7 +19,7 @@ Locking for multithreaded applications is not yet implemented. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbbardimhandlerbase.tex b/contrib/docs/latex/fl/cbbardimhandlerbase.tex index b66e9d154b..1487c7abb1 100644 --- a/contrib/docs/latex/fl/cbbardimhandlerbase.tex +++ b/contrib/docs/latex/fl/cbbardimhandlerbase.tex @@ -19,7 +19,7 @@ Specific handlers can be hooked up to specific types of bar. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbbardragplugin.tex b/contrib/docs/latex/fl/cbbardragplugin.tex index 46863514f0..518880ef86 100644 --- a/contrib/docs/latex/fl/cbbardragplugin.tex +++ b/contrib/docs/latex/fl/cbbardragplugin.tex @@ -15,7 +15,7 @@ Plugin class implementing bar dragging. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbbarhintsplugin.tex b/contrib/docs/latex/fl/cbbarhintsplugin.tex index ab34fa295b..13a3cbf001 100644 --- a/contrib/docs/latex/fl/cbbarhintsplugin.tex +++ b/contrib/docs/latex/fl/cbbarhintsplugin.tex @@ -16,7 +16,7 @@ around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbbarinfo.tex b/contrib/docs/latex/fl/cbbarinfo.tex index 6632630b8c..48664eb0cc 100644 --- a/contrib/docs/latex/fl/cbbarinfo.tex +++ b/contrib/docs/latex/fl/cbbarinfo.tex @@ -16,7 +16,7 @@ Holds and manages bar information. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbbarshapedata.tex b/contrib/docs/latex/fl/cbbarshapedata.tex index c498aadb9a..6b4bf87330 100644 --- a/contrib/docs/latex/fl/cbbarshapedata.tex +++ b/contrib/docs/latex/fl/cbbarshapedata.tex @@ -16,7 +16,7 @@ option is turned on. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbbarspy.tex b/contrib/docs/latex/fl/cbbarspy.tex index 03ad032dcd..da87a05660 100644 --- a/contrib/docs/latex/fl/cbbarspy.tex +++ b/contrib/docs/latex/fl/cbbarspy.tex @@ -16,7 +16,7 @@ and forwarding them to the frame layout. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbclosebox.tex b/contrib/docs/latex/fl/cbclosebox.tex index d0fdef5775..e3210833e9 100644 --- a/contrib/docs/latex/fl/cbclosebox.tex +++ b/contrib/docs/latex/fl/cbclosebox.tex @@ -15,7 +15,7 @@ cbCloseBox is a window close button, used in a wxToolWindow titlebar. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbcollapsebox.tex b/contrib/docs/latex/fl/cbcollapsebox.tex index 99b9e98ed9..b1f75db4fd 100644 --- a/contrib/docs/latex/fl/cbcollapsebox.tex +++ b/contrib/docs/latex/fl/cbcollapsebox.tex @@ -15,7 +15,7 @@ cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbcommonpaneproperties.tex b/contrib/docs/latex/fl/cbcommonpaneproperties.tex index 3a895bc4da..0ef8e1d741 100644 --- a/contrib/docs/latex/fl/cbcommonpaneproperties.tex +++ b/contrib/docs/latex/fl/cbcommonpaneproperties.tex @@ -3,13 +3,12 @@ % 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} @@ -17,7 +16,43 @@ a frame layout. \wxheading{Include files} - + \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} + diff --git a/contrib/docs/latex/fl/cbcustomizebarevent.tex b/contrib/docs/latex/fl/cbcustomizebarevent.tex index 3020c231f1..701ef965d7 100644 --- a/contrib/docs/latex/fl/cbcustomizebarevent.tex +++ b/contrib/docs/latex/fl/cbcustomizebarevent.tex @@ -15,7 +15,7 @@ Class for bar customization events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbcustomizelayoutevent.tex b/contrib/docs/latex/fl/cbcustomizelayoutevent.tex index 33f717e174..a7e1d81b10 100644 --- a/contrib/docs/latex/fl/cbcustomizelayoutevent.tex +++ b/contrib/docs/latex/fl/cbcustomizelayoutevent.tex @@ -15,7 +15,7 @@ Class for layout customization events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdiminfo.tex b/contrib/docs/latex/fl/cbdiminfo.tex index 4a7121499c..97aa565c43 100644 --- a/contrib/docs/latex/fl/cbdiminfo.tex +++ b/contrib/docs/latex/fl/cbdiminfo.tex @@ -16,7 +16,7 @@ Holds and manages information about bar dimensions. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdockbox.tex b/contrib/docs/latex/fl/cbdockbox.tex index 35d214b988..e89edc9158 100644 --- a/contrib/docs/latex/fl/cbdockbox.tex +++ b/contrib/docs/latex/fl/cbdockbox.tex @@ -15,7 +15,7 @@ cbDockBox is a window dock button, used in a wxToolWindow titlebar. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdockpane.tex b/contrib/docs/latex/fl/cbdockpane.tex index ac63f65bb4..315e76c709 100644 --- a/contrib/docs/latex/fl/cbdockpane.tex +++ b/contrib/docs/latex/fl/cbdockpane.tex @@ -16,7 +16,7 @@ along one of the four edges of the parent frame. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawbardecorevent.tex b/contrib/docs/latex/fl/cbdrawbardecorevent.tex index 6af82757e2..da0e868429 100644 --- a/contrib/docs/latex/fl/cbdrawbardecorevent.tex +++ b/contrib/docs/latex/fl/cbdrawbardecorevent.tex @@ -15,7 +15,7 @@ Class for bar decoration drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex b/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex index 1f600905ad..c82fec05f2 100644 --- a/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex +++ b/contrib/docs/latex/fl/cbdrawbarhandlesevent.tex @@ -15,7 +15,7 @@ Class for bar handles drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawhintrectevent.tex b/contrib/docs/latex/fl/cbdrawhintrectevent.tex index 46ec60ed01..2e9fc05edd 100644 --- a/contrib/docs/latex/fl/cbdrawhintrectevent.tex +++ b/contrib/docs/latex/fl/cbdrawhintrectevent.tex @@ -15,7 +15,7 @@ Class for hint-rectangle drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex b/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex index 895b98f898..8cc5ee9b2e 100644 --- a/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex +++ b/contrib/docs/latex/fl/cbdrawpanebkgroundevent.tex @@ -15,7 +15,7 @@ Class for pane background drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawpanedecorevent.tex b/contrib/docs/latex/fl/cbdrawpanedecorevent.tex index 27573caf76..444aaabc8e 100644 --- a/contrib/docs/latex/fl/cbdrawpanedecorevent.tex +++ b/contrib/docs/latex/fl/cbdrawpanedecorevent.tex @@ -15,7 +15,7 @@ Class for pane decoration drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex b/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex index 07e491f391..e2f0541b3e 100644 --- a/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex +++ b/contrib/docs/latex/fl/cbdrawrowbkgroundevent.tex @@ -15,7 +15,7 @@ Class for row background drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawrowdecorevent.tex b/contrib/docs/latex/fl/cbdrawrowdecorevent.tex index d487970234..5069d16241 100644 --- a/contrib/docs/latex/fl/cbdrawrowdecorevent.tex +++ b/contrib/docs/latex/fl/cbdrawrowdecorevent.tex @@ -15,7 +15,7 @@ Class for row decoration drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex b/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex index 00366f61f9..17a2609b1c 100644 --- a/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex +++ b/contrib/docs/latex/fl/cbdrawrowhandlesevent.tex @@ -15,7 +15,7 @@ Class for row handles drawing events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex b/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex index fb00a9b864..a58025a447 100644 --- a/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex +++ b/contrib/docs/latex/fl/cbdyntoolbardimhandler.tex @@ -15,7 +15,7 @@ Dynamic toolbar dimension handler. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex b/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex index 066f339572..df53b9ec6d 100644 --- a/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex +++ b/contrib/docs/latex/fl/cbfinishdrawinareaevent.tex @@ -15,7 +15,7 @@ Class for finish drawing in area events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbfloatedbarwindow.tex b/contrib/docs/latex/fl/cbfloatedbarwindow.tex index 0785403f77..a35d769581 100644 --- a/contrib/docs/latex/fl/cbfloatedbarwindow.tex +++ b/contrib/docs/latex/fl/cbfloatedbarwindow.tex @@ -16,7 +16,7 @@ implementing floating toolbars. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbgcupdatesmgr.tex b/contrib/docs/latex/fl/cbgcupdatesmgr.tex index 18f31ca525..482d271a60 100644 --- a/contrib/docs/latex/fl/cbgcupdatesmgr.tex +++ b/contrib/docs/latex/fl/cbgcupdatesmgr.tex @@ -83,7 +83,7 @@ in some special cases of 'overlapping anomalies'. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbhiddenbarinfo.tex b/contrib/docs/latex/fl/cbhiddenbarinfo.tex index f8dafe295e..7d47e8052a 100644 --- a/contrib/docs/latex/fl/cbhiddenbarinfo.tex +++ b/contrib/docs/latex/fl/cbhiddenbarinfo.tex @@ -15,7 +15,7 @@ Internal helper class. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbhintanimationplugin.tex b/contrib/docs/latex/fl/cbhintanimationplugin.tex index 9048400042..d2e63303f6 100644 --- a/contrib/docs/latex/fl/cbhintanimationplugin.tex +++ b/contrib/docs/latex/fl/cbhintanimationplugin.tex @@ -15,7 +15,7 @@ A plugin to draw animated hints when the user drags a pane. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbhintanimtimer.tex b/contrib/docs/latex/fl/cbhintanimtimer.tex index b5d20b216c..ec375e8b22 100644 --- a/contrib/docs/latex/fl/cbhintanimtimer.tex +++ b/contrib/docs/latex/fl/cbhintanimtimer.tex @@ -15,7 +15,7 @@ A private helper class. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbinsertbarevent.tex b/contrib/docs/latex/fl/cbinsertbarevent.tex index 8599ebe38f..c8018e40af 100644 --- a/contrib/docs/latex/fl/cbinsertbarevent.tex +++ b/contrib/docs/latex/fl/cbinsertbarevent.tex @@ -15,7 +15,7 @@ Class for bar insertion events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cblayoutrowevent.tex b/contrib/docs/latex/fl/cblayoutrowevent.tex index 70362bac24..6d076005ac 100644 --- a/contrib/docs/latex/fl/cblayoutrowevent.tex +++ b/contrib/docs/latex/fl/cblayoutrowevent.tex @@ -15,7 +15,7 @@ Class for single row layout events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cblayoutrowsevent.tex b/contrib/docs/latex/fl/cblayoutrowsevent.tex index af71f09533..1932e1fd78 100644 --- a/contrib/docs/latex/fl/cblayoutrowsevent.tex +++ b/contrib/docs/latex/fl/cblayoutrowsevent.tex @@ -15,7 +15,7 @@ Class for multiple rows layout events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbleftdclickevent.tex b/contrib/docs/latex/fl/cbleftdclickevent.tex index a41fd5a4a5..fbfa4d4793 100644 --- a/contrib/docs/latex/fl/cbleftdclickevent.tex +++ b/contrib/docs/latex/fl/cbleftdclickevent.tex @@ -15,7 +15,7 @@ Class for mouse left double click events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbleftdownevent.tex b/contrib/docs/latex/fl/cbleftdownevent.tex index 4988afaca1..ba56025df1 100644 --- a/contrib/docs/latex/fl/cbleftdownevent.tex +++ b/contrib/docs/latex/fl/cbleftdownevent.tex @@ -15,7 +15,7 @@ Class for mouse left down events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbleftupevent.tex b/contrib/docs/latex/fl/cbleftupevent.tex index 67bfe5cbf0..c4ceeeb329 100644 --- a/contrib/docs/latex/fl/cbleftupevent.tex +++ b/contrib/docs/latex/fl/cbleftupevent.tex @@ -15,7 +15,7 @@ Class for mouse left up events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbminibutton.tex b/contrib/docs/latex/fl/cbminibutton.tex index f2b8325d77..cf8d09f30c 100644 --- a/contrib/docs/latex/fl/cbminibutton.tex +++ b/contrib/docs/latex/fl/cbminibutton.tex @@ -16,7 +16,7 @@ titlebar. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbmotionevent.tex b/contrib/docs/latex/fl/cbmotionevent.tex index d5c977016e..8c2dcf09ba 100644 --- a/contrib/docs/latex/fl/cbmotionevent.tex +++ b/contrib/docs/latex/fl/cbmotionevent.tex @@ -15,7 +15,7 @@ Class for mouse motion events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbpanedrawplugin.tex b/contrib/docs/latex/fl/cbpanedrawplugin.tex index 550121ec09..b824a4b344 100644 --- a/contrib/docs/latex/fl/cbpanedrawplugin.tex +++ b/contrib/docs/latex/fl/cbpanedrawplugin.tex @@ -20,7 +20,7 @@ would be enough for the frame layout to function properly \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbpluginbase.tex b/contrib/docs/latex/fl/cbpluginbase.tex index b99f88ea4c..0147d1ab6e 100644 --- a/contrib/docs/latex/fl/cbpluginbase.tex +++ b/contrib/docs/latex/fl/cbpluginbase.tex @@ -18,7 +18,7 @@ this plugin is hooked). \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbpluginevent.tex b/contrib/docs/latex/fl/cbpluginevent.tex index a96058c49f..4de9953781 100644 --- a/contrib/docs/latex/fl/cbpluginevent.tex +++ b/contrib/docs/latex/fl/cbpluginevent.tex @@ -16,7 +16,7 @@ This is not a dynamically-creatable class. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbremovebarevent.tex b/contrib/docs/latex/fl/cbremovebarevent.tex index bac004c048..dfd7fd4b39 100644 --- a/contrib/docs/latex/fl/cbremovebarevent.tex +++ b/contrib/docs/latex/fl/cbremovebarevent.tex @@ -15,7 +15,7 @@ Class for bar removal events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbresizebarevent.tex b/contrib/docs/latex/fl/cbresizebarevent.tex index 83680efb8b..37d44fef05 100644 --- a/contrib/docs/latex/fl/cbresizebarevent.tex +++ b/contrib/docs/latex/fl/cbresizebarevent.tex @@ -15,7 +15,7 @@ Class for bar resize events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbresizerowevent.tex b/contrib/docs/latex/fl/cbresizerowevent.tex index dc1c37ee63..7f66d96f15 100644 --- a/contrib/docs/latex/fl/cbresizerowevent.tex +++ b/contrib/docs/latex/fl/cbresizerowevent.tex @@ -15,7 +15,7 @@ Class for row resize events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbrightdownevent.tex b/contrib/docs/latex/fl/cbrightdownevent.tex index a186da067c..2c30911591 100644 --- a/contrib/docs/latex/fl/cbrightdownevent.tex +++ b/contrib/docs/latex/fl/cbrightdownevent.tex @@ -15,7 +15,7 @@ Class for mouse right down events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbrightupevent.tex b/contrib/docs/latex/fl/cbrightupevent.tex index 5306145a3f..e6be7808e4 100644 --- a/contrib/docs/latex/fl/cbrightupevent.tex +++ b/contrib/docs/latex/fl/cbrightupevent.tex @@ -15,7 +15,7 @@ Class for mouse right up events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbrowdragplugin.tex b/contrib/docs/latex/fl/cbrowdragplugin.tex index f63642d332..1e691615e1 100644 --- a/contrib/docs/latex/fl/cbrowdragplugin.tex +++ b/contrib/docs/latex/fl/cbrowdragplugin.tex @@ -18,7 +18,7 @@ of the toolbar rows in Netscape Communicator 4.xx. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbrowinfo.tex b/contrib/docs/latex/fl/cbrowinfo.tex index 318b26dc5f..ef91464536 100644 --- a/contrib/docs/latex/fl/cbrowinfo.tex +++ b/contrib/docs/latex/fl/cbrowinfo.tex @@ -16,7 +16,7 @@ Holds and manages information about bar rows. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbrowlayoutplugin.tex b/contrib/docs/latex/fl/cbrowlayoutplugin.tex index 25a6d517b0..c6e936a6b2 100644 --- a/contrib/docs/latex/fl/cbrowlayoutplugin.tex +++ b/contrib/docs/latex/fl/cbrowlayoutplugin.tex @@ -16,7 +16,7 @@ requests sent from a frame layout. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex b/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex index 39176f0958..5240f9d912 100644 --- a/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex +++ b/contrib/docs/latex/fl/cbsimplecustomizationplugin.tex @@ -17,7 +17,7 @@ and horizontal/vertical alignment of the bar. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex b/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex index b9a3c97e3e..8e518ad9af 100644 --- a/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex +++ b/contrib/docs/latex/fl/cbsimpleupdatesmgr.tex @@ -16,7 +16,7 @@ the areas of frame layout that actually need to be updated. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbsizebarwndevent.tex b/contrib/docs/latex/fl/cbsizebarwndevent.tex index a464b321d9..831fd3229e 100644 --- a/contrib/docs/latex/fl/cbsizebarwndevent.tex +++ b/contrib/docs/latex/fl/cbsizebarwndevent.tex @@ -15,7 +15,7 @@ Class for bar window resize events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbstartbardraggingevent.tex b/contrib/docs/latex/fl/cbstartbardraggingevent.tex index 0a0c39f0b9..329dcffb32 100644 --- a/contrib/docs/latex/fl/cbstartbardraggingevent.tex +++ b/contrib/docs/latex/fl/cbstartbardraggingevent.tex @@ -15,7 +15,7 @@ Class for start-bar-dragging events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbstartdrawinareaevent.tex b/contrib/docs/latex/fl/cbstartdrawinareaevent.tex index 5f206c9b99..1b66cf983c 100644 --- a/contrib/docs/latex/fl/cbstartdrawinareaevent.tex +++ b/contrib/docs/latex/fl/cbstartdrawinareaevent.tex @@ -15,7 +15,7 @@ Class for start drawing in area events. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbupdatemgrdata.tex b/contrib/docs/latex/fl/cbupdatemgrdata.tex index 13e5ded718..9bd50f144a 100644 --- a/contrib/docs/latex/fl/cbupdatemgrdata.tex +++ b/contrib/docs/latex/fl/cbupdatemgrdata.tex @@ -17,7 +17,7 @@ auxiliary information to be used by its updating algorithm. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/cbupdatesmanagerbase.tex b/contrib/docs/latex/fl/cbupdatesmanagerbase.tex index b5c71937ec..51d652f0cb 100644 --- a/contrib/docs/latex/fl/cbupdatesmanagerbase.tex +++ b/contrib/docs/latex/fl/cbupdatesmanagerbase.tex @@ -17,7 +17,7 @@ to implement a custom updating strategy. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/dynamictoolbar.tex b/contrib/docs/latex/fl/dynamictoolbar.tex index 5767281260..0bc506fb1c 100644 --- a/contrib/docs/latex/fl/dynamictoolbar.tex +++ b/contrib/docs/latex/fl/dynamictoolbar.tex @@ -15,7 +15,7 @@ wxDynamicToolBar manages containment and layout of tool windows. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/dyntoolinfo.tex b/contrib/docs/latex/fl/dyntoolinfo.tex index 99deb6c10b..f180d977e2 100644 --- a/contrib/docs/latex/fl/dyntoolinfo.tex +++ b/contrib/docs/latex/fl/dyntoolinfo.tex @@ -15,7 +15,7 @@ This class holds dynamic toolbar item information. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/manual.tex b/contrib/docs/latex/fl/fl.tex similarity index 100% rename from contrib/docs/latex/fl/manual.tex rename to contrib/docs/latex/fl/fl.tex diff --git a/contrib/docs/latex/fl/framelayout.tex b/contrib/docs/latex/fl/framelayout.tex index 8be3975b57..b4289af0fe 100644 --- a/contrib/docs/latex/fl/framelayout.tex +++ b/contrib/docs/latex/fl/framelayout.tex @@ -17,7 +17,7 @@ parent frame. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/garbagecollector.tex b/contrib/docs/latex/fl/garbagecollector.tex index 71f31dfdb2..e0f25967b8 100644 --- a/contrib/docs/latex/fl/garbagecollector.tex +++ b/contrib/docs/latex/fl/garbagecollector.tex @@ -15,7 +15,7 @@ No base class \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/gcitem.tex b/contrib/docs/latex/fl/gcitem.tex index 6e24a96f74..658978e3fd 100644 --- a/contrib/docs/latex/fl/gcitem.tex +++ b/contrib/docs/latex/fl/gcitem.tex @@ -12,7 +12,7 @@ No base class \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/layoutmanagerbase.tex b/contrib/docs/latex/fl/layoutmanagerbase.tex index 9c99450260..2bbe7f036c 100644 --- a/contrib/docs/latex/fl/layoutmanagerbase.tex +++ b/contrib/docs/latex/fl/layoutmanagerbase.tex @@ -15,7 +15,7 @@ No base class \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/makefile.vc b/contrib/docs/latex/fl/makefile.vc index eabac7bd2f..d1c80290b0 100644 --- a/contrib/docs/latex/fl/makefile.vc +++ b/contrib/docs/latex/fl/makefile.vc @@ -40,23 +40,23 @@ $(DOCDIR)/winhelp/fl.hlp: $(THISDIR)/fl.rtf $(THISDIR)/fl.hpj 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 @@ -84,10 +84,10 @@ $(DOCDIR)\htb\fl.htb: $(DOCDIR)\html\fl\fl.htm 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 @@ -101,7 +101,7 @@ cleandocs: # 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" diff --git a/contrib/docs/latex/fl/morphinfot.tex b/contrib/docs/latex/fl/morphinfot.tex index 2b84131b7a..df90d0908c 100644 --- a/contrib/docs/latex/fl/morphinfot.tex +++ b/contrib/docs/latex/fl/morphinfot.tex @@ -15,7 +15,7 @@ No base class \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/newbitmapbutton.tex b/contrib/docs/latex/fl/newbitmapbutton.tex index 43c2b48762..7fe99e4fa6 100644 --- a/contrib/docs/latex/fl/newbitmapbutton.tex +++ b/contrib/docs/latex/fl/newbitmapbutton.tex @@ -16,7 +16,7 @@ in the implementation of dynamic toolbars. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/toollayoutitem.tex b/contrib/docs/latex/fl/toollayoutitem.tex index 525ce6fb62..f40864b1eb 100644 --- a/contrib/docs/latex/fl/toollayoutitem.tex +++ b/contrib/docs/latex/fl/toollayoutitem.tex @@ -15,7 +15,7 @@ Tool layout item. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/docs/latex/fl/toolwindow.tex b/contrib/docs/latex/fl/toolwindow.tex index 3e1eabbbec..e278a857a5 100644 --- a/contrib/docs/latex/fl/toolwindow.tex +++ b/contrib/docs/latex/fl/toolwindow.tex @@ -16,7 +16,7 @@ can be used to implement small floating windows. \wxheading{Include files} - + \wxheading{Data structures} diff --git a/contrib/include/wx/fl/controlbar.h b/contrib/include/wx/fl/controlbar.h index 168a718d0b..e9e448807c 100644 --- a/contrib/include/wx/fl/controlbar.h +++ b/contrib/include/wx/fl/controlbar.h @@ -1002,7 +1002,7 @@ class cbCommonPaneProperties : public wxObject bool mRealTimeUpdatesOn; // default: ON bool mOutOfPaneDragOn; // default: ON bool mExactDockPredictionOn; // default: OFF - bool mNonDestructFirctionOn; // default: OFF + bool mNonDestructFrictionOn; // default: OFF bool mShow3DPaneBorderOn; // default: ON @@ -1068,7 +1068,7 @@ public: /* protected really */ // 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; diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp index c1a3af514b..f1a8e556a6 100644 --- a/contrib/src/fl/controlbar.cpp +++ b/contrib/src/fl/controlbar.cpp @@ -2043,7 +2043,7 @@ cbCommonPaneProperties::cbCommonPaneProperties(void) : mRealTimeUpdatesOn ( TRUE ), mOutOfPaneDragOn ( TRUE ), mExactDockPredictionOn( FALSE ), - mNonDestructFirctionOn( FALSE ), + mNonDestructFrictionOn( FALSE ), mShow3DPaneBorderOn ( TRUE ), mBarFloatingOn ( FALSE ), mRowProportionsOn ( FALSE ), @@ -2303,7 +2303,7 @@ int cbDockPane::GetNotFixedBarsCount( cbRowInfo* pRow ) void cbDockPane::RemoveBar( cbBarInfo* pBar ) { - bool needsRestoring = mProps.mNonDestructFirctionOn && + bool needsRestoring = mProps.mNonDestructFrictionOn && mpStoredRow == pBar->mpRow; cbRemoveBarEvent evt( pBar, this ); @@ -2751,7 +2751,7 @@ void cbDockPane::DoInsertBar( cbBarInfo* pBar, int rowNo ) { pRow = mRows[rowNo]; - if ( mProps.mNonDestructFirctionOn == TRUE ) + if ( mProps.mNonDestructFrictionOn == TRUE ) { // store original shape of the row (before the bar is inserted) diff --git a/contrib/src/fl/makefile.vc b/contrib/src/fl/makefile.vc index 86ab8acd40..9fa563d064 100644 --- a/contrib/src/fl/makefile.vc +++ b/contrib/src/fl/makefile.vc @@ -24,3 +24,85 @@ OBJECTS = $(FL_OBJECTS) !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) + diff --git a/contrib/src/ogl/makefile.vc b/contrib/src/ogl/makefile.vc index 264aaaac4c..833eaf13b3 100644 --- a/contrib/src/ogl/makefile.vc +++ b/contrib/src/ogl/makefile.vc @@ -19,7 +19,7 @@ OGLINC = $(WXDIR)\contrib\include\wx\ogl 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 @@ -126,10 +126,10 @@ clean: -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 @@ -139,33 +139,32 @@ pdfrtf: $(DOCDIR)\pdf\ogl.rtf 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 @@ -192,8 +191,8 @@ $(DOCDIR)\htb\ogl.htb: $(DOCDIR)\html\ogl\ogl.htm 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 @@ -202,8 +201,8 @@ $(LOCALDOCDIR)\ogl.dvi: $(DOCSOURCES) -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) diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index ec1e8d8279..529f45712c 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -505,23 +505,22 @@ docs: allhlp allhtml allpdfrtf allhtb allhtmlhelp 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 @@ -529,6 +528,7 @@ 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 @@ -536,6 +536,8 @@ 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 @@ -543,6 +545,8 @@ 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 @@ -550,6 +554,8 @@ 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 @@ -557,6 +563,8 @@ 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 @@ -569,24 +577,11 @@ $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/w 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 @@ -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 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 diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index 1bbcc2dcaa..645ce43002 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -80,7 +80,7 @@ protected: // 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); diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 9acff308e2..104e6ae5be 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -752,6 +752,8 @@ allhlp: wxhlp 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 @@ -759,6 +761,8 @@ 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 @@ -766,6 +770,8 @@ 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 @@ -773,6 +779,8 @@ 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 @@ -780,6 +788,8 @@ 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 @@ -787,6 +797,8 @@ 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 diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 6530437b94..e77677c7d4 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -185,7 +185,7 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const return msflags; } -bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, +bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, const wxString& title, const wxPoint& pos, const wxSize& size) @@ -218,16 +218,16 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, } } - 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; } @@ -358,15 +358,24 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, // 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 { -- 2.45.2