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

fixes for compilation with WXWIN_COMPATIBILITY_2_2 == 0 and gcc warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-09 23:13:08 +00:00
parent c7c0e05cf0
commit bf1e895f19
4 changed files with 133 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/keyboard/keyboard.cpp
View File

@@ -465,7 +465,8 @@ void TextWindow::LogEvent(const wxChar *name, wxKeyEvent& event)
if ( keycode == 0 )
key.Printf(_T("NUL"));
else if ( keycode < 27 )
key.Printf(_T("Ctrl-%c"), _T('A') + keycode - 1);
key.Printf(_T("Ctrl-%c"),
(unsigned char)(_T('A') + keycode - 1));
else
key.Printf(_T("'%c'"), (unsigned char)keycode);
}
@@ -488,8 +489,8 @@ void TextWindow::LogEvent(const wxChar *name, wxKeyEvent& event)
if ( m_showRaw )
{
msg += wxString::Format(_T(" (raw key code/flags: %lu and 0x%lx)"),
event.GetRawKeyCode(),
event.GetRawKeyFlags());
(unsigned long)event.GetRawKeyCode(),
(unsigned long)event.GetRawKeyFlags());
}
wxLogMessage(msg);

2
samples/keyboard/keyboard.rc
View File

@@ -1 +1 @@
/* Placeholder so makefile doesn't complain */
#include "wx/msw/wx.rc"

4
samples/regtest/regtest.cpp
View File

@@ -639,7 +639,7 @@ void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
{
TreeNode *pNode = GetNode(event);
bool bExpanding = event.GetCode() == wxTREE_EXPAND_EXPAND;
bool bExpanding = event.GetKeyCode() == wxTREE_EXPAND_EXPAND;
// expansion might take some time
wxSetCursor(*wxHOURGLASS_CURSOR);
@@ -782,7 +782,7 @@ void RegTreeCtrl::OnEndDrag(wxTreeEvent& event)
wxRegKey keyDst(dst->Key(), src->m_strName);
ok = keyDst.Create(FALSE);
if ( !ok ) {
wxLogError(wxT("Key '%s' already exists"));
wxLogError(wxT("Key '%s' already exists"), keyDst.GetName().c_str());
}
else {
ok = key.Copy(keyDst);

90
samples/typetest/typetest.cpp
View File

@@ -379,10 +379,10 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
file_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (file_input.LastError())
textCtrl.WriteText( "; stream.GetLastError() returns: " );
switch (file_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -391,11 +391,11 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
}
textCtrl.WriteText( "\n" );
textCtrl.WriteText( "Seeking to 0; stream.LastError() returns: " );
textCtrl.WriteText( "Seeking to 0; stream.GetLastError() returns: " );
file_input.SeekI( 0 );
switch (file_input.LastError())
switch (file_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -406,10 +406,10 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
file_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (file_input.LastError())
textCtrl.WriteText( "; stream.GetLastError() returns: " );
switch (file_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -428,10 +428,10 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
ffile_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (ffile_input.LastError())
textCtrl.WriteText( "; stream.GetLastError() returns: " );
switch (ffile_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -440,11 +440,11 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
}
textCtrl.WriteText( "\n" );
textCtrl.WriteText( "Seeking to 0; stream.LastError() returns: " );
textCtrl.WriteText( "Seeking to 0; stream.GetLastError() returns: " );
ffile_input.SeekI( 0 );
switch (ffile_input.LastError())
switch (ffile_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -455,10 +455,10 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
ffile_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (ffile_input.LastError())
textCtrl.WriteText( "; stream.GetLastError() returns: " );
switch (ffile_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -477,10 +477,10 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
buf_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "; stream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -489,11 +489,11 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
}
textCtrl.WriteText( "\n" );
textCtrl.WriteText( "Seeking to 0; stream.LastError() returns: " );
textCtrl.WriteText( "Seeking to 0; stream.GetLastError() returns: " );
buf_input.SeekI( 0 );
switch (buf_input.LastError())
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -504,10 +504,10 @@ void MyApp::DoStreamDemo3(wxCommandEvent& WXUNUSED(event))
buf_input.Read( &ch, 1 );
textCtrl.WriteText( "Value read: " );
textCtrl.WriteText( (wxChar)(ch + '0') );
textCtrl.WriteText( "; stream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "; stream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -539,10 +539,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
wxFileInputStream file_input( wxString("test_wx.dat") );
wxBufferedInputStream buf_input( file_input );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "wxBufferedInputStream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -559,10 +559,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
buf_input.SeekI( 300 );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "wxBufferedInputStream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -581,10 +581,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
buf_input.Read( buf, 500 );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "wxBufferedInputStream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -600,10 +600,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
buf_input.Read( buf, 500 );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "wxBufferedInputStream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -619,10 +619,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
buf_input.Read( buf, 500 );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "wxBufferedInputStream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;
@@ -638,10 +638,10 @@ void MyApp::DoStreamDemo4(wxCommandEvent& WXUNUSED(event))
buf_input.Read( buf, 500 );
textCtrl.WriteText( "wxBufferedInputStream.LastError() returns: " );
switch (buf_input.LastError())
textCtrl.WriteText( "wxBufferedInputStream.GetLastError() returns: " );
switch (buf_input.GetLastError())
{
case wxSTREAM_NOERROR: textCtrl.WriteText( "wxSTREAM_NOERROR\n" ); break;
case wxSTREAM_NO_ERROR: textCtrl.WriteText( "wxSTREAM_NO_ERROR\n" ); break;
case wxSTREAM_EOF: textCtrl.WriteText( "wxSTREAM_EOF\n" ); break;
case wxSTREAM_READ_ERROR: textCtrl.WriteText( "wxSTREAM_READ_ERROR\n" ); break;
case wxSTREAM_WRITE_ERROR: textCtrl.WriteText( "wxSTREAM_WRITE_ERROR\n" ); break;