Various documentation changes, makefile fixes

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 170669e78d2b95516ff54ca29f1196e5e8951696..ea48d1fe5fdef7183022c75bb759fdaef89dcf33 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -14,6 +14,7 @@ src/common/dosyacc.c
 src/common/doslex.c
 src/common/vmsyacc.c
 src/common/vmslex.c
 src/common/doslex.c
 src/common/vmsyacc.c
 src/common/vmslex.c

+src/common/extended.c

 src/common/*.l
 src/common/*.y
 src/common/*.inc
 src/common/*.l
 src/common/*.y
 src/common/*.inc


@@ -181,6 +182,7 @@ utils/dialoged/src/*.ico
 utils/dialoged/src/*.prj
 utils/dialoged/src/*.bmp
 utils/dialoged/src/bitmaps/*.bmp
 utils/dialoged/src/*.prj
 utils/dialoged/src/*.bmp
 utils/dialoged/src/bitmaps/*.bmp

+utils/dialoged/src/bitmaps/*.ico

 utils/dialoged/test/*.cpp
 utils/dialoged/test/*.def
 utils/dialoged/test/*.rc
 utils/dialoged/test/*.cpp
 utils/dialoged/test/*.def
 utils/dialoged/test/*.rc

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index ffdb4253e7aff696783b54da5e2095eb542b186d..c766a13731204a52970bca374439ed1000e14a1c 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -12,14 +12,14 @@ erase %2\wx200*.zip
 
 cd %1
 echo Zipping...
 
 cd %1
 echo Zipping...

-zip32 -@ %2\wx200gen.zip < %1\distrib\generic.rsp
-zip32 -@ %2\wx200msw.zip < %1\distrib\msw.rsp
-zip32 -@ %2\wx200doc.zip < %1\distrib\docsrc.rsp
+zip32 -@ %2\wx200gen.zip < %1\distrib\msw\generic.rsp
+zip32 -@ %2\wx200msw.zip < %1\distrib\msw\msw.rsp
+zip32 -@ %2\wx200doc.zip < %1\distrib\msw\docsrc.rsp

 
 

-rem zip32 -@ %2\wx200ps.zip < %1\distrib\wx_ps.rsp
-zip32 -@ %2\wx200hlp.zip < %1\distrib\wx_hlp.rsp
-zip32 -@ %2\wx200htm.zip < %1\distrib\wx_html.rsp
-zip32 -@ %2\wx200pdf.zip < %1\distrib\wx_pdf.rsp
+rem zip32 -@ %2\wx200ps.zip < %1\distrib\msw\wx_ps.rsp
+zip32 -@ %2\wx200hlp.zip < %1\distrib\msw\wx_hlp.rsp
+zip32 -@ %2\wx200htm.zip < %1\distrib\msw\wx_html.rsp
+zip32 -@ %2\wx200pdf.zip < %1\distrib\msw\wx_pdf.rsp

 
 cd %2
 
 
 cd %2
 


@@ -28,7 +28,7 @@ goto end
 
 :usage
 echo DOS wxWindows distribution.
 
 :usage
 echo DOS wxWindows distribution.

-echo Usage: zipdistgeneric source destination
-echo e.g. zipdistgeneric c:\wx b:
+echo Usage: zipdist source destination
+echo e.g. zipdist d:\wx2\wxWindows d:\wx2\wxWindows\deliver

 
 :end
 
 :end

diff --git a/docs/changes.txt b/docs/changes.txt
index 522a6820646a5ef454a9b5f0a4779be9917de061..e46bf6630460400b6171e3ba74ae49478221da9f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,11 +1,15 @@
-
-

 Generic wxWindows 2.0 Change Log
 --------------------------------
 
 Note: for platform-specific changes, see wx/docs/XXX/changes.txt
 where XXX is one of msw, motif, xt, gtk, mac.
 
 Generic wxWindows 2.0 Change Log
 --------------------------------
 
 Note: for platform-specific changes, see wx/docs/XXX/changes.txt
 where XXX is one of msw, motif, xt, gtk, mac.
 

+Alpha 11, July 3rd 1998
+-----------------------
+
+- Major work on Dialog Editor (still plenty to go).
+- Expanded documentation a bit more.
+

 Alpha 9, April 27th 1998
 ------------------------
 
 Alpha 9, April 27th 1998
 ------------------------
 

diff --git a/docs/latex/porting/porting.hpj b/docs/latex/porting/porting.hpj
index 36765022384b3b835a62a0df80b1f99f8c8781a4..d1e08375c183a0f24465714a65d600a0c7eb03a3 100644 (file)
--- a/docs/latex/porting/porting.hpj
+++ b/docs/latex/porting/porting.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
 [OPTIONS]

-BMROOT=d:\wx2\docs/latex/porting ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxwind~1\docs\latex\porting ; Assume that bitmaps are where the source is

 TITLE=wxWindows Porting Guide
 CONTENTS=Contents
 COMPRESS=HIGH
 TITLE=wxWindows Porting Guide
 CONTENTS=Contents
 COMPRESS=HIGH

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index c14c68c0aea6cf428c22ac58612ccdb63c060d8a..a8cef0ce42e2b24189d9cb098a1ccca4e7fb3d43 100644 (file)
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -142,7 +142,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input statbox.tex
 \input stattext.tex
 \input statusbr.tex
 \input statbox.tex
 \input stattext.tex
 \input statusbr.tex

-\input wxstring.tex
+%\input wxstring.tex

 \input strlist.tex
 \input sysclevt.tex
 \input settings.tex
 \input strlist.tex
 \input sysclevt.tex
 \input settings.tex

diff --git a/docs/latex/wx/eraseevt.tex b/docs/latex/wx/eraseevt.tex
index f7397c2b425216eaa8fa56fde518dbc3f8c6883d..2c4a559780e1180e9defd6f2f922356ae3c87c8e 100644 (file)
--- a/docs/latex/wx/eraseevt.tex
+++ b/docs/latex/wx/eraseevt.tex
@@ -14,7 +14,7 @@ function that takes a wxEraseEvent argument.
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt

-\twocolitem{{\bf EVT\_ERASE(func)}}{Process a wxEVT\_ERASE\_BACKGROUND event.}
+\twocolitem{{\bf EVT\_ERASE\_BACKGROUND(func)}}{Process a wxEVT\_ERASE\_BACKGROUND event.}

 \end{twocollist}%
 
 \wxheading{Remarks}
 \end{twocollist}%
 
 \wxheading{Remarks}

diff --git a/docs/latex/wx/imaglist.tex b/docs/latex/wx/imaglist.tex
index 81d11bd2e66023eadf836de43f942614de201334..a1f79912d9e5377cc5ab24a2204cefe99e69e086 100644 (file)
--- a/docs/latex/wx/imaglist.tex
+++ b/docs/latex/wx/imaglist.tex
@@ -53,7 +53,7 @@ Adds a new image using a bitmap and optional mask bitmap.
 
 Adds a new image using a bitmap and mask colour.
 
 
 Adds a new image using a bitmap and mask colour.
 

-\func{int}{Add}{\param{const wxBitmap\&}{ icon}}
+\func{int}{Add}{\param{const wxIcon\&}{ icon}}

 
 Adds a new image using an icon.
 
 
 Adds a new image using an icon.
 

diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex
index c7f85fa14b14b1018ab6feb746a21e7edfd6ee89..50ff163bcdbc4c5f8e4cd640594a65665c972bf5 100644 (file)
--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -348,6 +348,16 @@ Inserts an image item.
 
 Insert an image/string item.
 
 
 Insert an image/string item.
 

+\wxheading{Parameters}
+
+\docparam{info}{wxListItem object}
+
+\docparam{index}{Index of the new item, supplied by the application}
+
+\docparam{label}{String label}
+
+\docparam{imageIndex}{index into the image list associated with this control and view style}
+

 \membersection{wxListCtrl::ScrollList}\label{wxlistctrlscrolllist}
 
 \func{bool}{ScrollList}{\param{int }{dx}, \param{int }{dy}}
 \membersection{wxListCtrl::ScrollList}\label{wxlistctrlscrolllist}
 
 \func{bool}{ScrollList}{\param{int }{dx}, \param{int }{dy}}


@@ -377,10 +387,12 @@ information.
 
 \func{bool}{SetColumnWidth}{\param{int }{col}, \param{int }{width}}
 
 
 \func{bool}{SetColumnWidth}{\param{int }{col}, \param{int }{width}}
 

-Sets the column width (report view only).
+Sets the column width.

 
 {\it width} can be a width in pixels or wxLIST\_AUTOSIZE (-1) or wxLIST\_AUTOSIZE\_USEHEADER (-2).
 
 
 {\it width} can be a width in pixels or wxLIST\_AUTOSIZE (-1) or wxLIST\_AUTOSIZE\_USEHEADER (-2).
 

+In small or normal icon view, {\it col} must be -1, and the column width is set for all columns.
+

 \membersection{wxListCtrl::SetImageList}\label{wxlistctrlsetimagelist}
 
 \func{void}{SetImageList}{\param{wxImageList*}{ imageList}, \param{int }{which}}
 \membersection{wxListCtrl::SetImageList}\label{wxlistctrlsetimagelist}
 
 \func{void}{SetImageList}{\param{wxImageList*}{ imageList}, \param{int }{which}}

diff --git a/docs/latex/wx/paintdc.tex b/docs/latex/wx/paintdc.tex
index e1c416044bfc31324088a0debb71c5433b90a2ef..5589b42648dc6bb661c1b7ee351cdfc3e12a5e1a 100644 (file)
--- a/docs/latex/wx/paintdc.tex
+++ b/docs/latex/wx/paintdc.tex
@@ -5,6 +5,10 @@ client area of a window from within an {\bf OnPaint} event.
 This should normally be constructed as a temporary stack object; don't store
 a wxPaintDC object.
 
 This should normally be constructed as a temporary stack object; don't store
 a wxPaintDC object.
 

+Using wxPaintDC within OnPaint is important because it automatically
+sets the clipping area to the damaged area of the window. Attempts to draw
+outside this area do not appear.
+

 To draw on a window from outside {\bf OnPaint}, construct a \helpref{wxClientDC}{wxclientdc} object.
 
 To draw on the whole window including decorations, construct a \helpref{wxWindowDC}{wxwindowdc} object
 To draw on a window from outside {\bf OnPaint}, construct a \helpref{wxClientDC}{wxclientdc} object.
 
 To draw on the whole window including decorations, construct a \helpref{wxWindowDC}{wxwindowdc} object

diff --git a/docs/latex/wx/tabctrl.tex b/docs/latex/wx/tabctrl.tex
index 3e93a5794562d4fc9ff7b9e240ed74a93603a11e..f623a4748a6726e6f65f4646d1bc44faa85ce647 100644 (file)
--- a/docs/latex/wx/tabctrl.tex
+++ b/docs/latex/wx/tabctrl.tex
@@ -65,6 +65,12 @@ Deletes all tab items.
 
 Deletes the specified tab item.
 
 
 Deletes the specified tab item.
 

+\membersection{wxTabCtrl::GetCurFocus}\label{wxtabctrlgetcurfocus}
+
+\constfunc{int}{GetCurFocus}{\void}
+
+Returns the index for the tab with the focus, or -1 if none has the focus.
+

 \membersection{wxTabCtrl::GetImageList}\label{wxtabctrlgetimagelist}
 
 \constfunc{wxImageList*}{GetImageList}{\void}
 \membersection{wxTabCtrl::GetImageList}\label{wxtabctrlgetimagelist}
 
 \constfunc{wxImageList*}{GetImageList}{\void}

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 9b126650fb4fd94a4845bd68a0e53ed4b562fb7c..609309b05baff59a65a06a5114ac57acda71f513 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -29,6 +29,8 @@ the application-wide policy is for 3D controls. Windows only.}
 \twocolitem{\windowstyle{wxTAB\_TRAVERSAL}}{Use this to enable tab traversal for non-dialog windows.}
 \twocolitem{\windowstyle{wxVSCROLL}}{Use this style to enable a vertical scrollbar.}
 \twocolitem{\windowstyle{wxHSCROLL}}{Use this style to enable a horizontal scrollbar.}
 \twocolitem{\windowstyle{wxTAB\_TRAVERSAL}}{Use this to enable tab traversal for non-dialog windows.}
 \twocolitem{\windowstyle{wxVSCROLL}}{Use this style to enable a vertical scrollbar.}
 \twocolitem{\windowstyle{wxHSCROLL}}{Use this style to enable a horizontal scrollbar.}

+\twocolitem{\windowstyle{wxCLIP\_CHILDREN}}{Use this style to eliminate flicker caused by the background being
+repainted, then children being painted over them. Windows-only.}

 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index a748fcdeae35ff077130d6d3f895a78bf66fb79d..28b76b44eda42bac1aa745d7755a177a520fd439 100644 (file)
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,8 +1,15 @@
+; This file is maintained by HCW. Do not modify this file directly.
+

 [OPTIONS]
 [OPTIONS]

-BMROOT=d:\wx2\wxwind~1\docs\latex\wx ; Assume that bitmaps are where the source is
-TITLE=wxWindows Manual
+HCW=0
+COMPRESS=60 Hall Zeck
+LCID=0x809 0x0 0x0 ;English (United Kingdom)
+REPORT=Yes

 CONTENTS=Contents
 CONTENTS=Contents

-COMPRESS=HIGH
+TITLE=wxWindows Manual
+BMROOT=..\..\..\..\wxwind~1\docs\latex\wx
+BMROOT=Assume that bitmaps are where the source is
+HLP=.\wx.hlp

 
 [FILES]
 wx.rtf
 
 [FILES]
 wx.rtf


@@ -10,8 +17,3 @@ wx.rtf
 [CONFIG]
 CreateButton("Up", "&Up", "JumpId(`wx.hlp', `Contents')")
 BrowseButtons()
 [CONFIG]
 CreateButton("Up", "&Up", "JumpId(`wx.hlp', `Contents')")
 BrowseButtons()

-
-[MAP]
-
-[BITMAPS]
-

diff --git a/docs/msw/changes.txt b/docs/msw/changes.txt
index b698bd3d18e37e3237f08a5ac8319ba4b88a7aa0..827736e9904accb261fde8e0155b390707183bc7 100644 (file)
--- a/docs/msw/changes.txt
+++ b/docs/msw/changes.txt
@@ -2,7 +2,7 @@
 wxWindows 2.0 for Windows Change Log
 ------------------------------------
 
 wxWindows 2.0 for Windows Change Log
 ------------------------------------
 

-Alpha 11, June ??th 1998
+Alpha 11, July 3rd 1998

 -----------------------
 
 - Added thread.h, thread.cpp.
 -----------------------
 
 - Added thread.h, thread.cpp.


@@ -15,6 +15,16 @@ Alpha 11, June ??th 1998
   wxRegion::IsEmpty for a more consistent naming convention.
 - Added Vadim's wxDataObject and wxDropSource.
 - ENTER/LEAVE events now work.
   wxRegion::IsEmpty for a more consistent naming convention.
 - Added Vadim's wxDataObject and wxDropSource.
 - ENTER/LEAVE events now work.

+- Cured wxMemoryDC bug where the DC wasn't being deleted.
+- Cured wxGauge SetSize major bugginess.
+- Cured problem where if a GDI object was created on the stack,
+  then went out of scope, then another object was selected into
+  the DC, GDI objects would leak. This is because the assignment
+  to e.g. wxDC::m_pen would delete the GDI object without it first
+  being selected out of the DC. Cured by selecting the old DC object
+  first, then doing the assignment.
+- Split up wxGaugeMSW, wxGauge95, wxSliderMSW, wxSlider95
+- Various other bug fixes and additions.

 
 Alpha 10, May 7th 1998
 ----------------------
 
 Alpha 10, May 7th 1998
 ----------------------

diff --git a/docs/msw/issues.txt b/docs/msw/issues.txt
index ac12269303ef3d463276bc3da6194febba6a80af..080459bb80b9aebbf79a9baf005ec45c39f08342 100644 (file)
--- a/docs/msw/issues.txt
+++ b/docs/msw/issues.txt
@@ -65,3 +65,10 @@ Options:
 - take elements from both
 - do the Windows stuff, let someone else write/adapt the
   non-Windows classes
 - take elements from both
 - do the Windows stuff, let someone else write/adapt the
   non-Windows classes

+
+Owner-draw menus
+----------------
+
+If USE_OWNER_DRAWN = 1 and you create a wxMenu, you get 'all bets
+are off' memory checking warnings from wxWindows.
+

diff --git a/samples/makefile.g95 b/samples/makefile.g95
index 761c7a23f34ff8dd8db16661422f411d0248b7c6..4156a79d2f5fd9eb0a1df8255b63c7e47309ede9 100644 (file)
--- a/samples/makefile.g95
+++ b/samples/makefile.g95
@@ -18,7 +18,6 @@ THISDIR=$(WXDIR)/samples
 all:
                cd $(WXDIR)/samples/splitter; make -f makefile.g95
                cd $(WXDIR)/samples/resource; make -f makefile.g95
 all:
                cd $(WXDIR)/samples/splitter; make -f makefile.g95
                cd $(WXDIR)/samples/resource; make -f makefile.g95

-               cd $(WXDIR)/samples/events; make -f makefile.g95

                cd $(WXDIR)/samples/controls; make -f makefile.g95
                cd $(WXDIR)/samples/listctrl; make -f makefile.g95
                cd $(WXDIR)/samples/treectrl; make -f makefile.g95
                cd $(WXDIR)/samples/controls; make -f makefile.g95
                cd $(WXDIR)/samples/listctrl; make -f makefile.g95
                cd $(WXDIR)/samples/treectrl; make -f makefile.g95


@@ -57,7 +56,6 @@ clean:
                cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean
                cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean
                cd $(WXDIR)/samples/validate; make -f makefile.g95 clean
                cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean
                cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean
                cd $(WXDIR)/samples/validate; make -f makefile.g95 clean

-               cd $(WXDIR)/samples/events; make -f makefile.g95 clean

                cd $(WXDIR)/samples/docview; make -f makefile.g95 clean
                cd $(WXDIR)/samples/controls; make -f makefile.g95 clean
                cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean
                cd $(WXDIR)/samples/docview; make -f makefile.g95 clean
                cd $(WXDIR)/samples/controls; make -f makefile.g95 clean
                cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean

diff --git a/samples/makefile.nt b/samples/makefile.nt
index 7c1fb9531fce39aa95b321c7d591922a95c76d6f..14cbb69ed3d8433abdb5a60a88a5abe944076d10 100644 (file)
--- a/samples/makefile.nt
+++ b/samples/makefile.nt
@@ -26,8 +26,6 @@ all:
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\resource
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\resource
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

-        cd $(WXDIR)\samples\events
-        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

         cd $(WXDIR)\samples\controls
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\listctrl
         cd $(WXDIR)\samples\controls
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\listctrl


@@ -124,8 +122,6 @@ clean:
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\validate
         nmake -f makefile.nt clean
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\validate
         nmake -f makefile.nt clean

-        cd $(WXDIR)\samples\events
-        nmake -f makefile.nt clean

         cd $(WXDIR)\samples\docview
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\controls
         cd $(WXDIR)\samples\docview
         nmake -f makefile.nt clean
         cd $(WXDIR)\samples\controls

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 5ad9b54e2a40fc452f763340cb34740253a9aa25..690e648d3740230fef173744ba543c5ff8771edc 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -70,15 +70,13 @@ bool MyApp::OnInit(void)
   frame->SetIcon(wxIcon("aiai.xbm"));
 #endif
 
   frame->SetIcon(wxIcon("aiai.xbm"));
 #endif
 

-  // Make an image list containing large icons
+  // Make an image list containing small icons

   m_imageListNormal = new wxImageList(16, 16, TRUE);
 
   m_imageListNormal = new wxImageList(16, 16, TRUE);
 

-  wxIcon *icon = new wxIcon("icon1", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon2", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
+  wxIcon icon1("icon1", wxBITMAP_TYPE_ICO_RESOURCE);
+  m_imageListNormal->Add(icon1);
+  wxIcon icon2("icon2", wxBITMAP_TYPE_ICO_RESOURCE);
+  m_imageListNormal->Add(icon2);

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;

diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32
index 36ae0adc504cb05bb9c824b128ee940e4b780670..1e447bdb211c666fb99bfac9a27ce699992c5d7a 100644 (file)
--- a/utils/dialoged/src/makefile.b32
+++ b/utils/dialoged/src/makefile.b32
@@ -38,7 +38,7 @@ DEBUG_FLAGS =
 !endif
 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
 
 !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
+OBJECTS = dialoged.obj editrpal.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj

 
 $(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
   tlink32 $(LINKFLAGS) @&&!
 
 $(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
   tlink32 $(LINKFLAGS) @&&!

diff --git a/utils/dialoged/src/makefile.g95 b/utils/dialoged/src/makefile.g95
index 22fba5095185ba05bd8a56344da12ec9aaad6b38..164db4f32d172992731d1ce1e9387a81bc43b2d4 100644 (file)
--- a/utils/dialoged/src/makefile.g95
+++ b/utils/dialoged/src/makefile.g95
@@ -16,6 +16,7 @@ include $(WXDIR)/src/makeg95.env
 
 OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/editrpal.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
  $(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(OBJSUFF)\
 
 OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/editrpal.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
  $(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(OBJSUFF)\

+ $(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF)\

  $(OBJDIR)/dialoged_resources.$(OBJSUFF)
 
 EXTRAINC = -I../../wxprop/src
  $(OBJDIR)/dialoged_resources.$(OBJSUFF)
 
 EXTRAINC = -I../../wxprop/src


@@ -54,6 +55,12 @@ $(OBJDIR)/reseditr.$(OBJSUFF):       winprop.h reseditr.h editrpal.h reseditr.$(SRCSUF
 $(OBJDIR)/dlghndlr.$(OBJSUFF): winprop.h reseditr.h editrpal.h dlghndlr.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ dlghndlr.$(SRCSUFF)
 
 $(OBJDIR)/dlghndlr.$(OBJSUFF): winprop.h reseditr.h editrpal.h dlghndlr.$(SRCSUFF)
        $(CC) -c $(CPPFLAGS) -o $@ dlghndlr.$(SRCSUFF)
 

+$(OBJDIR)/edlist.$(OBJSUFF):   winprop.h edlist.h edlist.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ edlist.$(SRCSUFF)
+
+$(OBJDIR)/edtree.$(OBJSUFF):   winprop.h edtree.h edtree.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+

 $(OBJDIR)/dialoged_resources.o:  dialoged.rc
        $(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)
 
 $(OBJDIR)/dialoged_resources.o:  dialoged.rc
        $(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)
 

diff --git a/utils/wxprop/docs/wxprop.hpj b/utils/wxprop/docs/wxprop.hpj
index a91f6b70e41e477aaeaf5e5216c84667bfae6091..5492173d5155a6f89df19d094b1c28a54f6d65f5 100644 (file)
--- a/utils/wxprop/docs/wxprop.hpj
+++ b/utils/wxprop/docs/wxprop.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
 [OPTIONS]

-BMROOT=d:\wx2\utils\wxprop\docs ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxwind~1\utils\wxprop\docs ; Assume that bitmaps are where the source is

 TITLE=Property Classes Manual
 CONTENTS=Contents
 COMPRESS=HIGH
 TITLE=Property Classes Manual
 CONTENTS=Contents
 COMPRESS=HIGH