Win16 BC++ makefile fixes, other v. small fixes

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index cbb02e741fdb9702d3d5b37271065cfd16fa9348..69f8de0516046729da2ab304a2678c6e1eca11de 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -50,7 +50,7 @@ docs/gpl.txt
 docs/lgpl.txt
 docs/symbols.txt
 docs/bugs.txt
-docs/*.htm
+docs/index.htm
 docs/html/*.htm
 docs/html/*.gif
 docs/html/*.png

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index 97d6d40d5f56d71e24aa54833b12592cfeb5dbdc..c03417682f350c8a05a67ca57cf94ca16014f259 100644 (file)
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -82,6 +82,7 @@ include/wx/msw/*.rc
 include/wx/msw/ctl3d/*.h
 include/wx/msw/gnuwin32/*.h
 include/wx/msw/gnuwin32/*.def
+include/wx/msw/gnuwin32/gl/*.h
 include/wx/msw/ole/*.h
 include/wx/msw/*.cur
 include/wx/msw/*.ico

diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 9c03f1ea982e02f9cd05fba5447065bbcf1800a1..e4683f6ecad254e39753a3a39d2cffe35334e09f 100644 (file)
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -20,7 +20,10 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         my $tag = "";
-        next if $wxGeneric{$file} =~ /\b(PS|G|U)\b/;
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
+            #! Need this file too since it has wxGenericPageSetupDialog
+            next unless $file =~ /^prntdlgg\./;
+        }
 
         $file =~ s/cp?p?$/obj/;
         $project{"WXGENERICOBJS"} .= "\$(MSWDIR)\\" . $file . " "
@@ -106,7 +109,7 @@ PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 893c2144602871e064f9d9e309831446dd01284d..8cb5b66e3100b35fd152c4e167b13170e1ed615b 100644 (file)
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -14,7 +14,7 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
-            #! this file for some reason wasn't compiled for VC++ 1.52
+            #! Need this file too since it has wxGenericPageSetupDialog
             next unless $file =~ /^prntdlgg\./;
         }
 

diff --git a/distrib/msw/wisebott.txt b/distrib/msw/wisebott.txt
index 119b20ffd8f59e2c2e5b833aae59adf3732a5265..309b56830e0e38358892c44d1e447d13054a3ea5 100644 (file)
--- a/distrib/msw/wisebott.txt
+++ b/distrib/msw/wisebott.txt
@@ -63,12 +63,17 @@ end
 item: Create Shortcut
   Source=%MAINDIR%\bin\dialoged.exe
   Destination=%GROUP%\Dialog Editor.lnk
-  Working Directory=%MAINDIR%
+  Working Directory=%MAINDIR%\bin
+end
+item: Create Shortcut
+  Source=%MAINDIR%\bin\tex2rtf.exe
+  Destination=%GROUP%\Tex2RTF.lnk
+  Working Directory=%MAINDIR%\bin
 end
 item: Create Shortcut
   Source=%MAINDIR%\bin\dbgview.exe
   Destination=%GROUP%\DebugView.lnk
-  Working Directory=%MAINDIR%
+  Working Directory=%MAINDIR%\bin
 end
 item: Create Shortcut
   Source=%MAINDIR%\bin\life.exe
@@ -129,7 +134,13 @@ item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Dialog Editor
   Command Line=%MAINDIR%\bin\dialoged.exe
-  Default Directory=%MAINDIR%
+  Default Directory=%MAINDIR%\bin
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Tex2RTF
+  Command Line=%MAINDIR%\bin\tex2rtf.exe
+  Default Directory=%MAINDIR%\bin
 end
 item: Add ProgMan Icon
   Group=%GROUP%
@@ -141,7 +152,7 @@ item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Life! Demo
   Command Line=%MAINDIR%\bin\life.exe
-  Default Directory=%MAINDIR%
+  Default Directory=%MAINDIR%\bin
 end
 item: End Block
 end

diff --git a/distrib/msw/wx_html.rsp b/distrib/msw/wx_html.rsp
index 08e1fa9d5d582b2c9075dc5a80d40ddf8cd1dff8..478f9ef94c72a798407c9a23ae2b483f01f3bc61 100644 (file)
--- a/distrib/msw/wx_html.rsp
+++ b/distrib/msw/wx_html.rsp
@@ -14,3 +14,10 @@ docs/html/odbc/*.htm
 
 docs/html/gettext/*.htm
 
+contrib/docs/html/ogl/*.htm
+contrib/docs/html/ogl/*.gif
+contrib/docs/html/mmedia/*.htm
+contrib/docs/html/mmedia/*.gif
+contrib/docs/html/stc/*.htm
+contrib/docs/html/stc/*.gif
+

diff --git a/distrib/msw/wx_pdf.rsp b/distrib/msw/wx_pdf.rsp
index 6a979c3678b40ec4538dee1de6ce3f6fd21582bd..710dc9de2bae7df4a4a7efe475e46b50892357de 100644 (file)
--- a/distrib/msw/wx_pdf.rsp
+++ b/distrib/msw/wx_pdf.rsp
@@ -1 +1,2 @@
 docs/pdf/*.pdf
+contrib/docs/pdf/*.pdf

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index fd34565f4f0d846fcafc18756653db07909760bf..ca4889596d8e736821f26c0cb715513426326515 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -28,6 +28,7 @@ erase %dest\jpeg.zip
 erase %dest\tiff.zip
 erase %dest\dialoged.zip
 erase %dest\utils.zip
+erase %dest\extradoc.zip
 
 if direxist %dest\wx deltree /Y %dest\wx
 
@@ -51,6 +52,10 @@ zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
 zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
 zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
 
+Rem PDF/HTML docs that should go into the Windows setup because
+Rem there are no WinHelp equivalents
+zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
+
 rem VC++ project files
 zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp
 
@@ -119,6 +124,7 @@ unzip32 -o ..\wx%version%_gen.zip
 unzip32 -o ..\wx%version%_vc.zip
 unzip32 -o ..\wx%version%_bc.zip
 unzip32 -o ..\wx%version%_hlp.zip
+unzip32 -o ..\extradoc.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wx%version%_wrd.zip
 unzip32 -o ..\ogl3.zip
@@ -132,15 +138,20 @@ erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh
 erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in
 erase /Y setup.h.in setup.h_vms
 erase /SY Makefile.in
-rem erase /Y docs\pdf\ogl.pdf
-rem deltree /Y docs\html\ogl
+erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
+erase /Y contrib\docs\winhelp\mmedia.*
+erase /Y contrib\docs\winhelp\stc.*
+erase /Y contrib\docs\pdf\*.*
+deltree /Y contrib\docs\latex\ogl
 
 rem Now copy some binary files to 'bin'
 if not isdir bin mkdir bin
 copy %src\bin\dialoged.exe bin
+copy %src\bin\tex2rtf.exe bin
 copy %src\bin\dbgview.* bin
 copy %src\bin\life.exe bin
 copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
+copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
 
 rem Time to regenerate the WISE install script, wxwin2.wse.
 rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe

diff --git a/docs/html/index.htm b/docs/html/index.htm
index 63fde10e2c7701ab44b6ccbe7f0502b5a556cb2c..34f34224685650eb8e2594f29d9c2c8fea7adac1 100644 (file)
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -137,6 +137,13 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 <ul>
 <li><a href="../tech/index.txt">Index of technical notes</a>
 <li><a href="../tech/">Technical notes</a> in text form
+<li>Other documents:
+  <ul>
+  <li><a href="platform.htm">Platforms supported</a>
+  <li><a href="i18n.htm">Languages supported by wxWindows</a>
+  <li><a href="standard.htm">wxWindows programmer style guide</a>
+  <li><a href="news.htm">wxWindows news</a>
+  </ul>
 </ul>
 
 <h3 align=center><a name="thirdparty"><hr>Third-party tools<hr></a></h3>

diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc
index 6efb0aa0d2dff3cd0e7797f626d0db207c4c056c..74149d6ff782a2395fa7d5f8296be9f074e2301a 100644 (file)
--- a/samples/docview/makefile.bcc
+++ b/samples/docview/makefile.bcc
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=docview
-OBJECTS=$(TARGET).obj
+OBJECTS=$(TARGET).obj doc.obj view.obj
 
 !include $(WXDIR)\src\makeprog.bcc
 

diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc
index 6efb0aa0d2dff3cd0e7797f626d0db207c4c056c..74149d6ff782a2395fa7d5f8296be9f074e2301a 100644 (file)
--- a/samples/docvwmdi/makefile.bcc
+++ b/samples/docvwmdi/makefile.bcc
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=docview
-OBJECTS=$(TARGET).obj
+OBJECTS=$(TARGET).obj doc.obj view.obj
 
 !include $(WXDIR)\src\makeprog.bcc
 

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index 5ce1e70d94449223eb3889545c12799f16396014..2f1661b329820921583386800871c6e11c45584b 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -170,6 +170,7 @@ bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP
     wxFAIL_MSG(_T("not implemented"));
+    return FALSE;
 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 9d825985c91a97cab10b9aaa01dedfc9ff5d0891..456a7e3de2ffa9ec80e7a6444679747f7decaa4b 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 15:55, 2000/03/14
+# This file was automatically generated by tmake at 16:08, 2000/03/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -88,6 +88,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\numdlgg.obj \
                $(MSWDIR)\panelg.obj \
                $(MSWDIR)\plot.obj \
+               $(MSWDIR)\prntdlgg.obj \
                $(MSWDIR)\progdlgg.obj \
                $(MSWDIR)\prop.obj \
                $(MSWDIR)\propform.obj \
@@ -676,6 +677,8 @@ $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
 $(MSWDIR)\plot.obj: $(GENDIR)\plot.$(SRCSUFF)
 
+$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
+
 $(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
 $(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
@@ -706,6 +709,8 @@ $(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
 
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
+
+
 all_utils:
     cd $(WXDIR)\utils
     make -f makefile.bcc