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

Misc small changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-19 19:55:13 +00:00
parent 1f3c610d03
commit 281b0186b8
16 changed files with 86 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/ogl/ogledit/Makefile
View File

@@ -16,7 +16,7 @@ CPP = gcc -g
CC = gcc
WXCONFIG=../../../../wx-config
WXINCLUDE=-I../../../../include -I../../../include
WXLIB=-L../../../../lib -L../../../lib
WXLIB=-L../../../../lib -L../../../src/ogl
OBJECTS=ogledit.o palette.o doc.o view.o

2
contrib/samples/ogl/studio/Makefile
View File

@@ -16,7 +16,7 @@ CPP = gcc -g
CC = gcc
WXCONFIG=../../../../wx-config
WXINCLUDE=-I../../../../include -I../../../include
WXLIB=-L../../../../lib -L../../../lib
WXLIB=-L../../../../lib -L../../../src/ogl
OBJECTS=studio.o cspalette.o csprint.o dialogs.o doc.o mainfrm.o project.o shapes.o symbols.o view.o

2
demos/forty/forty.cpp
View File

@@ -227,7 +227,7 @@ FortyFrame::About(wxCommandEvent&)
"Forty Thieves\n\n"
"A freeware program using the wxWindows\n"
"portable C++ GUI toolkit.\n"
"http://web.ukonline.co.uk/julian.smart/wxwin\n"
"http://www.wxwindows.org\n"
"http://www.freiburg.linux.de/~wxxt\n\n"
"Author: Chris Breeze (c) 1992-1998\n"
"email: chris.breeze@iname.com",

2
demos/forty/playerdg.cpp
View File

