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

Corrected bug in filedlg.

Browse Source 
Added more stream tests to typetest sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-01 12:54:06 +00:00
parent 1e3eca9d37
commit 53daeadab7
3 changed files with 62 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
samples/typetest/typetest.cpp
View File

@@ -43,6 +43,7 @@
#endif
#include "wx/wfstream.h"
#include "wx/datstrm.h"
// Create a new application object
@@ -191,6 +192,57 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
file_input >> str;
tmp.Printf( "String: %s\n", str.c_str() );
textCtrl.WriteText( tmp );
textCtrl << "\nTest for wxDataStream:\n\n";
textCtrl.WriteText( "Writing to wxDataOutputStream:\n" );
file_output.SeekO( 0 );
wxDataOutputStream data_output( file_output );
wxInt32 i32 = 0xFFFFFFFF;
tmp.Printf( "Signed int32: %d\n", i32 );
textCtrl.WriteText( tmp );
data_output.Write32( i32 );
wxUint32 ui32 = 0xFFFFFFFF;
tmp.Printf( "Unsigned int32: %u\n", ui32 );
textCtrl.WriteText( tmp );
data_output.Write32( ui32 );
d = 2.01234567890123456789;
tmp.Printf( "Double: %f\n", d );
textCtrl.WriteText( tmp );
data_output.WriteDouble( d );
str = "Hello!";
tmp.Printf( "String: %s\n", str.c_str() );
textCtrl.WriteText( tmp );
data_output.WriteString( str );
file_output.OutputStreamBuffer()->FlushBuffer();
textCtrl.WriteText( "\nReading from wxDataInputStream:\n" );
file_input.SeekI( 0 );
wxDataInputStream data_input( file_input );
i32 = data_input.Read32();
tmp.Printf( "Signed int32: %d\n", i32 );
textCtrl.WriteText( tmp );
ui32 = data_input.Read32();
tmp.Printf( "Unsigned int32: %d\n", ui32 );
textCtrl.WriteText( tmp );
d = data_input.ReadDouble();
tmp.Printf( "Double: %f\n", d );
textCtrl.WriteText( tmp );
str = data_input.ReadString();
tmp.Printf( "String: %s\n", str.c_str() );
textCtrl.WriteText( tmp );
}
#if wxUSE_UNICODE

4
src/gtk/filedlg.cpp
View File

@@ -165,9 +165,13 @@ void wxFileDialog::SetPath(const wxString& path)
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
if (!ext.IsEmpty())
{
m_fileName += _T(".");
m_fileName += ext;
}
}
}
// ----------------------------------------------------------------------------
// global functions

4
src/gtk1/filedlg.cpp
View File

@@ -165,9 +165,13 @@ void wxFileDialog::SetPath(const wxString& path)
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
if (!ext.IsEmpty())
{
m_fileName += _T(".");
m_fileName += ext;
}
}
}
// ----------------------------------------------------------------------------
// global functions