applied wxDirSelector() patch and regenerated the makefiles to include the new src...

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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 464cb9d2505463c936b3c534bfa49e18f3273fab..afc08205537f403b3c56a1d408343ccc4804725b 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -136,6 +136,7 @@ dndcmn.cpp  Common
 dobjcmn.cpp    Common
 docmdi.cpp     Common
 docview.cpp    Common
 dobjcmn.cpp    Common
 docmdi.cpp     Common
 docview.cpp    Common

+dseldlg.cpp    Common

 dynarray.cpp   Common  Base
 dynlib.cpp     Common  Base
 effects.cpp    Common
 dynarray.cpp   Common  Base
 dynlib.cpp     Common  Base
 effects.cpp    Common

diff --git a/docs/changes.txt b/docs/changes.txt
index c61b5e79fd3056c9a701caf6b85599b45b926ecf..c488a416f6b4403dcfd7456eee542c38ed942646 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -43,6 +43,7 @@ All (GUI):
 - polygon support in wxRegion (Klaas Holwerda)
 - wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
 - fixed bug with using wxExecute() to capture huge amounts of output
 - polygon support in wxRegion (Klaas Holwerda)
 - wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
 - fixed bug with using wxExecute() to capture huge amounts of output

+- wxDirSelector() added (Paul A. Thiessen)

 
 wxHTML:
 
 
 wxHTML:
 

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index dc9310d0bf1b25f8764ab378e9bad8c012f94944..07fe1ee4bd18f14c24525790511ee561cafd3c41 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -597,6 +597,32 @@ is remembered between the 2 program runs.}
 
 <wx/tipdlg.h>
 
 
 <wx/tipdlg.h>
 

