X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59db511380ee3ef4de0ada4e92237584ba00784b..6644cbe7fbe910802eebd7df66203191d30b1c5c:/samples/keyboard/keyboard.cpp diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp index 479d539f4c..54ef746ff4 100644 --- a/samples/keyboard/keyboard.cpp +++ b/samples/keyboard/keyboard.cpp @@ -112,7 +112,7 @@ private: } } - virtual void DoLogString(const wxChar *szString, time_t t) + virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { wxString msg; TimeStamp(&msg); @@ -154,7 +154,7 @@ protected: void OnKeyUp(wxKeyEvent& event) { LogEvent(_T("Key up"), event); } void OnChar(wxKeyEvent& event) { LogEvent(_T("Char"), event); } - void OnPaint(wxPaintEvent& event) + void OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); dc.SetTextForeground(*wxWHITE); @@ -320,7 +320,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxMessageBox(msg, _T("About wxKeyboard"), wxOK | wxICON_INFORMATION, this); } -void MyFrame::OnClear(wxCommandEvent& event) +void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event)) { m_lboxLog->Clear(); } @@ -352,7 +352,7 @@ void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event)) void TextWindow::LogEvent(const wxChar *name, wxKeyEvent& event) { wxString key; - long keycode = event.KeyCode(); + long keycode = event.GetKeyCode(); switch ( keycode ) { case WXK_BACK: key = _T("BACK"); break; @@ -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);