From bc1dcfc1aa7cb30753c10b06409afae8e895ffa0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 17 Mar 2000 14:08:54 +0000 Subject: [PATCH] warnings from FreeBSD compilation log removed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fs_mem.cpp | 10 ++++++---- src/common/utilscmn.cpp | 2 +- src/generic/dragimgg.cpp | 5 ++++- src/generic/listctrl.cpp | 3 ++- src/generic/splitter.cpp | 8 +++++++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 3b45f31ae2..bc089b0990 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -112,9 +112,11 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString -wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags) +wxString wxMemoryFSHandler::FindFirst(const wxString& WXUNUSED(spec), + int WXUNUSED(flags)) { - wxLogWarning(wxT("wxMemoryFSHandler::FindFirst not implemented")); + wxFAIL_MSG(wxT("wxMemoryFSHandler::FindFirst not implemented")); + return wxEmptyString; } @@ -122,12 +124,12 @@ wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags) wxString wxMemoryFSHandler::FindNext() { - wxLogWarning(wxT("wxMemoryFSHandler::FindNext not implemented")); + wxFAIL_MSG(wxT("wxMemoryFSHandler::FindNext not implemented")); + return wxEmptyString; } - bool wxMemoryFSHandler::CheckHash(const wxString& filename) { if (m_Hash == NULL) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 5fee1a66ca..2ac002dec3 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1047,7 +1047,7 @@ wxWindowDisabler::~wxWindowDisabler() // the given one bool wxSafeYield(wxWindow *win) { - wxWindowDisabler wd; + wxWindowDisabler wd(win); bool rc = wxYield(); diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 747b155153..dc79dc7d74 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -183,7 +183,10 @@ bool wxGenericDragImage::Create(const wxListCtrl& listCtrl, long id) } // Begin drag -bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen, wxRect* rect) +bool wxGenericDragImage::BeginDrag(const wxPoint& WXUNUSED(hotspot), + wxWindow* window, + bool fullScreen, + wxRect* rect) { wxASSERT_MSG( (window != 0), wxT("Window must not be null in BeginDrag.")); diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 90f95e61f7..128c1fc027 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -722,7 +722,8 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) } } -void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width ) +void wxListLineData::SetPosition( wxDC * WXUNUSED(dc), + int x, int y, int window_width ) { m_bound_all.x = x; m_bound_all.y = y; diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index f806238232..0116742696 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -939,7 +939,13 @@ void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event) OnUnsplit(win); } -void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event) +#if defined(__WXMSW__) + #define WXUNUSED_UNLESS_MSW(identifier) identifier +#else + #define WXUNUSED_UNLESS_MSW(identifier) WXUNUSED(identifier) +#endif + +void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& WXUNUSED_UNLESS_MSW(event)) { // this is currently called (and needed) under MSW only... #ifdef __WXMSW__ -- 2.45.2