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

Added Property List classes to main library; added proplist sample; merged

Browse Source 
changes.txt files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-31 16:15:45 +00:00
parent 8973fbec7e
commit e3a43801df
76 changed files with 9575 additions and 2686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
utils/dialoged/docs/body.tex
View File

@@ -15,18 +15,17 @@ no independent file format.
provide immediate visual feedback of changed properties.
\end{enumerate}
Dialog Editor should be compiled and used with wxWindows 1.65 or later.
Dialog Editor 2.0 should be compiled and used with wxWindows 2.0.
\section{Current status}
Dialog Editor currently runs under MS Windows. It has yet to
be tested under Motif and XView: see \helpref{Technical notes}{technotes} for a discussion
of what needs to be done.
Dialog Editor currently runs under wxMSW and wxGTK. It has yet to
be tested under wxMotif.
\section{Future developments}
\begin{itemize}\itemsep=0pt
\item XView and Motif versions.
\item Motif compilation.
\item It would be nice to have a dialog browser, showing thumbnails of
all dialogs in a particular directory.
\item Maybe add a menubar editor (from wxBuilder).
@@ -42,24 +41,23 @@ all dialogs in a particular directory.
\subsection{File menu}
\begin{twocollist}\itemsep=0pt
\twocolitem{New project}{Creates a new project (clears index and resets project name).}
\twocolitem{New dialog}{Creates a new dialog resource.}
\twocolitem{New project}{Creates a new project (clears index and resets project name).}
\twocolitem{Open}{Opens an existing resource file.}
\twocolitem{Save}{Saves the current resources.}
\twocolitem{Save as}{Saves the current resources in a named file.}
\twocolitem{Save As...}{Saves the current resources in a named file.}
\twocolitem{Clear}{Clears the current resources.}
\twocolitem{Exit}{Exit the program.}
\twocolitem{Exit}{Exits the program.}
\end{twocollist}
\subsection{Edit menu}
\begin{twocollist}\itemsep=0pt
\twocolitem{Recreate}{Recreates the currently selected panel item from the underlying resource. This may be necessary
\twocolitem{Test Dialog}{Creates the current dialog for test purposes.}
\twocolitem{Recreate}{Recreates the currently selected control from the underlying resource. This may be necessary
to regenerate items that cannot be changed dynamically, and which have got out of sync with the displayed
item.}
\twocolitem{Delete}{Deletes the currently selected resource.}
\twocolitem{Toggle edit/test mode}{Toggles from edit to test mode, and vice versa. Edit mode is used for editing
dialogs, test mode allows panel items to be manipulated as they will appear to the user.}
\end{twocollist}
\subsection{Help menu}
@@ -93,35 +91,15 @@ The command toolbar consists of the following tools:
\latexonly{\newpage}
\section{Tool palette}
The tool palette is used to select a type of panel item to create on the dialog.
To create a new panel item, select a tool with left-click, then left-click on the dialog to
window. Select the pointer tool to use left-click for selecting and deselecting
The tool palette is used to select a type of control to create on the dialog.
To create a new control, select a tool with left-click, then left-click on the dialog.
Select the pointer tool to use left-click for selecting and deselecting
items.
The tool palette consists of the following tools.
\section{Resource tree}
\begin{twocollist}%\itemsep=0pt
\twocolitem{\icon{arrow.eps}{Pointer}}{Click this to select/deselect items on a dialog.}
\twocolitem{\icon{message.eps}{Message}}{Text message item.}
\twocolitem{\icon{picture.eps}{Bitmap message}}{Bitmap message item.}
\twocolitem{\icon{button.eps}{Button}}{Text button item.}
\twocolitem{\icon{bmpbuttn.eps}{Bitmap button}}{Bitmap button item.}
\twocolitem{\icon{check.eps}{Checkbox}}{Checkbox item.}
\twocolitem{\icon{radio.eps}{Radiobox}}{Radiobox item.}
\twocolitem{\icon{listbox.eps}{Listbox}}{Listbox item.}
\twocolitem{\icon{choice.eps}{Choice}}{Choice item.}
\twocolitem{\icon{text.eps}{Text}}{Single-line text item.}
\twocolitem{\icon{mtext.eps}{Multitext}}{Multi-line text item.}
\twocolitem{\icon{slider.eps}{Slider}}{Slider item.}
\twocolitem{\icon{group.eps}{Groupbpx}}{Groupbox item.}
\twocolitem{\icon{gauge.eps}{Gauge}}{Gauge item.}
\twocolitem{\icon{scroll.eps}{Scrollbar}}{Scrollbar item.}
\end{twocollist}
\section{Resource list}
The resource list shows a list of the dialogs, panel items and bitmaps currently loaded
in Dialog Editor. Double-clicking on a dialog item shows the associated dialog box.
The resource tree shows a list of the dialogs, controls and bitmaps currently loaded
in Dialog Editor. Double-clicking on an item shows the associated resource.
\chapter{Procedures}\label{procedures}
\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
@@ -138,16 +116,16 @@ status line.
\section{Creating a dialog}
To create a new dialog, click on the {\bf File: New} menu item, or equivalent
toolbar button. A dialog will appear. To put a panel item on the dialog, left-click
toolbar button. A dialog will appear. To put a control on the dialog, left-click
on the appropriate palette icon and then left-click on the dialog. A new item
will appear at the place you clicked.
You can edit any panel item or dialog by control-left clicking. A property editor
You can edit any control or dialog by control-left clicking. A property editor
will appear, allowing any property to be selected and edited (see \helpref{Using property editors}{propeditors}).
You can also edit items by right-clicking to show a menu, and then selecting {\it Edit properties}.
To move a panel item, drag the item with the left mouse button, or edit
the position values in the property editor. To resize a panel item, you
To move a control, drag the item with the left mouse button, or edit
the position values in the property editor. To resize a control, you
can either select it by left-clicking and then dragging on a selection
handle, or edit the size values in the property editor.
@@ -169,7 +147,7 @@ the file selector, and properties containing list of user-definable strings use
string editor.
When you change a property value, this value is immediately reflected in
the dialog or panel item. If the item allows this value to be changed
the dialog or control. If the item allows this value to be changed
dynamically, the relevant wxWindows function will be called internally
to effect the change. If the value cannot be changed dynamically, the
item will be destroyed and re-created, which means that there will be
@@ -186,12 +164,37 @@ wxWindows resources have been enabled when building the wxWindows library.
These files can be loaded dynamically, or included directly into program source
with a \verb$#include$ directive. See the wxWindows user manual for further details.
\section{Working with identifiers}
Dialog Editor keeps track of identifiers in your resources, and reads and writes an include file of the
form {\tt name.h} where 'name' is the root name of your {\tt .wxr} file. Dialog Editor
knows about the predefined identifiers such as wxID\_OK.
When you create a dialog or control, the identifier is initially generated. When you
edit the identifier via a property editor, you can choose a new name, such as a predefined
symbol and optionally change the integer assigned to the name (assuming it's not a
predefined symbol).
When you save the project, the identifier include file is saved as well. Include this file
in your project so that you can refer to controls and dialogs by identifier rather than
obscure integers. Note that the {\tt .wxr} file itself can only contain integer ids and not the symbols,
due to way in which the resource file is loaded.
\section{Multi-platform development}
{\tt .wxr} files generated on one environment (e.g. Windows) can be used in another (e.g. Motif).
However, because the same panel item can have different sizes on different GUIs,
{\tt .wxr} files generated on one environment (e.g. Windows) can be used in another (e.g. GTK).
If you use default fonts and colouring (set {\bf useSystemDefaults} to True in the dialog properties)
then the dialog fonts and colours will take on the native values, rather than ones specified in the
resource. Without this, colours in the dialog resource may not match system colours.
Also, set {\bf useDialogUnits} to True whenever possible since this will cause the dialog
to be created using a scale based on the current system font size, and will result in dialogs that are
portable between screen resolutions as well as platforms.
Because the same control can have different sizes on different GUIs,
the user should be cautious in assuming that one resource file will work for all
platforms. It may be better to plan to conditionally include or load different
resource files for different platforms, with spacing modified to suit each
environment.
environment. The best thing is to try your dialog resource on several platforms
and see whether tweaking is required for some platforms.

14
utils/dialoged/docs/bugs.tex
View File

@@ -2,14 +2,16 @@
\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
\setfooter{\thepage}{}{}{}{}{\thepage}%
Version 1.0
Version 2.0
\begin{itemize}\itemsep=0pt
\item No XView or Motif versions yet.
\item In Watcom-compiled 32-bit Windows version, bitmap buttons and messages
don't work properly.
\item Some panel item properties missing, e.g. wxPASSWORD, wxREADONLY.
\item No Motif version yet.
\item Some control properties missing.
\item When dragging a selected item, other selected items should follow (to be
consistent with convention), but don't.
\item wxSlider sizing a bit broken: a wxWindows problem.
\item No grid.
\item No keyboard shortcuts.
\item No tab ordering.
\item In dialog unit mode, controls will sometimes move slightly when properties are edited,
because translating between units isn't always reversible (rounding errors?).
\end{itemize}

8
utils/dialoged/docs/changes.tex
View File

@@ -2,6 +2,14 @@
\setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}%
\setfooter{\thepage}{}{}{}{}{\thepage}%
December 31st 1998, Version 2.0
\begin{itemize}\itemsep=0pt
\item wxWindows 2.0 port.
\item Major user interface changes.
\item Allows identifiers to be edited and reads/writes an id header file.
\end{itemize}
March 15th 1997, Version 1.7
\begin{itemize}\itemsep=0pt

