Stupid makeprog.vc corruption fixed

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

diff --git a/docs/bugs.txt b/docs/bugs.txt
index 1dbfd3efa5e160d9cae0406d033ab05c7e58fe7c..6944b9e5956c115f5ca8c89a6e902b65b06693d7 100644 (file)
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -79,6 +79,15 @@ IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
 DATE FIXED:
 FIXED BY:
 
+BUG NUMBER:             4
+SHORT DESCRIPTION: Appending a menuitem with negative id causes menu not to be shown
+DETAILS: I haven't tested it throughly, though it happens when appending a submenu
+WORKAROUND: Add dummy id number even for menuitems which don't require them (submenus for example)
+wxWINDOWS VERSION: 2.1.11
+PLATFORMS: wxGTK
+DATE IDENTIFIED: 10/11/1999
+IDENTIFIED BY: Jonathan Brown <jbrown@sso.sytexinc.com>
+
 
 ---------------------------END OF BUGLIST-------------------------
 

diff --git a/docs/html/index.htm b/docs/html/index.htm
index 33b86c91de485958a3c79485c4c47aa57973f7db..be7235836167b60ed4b10cf3a2f43b43040d20fb 100644 (file)
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -45,6 +45,7 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 <a href="../gtk/readme.txt">wxGTK</a>,
 <a href="../motif/readme.txt">wxMotif</a>,
 <a href="../msw/readme.txt">wxMSW</a>
+<li><a href="../release.txt"><b>Release notes</b></a>
 <li>Installation: <a href="../gtk/install.txt">wxGTK</a>,
 <a href="../motif/install.txt">wxMotif</a>,
 <a href="../msw/install.txt">wxMSW</a>

diff --git a/docs/html/news.htm b/docs/html/news.htm
index a085388f3de073934fca0ee4aa40c149f5f9ee59..0fca159d8f5c264b38ed5771d60d929786a5933b 100644 (file)
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,6 +18,40 @@ News
 </tr>
 </table>
 
+<H3><a name="release2_1_11">November 9th, 1999</a></H3><P>
+
+<a href="download.htm" target=wxmain>wxWindows 2.1.11</a> is now available for Windows, Motif and GTK.
+The final 2.2 public release will have further bug fixes, but 2.1.11 is pretty stable - a big improvement
+on 2.0.1 and better than previous snapshots. Here are a few of the features that make it well worth the upgrade:<P>
+
+<ul>
+<li> Numerous bug fixes and consistency improvements.
+<li> Further samples.
+<li> Factoring out of some code into base classes, for easier
+  maintenance.
+<li> Ability to compile library in console (non-GUI) mode.
+<li> Integration of wxHTML widget and help controller into
+  wxWindows. wxHTML allows HTML viewing and printing (wxGTK
+  and wxMSW, partial support in wxMotif).
+<li> New classes wxChrono, wxDialUpManager, wxFontEnumerator,
+  wxWizard, wxStaticLine, etc.
+<li> wxShowTip for showing 'startup tips' to the user.
+<li> wxSocket and wxThread classes rewritten.
+<li> New, consistent drag and drop API (not wxMotif).
+<li> Better-looking dialogs in wxGTK; native message box used
+  in wxMotif.
+<li> wxSizers reimplemented and used to specify window layout
+  for some generic dialogs.
+<li> New, more sophisticated wxGrid class (in beta). The old grid
+  class can still be used.
+<li> Text alignment options in wxStaticText.
+<li> wxImage class extended to read PCX and GIF files.
+<li> Documentation improvements.
+<li> Revised configure system for wxGTK and wxMotif; tmake-based
+  system for generating wxMSW makefiles.
+<li> Installer for Windows as alternative to zip archives.
+</ul>
+
 <H3>August 6th, 1999</H3><P>
 
 Today, a snapshot release of the MSW and the GTK ports has been

diff --git a/src/makeprog.vc b/src/makeprog.vc
index e938d7c78cb54751f747d056fb22c3f6bb2fc471..b89d4066d810d8aef14d7520908c2f38819cfe1e 100644 (file)
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -29,14 +29,17 @@ wxclean:
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 
-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) 
+$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
        $(link) @<<
 -out:$(PROGRAM).exe
 $(LINKFLAGS)
-$(DUMMYOBJ) $(OBJECTS)
+$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
 $(LIBS)
 <<
 
+$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
+    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
+
 clean:
         -erase $(OBJECTS)
         -erase *.exe