From edc26c4c2dc43b7de3245c561dfa73d30a780a84 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 5 Aug 1999 09:33:04 +0000 Subject: [PATCH] Added new files to .rsp files; added new samples to index.htm git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 127 ++++++++++++++++++++++++++++++++++ distrib/msw/makefile.rsp | 81 ++++++++++++++++++++++ distrib/msw/msw.rsp | 2 + docs/html/index.htm | 7 ++ samples/richedit/wxLayout.cpp | 6 ++ samples/text/makefile.vc | 2 +- samples/text/text.rc | 7 -- src/msw/makefile.vc | 2 +- 8 files changed, 225 insertions(+), 9 deletions(-) diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 0e4b92175f..fb5aa86cb0 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -36,6 +36,10 @@ src/generic/*.cpp src/generic/*.c src/generic/*.inc +src/html/*.cpp +src/html/*.h +src/html/bitmaps/*.xpm + src/unix/*.cpp src/png/*.c @@ -725,3 +729,126 @@ samples/drawing/*.png samples/drawing/*.ico samples/drawing/*.txt +samples/html/makefile* +samples/html/*.txt + +samples/html/about/*.cpp +samples/html/about/*.h +samples/html/about/makefile* +samples/html/about/*.rc +samples/html/about/*.def +samples/html/about/*.bmp +samples/html/about/*.xpm +samples/html/about/*.xbm +samples/html/about/*.png +samples/html/about/*.ico +samples/html/about/*.txt +samples/html/about/data/*.htm +samples/html/about/data/*.png + +samples/html/help/*.cpp +samples/html/help/*.h +samples/html/help/makefile* +samples/html/help/*.rc +samples/html/help/*.def +samples/html/help/*.bmp +samples/html/help/*.xpm +samples/html/help/*.xbm +samples/html/help/*.png +samples/html/help/*.ico +samples/html/help/*.txt +samples/html/help/helpfiles/*.htm +samples/html/help/helpfiles/*.hhc +samples/html/help/helpfiles/*.hhk +samples/html/help/helpfiles/*.hhp + +samples/html/printing/*.cpp +samples/html/printing/*.h +samples/html/printing/makefile* +samples/html/printing/*.rc +samples/html/printing/*.def +samples/html/printing/*.bmp +samples/html/printing/*.xpm +samples/html/printing/*.xbm +samples/html/printing/*.png +samples/html/printing/*.ico +samples/html/printing/*.htm + +samples/html/test/*.cpp +samples/html/test/*.h +samples/html/test/makefile* +samples/html/test/*.rc +samples/html/test/*.def +samples/html/test/*.bmp +samples/html/test/*.xpm +samples/html/test/*.xbm +samples/html/test/*.png +samples/html/test/*.ico +samples/html/test/*.htm +samples/html/test/*.html + +samples/html/virtual/*.cpp +samples/html/virtual/*.h +samples/html/virtual/makefile* +samples/html/virtual/*.rc +samples/html/virtual/*.def +samples/html/virtual/*.bmp +samples/html/virtual/*.xpm +samples/html/virtual/*.xbm +samples/html/virtual/*.png +samples/html/virtual/*.ico +samples/html/virtual/*.htm +samples/html/virtual/*.html + +samples/html/widget/*.cpp +samples/html/widget/*.h +samples/html/widget/makefile* +samples/html/widget/*.rc +samples/html/widget/*.def +samples/html/widget/*.bmp +samples/html/widget/*.xpm +samples/html/widget/*.xbm +samples/html/widget/*.png +samples/html/widget/*.ico +samples/html/widget/*.htm +samples/html/widget/*.html + +samples/html/zip/*.cpp +samples/html/zip/*.h +samples/html/zip/makefile* +samples/html/zip/*.rc +samples/html/zip/*.def +samples/html/zip/*.bmp +samples/html/zip/*.xpm +samples/html/zip/*.xbm +samples/html/zip/*.png +samples/html/zip/*.ico +samples/html/zip/*.htm +samples/html/zip/*.html + +samples/richedit/*.cpp +samples/richedit/*.h +samples/richedit/makefile* +samples/richedit/*.rc +samples/richedit/*.def +samples/richedit/*.bmp +samples/richedit/*.xpm +samples/richedit/*.xbm +samples/richedit/*.png +samples/richedit/*.ico +samples/richedit/*.txt +samples/richedit/TODO +samples/richedit/README + +samples/text/*.cpp +samples/text/*.h +samples/text/makefile* +samples/text/*.rc +samples/text/*.def +samples/text/*.bmp +samples/text/*.xpm +samples/text/*.xbm +samples/text/*.png +samples/text/*.ico +samples/text/*.txt + diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index a4929beecd..4ea2beb18e 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -80,6 +80,10 @@ samples/caret/Makefile.in samples/caret/Makefile samples/drawing/Makefile.in samples/drawing/Makefile +samples/richedit/Makefile.in +samples/richedit/Makefile +samples/html/Makefile.in +samples/html/Makefile src/Makefile.in src/Makefile utils/ogl/samples/ogledit/Makefile.in @@ -89,3 +93,80 @@ utils/ogl/samples/studio/Makefile utils/ogl/src/Makefile.in utils/ogl/src/Makefile +Makefile.am +include/Makefile.am +include/wx/Makefile.am +include/wx/generic/Makefile.am +include/wx/gtk/Makefile.am +include/wx/html/Makefile.am +include/wx/motif/Makefile.am +include/wx/msw/Makefile.am +include/wx/msw/ctl3d/Makefile.am +include/wx/msw/gnuwin32/Makefile.am +include/wx/protocol/Makefile.am +include/wx/unix/Makefile.am +misc/Makefile.am +misc/afm/Makefile.am +misc/gs_afm/Makefile.am +samples/Makefile.am +samples/bombs/Makefile.am +samples/caret/Makefile.am +samples/checklst/Makefile.am +samples/config/Makefile.am +samples/controls/Makefile.am +samples/db/Makefile.am +samples/dialogs/Makefile.am +samples/dnd/Makefile.am +samples/docview/Makefile.am +samples/docvwmdi/Makefile.am +samples/drawing/Makefile.am +samples/dynamic/Makefile.am +samples/forty/Makefile.am +samples/fractal/Makefile.am +samples/grid/Makefile.am +samples/help/Makefile.am +samples/html/Makefile.am +samples/html/about/Makefile.am +samples/html/help/Makefile.am +samples/html/printing/Makefile.am +samples/html/test/Makefile.am +samples/html/virtual/Makefile.am +samples/html/widget/Makefile.am +samples/html/zip/Makefile.am +samples/image/Makefile.am +samples/internat/Makefile.am +samples/joytest/Makefile.am +samples/layout/Makefile.am +samples/listctrl/Makefile.am +samples/mdi/Makefile.am +samples/memcheck/Makefile.am +samples/mfc/Makefile.am +samples/minifram/Makefile.am +samples/minimal/Makefile.am +samples/nativdlg/Makefile.am +samples/notebook/Makefile.am +samples/oleauto/Makefile.am +samples/ownerdrw/Makefile.am +samples/png/Makefile.am +samples/printing/Makefile.am +samples/proplist/Makefile.am +samples/regtest/Makefile.am +samples/resource/Makefile.am +samples/richedit/Makefile.am +samples/sashtest/Makefile.am +samples/scroll/Makefile.am +samples/splitter/Makefile.am +samples/tab/Makefile.am +samples/taskbar/Makefile.am +samples/text/Makefile.am +samples/thread/Makefile.am +samples/toolbar/Makefile.am +samples/treectrl/Makefile.am +samples/typetest/Makefile.am +samples/validate/Makefile.am +samples/wxpoem/Makefile.am +samples/wxsocket/Makefile.am +src/Makefile.am +src/gtk/Makefile.am +src/motif/Makefile.am +src/msw/Makefile.am diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp index 710bf7ef3a..d2525cb30c 100644 --- a/distrib/msw/msw.rsp +++ b/distrib/msw/msw.rsp @@ -3,6 +3,7 @@ docs/licence.txt distrib/msw/*.rsp distrib/msw/*.bat +distrib/msw/tmake/*.t tools/gettext/xgettext.exe tools/gettext/msgfmt.exe @@ -48,6 +49,7 @@ src/msw/makefile.* src/msw/*.lst src/msw/*.def src/msw/*.inc +src/msw/winestub.c src/msw/ctl3d/*.* src/msw/ctl3d/msvc/*.* diff --git a/docs/html/index.htm b/docs/html/index.htm index 00d0d0afd5..c5336612d0 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -185,6 +185,7 @@ downloaded from the wxWindows Web site.

  • bombs: minesweeper-like game. +
  • caret: a sample to test the wxCaret class.
  • checklst: demonstrates wxCheckListBox on supported platforms (currently Windows and GTK only).
  • config: demonstrates use of wxConfig, which @@ -210,6 +211,8 @@ fully-fledged application!
  • fractal: fractal mountains by Andrew Davison.
  • grid: demonstrates the wxGrid class.
  • help: shows how to use wxHelpController. +
  • html: a number of demos for the wxHTML class library, used inside +applications and also as a help facility.
  • image: shows off the cross-platform wxImage class.
  • internat: use of wxWindows' internationalization support.
  • joytest: tests the wxJoystick class (currently Windows and GTK only). @@ -237,6 +240,8 @@ Excel to be present).
  • proplist: demonstrates the property list classes (a VB-style property editor).
  • regtest: tests the low-level Windows registry functions (Windows only).
  • resource: shows how to use wxWindows resources (.wxr files). +
  • richedit: a work-in-progress rich text editor with plain text and HTML export +facilities.
  • sashtest: demonstrates use of the wxSashWindow class to allow the user to resize subwindows.
  • splitter: demonstrates the wxSplitterWindow class. @@ -246,6 +251,8 @@ implementing wxNotebook on platforms with no native support.
  • taskbar: demonstrates the wxTaskBarIcon class, for adding icons to the system tray. Windows only, but may eventually be implemented for other desktop environments that use this metaphor. +
  • text: demonstrates single and multiline text controls, +and clipboard operations.
  • thread: tests the family of classes for doing thread programming.
  • toolbar: demonstrates wxToolBar. diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp index 86532e650e..f9957ef8f4 100644 --- a/samples/richedit/wxLayout.cpp +++ b/samples/richedit/wxLayout.cpp @@ -123,6 +123,12 @@ MyFrame::MyFrame(void) : m_lwin->SetEditable(true); m_lwin->SetWrapMargin(40); m_lwin->SetFocus(); + + // JACS: under MSW, the window doesn't show the caret initially, + // and the following line I added doesn't help either. + // going to another window and then back again fixes it. + // m_lwin->OnSetFocus(wxFocusEvent()); + Clear(); #if 0 diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc index c64996a7a4..7f5644d7f6 100644 --- a/samples/text/makefile.vc +++ b/samples/text/makefile.vc @@ -11,7 +11,7 @@ # Set WXDIR for your system WXDIR = $(WXWIN) -PROGRAM=controls +PROGRAM=text OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc diff --git a/samples/text/text.rc b/samples/text/text.rc index 746abb4618..94d24028d7 100644 --- a/samples/text/text.rc +++ b/samples/text/text.rc @@ -1,10 +1,3 @@ mondrian ICON "mondrian.ico" -choice BITMAP "icons/choice.bmp" -combo BITMAP "icons/combo.bmp" -gauge BITMAP "icons/gauge.bmp" -list BITMAP "icons/list.bmp" -radio BITMAP "icons/radio.bmp" -text BITMAP "icons/text.bmp" - #include "wx/msw/wx.rc" diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 34d6bf1caf..89f483abc9 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -305,7 +305,7 @@ HTMLOBJS = \ # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. # Add $(HTMLOBJS) if wanting wxHTML classes -OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) +OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) # Normal, static library all: dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) -- 2.45.2