Distrib file updates; test for bitmap presence in controls.cpp

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

distrib/msw/generic.rsp

@@ -332,15 +332,6 @@ samples/help/doc/*.tex
 samples/help/doc/*.gif
 samples/help/doc/*.map
 
-samples/ipc/*.cpp
-samples/ipc/*.h
-samples/ipc/*.def
-samples/ipc/makefile*
-samples/ipc/*.xbm
-samples/ipc/*.xpm
-samples/ipc/*.ico
-samples/ipc/*.rc
-
 samples/typetest/*.cpp
 samples/typetest/*.h
 samples/typetest/*.def
@@ -426,6 +417,16 @@ samples/proplist/*.ico
 samples/proplist/*.bmp
 samples/proplist/*.rc
 
+samples/propsize/*.cpp
+samples/propsize/*.h
+samples/propsize/*.def
+samples/propsize/makefile*
+samples/propsize/*.xbm
+samples/propsize/*.xpm
+samples/propsize/*.ico
+samples/propsize/*.bmp
+samples/propsize/*.rc
+
 samples/layout/*.cpp
 samples/layout/*.h
 samples/layout/*.def
@@ -1007,9 +1008,19 @@ samples/exec/*.ico
 samples/exec/*.xpm
 samples/exec/*.txt
 
-samples/makefile*
+samples/rotate/*.cpp
-samples/configure
+samples/rotate/*.h
-samples/configure.in
+samples/rotate/makefile*
+samples/rotate/*.rc
+samples/rotate/*.def
+samples/rotate/*.ico
+samples/rotate/*.xpm
+samples/rotate/*.txt
+samples/rotate/*.bmp
+
+demos/makefile*
+demos/configure
+demos/configure.in
 
 demos/bombs/*.cpp
 demos/bombs/*.h

distrib/msw/makefile.rsp

@@ -2,9 +2,11 @@ Makefile.in
 src/Makefile
 locale/Makefile
 samples/Makefile.in
+samples/calendar/Makefile.in
 samples/caret/Makefile.in
 samples/checklst/Makefile.in
 samples/config/Makefile.in
+samples/console/Makefile.in
 samples/controls/Makefile.in
 samples/db/Makefile.in
 samples/dialogs/Makefile.in
@@ -13,6 +15,7 @@ samples/docview/Makefile.in
 samples/docvwmdi/Makefile.in
 samples/drawing/Makefile.in
 samples/dynamic/Makefile.in
+samples/exec/Makefile.in
 samples/genvalid/Makefile.in
 samples/html/Makefile.in
 samples/html/about/Makefile.in
@@ -31,6 +34,8 @@ samples/minimal/Makefile.in
 samples/notebook/Makefile.in
 samples/printing/Makefile.in
 samples/proplist/Makefile.in
+samples/propsize/Makefile.in
+samples/rotate/Makefile.in
 samples/sashtest/Makefile.in
 samples/scroll/Makefile.in
 samples/scrollsub/Makefile.in
@@ -46,9 +51,6 @@ samples/socket/Makefile.in
 samples/dialup/Makefile.in
 samples/font/Makefile.in
 samples/menu/Makefile.in
-samples/console/Makefile.in
-samples/calendar/Makefile.in
-samples/exec/Makefile.in
 demos/bombs/Makefile.in
 demos/forty/Makefile.in
 demos/fractal/Makefile.in

distrib/msw/wisetop.txt

@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=wxWindows 2.1.12 Installation
+  Title=wxWindows 2.1.13 Installation
   Flags=00000100
   Split=1420
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=wxWindows 2.1.12
+  Value=wxWindows 2.1.13
 end
 item: Set Variable
   Variable=GROUP

distrib/msw/zipdist.bat

@@ -5,7 +5,7 @@ set dest=%src\deliver
 set wise=0
 
 Rem Set this to the required version
-set version=2_1_12
+set version=2_1_13
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -42,7 +42,7 @@ zip32 -@ -u %dest\wx%version%_gtk.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ %dest\wx%version%_stubs.zip < %src\distrib\msw\stubs.rsp
 zip32 -@ %dest\wx%version%_mot.zip < %src\distrib\msw\motif.rsp
 zip32 -@ -u %dest\wx%version%_mot.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp
+Rem (Obsolete) zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp
 
 zip32 -@ %dest\wx%version%_doc.zip < %src\distrib\msw\docsrc.rsp
 zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp

docs/changes.txt

@@ -1,22 +1,18 @@
 wxWindows 2 Change Log
 ----------------------
 
-next release (2.1.12 or 2.2?)
+2.1.14
------------------------------
+------
 
 wxBase:
 
 - wxDateTime replaces and extends old wxDate and wxTime classes (still
   available but strongly deprecated) with many new features
-
 - wxLongLong class provides support for (signed) 64 bit integers
-
 - wxCmdLineParser class for parsing the command line (supporting short and
   long options, switches and parameters of different types)
-
 - it is now possible to build wxBase under Win32 (using VC++ only so far)
   and BeOS (without thread support yet)
-
 - wxThread class modified to support both detached and joinable threads, also
   added new GetCPUCount() and SetConcurrency() functions (useful under Solaris
   only so far)
@@ -27,37 +23,34 @@ wxBase:
 - wxString::ToLong, ToULong, ToDouble methods and Format() static one added
 - buffer overflows in wxString and wxLog classes fixed (if snprintf() function
   is available)
-- wxArray::RemoveAt() replaces deprectaed wxArray::Remove(index)
+- wxArray::RemoveAt() replaces deprecated wxArray::Remove(index)
 
 all (GUI):
 
+- Added wxImage::Rotate.
 - new wxCalendarCtrl class for picking a date interactively
-
 - wxMenu(Bar)::Insert() and Remove() functions for dynamic menu menagament
 - wxToolBar supports arbitrary controls (not only buttons) and can be
   dynamically changed (Delete/Insert functions)
 - vertical toolbars supported by MSW and GTK native wxToolBar classes
-
 - wxTreeCtrl and wxListCtrl allow setting colour/fonts for individual items
 - "file open" dialog allows selecting multiple files at once (contributed by
   John Norris)
 - wxMimeTypesManager uses GNOME/KDE MIME database to get the icons for the
   MIME types if available (Unix only)
 - wxDC::DrawRotatedText() (based on contribution by Hans-Joachim Baader)
-
 - TIFF support added (libtiff required and included in the distribution)
 - PCX files can now be written (24 bit only so far)
-
 - validators may work recursively if wxWS_EX_VALIDATE_RECURSIVELY is set
 - wxScrolledWindow now has keyboard interface
 - wxTextEntryDialog may be used for entering passwords (supports wxTE_PASSWORD)
-
 - added wxEncodingConverter and improved wxFontMapper
   for dealing with convertions between different encodings,
   charsets support in wxLocale and wxHTML
 
 wxMSW:
 
+- wxFrame::MakeFullScreen added.
 - support for enhanced metafiles added, support for copying/pasting metafiles
   (WMF and enhanced ones) fixed/added.
 - implemented setting colours for push buttons
@@ -99,8 +92,6 @@ wxHTML:
 NOTE: for changes after wxWindows 2.1.0 b4, please see the CVS
 change log.
 
-Major improvements are listed in readme.txt.
-
 2.1.0, b4, May 9th 1999
 -----------------------
 

docs/motif/install.txt

@@ -180,6 +180,49 @@ exit
 NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL
 CRASH UPON START-UP! Just always use egcs and be happy.
 
+* Building wxGTK on OS/2
+--------------------------
+
+Please send comments and question about the OS/2 installation
+to Andrea Venturoli <a.ventu@flashnet.it> and patches to
+the wxWindows mailing list.
+
+You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
+Lesstif (0.89.1 or newer), emx (0.9d fix 1), flex (2.5.4),
+yacc (1.8), unix like shell, e.g. korn shell (5.2.13),
+Autoconf (2.13),  GNU file utilities (3.6),
+GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
+sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
+
+Open an OS/2 prompt and switch to the directory above.
+First set some global environment variables we need:
+
+SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
+SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__
+SET OSTYPE=OS2X              
+SET COMSPEC=sh
+
+Notice you can choose whatever you want, if you don't like OS2X.
+
+Now, run autoconf in the main directory and in the samples, demos
+and utils subdirectory. This will generate the OS/2 specific
+versions of the configure scripts. Now run
+    configure --with-motif
+as described above.
+
+To verify Lesstif installation, configure will try to compile a
+sample program that requires X headers/libraries to be either
+available via C_INCLUDE_PATH and LIBRARY_PATH or you need to
+explicitly set CFLAGS prior to running configure.
+
+If you have pthreads library installed, it will be autodetected
+and the library will be compiled with thread-support.
+
+Note that configure assumes your flex will generate files named
+"lexyy.c", not "lex.yy.c". If you have a version which does
+generate "lex.yy.c", you need to manually change the generated
+makefile.
+
 * Building wxMotif on SGI
 --------------------------
 
@@ -315,7 +358,7 @@ are
 	
 	--without-libjpeg	Disables JPEG image format code.
 	
-	--without-odbc          Disables ODBC code.
+{	--without-odbc          Disables ODBC code. Not yet. }
 	
         --disable-resources     Disables the use of *.wxr type
 	                        resources.

docs/readme.txt

@@ -1,4 +1,4 @@
-wxWindows 2.1.12
+wxWindows 2.1.13
 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
@@ -21,46 +21,7 @@ important documents and samples.
 Changes in this release
 -----------------------
 
-These are some of the major improvements:
+Please see changes.txt for details.
-
-wxWindows 2.1.12
-================
-
-- New wxDateTime class to replace millenium-uncompliant wxTime
-  and wxDate classes.
-- New wxCalendarCtrl class and sample.
-- New wxCmdLineParser class.
-- Further bug fixes.
-- TIFF support added to wxImage.
-
-wxWindows 2.1.11
-================
-
-- 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.
 
 Platforms supported
 -------------------
@@ -73,8 +34,8 @@ wxWindows 2 currently supports the following platforms:
 - Mac (not covered here: please see the wxWindows web site
   for details)
 
-Most popular C++ compilers are supported; see the release notes
+Most popular C++ compilers are supported; see the install.txt
-(available via docs/html/index.htm) for details.
+file for each platform (available via docs/html/index.htm) for details.
 
 Files
 -----
@@ -189,12 +150,9 @@ already present in user's system - like glibc usually is).
 If compiled with --enable-odbc (Unix only), wxWindows library will 
 contain iODBC library which is covered by LGPL.
 
-
 Documentation
 -------------
 
-See docs/release.txt for some notes about the current release.
-
 See docs/bugs.txt for a bug list: this file is new and will initially
   be edited by hand, later generated from a web-based bug database.
 
@@ -229,5 +187,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, Janurary 2000
+The wxWindows Team, February 2000
 

docs/release.txt

@@ -4,7 +4,7 @@ wxWindows Release Notes
 2.1.13
 ======
 
-- New wxEncodingConverter class
+- New wxEncodingConverter class.
 
 
 2.1.12

samples/controls/controls.cpp

@@ -635,8 +635,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #ifdef __WXMSW__
     // test for masked bitmap display
     bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP);
-    bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+    if (bitmap.Ok())
-    (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
+    {
+       bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+       (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
+    }
 #endif
 
     wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),

src/msw/dialog.cpp

@@ -567,7 +567,7 @@ void wxDialog::DoShowModal()
     }
 
     // and restore focus
-    if ( winFocus )
+    if ( winFocus && (winFocus != this) )
     {
         winFocus->SetFocus();
     }

utils/projgen/makeproj.cpp

@@ -158,6 +158,8 @@ bool MyApp::OnInit()
     MyDialog* dialog = new MyDialog("VC++ MakeProject");
     dialog->ShowModal();
 
+    delete dialog;
+
     return FALSE;
 }
 
@@ -1031,7 +1033,7 @@ MyDialog::MyDialog(const wxString& title, const wxPoint& pos, const wxSize& size
 
 void MyDialog::OnQuit(wxCommandEvent& event)
 {
-    this->Destroy();
+    this->EndModal(wxID_OK);
 }
 
 void MyDialog::OnAbout(wxCommandEvent& event)