1754
utils/dialoged/docs/classes.tex
View File

File diff suppressed because it is too large Load Diff

36
utils/dialoged/docs/dialoged.tex
View File

@@ -5,11 +5,9 @@
%\special{!/@scaleunit 1 def}
\parskip=10pt
\parindent=0pt
\title{User Manual for wxWindows Dialog Editor Version 1.7}
\winhelponly{\author{by Julian Smart, A.I. Applications Institute, University of Edinburgh\\}}
\winhelpignore{\author{Julian Smart\\Artificial Intelligence Applications Institute\\
University of Edinburgh\\EH1 1HN}
\date{March 1997}
\title{User Manual for wxWindows Dialog Editor Version 2.0}
\winhelponly{\author{by Julian Smart, Anthemion Software}
\date{December 1998}
}
\makeindex
\begin{document}
@@ -26,36 +24,20 @@ University of Edinburgh\\EH1 1HN}
\setfooter{\thepage}{}{}{}{}{\thepage}%
\begin{center}
Copyright (c) 1996 Artificial Intelligence Applications Institute,
The University of Edinburgh\\
Copyright (c) 1998 Julian Smart et al
\end{center}
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose is hereby granted without fee, provided that the
above copyright notice, author statement and this permission notice appear in
all copies of this software and related documentation.
THE SOFTWARE IS PROVIDED ``AS-IS'' AND WITHOUT WARRANTY OF ANY KIND, EXPRESS,
IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
IN NO EVENT SHALL THE ARTIFICIAL INTELLIGENCE APPLICATIONS INSTITUTE OR THE
UNIVERSITY OF EDINBURGH BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF
DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
Please see the wxWindows licence for licensing details.
\input{body.tex}
\input{classes.tex}
\input{changes.tex}
\input{bugs.tex}
\input{tech.tex}
\newpage
\addcontentsline{toc}{chapter}{Index}
%\newpage
%
\addcontentsline{toc}{chapter}{Index}%
\printindex%
\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
\setfooter{\thepage}{}{}{}{}{\thepage}%
\printindex
\end{document}

