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

Updated changes.txt,

Browse Source 
Removed use of Build Root Dir in wxGTK.spec,
  Small correction to tiff code,
  Added more tests (for Peek()) to stream tests
    in typetest sample,
  Fixed bug in wxTextInputStream::ReadWord()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-06-24 14:25:00 +00:00
parent 7aed63fdb7
commit 551490e542
8 changed files with 205 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/gtk/changes.txt
View File

@@ -1,6 +1,10 @@
20th June 2000: wxWindows 2.2 released
4th July 2000: wxWindows 2.2 released
Minor bug-fixes.
Added code for writing BMP images.
Added code for writing TIFF images.
Bug-fixes.
4th June 2000: wxWindows pre-2.2 release

2
docs/gtk/install.txt
View File

@@ -1,7 +1,7 @@
!!! When sending bug reports tell us what version of wxWindows you are
using (including the beta) and what compiler on what system. One
example: wxGTK 2.1 beta 6, egcs 1.1.1, Redhat 5.0 !!!
example: wxGTK 2.2.0, egcs 1.1.1, Redhat 6.2 !!!
* The most simple case
-----------------------

7
docs/gtk/todo.txt
View File

@@ -1,9 +1,7 @@
-------------------- High priority ---------------------
Improve, update translations. Install *.mo files somewehere.
Fix wxMenu::Replace() bug reported weeks ago.
Improve, update translations. Install *.mo files somewhere.
-------------------- Medium priority ---------------------
@@ -25,9 +23,6 @@ Add wxNoteBook::SetTabPosition()
More testing of Unicode support.
-> Postponed.
OwnerDraw for wxListCtrl and others
-> Hardly necessary.
Implement wxPalette
-> Postponed.

86
samples/typetest/typetest.cpp
View File

