Don't draw the primary highlight colors if the control doesn't have the focus.

[wxWidgets.git] / distrib / msw / makefile.vc

diff --git a/distrib/msw/makefile.vc b/distrib/msw/makefile.vc
index e5ab8d88cd61ece8becd1424e63e2a7add1ad865..a1b4c10509d888c5e337bdb7555fbb578952c7e3 100644 (file)
--- a/distrib/msw/makefile.vc
+++ b/distrib/msw/makefile.vc
@@ -6,7 +6,7 @@
 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

-# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
+# Makefile : Builds wxWidgets library wx.lib for VC++ (32-bit)

 # Arguments:
 #
 # FINAL=1 argument to nmake to build version with no debugging info.
 # Arguments:
 #
 # FINAL=1 argument to nmake to build version with no debugging info.


@@ -25,7 +25,7 @@ rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb

-wxhtml:        $(DOCDIR)\html\wx\wx.htm
+wxhtml:        $(DOCDIR)\html\wx\wx_contents.html

 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps
 wxps:  $(WXDIR)\docs\ps\wx.ps
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps
 wxps:  $(WXDIR)\docs\ps\wx.ps


@@ -89,6 +89,7 @@ allpdfrtf: pdfrtf
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
         cd $(DOCDIR)/latex/wx

+       -mkdir $(DOCDIR)\winhelp

         -erase wx.ph
         hc wx
         -erase $(DOCDIR)\winhelp\wx.hlp
         -erase wx.ph
         hc wx
         -erase $(DOCDIR)\winhelp\wx.hlp


@@ -104,6 +105,7 @@ $(DOCDIR)/latex/wx/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/late
 
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx
 
 $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
         cd $(DOCDIR)\latex\wx

+       -mkdir $(DOCDIR)\pdf

         -copy *.wmf $(DOCDIR)\pdf
         -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
         -copy *.wmf $(DOCDIR)\pdf
         -copy *.bmp $(DOCDIR)\pdf
         -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf


@@ -111,7 +113,7 @@ $(DOCDIR)/pdf/wx.rtf:         $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/
 
 # This target does two sets of HTML: one using a style sheet, for
 # the purposes of the CHM file, and one without.
 
 # This target does two sets of HTML: one using a style sheet, for
 # the purposes of the CHM file, and one without.

-$(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
+$(DOCDIR)\html\wx\wx_contents.html:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex

         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
         copy *.gif $(DOCDIR)\html\wx


@@ -126,7 +128,7 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 

-$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx.hhp

        cd $(DOCDIR)\mshtml\wx
     copy $(DOCDIR)\latex\wx\wx.css .
        -hhc wx.hhp
        cd $(DOCDIR)\mshtml\wx
     copy $(DOCDIR)\latex\wx\wx.css .
        -hhc wx.hhp


@@ -171,10 +173,10 @@ $(WXDIR)\docs\ps\referenc.ps:     $(WXDIR)\docs\latex\wx\referenc.dvi
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.
 # files, renamed to htb.
 # This can then be used with e.g. helpview.
 # Optionally, a cached version of the .hhp file can be generated with hhp2cached.

-$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm
+$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx_contents.html

        cd $(WXDIR)\docs\html\wx
     -erase wx.zip wx.htb
        cd $(WXDIR)\docs\html\wx
     -erase wx.zip wx.htb

-    zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk
+    zip wx.zip *.html *.gif *.hhp *.hhc *.hhk

     -mkdir $(DOCDIR)\htb
     move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)
     -mkdir $(DOCDIR)\htb
     move wx.zip $(DOCDIR)\htb\wx.htb
     cd $(THISDIR)


@@ -188,17 +190,29 @@ updatedocs: touchmanual alldocs
 cleandocs:
     -erase $(DOCDIR)\winhelp\wx.hlp
     -erase $(DOCDIR)\winhelp\wx.cnt
 cleandocs:
     -erase $(DOCDIR)\winhelp\wx.hlp
     -erase $(DOCDIR)\winhelp\wx.cnt

-    -erase $(DOCDIR)\html\wx\*.htm
+    -erase $(DOCDIR)\html\wx\*.html

     -erase $(DOCDIR)\pdf\wx.rtf
     -erase $(DOCDIR)\latex\wx\wx.rtf
     -erase $(DOCDIR)\latex\wx\WX.PH
     -erase $(DOCDIR)\htmlhelp\wx.chm
     -erase $(DOCDIR)\htb\wx.htb
 
     -erase $(DOCDIR)\pdf\wx.rtf
     -erase $(DOCDIR)\latex\wx\wx.rtf
     -erase $(DOCDIR)\latex\wx\WX.PH
     -erase $(DOCDIR)\htmlhelp\wx.chm
     -erase $(DOCDIR)\htb\wx.htb
 

+# Only clean the online help, not PDF RTF
+cleanonlinehelp:
+    -erase $(DOCDIR)\winhelp\wx.hlp
+    -erase $(DOCDIR)\winhelp\wx.cnt
+    -erase $(DOCDIR)\html\wx\*.html
+    -erase $(DOCDIR)\latex\wx\wx.rtf
+    -erase $(DOCDIR)\latex\wx\WX.PH
+    -erase $(DOCDIR)\latex\wx\wx.hpj
+    -erase $(DOCDIR)\htmlhelp\wx.chm
+    -erase $(DOCDIR)\mshtml\wx\*.html
+    -erase $(DOCDIR)\htb\wx.htb
+

 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 updatepdf:  # touchmanual pdfrtf