6
utils/dialoged/src/Makefile.in
View File

@@ -17,12 +17,10 @@ BIN_OBJ=dialoged.o dlghndlr.o edlist.o edtree.o \
reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o
# additional things needed to link
BIN_LINK= \
-lwx_prop_gtk
BIN_LINK=
# additional things needed to compile
ADD_COMPILE= \
-I../../../wxprop/src
ADD_COMPILE=
# include the definitions now
include ../../../../template.mak

94
utils/dialoged/src/dlghndlr.cpp
View File

@@ -149,6 +149,20 @@ void wxResourceEditorDialogHandler::OnLeftClick(int x, int y, int keys)
return;
}
// Round down to take account of dialog units
wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(handlerDialog);
if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = handlerDialog->ConvertPixelsToDialog(wxPoint(x, y));
// Convert back so we've rounded down
pt = handlerDialog->ConvertDialogToPixels(pt);
pt = handlerDialog->ConvertPixelsToDialog(pt);
pt = handlerDialog->ConvertDialogToPixels(pt);
x = pt.x;
y = pt.y;
}
switch (wxResourceManager::GetCurrentResourceManager()->GetEditorControlList()->GetSelection())
{
case RESED_BUTTON:
@@ -1000,34 +1014,66 @@ void wxResourceEditorControlHandler::OnDragEnd(int x, int y, int WXUNUSED(keys),
height1 = (ypos + height) - y;
break;
}
handlerControl->SetSize(x1, y1, width1, height1);
// Also update the associated resource
// Update the associated resource
// We need to convert to dialog units if this is not a dialog or panel, but
// the parent resource specifies dialog units.
int resourceX = x1;
int resourceY = y1;
int resourceWidth = width1;
int resourceHeight = height1;
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = handlerControl->GetParent()->ConvertPixelsToDialog(wxPoint(x1, y1));
x1 = pt.x; y1 = pt.y;
wxSize sz = handlerControl->GetParent()->ConvertPixelsToDialog(wxSize(width1, height1));
width1 = sz.x; height1 = sz.y;
// Convert back so we've rounded down
sz = handlerControl->GetParent()->ConvertDialogToPixels(sz);
sz = handlerControl->GetParent()->ConvertPixelsToDialog(sz);
resourceWidth = sz.x; resourceHeight = sz.y;
sz = handlerControl->GetParent()->ConvertDialogToPixels(sz);
width1 = sz.x;
height1 = sz.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
pt = handlerControl->GetParent()->ConvertPixelsToDialog(pt);
resourceX = pt.x; resourceY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
x1 = pt.x;
y1 = pt.y;
}
resource->SetSize(x1, y1, width1, height1);
handlerControl->SetSize(x1, y1, width1, height1);
resource->SetSize(resourceX, resourceY, resourceWidth, resourceHeight);
}
else
{
// Correction 31/12/98. We need to round down the values to take into account
// the fact that several pixels map to the same dialog unit.
int newX = (int)(x - dragOffsetX);
int newY = (int)(y - dragOffsetY);
handlerControl->Move(newX, newY);
OldOnMove(newX, newY);
int resourceX = newX;
int resourceY = newY;
// Also update the associated resource
// Update the associated resource
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = handlerControl->GetParent()->ConvertPixelsToDialog(wxPoint(newX, newY));
newX = pt.x; newY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
pt = handlerControl->GetParent()->ConvertPixelsToDialog(pt);
resourceX = pt.x; resourceY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
// Having converted it several times, we know it'll map to dialog units exactly.
newX = pt.x;
newY = pt.y;
}
resource->SetSize(newX, newY, resource->GetWidth(), resource->GetHeight());
handlerControl->Move(newX, newY);
OldOnMove(newX, newY);
resource->SetSize(resourceX, resourceY, resource->GetWidth(), resource->GetHeight());
// Also move other selected items
wxNode *node = panel->GetChildren().First();
@@ -1044,18 +1090,28 @@ void wxResourceEditorControlHandler::OnDragEnd(int x, int y, int WXUNUSED(keys),
item->GetPosition(&x1, &y1);
int x2 = (int)(x1 + (x - dragOffsetX) - xpos);
int y2 = (int)(y1 + (y - dragOffsetY) - ypos);
// Update the associated resource
resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = item->GetParent()->ConvertPixelsToDialog(wxPoint(x2, y2));
pt = item->GetParent()->ConvertDialogToPixels(pt);
pt = item->GetParent()->ConvertPixelsToDialog(pt);
resourceX = pt.x; resourceY = pt.y;
pt = handlerControl->GetParent()->ConvertDialogToPixels(pt);
// Having converted it several times, we know it'll map to dialog units exactly
x2 = pt.x;
y2 = pt.y;
}
item->Move(x2, y2);
((wxResourceEditorControlHandler *)item->GetEventHandler())->OldOnMove(x2, y2);
((wxResourceEditorControlHandler *)item->GetEventHandler())->DrawSelectionHandles(dc);
// Also update the associated resource
resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxPoint pt = item->GetParent()->ConvertPixelsToDialog(wxPoint(newX, newY));
x2 = pt.x; y2 = pt.y;
}
resource->SetSize(x2, y2, resource->GetWidth(), resource->GetHeight());
resource->SetSize(resourceX, resourceY, resource->GetWidth(), resource->GetHeight());
}
}