+\membersection{::wxDirSelector}\label{wxdirselector}
+
+\func{wxString}{wxDirSelector}{\param{const wxString\& }{message = wxDirSelectorPromptStr},\\
+ \param{const wxString\& }{default\_path = ""},\\
+ \param{long }{style = 0}, \param{const wxPoint\& }{pos = wxDefaultPosition},\\
+ \param{wxWindow *}{parent = NULL}}
+
+Pops up a directory selector dialog. The arguments have the same meaning as
+those of wxDirDialog::wxDirDialog(). The message is displayed at the top,
+and the default_path, if specified, is set as the initial selection.
+
+The application must check for an empty return value (if the user pressed
+Cancel). For example:
+
+\begin{verbatim}
+const wxString& dir = wxDirSelector("Choose a folder");
+if ( !dir.empty() )
+{
+  ...
+}
+\end{verbatim}
+
+\wxheading{Include files}
+
+<wx/dirdlg.h>
+

 \membersection{::wxFileSelector}\label{wxfileselector}
 
 \func{wxString}{wxFileSelector}{\param{const wxString\& }{message}, \param{const wxString\& }{default\_path = ""},\\
 \membersection{::wxFileSelector}\label{wxfileselector}
 
 \func{wxString}{wxFileSelector}{\param{const wxString\& }{message}, \param{const wxString\& }{default\_path = ""},\\

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index f33ab1754f247b7cd387d18be8fb06eda17db2e6..63a01f17144a5b2a8f86e600c8042c864ed5358a 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -12,23 +12,36 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 #if defined(__WXMSW__)
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 #if defined(__WXMSW__)

-#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
-#include "wx/generic/dirdlgg.h"
-#else
-#include "wx/msw/dirdlg.h"
-#endif
+    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
+        #include "wx/generic/dirdlgg.h"
+    #else
+        #include "wx/msw/dirdlg.h"
+    #endif

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/dirdlg.h"
+    #include "wx/mac/dirdlg.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/dirdlg.h"
+    #include "wx/os2/dirdlg.h"

 #elif defined(__WXSTUBS__)
 #elif defined(__WXSTUBS__)

-#include "wx/stubs/dirdlg.h"
+    #include "wx/stubs/dirdlg.h"

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// common ::wxDirSelector() function
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+
+WXDLLEXPORT wxString
+wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+              const wxString& defaultPath = wxEmptyString,
+              long style = 0,
+              const wxPoint& pos = wxDefaultPosition,
+              wxWindow *parent = NULL);
+

 #endif // wxUSE_DIRDLG
 
 #endif
 #endif // wxUSE_DIRDLG
 
 #endif

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 53135f57bbdc061a8e9b728c23739e3fcf37a472..3922c472b6f22e754d53a8c1dc74662fd95a1f3f 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -60,9 +60,12 @@
 #if wxUSE_DIRDLG
 
 #include "wx/dialog.h"
 #if wxUSE_DIRDLG
 
 #include "wx/dialog.h"

-#include "wx/checkbox.h"

 #include "wx/treectrl.h"
 
 #include "wx/treectrl.h"
 

+class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxCheckBox;
+class WXDLLEXPORT wxTextCtrl;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/common/dseldlg.cpp b/src/common/dseldlg.cpp
new file mode 100644 (file)
index 0000000..bd12182
--- /dev/null
+++ b/src/common/dseldlg.cpp
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dseldlg.cpp
+// Purpose:     implementation of ::wxDirSelector()
+// Author:      Paul Thiessen
+// Modified by:
+// Created:     20.02.01
+// RCS-ID:      $Id$
+// Copyright:   (c) 2001 wxWindows team
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "dseldlg.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/dirdlg.h"
+
+#if wxUSE_DIRDLG
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+const wxChar *wxDirSelectorPromptStr = wxT("Select a directory");
+
+wxString wxDirSelector(const wxString& message,
+                       const wxString& defaultPath,
+                       long style,
+                       const wxPoint& pos,
+                       wxWindow *parent)
+{
+    wxString path;
+
+    wxDirDialog dirDialog(parent, message, defaultPath, style, pos);
+    if ( dirDialog.ShowModal() == wxID_OK )
+    {
+        path = dirDialog.GetPath();
+    }
+
+    return path;
+}
+
+#endif // wxUSE_DIRDLG
+

diff --git a/src/files.lst b/src/files.lst
index 968217e87043b0e41cdeeece88fb8282b91d542d..c41b27395f1afaf279632293c3fb5482e1f30339 100644 (file)
--- a/src/files.lst
+++ b/src/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
                common/init.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
                common/init.cpp \

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index ebca4ad004589fde7a97b9510c89d1c964edc88f..3ad06f26a9abaf2ae94ff03e45cb6aa2f298cc57 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \


@@ -72,6 +72,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -636,6 +637,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index ebca4ad004589fde7a97b9510c89d1c964edc88f..3ad06f26a9abaf2ae94ff03e45cb6aa2f298cc57 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \


@@ -72,6 +72,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -636,6 +637,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index 23cd4b9bca276734fdf8865d62609cf104ed863b..590d244d2edd1788b1923fc5d616d6a5f2d7ebef 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -67,6 +67,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -660,6 +661,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/mac/files.lst b/src/mac/files.lst
index 23cd4b9bca276734fdf8865d62609cf104ed863b..590d244d2edd1788b1923fc5d616d6a5f2d7ebef 100644 (file)
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MAC.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -67,6 +67,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -660,6 +661,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 0bdf71c030e850e74034bd790bd06460d3d5e811..ead3c38c5bfdfd4f7129d8b9bc3788b500a64ab5 100644 (file)
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \


@@ -70,6 +70,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -597,6 +598,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/motif/files.lst b/src/motif/files.lst
index 0609a5a8c306ec8e7df570a5741652d0d334ec03..f00457bdcee959502584bf0059b179b9fe710471 100644 (file)
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -71,6 +71,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -623,6 +624,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/msw/files.lst b/src/msw/files.lst
index 7b07500a67a60b0de8ec5a3bd8f5f54aba3a411a..b42f82a45f95b69f32aa5152d93805e794219a1c 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \


@@ -54,6 +54,7 @@ ALL_SOURCES = \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \
                common/dobjcmn.cpp \
                common/docmdi.cpp \
                common/docview.cpp \

+               common/dseldlg.cpp \

                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \
                common/dynarray.cpp \
                common/dynlib.cpp \
                common/effects.cpp \


@@ -692,6 +693,7 @@ COMMONOBJS = \
                dobjcmn.o \
                docmdi.o \
                docview.o \
                dobjcmn.o \
                docmdi.o \
                docview.o \

+               dseldlg.o \

                dynarray.o \
                dynlib.o \
                effects.o \
                dynarray.o \
                dynlib.o \
                effects.o \

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 3faecf8e16315cb4c6f2fb40cec48dda18c2b26f..ff91da829b39ea0ff3e38fcdd5c76f6280b7f3ae 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #


@@ -138,6 +138,7 @@ COMMONOBJS = \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \

+               $(MSWDIR)\dseldlg.obj \

                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
                $(MSWDIR)\effects.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
                $(MSWDIR)\effects.obj \


@@ -680,6 +681,8 @@ $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 

+$(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
+

 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 84ed832bb857aa04cc1599313604f564d5b1e56b..56021e50a13d6f2eb75d3ab0e5e586cff5a2d557 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #


@@ -125,6 +125,7 @@ COMMONOBJS = \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \

+               $(MSWDIR)\dseldlg.obj \

                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
                $(MSWDIR)\effects.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
                $(MSWDIR)\effects.obj \


@@ -542,6 +543,8 @@ $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
 
 $(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 

+$(MSWDIR)\dseldlg.obj: $(COMMDIR)\dseldlg.$(SRCSUFF)
+

 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index e718b540b99de1e9c964b57267ee93811c0c032d..ae31308a69d5dfc201a688ebb59939b7197bae24 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #


@@ -109,6 +109,7 @@ COMMONOBJS1 = \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \

+               $(COMMDIR)\dseldlg.obj \

                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
                $(COMMDIR)\effects.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
                $(COMMDIR)\effects.obj \


@@ -882,6 +883,11 @@ $(COMMDIR)/docview.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

+$(COMMDIR)/dseldlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+

 $(COMMDIR)/dynarray.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 $(COMMDIR)/dynarray.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 129f2056d18ba02c7246fabb178b661cd500350f..f9c2d922f387055a9cffbd4a83e1c3d59b0c3c4f 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #


@@ -125,6 +125,7 @@ COMMONOBJS  = \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \
                $(COMMDIR)/dobjcmn.$(OBJSUFF) \
                $(COMMDIR)/docmdi.$(OBJSUFF) \
                $(COMMDIR)/docview.$(OBJSUFF) \

+               $(COMMDIR)/dseldlg.$(OBJSUFF) \

                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
                $(COMMDIR)/effects.$(OBJSUFF) \
                $(COMMDIR)/dynarray.$(OBJSUFF) \
                $(COMMDIR)/dynlib.$(OBJSUFF) \
                $(COMMDIR)/effects.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 725c96c633a686211d90787381482a1c566fd046..9038c52738e9e5951cdf2a6255258b04d5b67bbd 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects


@@ -81,6 +81,7 @@ COMMONOBJS = \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \
                $(COMMDIR)\dobjcmn.obj \
                $(COMMDIR)\docmdi.obj \
                $(COMMDIR)\docview.obj \

+               $(COMMDIR)\dseldlg.obj \

                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
                $(COMMDIR)\effects.obj \
                $(COMMDIR)\dynarray.obj \
                $(COMMDIR)\dynlib.obj \
                $(COMMDIR)\effects.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1175e5f50b88184cae74cc74094ed2710ae6be01..e349b1108325af9ece0a758bf8c0f9e66e3f62b7 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc


@@ -160,6 +160,7 @@ COMMONOBJS = \
                $(COMMDIR)\$D\dobjcmn.obj \
                $(COMMDIR)\$D\docmdi.obj \
                $(COMMDIR)\$D\docview.obj \
                $(COMMDIR)\$D\dobjcmn.obj \
                $(COMMDIR)\$D\docmdi.obj \
                $(COMMDIR)\$D\docview.obj \

+               $(COMMDIR)\$D\dseldlg.obj \

                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \
                $(COMMDIR)\$D\effects.obj \
                $(COMMDIR)\$D\dynarray.obj \
                $(COMMDIR)\$D\dynlib.obj \
                $(COMMDIR)\$D\effects.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 29b689be0281973a2e0501309ed2d334190b01b6..6647c21b65cfa9c1ec5ecb50b0c82f23748b24d4 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
 #!/binb/wmake.exe
 

-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -120,6 +120,7 @@ COMMONOBJS = &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &

+       dseldlg.obj &

        dynarray.obj &
        dynlib.obj &
        effects.obj &
        dynarray.obj &
        dynlib.obj &
        effects.obj &


@@ -782,6 +783,9 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 dynarray.obj:     $(COMMDIR)\dynarray.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dynarray.obj:     $(COMMDIR)\dynarray.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/univ/files.lst b/src/univ/files.lst
index 132759931bfb4d9a2bf0344d7cab3429c5334d9c..681561724b49a28f6e82a16359c1ad04dc1791f8 100644 (file)
--- a/src/univ/files.lst
+++ b/src/univ/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:46, 2001/10/30
+# This file was automatically generated by tmake at 17:52, 2001/10/30

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
                bmpbuttn.o \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T!
 UNIVOBJS = \
                bmpbuttn.o \

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 2cca47007e6f56714318af0a65080ba359be2673..7cf3594720b885e75e6bdcf9cc85e6a2c88607e8 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -181,6 +181,10 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\dseldlg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index d16ae8ca56c40c69267984aa426600fc85c4ace1..42cfc3a36b06a3add5f9e1e2c5c84391156a54ad 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -344,6 +344,10 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\dseldlg.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\dynarray.cpp
 # End Source File
 # Begin Source File