-    start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
+    start $(WAITFLAG) "winword d:\wx2\wxWidgets\docs\pdf\wx.rtf /mGeneratePDF"

 
 
 MFTYPE=vc
 
 
 MFTYPE=vc


@@ -207,3 +221,80 @@ makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\ms
        tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
        copy makefile.$(MFTYPE) $(WXWIN)\src\msw
 
        tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
        copy makefile.$(MFTYPE) $(WXWIN)\src\msw
 

+######################
+# Tex2RTF
+######################
+
+TEX2RTFDOCDIR=$(WXDIR)\utils\tex2rtf\docs
+
+tex2rtfhtml: $(DOCDIR)\html\tex2rtf\t2rtf.htm
+tex2rtfhtmlhelp: $(DOCDIR)\htmlhelp\tex2rtf.chm
+tex2rtfhtb:    $(DOCDIR)\htb\tex2rtf.htb
+tex2rtfhlp: $(DOCDIR)\winhelp\tex2rtf.hlp
+tex2rtfpdfrtf: $(DOCDIR)\pdf\tex2rtf.rtf
+tex2rtfps: $(WXDIR)\docs\ps\tex2rtf.ps
+
+$(DOCDIR)\winhelp\tex2rtf.hlp:         $(TEX2RTFDOCDIR)\tex2rtf.rtf $(TEX2RTFDOCDIR)\tex2rtf.hpj
+        cd $(TEX2RTFDOCDIR)
+        -erase tex2rtf.ph
+        hc tex2rtf
+        copy tex2rtf.hlp $(DOCDIR)\winhelp\tex2rtf.hlp
+        copy tex2rtf.cnt $(DOCDIR)\winhelp\tex2rtf.cnt
+        cd $(THISDIR)
+
+$(TEX2RTFDOCDIR)\tex2rtf.rtf: $(DOCSOURCES)
+        cd $(TEX2RTFDOCDIR)
+        -start /w tex2rtf $(TEX2RTFDOCDIR)\tex2rtf.tex $(TEX2RTFDOCDIR)\tex2rtf.rtf -twice -winhelp
+        cd $(THISDIR)
+
+$(DOCDIR)\pdf\tex2rtf.rtf: $(DOCSOURCES)
+        cd $(TEX2RTFDOCDIR)
+        -copy *.wmf $(DOCDIR)\pdf
+        -copy *.bmp $(DOCDIR)\pdf
+        -start /w tex2rtf $(TEX2RTFDOCDIR)\tex2rtf.tex $(DOCDIR)\pdf\tex2rtf.rtf -twice -rtf
+        cd $(THISDIR)
+
+$(DOCDIR)\html\tex2rtf\t2rtf.htm:         $(DOCSOURCES)
+        cd $(TEX2RTFDOCDIR)
+        -mkdir $(DOCDIR)\html\tex2rtf
+        -copy *.gif $(DOCDIR)\html\tex2rtf
+        -start /w tex2rtf $(TEX2RTFDOCDIR)\tex2rtf.tex $(DOCDIR)\html\tex2rtf\t2rtf.htm -twice -html
+        -erase $(DOCDIR)\html\tex2rtf\*.con
+        -erase $(DOCDIR)\html\tex2rtf\*.ref
+        cd $(THISDIR)
+
+$(DOCDIR)\htmlhelp\tex2rtf.chm : $(DOCDIR)\html\tex2rtf\t2rtf.htm $(DOCDIR)\html\tex2rtf\t2rtf.hhp
+       cd $(DOCDIR)\html\tex2rtf
+       -hhc t2rtf.hhp
+    move t2rtf.chm $(DOCDIR)\htmlhelp\tex2rtf.chm
+       cd $(THISDIR)
+
+# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk
+# files, renamed to htb.
+# This can then be used with e.g. helpview.
+# Optionally, a cached version of the .hhp file can be generated with hhp2cached.
+$(DOCDIR)\htb\tex2rtf.htb: $(DOCDIR)\html\tex2rtf\t2rtf.htm
+       cd $(DOCDIR)\html\tex2rtf
+    -erase tex2rtf.zip tex2rtf.htb
+    zip tex2rtf.zip *.htm *.gif *.hhp *.hhc *.hhk
+    -mkdir $(DOCDIR)\htb
+    move tex2rtf.zip $(DOCDIR)\htb\tex2rtf.htb
+    cd $(THISDIR)
+
+$(TEX2RTFDOCDIR)\tex2rtf.dvi:  $(DOCSOURCES)
+       cd $(TEX2RTFDOCDIR)
+        -latex tex2rtf
+        -latex tex2rtf
+        -makeindx tex2rtf
+        -bibtex tex2rtf
+        -latex tex2rtf
+        -latex tex2rtf
+        cd $(THISDIR)
+
+$(WXDIR)\docs\ps\tex2rtf.ps:   $(TEX2RTFDOCDIR)\tex2rtf.dvi
+       cd $(TEX2RTFDOCDIR)
+        -dvips32 -o tex2rtf.ps tex2rtf
+        copy tex2rtf.ps $(WXDIR)\docs\ps\tex2rtf.ps
+        cd $(THISDIR)
+
+