Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resource sample reflects recent font correction; doc updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-07-10 05:47:45 +00:00
parent d19e79247c
commit 6b5f146a2b
14 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/extradoc.rsp
View File

@@ -1,3 +1,3 @@
docs/pdf/odbc.pdf
docs/html/gettext/*.htm
docs/html/gettext/*.html

4
distrib/msw/jpeg.rsp
View File

@@ -1,6 +1,6 @@
src/jpeg/make*
src/jpeg/jpeg.dsp
src/jpeg/jpeg.dsw
src/jpeg/JpegVC.dsp
src/jpeg/JpegVC.dsw
src/jpeg/*.c
src/jpeg/*.h
src/jpeg/README

2
distrib/msw/tarwxmotif
View File

@@ -3,7 +3,7 @@
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
init=""
WXVER=2.1.16
WXVER=2.2.0
if [ $1 = "" ]
then
exit

4
distrib/msw/tiff.rsp
View File

@@ -1,6 +1,6 @@
src/tiff/make*
src/tiff/tiff.dsp
src/tiff/tiff.dsw
src/tiff/TiffVC.dsp
src/tiff/TiffVC.dsw
src/tiff/*.c
src/tiff/*.h
src/tiff/README

4
distrib/msw/wisetop.txt
View File

@@ -207,7 +207,9 @@ item: Custom Dialog Set
item: Static
Rectangle=86 41 256 130
Create Flags=01010000000000000000000000000000
Text=This installation program will install %APPTITLE%. It will need about 25 MB of hard disk space.
Text=This installation program will install %APPTITLE%. It will need 30-130 MB of hard disk space,
Text=depending on the disk cluster size. Allow further disk space for compiling the library
Text=and samples.
Text=
Text=Press the Next button to start the installation. You can press the Cancel button now if you do not want to install %APPTITLE% at this time.
Text French=Ce programme d'installation va installer %APPTITLE%.

2
distrib/msw/wx_html.rsp
View File

@@ -12,7 +12,7 @@ docs/html/tex2rtf/*.gif
docs/html/odbc/*.htm
docs/html/gettext/*.htm
docs/html/gettext/*.html
contrib/docs/html/ogl/*.htm
contrib/docs/html/ogl/*.gif

10
distrib/msw/zipdist.bat
View File

@@ -5,7 +5,7 @@ set dest=%src\deliver
set wise=0
Rem Set this to the required version
set version=2.1.16
set version=2.2.0
if "%src" == "" goto usage
if "%dest" == "" goto usage
@@ -30,6 +30,7 @@ erase %dest\tiff.zip
erase %dest\dialoged.zip
erase %dest\utils.zip
erase %dest\extradoc.zip
erase %dest\*-win32.zip
if direxist %dest\wx deltree /Y %dest\wx
@@ -127,6 +128,13 @@ if "%wise" == "0" goto end
:dounzip
Rem Make dialoged-win32.zip and tex2rtf-win32.zip
cd %src\bin
zip32 %dest\dialoged-win32.zip dialoged.*
zip32 %dest\tex2rtf-win32.zip tex2rtf.*
cd %dest
rem Unzip the Windows files into 'wx'

4
docs/motif/install.txt
View File

@@ -1,4 +1,4 @@
wxWindows 2.1 for Motif installation
wxWindows 2.2 for Motif installation
------------------------------------
IMPORTANT NOTE:
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWindows you are
using (including the beta) and what compiler on what system. One
example: wxMotif 2.1 beta 6, egcs 1.1.1, Redhat 5.0
example: wxMotif 2.2.0, egcs 1.1.1, Redhat 5.0
First steps
-----------

14
docs/motif/readme.txt
View File

@@ -1,14 +1,8 @@
Welcome to wxWindows/Motif 2.1.16
Welcome to wxWindows/Motif 2.2.0
You have downloaded version 2.1.16 of the Motif port of
the wxWindows GUI library. Although this is not yet the
final stable release wxMotif 2.2, the current version has
been tested carefully on many systems and has been found
to work better than any other previous version.
This is the last beta release. wxWindows is now in a code
freeze and only bugs will be corrected.
You have downloaded version 2.2.0 of the Motif port of
the wxWindows GUI library.
More information about the wxWindows project as a whole
can be found at:
@@ -39,7 +33,7 @@ Alternatively, you may also use the bug reporting system
linked from the wxWindows web page.
The library produced by the install process will be called
libwx_motif.a (static) and libwx_motif-2.1.so.16.0.0 (shared) so that
libwx_motif.a (static) and libwx_motif-2.2.so.0.0.0 (shared) so that
once a binary incompatible version of wxWindows/Motif comes out
we'll augment the library version number to avoid linking problems.

12
docs/msw/install.txt
View File

@@ -1,11 +1,9 @@
Installing wxWindows 2.1
Installing wxWindows 2.2
------------------------
This is a beta release of wxWindows 2.1 for Microsoft
Windows 95, 98 and NT. This is not a production release,
although a huge number of bugs found in earlier versions
of wxWindows have been fixed.
This is wxWindows 2.2 for Microsoft Windows 3.1, 95, 98 and
Windows NT/Windows 2000. This is an official, stable release.
IMPORTANT NOTE: If you experience problems installing, please
re-read this instructions and other related files (changes.txt,
@@ -188,7 +186,7 @@ the project. After this, delete everything (including PCH) and recompile.
Note (5): for some further notes about upgrading your project
files to be compatible with wxWindows 2.1.14, please see
"Highlights of wxWindows 2.1.14" from the Download page of the
"Highlights of wxWindows" from the Download page of the
web site or CD-ROM.
Note (6): to create your own IDE files, see the technical note on the
@@ -427,7 +425,7 @@ src\xpm\xpmi.h:
Metrowerks CodeWarrior compilation
----------------------------------
1. Downloaded and unzip wx2_x_y_cw.zip.
1. Downloaded and unzip wxWindows-x.y.z-cw.zip.
2. Load the make_cw.mcp project in wx\src, and compile.
3. Load the make_cw.mcp project in wx\samples\minimal, and compile.
Further project files for samples will be available in due

30
docs/todo.txt
View File

@@ -14,38 +14,8 @@ Please see also:
usage, how many classes of each kind are in use, etc.? That
would be neat.
- Documentation: mention include files with each class.
- Document/update wxTime.
- Document wxSpinCtrl & wxFontMapper.
- Fix TCP/IP mode in dde sample (how to use; why does it crash).
- In doc/view file selector, document type is selected by
extension, not the type selected in the (Windows) file selector.
- Add all makefiles/documentation for utils/serialize.
- Implement wxScrolledWindow::OnChar to scroll the window using
the keyboard.
- Documentation for ODBC classes
For 2.1: small changes not involving rewriting anything
-------------------------------------------------------
- wxArrayDouble class?
- generate CREATE/DESTROY events just after/before a window (any window, not
just frame/dialog) is created/deleted
- Dynamic menu handling: wxMenuBar::DeleteMenu(), InsertMenu()
For 2.2: major new additions
-------------------------------------------------------
- Unicode support (Win32 only probably)
- DnD and OLE clipboard, uniform DnD/clipboard handling

2
include/wx/msw/setup0.h
View File

@@ -616,7 +616,7 @@
// Define 1 for font size to be backward compatible
// to 1.63 and earlier. 1.64 and later define point
// sizes to be compatible with Windows.
#define wxDIALOG_UNIT_COMPATIBILITY 1
#define wxDIALOG_UNIT_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else
// 1 to be as per 2.1.16 and before. If migrating
// between versions, your dialogs may seem to shrink.

4
samples/nativdlg/dialog1.rc
View File

@@ -13,6 +13,10 @@
#define __WIN95__
#endif
//#ifdef _MSC_VER
#define __VISUALC__ _MSC_VER
//#endif
#ifdef __GNUWIN32__
#define wxID_OK 5100
#define wxID_CANCEL 5101

18
samples/resource/dialog1.wxr
View File

@@ -2,25 +2,25 @@ static char *dialog1 = "dialog(name = 'dialog1',\
style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
title = 'Test dialog box',\
id = 100,\
x = 10, y = 10, width = 197, height = 146,\
x = 10, y = 10, width = 210, height = 145,\
background_colour = 'D6D6D6',\
use_dialog_units = 1,\
use_system_defaults = 1,\
font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 184, 103,\
control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 200, 103,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [102, wxRadioBox, 'Radiobox', 'wxRA_SPECIFY_COLS', 'radiobox2', 13, 24, 45, 72, ['One', 'Two', 'Three', 'Four', 'One more'], 1,\
control = [102, wxRadioBox, 'Radiobox', 'wxRA_SPECIFY_COLS', 'radiobox2', 13, 24, 60, 72, ['One', 'Two', 'Three', 'Four', 'One more'], 1,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 62, 24, 67, 33, 'wxWindows rules!',\
control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 80, 24, 67, 33, 'wxWindows rules!',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [105, wxListBox, '', '0', 'listbox4', 62, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\
control = [105, wxListBox, '', '0', 'listbox4', 80, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 141, 26, 40, 14, 0,\
control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 150, 26, 50, 14, 0,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [107, wxStaticText, 'My Message', '0', 'message10', 143, 57, 39, 12, '',\
control = [107, wxStaticText, 'My Message', '0', 'message10', 150, 57, 50, 12, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [108, wxButton, 'Press me', '0', 'button7', 141, 81, 36, 13, '',\
control = [108, wxButton, 'Press me', '0', 'button7', 150, 81, 50, 13, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [109, wxButton, 'Cancel', '0', 'button8', 62, 119, 55, 17, '',\
control = [109, wxButton, 'Cancel', '0', 'button8', 80, 119, 55, 17, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).";