13
utils/dialoged/src/makefile.b32
View File

@@ -16,13 +16,9 @@ WXDIR = $(WXWIN)
WXLIBDIR = $(WXDIR)\lib
WXINC = $(WXDIR)\include\msw
WXBASESRC = $(WXDIR)\src\base
WXBASEINC = $(WXDIR)\include\base
WXLIB = $(WXLIBDIR)\wx32.lib
WXPROPDIR = $(WXDIR)\utils\wxprop
WXPROPINC = $(WXPROPDIR)\src
WXPROPLIB = $(WXDIR)\lib\wxprop.lib
LIBS=$(WXLIB) $(WXPROPLIB) cw32 import32 ole2w32
LIBS=$(WXLIB) cw32 import32 ole2w32
INCFILE = includes.cfg
TARGET=dialoged
@@ -40,7 +36,7 @@ CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
$(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
$(TARGET).exe: $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
tlink32 $(LINKFLAGS) @&&!
c0w32.obj $(OBJECTS)
$(TARGET)
@@ -58,11 +54,6 @@ $(INCFILE): $(MAKEFILENAME)
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\msw\wx.rc
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
wxprop:
cd $(WXPROPDIR)\src
make -f makefile.b32
cd $(WXDIR)\utils\dialoged\src
clean:
-erase *.obj *.exe *.res *.map *.rws

79
utils/dialoged/src/makefile.bcc
View File

@@ -1,87 +1,20 @@
#
# File: makefile.bcc
# Author: Julian Smart
# Created: 1993
# Created: 1998
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
#
# "%W% %G%"
#
# Makefile : Builds Dialog Editor (Borland, 16-bit)
!if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
!endif
# Builds a BC++ 16-bit Dialog Editor
!if "$(WXWIN)" == ""
!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
!endif
!ifndef FINAL
FINAL=0
!endif
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makebcc.env
THISDIR = $(WXDIR)\utils\dialoged\src
WXLIB = $(WXDIR)\lib\wx.lib
WXPROPDIR = $(WXDIR)\utils\wxprop
WXPROPINC = $(WXPROPDIR)\src
WXPROPLIB = $(WXPROPDIR)\lib\wxprop.lib
TARGET=dialoged
OBJECTS=dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
LIBS=$(WXLIB) $(WXPROPLIB) mathwl cwl import
INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
CFG=$(WXDIR)\src\wxwin.cfg
INCFILE = includes.cfg
!include $(WXDIR)\src\makeprog.bcc
!if "$(FINAL)" == "0"
LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -Od
DEBUG_FLAGS= -v
!else
LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
OPT = -O2
DEBUG_FLAGS =
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
OBJECTS = wx_resed.obj wx_rdlg.obj wx_reswr.obj wx_repal.obj wx_rprop.obj dialoged.obj
all: dialoged.exe
dialoged.exe: $(INCFILE) $(WXLIB) $(OBJECTS) dialoged.def dialoged.res
tlink $(LINKFLAGS) @&&!
c0wl.obj $(OBJECTS)
dialoged
nul
$(LIBS) $(WXPROPLIB)
dialoged.def
!
rc -30 -K dialoged.res
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) -c {$< }
dialoged.obj: dialoged.$(SRCSUFF) wx_resed.h
wx_resed.obj: wx_resed.$(SRCSUFF) wx_resed.h wx_rprop.h
wx_resed.obj: wx_rdlg.$(SRCSUFF) wx_resed.h wx_rprop.h
wx_rprop.obj: wx_rprop.$(SRCSUFF) wx_resed.h wx_rprop.h
wx_reswr.obj: wx_reswr.$(SRCSUFF) wx_resed.h
wx_repal.obj: wx_repal.$(SRCSUFF) wx_repal.h
dialoged.res : dialoged.rc $(WXDIR)\include\msw\wx.rc
rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa dialoged
$(INCFILE): $(MAKEFILENAME)
copy &&!
-I..\..\wxprop\src
! $(INCFILE)
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.rws