@@ -116,7 +116,7 @@ PlayerSelectionDialog::PlayerSelectionDialog(
list->SetConstraints(layout);
wxString prevPlayer = m_scoreFile->GetPreviousPlayer();
if (prevPlayer.Length() > 0)
if ((prevPlayer.Length() > 0) && (list->FindString(prevPlayer) != -1))
{
list->SetStringSelection(prevPlayer);
m_textField->SetValue(prevPlayer);

1
demos/life/life.cpp
View File

@@ -285,6 +285,7 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
sizer2->Add( m_text, 0, wxGROW | wxTOP, 4 );
sizer2->Add( slider, 0, wxCENTRE | wxALL, 4 );
panel2->SetSizer( sizer2 );
panel2->SetAutoLayout( TRUE );
sizer2->Fit( panel2 );

24
distrib/msw/dialoged.rsp Normal file
View File

@@ -0,0 +1,24 @@
utils/dialoged/Makefile.in
utils/dialoged/src/bitmaps/*.xbm
utils/dialoged/src/bitmaps/*.xpm
utils/dialoged/src/bitmaps/*.bmp
utils/dialoged/src/bitmaps/*.ico
utils/dialoged/src/*.h
utils/dialoged/src/*.cpp
utils/dialoged/src/*.def
utils/dialoged/src/*.rc
utils/dialoged/src/makefile*
utils/dialoged/src/*.xbm
utils/dialoged/src/*.xpm
utils/dialoged/src/*.txt
utils/dialoged/src/*.inf
utils/dialoged/src/*.ico
utils/dialoged/src/*.prj
utils/dialoged/src/*.bmp
docs/html/dialoged/*.htm
docs/html/dialoged/*.gif
docs/winhelp/dialoged.hlp
docs/winhelp/dialoged.cnt
docs/pdf/dialoged.pdf

15
distrib/msw/generic.rsp
View File

@@ -153,6 +153,8 @@ utils/configure.in
utils/dialoged/Makefile.in
utils/dialoged/src/bitmaps/*.xbm
utils/dialoged/src/bitmaps/*.xpm
utils/dialoged/src/bitmaps/*.bmp
utils/dialoged/src/bitmaps/*.ico
utils/dialoged/src/*.h
utils/dialoged/src/*.cpp
utils/dialoged/src/*.def
@@ -162,20 +164,9 @@ utils/dialoged/src/*.xbm
utils/dialoged/src/*.xpm
utils/dialoged/src/*.txt
utils/dialoged/src/*.inf
utils/dialoged/test/*.h
utils/dialoged/src/*.ico
utils/dialoged/src/*.prj
utils/dialoged/src/*.bmp
utils/dialoged/src/bitmaps/*.bmp
utils/dialoged/src/bitmaps/*.ico
utils/dialoged/test/*.cpp
utils/dialoged/test/*.def
utils/dialoged/test/*.rc
utils/dialoged/test/makefile*
utils/dialoged/lib/dummy
utils/dialoged/test/*.ico
utils/dialoged/test/*.prj
utils/dialoged/test/*.bmp
utils/hhp2cached/*.h
utils/hhp2cached/*.cpp
@@ -258,6 +249,7 @@ samples/help/*.xbm
samples/help/*.xpm
samples/help/*.ico
samples/help/*.bmp
samples/help/*.gif
samples/help/*.rc
samples/help/*.hlp
samples/help/*.cnt
@@ -599,6 +591,7 @@ samples/dnd/*.def
samples/dnd/*.bmp
samples/dnd/*.xbm
samples/dnd/*.xpm
samples/dnd/*.png
samples/dnd/*.ico
samples/dnd/*.txt

7
distrib/msw/zipdist.bat
View File

@@ -26,6 +26,7 @@ erase %dest\ogl3.zip
erase %dest\tex2rtf2.zip
erase %dest\jpeg.zip
erase %dest\tiff.zip
erase %dest\dialoged.zip
if direxist %dest\wx deltree /Y %dest\wx
@@ -79,6 +80,12 @@ zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
rem TIFF source
zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
rem Dialog Editor source and binary
erase %dest\dialoged_source.zip
zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\bin\dialoged.hlp %src\bin\dialoged.cnt
erase %dest\dialoged_source.zip
copy %src\docs\changes.txt %dest
copy %src\docs\msw\install.txt %dest\install_msw.txt
copy %src\docs\motif\install.txt %dest\install_motif.txt

2
docs/html/news.htm
View File

@@ -23,7 +23,7 @@ News
<ul>
<li><a href="download.htm" target=wxmain>wxWindows 2.1.14</a> is now available for Windows, Motif and GTK.
Again, great strides have been made since the previous official version (2.1.11), and 2.2 will be the next official
stable version. Many things have been fixed and added but <a href="newver.htm">here</a> are some highlights.
stable version. Many things have been fixed and added but <a href="newver.htm">here are some highlights</a>.
<li>Robin Dunn is contributing a wxStyledTextCtrl, a wrapper around the <a href="http://www.scintilla.org/" target=_new>Scintilla</a>
styled text edit control. It can be used to provide syntax highlighting for various languages, and other applications.
A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside wxWindows 2.1.14.

22
docs/html/platform.htm
View File

@@ -6,12 +6,26 @@
</head>
<body>
<FONT FACE="Arial, Lucida Sans, Helvetica">
<table align=center width=100% border=4 cellpadding=5 cellspacing=0>
<tr>
<td bgcolor="#660000" align=left colspan=2>
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
Supported Platforms
</font>
</td>
</tr>
</table>
</p>
You will find below the list of all supported platforms for different ports of wxWindows 2.x (wxMSW/wxGTK/wxMotif ports
only). The cross icon in the third column doesn't mean that the platform is not supported, but just that wxWindows hasn't
been tested on it recently (the table is being updated for wxWindows 2.1.14
beta currently).
<p>
See also the <A HREF=daily/>daily rebuilds page</A> for some of the platforms mentioned below.
See also the <A HREF="http://www.lpthe.jussieu.fr/~zeitlin/wxWindows/daily/">daily rebuilds page</A> for some of the platforms mentioned below.
<p>
If you have tested wxWindows on a platform not mentioned here, please tell us about your experience on our mailing list!
We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX,
@@ -36,7 +50,7 @@ other flavours of BSD, ...
<td bgcolor="#FFFFFF" align=center valign=center rowspan=6>Win32 (Windows 9x/NT)</td>
<td>Visual C++ 4.2/5.x/6.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ, JS</td><td>Project files are provided for all versions except 4.2</td>
<tr> <td>Borland C++ 5.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>Also works with free command line Borland C++ 5.5</td>
<tr> <td>Myngw32</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
<tr> <td>Mingw32</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
Version 2.95.2 recommended, otherwise some (included) patches must be applied<br>
Memory debugging code doesn't seem to work well</td>
<tr> <td>Cygwin</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td>Hasn't been tested recently, anyone?</td>
@@ -99,8 +113,10 @@ other flavours of BSD, ...
<br>
<hr>
Contact <A HREF="mailto:zeitlin@dptmaths.ens-cachan.fr">me</A> with
Contact <A HREF="mailto:zeitlin@dptmaths.ens-cachan.fr">Vadim Zeitlin</A> with
any comments/suggestions.
</font>
</body>
</html>

1
docs/latex/wx/listctrl.tex
View File

@@ -674,3 +674,4 @@ using this function.
function to call, so it is not available for programmer use. Call
SortItems with a reference to a callable object that expects two
parameters.}

1
docs/latex/wx/panel.tex
View File

@@ -139,3 +139,4 @@ Changes the default button for the panel.
\wxheading{See also}
\helpref{GetDefaultItem}{wxpanelgetdefaultitem}

25
docs/motif/issues.txt
View File

@@ -1,15 +1,34 @@
Outstanding issues
------------------
(see also todo.txt)
Last updated 19/3/2000.
See also: todo.txt.
- wxTextCtrl doesn't work as a stream buffer in Linux/gcc.
- No wxSpinButton.
- No wxToolTip (but see wxToolBar for a way of implementing it).
- Limited clipboard support (text only) and no drag and drop.
- wxTextCtrl doesn't work as a stream buffer in Linux/gcc
- No wxSpinButton
- Need a way of specifying default settings for colour/font/etc.
- More optimisation could be done to reduce X server traffic, etc.
- Should scrollbars take on the background colour? Not right for
e.g. wxScrolledWindows, so maybe have wxSystemSettings value for
scrollbar colour, and/or ability to set scrollbar colour independently.
- wxFrame can accept events, but apps cannot draw into it for some reason,
so the rotate sample won't work. Workaround: use an embedded wxWindow.
- In Life! sample, text above slider isn't legible.
- samples/html/helpview and samples/help show a problem when showing
the advanced HTML help controller: a BadDrawable X error occurs
(unfortunately hard to tell where). Somewhere in wxHtmlHelpFrame.
- Dialog Editor needs a lot of work.

2
docs/readme.txt
View File

@@ -207,5 +207,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
Good luck!
The wxWindows Team, March 2000
The wxWindows Team, 19 March, 2000

1
src/generic/splitter.cpp
View File

@@ -290,7 +290,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
// if the child window doesn't have a cursor, the
// parent's (splitter window) will be used, and this
// must be the standard cursor.
wxLogDebug("wxSplitterWindow: Setting to standard cursor");
// where else do we unset the cursor?
SetCursor(* wxSTANDARD_CURSOR);

2
utils/dialoged/src/reswrite.cpp
View File

@@ -67,7 +67,7 @@ void wxResourceTableWithSaving::OutputFont(wxTextOutputStream& stream, const wxF
bool wxResourceTableWithSaving::Save(const wxString& filename)
{
wxFileOutputStream file_output( filename.fn_str() );
wxFileOutputStream file_output( filename );
if (file_output.LastError())
return FALSE;