@@ -46,6 +46,7 @@
#include "wx/wfstream.h"
#include "wx/datstrm.h"
#include "wx/txtstrm.h"
#include "wx/mstream.h"
// Create a new application object
IMPLEMENT_APP (MyApp)
@@ -64,6 +65,7 @@ BEGIN_EVENT_TABLE(MyApp, wxApp)
EVT_MENU(TYPES_STREAM2, MyApp::DoStreamDemo2)
EVT_MENU(TYPES_STREAM3, MyApp::DoStreamDemo3)
EVT_MENU(TYPES_STREAM4, MyApp::DoStreamDemo4)
EVT_MENU(TYPES_STREAM5, MyApp::DoStreamDemo5)
EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo)
END_EVENT_TABLE()
@@ -95,6 +97,7 @@ bool MyApp::OnInit()
test_menu->Append(TYPES_STREAM2, "&Stream seek test");
test_menu->Append(TYPES_STREAM3, "&Stream error test");
test_menu->Append(TYPES_STREAM4, "&Stream buffer test");
test_menu->Append(TYPES_STREAM5, "&Stream peek test");
test_menu->AppendSeparator();
test_menu->Append(TYPES_MIME, "&MIME database test");
@@ -178,10 +181,11 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
tmp.Printf( _T("Float: %f\n"), f );
textCtrl.WriteText( tmp );
// This doesn't compile (at least with VC++ 4)
// Why doesn't this work?
#if 0
std_file_input >> str;
tmp.Printf( _T("String: %s\n"), str.c_str() );
char std_buf[200];
std_file_input >> std_buf;
tmp.Printf( _T("String: %s\n"), std_buf );
textCtrl.WriteText( tmp );
#endif
@@ -214,6 +218,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
textCtrl.WriteText( tmp );
textCtrl << "\nTest for wxDataStream:\n\n";
textCtrl.WriteText( "Writing to wxDataOutputStream:\n" );
@@ -637,6 +642,81 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
textCtrl.WriteText( "\n\n" );
}
void MyApp::DoStreamDemo5(wxCommandEvent& WXUNUSED(event))
{
wxTextCtrl& textCtrl = * GetTextCtrl();
textCtrl.Clear();
textCtrl << "\nTesting wxFileInputStream's Peek():\n\n";
char ch;
wxString str;
textCtrl.WriteText( "Writing number 0 to 9 to wxFileOutputStream:\n\n" );
wxFileOutputStream file_output( wxString("test_wx.dat") );
for (ch = 0; ch < 10; ch++)
file_output.Write( &ch, 1 );
file_output.Sync();
wxFileInputStream file_input( wxString("test_wx.dat") );
ch = file_input.Peek();
str.Printf( "First char peeked: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = file_input.GetC();
str.Printf( "First char read: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = file_input.Peek();
str.Printf( "Second char peeked: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = file_input.GetC();
str.Printf( "Second char read: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = file_input.Peek();
str.Printf( "Third char peeked: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = file_input.GetC();
str.Printf( "Third char read: %d\n", (int) ch );
textCtrl.WriteText( str );
textCtrl << "\n\n\nTesting wxMemoryInputStream's Peek():\n\n";
char buf[] = { 0,1,2,3,4,5,6,7,8,9,10 };
wxMemoryInputStream input( buf, 10 );
ch = input.Peek();
str.Printf( "First char peeked: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = input.GetC();
str.Printf( "First char read: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = input.Peek();
str.Printf( "Second char peeked: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = input.GetC();
str.Printf( "Second char read: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = input.Peek();
str.Printf( "Third char peeked: %d\n", (int) ch );
textCtrl.WriteText( str );
ch = input.GetC();
str.Printf( "Third char read: %d\n", (int) ch );
textCtrl.WriteText( str );
}
#if wxUSE_UNICODE
void MyApp::DoUnicodeDemo(wxCommandEvent& WXUNUSED(event))
{

2
samples/typetest/typetest.h
View File

@@ -33,6 +33,7 @@ public:
void DoStreamDemo2(wxCommandEvent& event);
void DoStreamDemo3(wxCommandEvent& event);
void DoStreamDemo4(wxCommandEvent& event);
void DoStreamDemo5(wxCommandEvent& event);
#if wxUSE_UNICODE
void DoUnicodeDemo(wxCommandEvent& event);
#endif
@@ -80,6 +81,7 @@ enum
TYPES_STREAM2,
TYPES_STREAM3,
TYPES_STREAM4,
TYPES_STREAM5,
TYPES_MIME
};

4
src/common/imagtiff.cpp
View File

@@ -132,7 +132,7 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
{
TIFF* tif = TIFFClientOpen(name, mode,
(thandle_t) &stream,
_tiffReadProc, _tiffWriteProc,
_tiffReadProc, _tiffNullProc,
_tiffSeekIProc, _tiffCloseProc, _tiffSizeProc,
_tiffMapProc, _tiffUnmapProc);
@@ -144,7 +144,7 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
{
TIFF* tif = TIFFClientOpen(name, mode,
(thandle_t) &stream,
_tiffReadProc, _tiffWriteProc,
_tiffNullProc, _tiffWriteProc,
_tiffSeekOProc, _tiffCloseProc, _tiffSizeProc,
_tiffMapProc, _tiffUnmapProc);

12
src/common/txtstrm.cpp
View File

@@ -237,6 +237,7 @@ wxString wxTextInputStream::ReadLine()
while ( !m_input.Eof() )
{
c = m_input.GetC();
if ( !m_input )
break;
@@ -260,8 +261,15 @@ wxString wxTextInputStream::ReadWord()
if ( !c )
return word;
word += c;
while ( !m_input.Eof() )
{
c = m_input.GetC();
if (!m_input)
break;
if (m_separators.Contains(c))
break;
@@ -269,10 +277,6 @@ wxString wxTextInputStream::ReadWord()
break;
word += c;
c = m_input.GetC();
if (!m_input)
break;
}
return word;

13
wxGTK.spec
View File

@@ -10,9 +10,8 @@ Release: %{rel}
Copyright: wxWindows Licence
Group: X11/Libraries
Source: wxGTK-%{ver}.tgz
URL: http://wesley.informatik.uni-freiburg.de/~wxxt
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
BuildRoot: /tmp/wxgtk_root
URL: http://wxwindows.org
Packager: Robert Roebling <robert@roebling.de>
# all packages providing an implementation of wxWindows library (regardless of
# the toolkit used) should provide the (virtual) wxwin package, this makes it
@@ -53,11 +52,7 @@ fi
$MAKE
%install
rm -rf $RPM_BUILD_ROOT
make prefix=$RPM_BUILD_ROOT%{pref} install
%clean
rm -rf $RPM_BUILD_ROOT
make install
%post
/sbin/ldconfig
@@ -71,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{pref}/share/wx
%{pref}/share/wx/*
%attr(755, -, -) %{pref}/lib/libwx_gtk.*
%attr(755, -, -) %{pref}/lib/libwx_gtk-2.1.*
%attr(755, -, -) %{pref}/lib/libwx_gtk-2.2.*
%files devel
%defattr (644, root, root, 755)