17
utils/dialoged/src/makefile.dos
View File

@@ -20,23 +20,8 @@ WXLIB = $(WXDIR)\lib\wx.lib
DOCDIR = $(WXDIR)\utils\dialoged\docs
PROPDIR = $(WXDIR)\utils\wxprop
PROPINC = $(PROPDIR)\src
PROPLIB = $(PROPDIR)\lib\wxprop.lib
TREEDIR = $(WXDIR)\utils\wxtree
TREEINC = $(TREEDIR)\src
TREELIB = $(TREEDIR)\lib\wxtree.lib
DIBDIR = $(WXDIR)\utils\dib
DIBLIB = $(DIBDIR)\dib.lib
DIBINC = $(DIBDIR)
RCDIR = $(WXDIR)\utils\rcparser
RCLIB = $(RCDIR)\lib\rcparser.lib
RCINC = $(RCDIR)\src
LIBS=$(WXLIB) $(PROPLIB) oldnames libw llibcew commdlg shell ddeml
LIBS=$(WXLIB) oldnames libw llibcew commdlg shell ddeml
INC=/I$(WXDIR)\include\base /I$(WXDIR)\include\msw /I$(PROPINC)
!ifndef FINAL

18
utils/dialoged/src/makefile.nt
View File

@@ -14,10 +14,6 @@
# Set WXDIR for your system
WXDIR = $(WXWIN)
THISDIR = $(WXDIR)\utils\dialoged\src
PROPDIR = $(WXDIR)\utils\wxprop
PROPLIB=$(PROPDIR)\lib\wxprop.lib
EXTRALIBS=$(PROPDIR)\lib\wxprop.lib
EXTRAINC=/I$(PROPDIR)\src
DOCDIR=$(WXDIR)\docs
LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs
@@ -28,7 +24,7 @@ PROGRAM=dialoged
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
all: wxprop dialoged.exe
all: dialoged.exe
wx:
cd $(WXDIR)\src\msw
@@ -40,7 +36,7 @@ wxclean:
nmake -f makefile.nt clean
cd $(THISDIR)
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROPLIB) $(PROGRAM).res
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
$(link) @<<
-out:$(PROGRAM).exe
$(LINKFLAGS)
@@ -96,16 +92,6 @@ $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
wxprop:
cd $(PROPDIR)\src
nmake -f makefile.nt FINAL=$(FINAL)
cd $(THISDIR)
clean_wxprop:
cd $(PROPDIR)\src
nmake -f makefile.nt clean
cd $(THISDIR)
clean:
-erase *.obj
-erase *.sbr

