From 4f02408ec96dbb43a505aa2b4781ac943a32772c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 10 Nov 1999 13:26:55 +0000 Subject: [PATCH] Stupid makeprog.vc corruption fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/bugs.txt | 9 +++++++++ docs/html/index.htm | 1 + docs/html/news.htm | 34 ++++++++++++++++++++++++++++++++++ src/makeprog.vc | 7 +++++-- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/docs/bugs.txt b/docs/bugs.txt index 1dbfd3efa5..6944b9e595 100644 --- a/docs/bugs.txt +++ b/docs/bugs.txt @@ -79,6 +79,15 @@ IDENTIFIED BY: Julian Smart 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 + ---------------------------END OF BUGLIST------------------------- diff --git a/docs/html/index.htm b/docs/html/index.htm index 33b86c91de..be72358361 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -45,6 +45,7 @@ downloaded from the wxWindows Web site.

wxGTK, wxMotif, wxMSW +

  • Release notes
  • Installation: wxGTK, wxMotif, wxMSW diff --git a/docs/html/news.htm b/docs/html/news.htm index a085388f3d..0fca159d8f 100644 --- a/docs/html/news.htm +++ b/docs/html/news.htm @@ -18,6 +18,40 @@ News +

    November 9th, 1999

    + +wxWindows 2.1.11 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:

    + +

      +
    • Numerous bug fixes and consistency improvements. +
    • Further samples. +
    • Factoring out of some code into base classes, for easier + maintenance. +
    • Ability to compile library in console (non-GUI) mode. +
    • Integration of wxHTML widget and help controller into + wxWindows. wxHTML allows HTML viewing and printing (wxGTK + and wxMSW, partial support in wxMotif). +
    • New classes wxChrono, wxDialUpManager, wxFontEnumerator, + wxWizard, wxStaticLine, etc. +
    • wxShowTip for showing 'startup tips' to the user. +
    • wxSocket and wxThread classes rewritten. +
    • New, consistent drag and drop API (not wxMotif). +
    • Better-looking dialogs in wxGTK; native message box used + in wxMotif. +
    • wxSizers reimplemented and used to specify window layout + for some generic dialogs. +
    • New, more sophisticated wxGrid class (in beta). The old grid + class can still be used. +
    • Text alignment options in wxStaticText. +
    • wxImage class extended to read PCX and GIF files. +
    • Documentation improvements. +
    • Revised configure system for wxGTK and wxMotif; tmake-based + system for generating wxMSW makefiles. +
    • Installer for Windows as alternative to zip archives. +
    +

    August 6th, 1999

    Today, a snapshot release of the MSW and the GTK ports has been diff --git a/src/makeprog.vc b/src/makeprog.vc index e938d7c78c..b89d4066d8 100644 --- 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 -- 2.45.2