119
utils/dialoged/src/makefile.unx
View File

@@ -1,123 +1,18 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1993
# Created: 1998
# Updated:
# Copyright: (c) 1993, AIAI, University of Edinburgh
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
# Makefile for dialoged example (UNIX).
# Makefile for Dialog Editor (Unix)
WXDIR = ../../..
PROGRAM=dialoged
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/make.env
OBJECTS = dialoged.o reseditr.o dlghndlr.o reswrite.o\
winprop.o edtree.o edlist.o symbtabl.o winstyle.o
WXPROPDIR = $(WXDIR)/utils/wxprop
WXPROPINC = $(WXDIR)/utils/wxprop/src
WXPROPLIB = $(WXDIR)/utils/wxprop/lib
include ../../../src/makeprog.env
DIALOGEDDIR = $(WXDIR)/utils/dialoged
OBJECTS = $(OBJDIR)/dialoged.o $(OBJDIR)/wx_repal.o $(OBJDIR)/wx_resed.o $(OBJDIR)/wx_rdlg.o $(OBJDIR)/wx_reswr.o $(OBJDIR)/wx_rprop.o
INC = $(COMPPATHS) -I$(WXDIR)/include/x -I$(WXDIR)/include/base -I$(WXPROPINC)
XVIEWLDLIBS = -lwxprop_ol -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
MOTIFLDLIBS = -lwxprop_motif -lwx_motif -lXm -lXt -lX11 -lm $(COMPLIBS)
HPLDLIBS = -lwxprop_hp -lwx_hp -lXm -lXt -lX11 -lm $(HPCOMPLIBS)
# Default
LDLIBS=$(XVIEWLDLIBS)
CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(WARN) $(OPT)
LDFLAGS = $(XLIB) -L$(WXDIR)/lib -L$(WXPROPLIB)
.SUFFIXES:
all: $(OBJDIR) dialoged$(GUISUFFIX)
wx_ol:
cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
wx_motif:
cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx motif
motif:
$(MAKE) -f makefile.unx dialoged_motif GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)'\
OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
xview:
$(MAKE) -f makefile.unx dialoged_ol GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)'\
DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
hp:
$(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' DEBUGFLAGS='$(DEBUGFLAGS)' WARN='-w' \
XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
$(OBJDIR):
mkdir $(OBJDIR)
dialoged$(GUISUFFIX): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o dialoged$(GUISUFFIX) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS)
$(OBJDIR)/dialoged.o: dialoged.$(SRCSUFF) dialoged.h
$(CC) -c $(CPPFLAGS) -o $@ dialoged.$(SRCSUFF)
$(OBJDIR)/wx_rprop.o: wx_rprop.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ wx_rprop.$(SRCSUFF)
$(OBJDIR)/wx_resed.o: wx_resed.$(SRCSUFF) wx_resed.h
$(CC) -c $(CPPFLAGS) -o $@ wx_resed.$(SRCSUFF)
$(OBJDIR)/wx_rdlg.o: wx_rdlg.$(SRCSUFF) wx_resed.h
$(CC) -c $(CPPFLAGS) -o $@ wx_rdlg.$(SRCSUFF)
$(OBJDIR)/wx_repal.o: wx_repal.$(SRCSUFF) wx_repal.h
$(CC) -c $(CPPFLAGS) -o $@ wx_repal.$(SRCSUFF)
$(OBJDIR)/wx_reswr.o: wx_reswr.$(SRCSUFF) wx_resed.h
$(CC) -c $(CPPFLAGS) -o $@ wx_reswr.$(SRCSUFF)
wxprop_motif:
cd $(WXPROPDIR)/src; $(MAKE) -f makefile.unx motif OPT='$(OPT)'
wxprop_ol:
cd $(WXPROPDIR)/src
$(MAKE) -f makefile.unx xview OPT='$(OPT)'
clean_motif:
$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
clean_ol:
$(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
clean_hp:
$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
cleanany:
rm -f $(OBJECTS) $(TESTOBJECTS) test$(GUISUFFIX) dialoged$(GUISUFFIX) core
HTMLDIR=/home/hardy/html/wx/manuals
docs: ps xlp
ps: $(DIALOGEDDIR)/docs/dialoged.ps
xlp: $(DIALOGEDDIR)/docs/dialoged.xlp
html: $(HTMLDIR)/dialoged/dialoged_contents.html
$(DIALOGEDDIR)/docs/dialoged.xlp: $(DIALOGEDDIR)/docs/dialoged.tex $(DIALOGEDDIR)/docs/classes.tex $(DIALOGEDDIR)/docs/body.tex $(DIALOGEDDIR)/docs/tech.tex
cd ../docs; tex2rtf dialoged.tex tmp.xlp -xlp -twice
sed -e "s/WXHELPCONTENTS/wxChart Manual/g" < $(DIALOGEDDIR)/docs/tmp.xlp > $(DIALOGEDDIR)/docs/dialoged.xlp
/bin/rm -f $(DIALOGEDDIR)/docs/tmp.xlp
$(HTMLDIR)/dialoged/dialoged_contents.html: $(DIALOGEDDIR)/docs/dialoged.tex $(DIALOGEDDIR)/docs/body.tex $(DIALOGEDDIR)/docs/tech.tex
cd ../docs; tex2rtf dialoged.tex $(HTMLDIR)/dialoged/dialoged.html -html -twice
$(DIALOGEDDIR)/docs/dialoged.dvi: $(DIALOGEDDIR)/docs/dialoged.tex $(DIALOGEDDIR)/docs/classes.tex
cd $(DIALOGEDDIR)/docs; latex dialoged; latex dialoged; makeindex dialoged; latex dialoged; latex dialoged
# makeindex dialoged; bibtex dialoged; latex dialoged; latex dialoged
$(DIALOGEDDIR)/docs/dialoged.ps: $(DIALOGEDDIR)/docs/dialoged.dvi
cd $(DIALOGEDDIR)/docs; dvips -f -r < dialoged.dvi > dialoged.ps

67
utils/dialoged/src/makefile.wat
View File

@@ -1,62 +1,15 @@
# Dialog Editor makefile for Watcom
#
# Makefile for WATCOM
#
# Created by D.Chubraev, chubraev@iem.ee.ethz.ch
# 8 Nov 1994
#
WXDIR = ..\..\..
WXDIR = $(%WXWIN)
# EXTRACPPFLAGS = $(CLIPSFLAGS)
PROGRAM = dialoged
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
!include $(WXDIR)\src\makewat.env
WXPROPDIR = $(WXDIR)\utils\wxprop
WXPROPLIB = $(WXPROPDIR)\lib\wxprop.lib
WXPROPINC = $(WXPROPDIR)\src
THISDIR = $(WXDIR)\utils\dialoged\src
NAME = dialoged
LNK = $(name).lnk
IFLAGS = -i=$(WXINC) -i=$(WXBASEINC) -i=$(WXPROPINC)
PROGOBJECTS = dialoged.obj wx_resed.obj wx_rdlg.obj wx_reswr.obj wx_repal.obj wx_rprop.obj
all: wx wxprop erasepch $(PROGOBJECTS) dialoged.exe
wx: .SYMBOLIC
cd $(WXDIR)\src\msw
wmake -f makefile.wat all
cd $(THISDIR)
wxprop: .SYMBOLIC
cd $(WXPROPDIR)\src
wmake -f makefile.wat all
cd $(THISDIR)
$(name).exe : $(PROGOBJECTS) $(name).res $(LNK) $(WXDIR)\lib\wx$(LEVEL).lib $(WXPROPLIB)
wlink @$(LNK)
$(BINDCOMMAND) $(name).res
$(name).res : $(name).rc $(WXDIR)\include\msw\wx.rc
$(RC) $(RESFLAGS1) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(name).rc
$(LNK) : makefile.wat
%create $(LNK)
@%append $(LNK) $(DEBUGINFO)
@%append $(LNK) system $(LINKOPTION)
@%append $(LNK) $(MINDATA)
@%append $(LNK) $(MAXDATA)
@%append $(LNK) $(STACK)
@%append $(LNK) name $(name)
@%append $(LNK) file $(WXDIR)\lib\wx$(LEVEL).lib
@%append $(LNK) file $(WXPROPLIB)
@for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
@for %i in ($(PROGOBJECTS)) do @%append $(LNK) file %i
cleanutils: .SYMBOLIC
cd $(WXPROPDIR)\src
wmake -f makefile.wat clean
cd $(THISDIR)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch *.lbc *.res
!include $(WXDIR)\src\makeprog.wat