From 2eb10e2a17a02acaaa32a41304243999f3a862a1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 22 Jul 2003 01:42:41 +0000 Subject: [PATCH] more warning fixes; removed references to wxToolBarBase from wxRTTI git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dialup.h | 3 +++ include/wx/generic/laywin.h | 6 +++--- include/wx/generic/sashwin.h | 2 +- include/wx/generic/splash.h | 3 ++- include/wx/generic/statusbr.h | 4 +--- include/wx/msw/enhmeta.h | 6 +++++- include/wx/msw/minifram.h | 2 +- include/wx/msw/tabctrl.h | 2 +- include/wx/msw/tglbtn.h | 2 +- include/wx/selstore.h | 2 +- include/wx/tbarsmpl.h | 2 +- src/generic/renderg.cpp | 6 +++--- src/generic/tbarsmpl.cpp | 4 +++- src/gtk/tbargtk.cpp | 2 +- src/gtk1/tbargtk.cpp | 2 +- src/html/htmlpars.cpp | 7 +++++++ src/mac/carbon/toolbar.cpp | 2 +- src/mac/toolbar.cpp | 2 +- src/motif/toolbar.cpp | 2 +- src/msw/dc.cpp | 4 ++++ src/msw/dcprint.cpp | 2 +- src/msw/dialup.cpp | 6 +++++- src/msw/display.cpp | 14 +++++++------- src/msw/iniconf.cpp | 22 ++++++++++++---------- src/msw/ole/dataobj.cpp | 2 ++ src/msw/renderer.cpp | 5 +++++ src/msw/scrolbar.cpp | 2 +- src/msw/tbar95.cpp | 8 +++++--- src/msw/textctrl.cpp | 6 +++--- src/msw/thread.cpp | 2 ++ src/msw/toplevel.cpp | 5 ++++- 31 files changed, 89 insertions(+), 50 deletions(-) diff --git a/include/wx/dialup.h b/include/wx/dialup.h index b877c6b369..a38627daf1 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -182,6 +182,9 @@ public: // implement the base class pure virtual virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } + +private: + DECLARE_NO_COPY_CLASS(wxDialUpEvent) }; // the type of dialup event handler function diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index 992e1b0d34..6451ece88d 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -99,7 +99,7 @@ protected: wxLayoutAlignment m_alignment; private: - DECLARE_DYNAMIC_CLASS(wxQueryLayoutInfoEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxQueryLayoutInfoEvent) }; typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&); @@ -136,7 +136,7 @@ protected: wxRect m_rect; private: - DECLARE_DYNAMIC_CLASS(wxCalculateLayoutEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxCalculateLayoutEvent) }; typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&); @@ -192,7 +192,7 @@ private: wxSize m_defaultSize; private: - DECLARE_CLASS(wxSashLayoutWindow) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashLayoutWindow) DECLARE_EVENT_TABLE() }; diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index 211fc4b783..bad1784c85 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -232,7 +232,7 @@ private: wxSashDragStatus m_dragStatus; private: - DECLARE_DYNAMIC_CLASS(wxSashEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashEvent) }; typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&); diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index a3ccfa3897..a6a580c0e9 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -90,7 +90,8 @@ public: protected: wxBitmap m_bitmap; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxSplashScreenWindow) }; diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index f203e174d6..fcca524216 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -121,10 +121,8 @@ protected: private: DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxStatusBarGeneric) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric) }; #endif // _WX_GENERIC_STATUSBR_H_ - -// vi:sts=4:sw=4:et diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index 13c668029d..efbaafd617 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -91,7 +91,7 @@ public: wxEnhMetaFile *Close(); private: - DECLARE_DYNAMIC_CLASS(wxEnhMetaFileDC) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC) }; #if wxUSE_DRAG_AND_DROP @@ -128,6 +128,8 @@ public: protected: wxEnhMetaFile m_metafile; + + DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject) }; @@ -160,6 +162,8 @@ public: protected: wxEnhMetaFile m_metafile; + + DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject) }; #endif // wxUSE_DRAG_AND_DROP diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h index 451ed9a8a8..be1154d9e2 100644 --- a/include/wx/msw/minifram.h +++ b/include/wx/msw/minifram.h @@ -49,7 +49,7 @@ public: } protected: - DECLARE_DYNAMIC_CLASS(wxMiniFrame) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame) }; #endif diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index 4a11d95c35..ef3e50fa9c 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -150,7 +150,7 @@ private: int m_nSel, // currently selected page m_nOldSel; // previously selected page - DECLARE_DYNAMIC_CLASS(wxTabEvent) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxTabEvent) }; typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&); diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index 3f665d4d9b..7f6edb2960 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -52,7 +52,7 @@ protected: virtual wxSize DoGetBestSize() const; private: - DECLARE_DYNAMIC_CLASS(wxToggleButton) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) }; #endif // _WX_TOGGLEBUTTON_H_ diff --git a/include/wx/selstore.h b/include/wx/selstore.h index a248597988..8ddb73be18 100644 --- a/include/wx/selstore.h +++ b/include/wx/selstore.h @@ -48,7 +48,7 @@ public: void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = FALSE; } // must be called when a new item is inserted/added - void OnItemAdd(size_t item) { wxFAIL_MSG( _T("TODO") ); } + void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( _T("TODO") ); } // must be called when an item is deleted void OnItemDelete(size_t item); diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h index 7d68984022..b2522caca5 100644 --- a/include/wx/tbarsmpl.h +++ b/include/wx/tbarsmpl.h @@ -164,7 +164,7 @@ protected: private: DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxToolBarSimple) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarSimple) }; #endif // wxUSE_TOOLBAR_SIMPLE diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 19a4777f64..52ca205837 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -146,10 +146,10 @@ wxRendererGeneric::DrawShadedRect(wxDC& dc, // ---------------------------------------------------------------------------- void -wxRendererGeneric::DrawHeaderButton(wxWindow *win, +wxRendererGeneric::DrawHeaderButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, - int flags) + int WXUNUSED(flags)) { const int CORNER = 1; @@ -177,7 +177,7 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win, // draw the plus or minus sign void -wxRendererGeneric::DrawTreeItemButton(wxWindow *win, +wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp index 8aceb7f09d..51699c845c 100644 --- a/src/generic/tbarsmpl.cpp +++ b/src/generic/tbarsmpl.cpp @@ -79,13 +79,15 @@ public: wxCoord m_y; wxCoord m_width; wxCoord m_height; + + DECLARE_NO_COPY_CLASS(wxToolBarToolSimple) }; // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl) #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__) IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple) diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 6adcd35417..b3ab910bfd 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -136,7 +136,7 @@ protected: // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // ============================================================================ // implementation diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 6adcd35417..b3ab910bfd 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -136,7 +136,7 @@ protected: // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // ============================================================================ // implementation diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index 3a409efb3b..ae2ccef9a7 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -859,9 +859,14 @@ wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), class wxMetaTagParser : public wxHtmlParser { public: + wxMetaTagParser() { } + wxObject* GetProduct() { return NULL; } + protected: virtual void AddText(const wxChar* WXUNUSED(txt)) {} + + DECLARE_NO_COPY_CLASS(wxMetaTagParser) }; class wxMetaTagHandler : public wxHtmlTagHandler @@ -873,6 +878,8 @@ public: private: wxString *m_retval; + + DECLARE_NO_COPY_CLASS(wxMetaTagHandler) }; bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag) diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 5820490844..51ba976d42 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -23,7 +23,7 @@ #include "wx/bitmap.h" #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp index 5820490844..51ba976d42 100644 --- a/src/mac/toolbar.cpp +++ b/src/mac/toolbar.cpp @@ -23,7 +23,7 @@ #include "wx/bitmap.h" #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index 2a75efa5b1..173e6a9756 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -53,7 +53,7 @@ // ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) #endif // ---------------------------------------------------------------------------- diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index f4e01a72a1..52e247fce2 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -158,6 +158,8 @@ private: COLORREF m_colFgOld, m_colBgOld; bool m_changed; + + DECLARE_NO_COPY_CLASS(wxColourChanger) }; // this class saves the old stretch blit mode during its life time @@ -186,6 +188,8 @@ private: const HDC m_hdc; int m_modeOld; + + DECLARE_NO_COPY_CLASS(StretchBltModeChanger) }; // =========================================================================== diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index aac533377b..c0f9a2c097 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -408,7 +408,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp, bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, - wxCoord xsrc, wxCoord ysrc, + wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc), int WXUNUSED(rop), bool useMask, wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) { diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index fa9bb8143f..72b6990c78 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -215,6 +215,8 @@ private: private: wxDialUpManagerMSW *m_dialUpManager; + + DECLARE_NO_COPY_CLASS(RasTimer) } m_timerStatusPolling; // thread handle for the thread sitting on connection change event @@ -264,6 +266,8 @@ private: // this flag tells us whether a call to RasDial() is in progress static wxDialUpManagerMSW *ms_dialer; + + DECLARE_NO_COPY_CLASS(wxDialUpManagerMSW) }; // ---------------------------------------------------------------------------- @@ -1236,7 +1240,7 @@ static LRESULT APIENTRY wxRasStatusWindowProc(HWND hWnd, UINT message, return 0; } -static void WINAPI wxRasDialFunc(UINT unMsg, +static void WINAPI wxRasDialFunc(UINT WXUNUSED(unMsg), RASCONNSTATE rasconnstate, DWORD dwError) { diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 10012b320f..ecb46d2913 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -166,10 +166,10 @@ static wxDisplayInfoArray *gs_displays = NULL; // ---------------------------------------------------------------------------- static BOOL CALLBACK wxmswMonitorEnumProc ( - HMONITOR hMonitor, // handle to display monitor - HDC hdcMonitor, // handle to monitor-appropriate device context (NULL) - LPRECT lprcMonitor, // pointer to monitor intersection rectangle - LPARAM dwData // data passed from EnumDisplayMonitors (unused) + HMONITOR hMonitor, // handle to display monitor + HDC WXUNUSED(hdcMonitor), // handle to monitor-appropriate device context + LPRECT lprcMonitor, // pointer to monitor intersection rectangle + LPARAM WXUNUSED(dwData) // data passed from EnumDisplayMonitors (unused) ) { wxDisplayInfo *info = new wxDisplayInfo(); @@ -193,9 +193,9 @@ static BOOL CALLBACK wxmswMonitorEnumProc ( BOOL PASCAL wxDDEnumExCallback(GUID *pGuid, - LPTSTR driverDescription, + LPTSTR WXUNUSED(driverDescription), LPTSTR driverName, - LPVOID lpContext, + LPVOID WXUNUSED(lpContext), HMONITOR hmon) { if ( pGuid ) @@ -539,7 +539,7 @@ wxString wxDisplay::GetNameForEnumSettings() const // ---------------------------------------------------------------------------- wxArrayVideoModes -wxDisplay::DoGetModesDirectX(const wxVideoMode& modeMatch) const +wxDisplay::DoGetModesDirectX(const wxVideoMode& WXUNUSED(modeMatch)) const { wxArrayVideoModes modes; diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp index 722fda8557..9200b5263d 100644 --- a/src/msw/iniconf.cpp +++ b/src/msw/iniconf.cpp @@ -200,28 +200,28 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const // ---------------------------------------------------------------------------- // not implemented -bool wxIniConfig::GetFirstGroup(wxString& str, long& lIndex) const +bool wxIniConfig::GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const { wxFAIL_MSG("not implemented"); return FALSE; } -bool wxIniConfig::GetNextGroup (wxString& str, long& lIndex) const +bool wxIniConfig::GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const { wxFAIL_MSG("not implemented"); return FALSE; } -bool wxIniConfig::GetFirstEntry(wxString& str, long& lIndex) const +bool wxIniConfig::GetFirstEntry(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const { wxFAIL_MSG("not implemented"); return FALSE; } -bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const +bool wxIniConfig::GetNextEntry (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const { wxFAIL_MSG("not implemented"); @@ -233,28 +233,28 @@ bool wxIniConfig::GetNextEntry (wxString& str, long& lIndex) const // ---------------------------------------------------------------------------- // not implemented -size_t wxIniConfig::GetNumberOfEntries(bool bRecursive) const +size_t wxIniConfig::GetNumberOfEntries(bool WXUNUSED(bRecursive)) const { wxFAIL_MSG("not implemented"); return (size_t)-1; } -size_t wxIniConfig::GetNumberOfGroups(bool bRecursive) const +size_t wxIniConfig::GetNumberOfGroups(bool WXUNUSED(bRecursive)) const { wxFAIL_MSG("not implemented"); return (size_t)-1; } -bool wxIniConfig::HasGroup(const wxString& strName) const +bool wxIniConfig::HasGroup(const wxString& WXUNUSED(strName)) const { wxFAIL_MSG("not implemented"); return FALSE; } -bool wxIniConfig::HasEntry(const wxString& strName) const +bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const { wxFAIL_MSG("not implemented"); @@ -449,13 +449,15 @@ bool wxIniConfig::DeleteAll() return TRUE; } -bool wxIniConfig::RenameEntry(const wxString& oldName, const wxString& newName) +bool wxIniConfig::RenameEntry(const wxString& WXUNUSED(oldName), + const wxString& WXUNUSED(newName)) { // Not implemented return FALSE; } -bool wxIniConfig::RenameGroup(const wxString& oldName, const wxString& newName) +bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName), + const wxString& WXUNUSED(newName)) { // Not implemented return FALSE; diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index ac37833d0d..1f2df6cdb2 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -1134,6 +1134,8 @@ protected: return TRUE; } #endif + + DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject) }; diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 095403939d..4c8a59db57 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -36,6 +36,11 @@ class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererNative { +public: + wxRendererMSW() { } + +private: + DECLARE_NO_COPY_CLASS(wxRendererMSW) }; // ============================================================================ diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index 9f7c9ce146..c4fbe72399 100644 --- a/src/msw/scrolbar.cpp +++ b/src/msw/scrolbar.cpp @@ -121,7 +121,7 @@ wxScrollBar::~wxScrollBar(void) } bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, - WXWORD pos, WXHWND control) + WXWORD pos, WXHWND WXUNUSED(control)) { // current and max positions int position, diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index a1d6e9d484..0307c1eff2 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -123,7 +123,7 @@ // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent) @@ -178,6 +178,8 @@ public: private: size_t m_nSepCount; + + DECLARE_NO_COPY_CLASS(wxToolBarTool) }; @@ -1175,7 +1177,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event) } } -bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam) +bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) { // calculate our minor dimension ourselves - we're confusing the standard // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks @@ -1317,7 +1319,7 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam) return TRUE; } -void wxToolBar::HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam) +void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) { wxCoord x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index cd347f4764..33137b7274 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1664,7 +1664,7 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event)) Redo(); } -void wxTextCtrl::OnDelete(wxCommandEvent& event) +void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event)) { long from, to; GetSelection(& from, & to); @@ -1672,7 +1672,7 @@ void wxTextCtrl::OnDelete(wxCommandEvent& event) Remove(from, to); } -void wxTextCtrl::OnSelectAll(wxCommandEvent& event) +void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { SetSelection(-1, -1); } @@ -1740,7 +1740,7 @@ void wxTextCtrl::OnRightClick(wxMouseEvent& event) event.Skip(); } -void wxTextCtrl::OnSetFocus(wxFocusEvent& event) +void wxTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) { // be sure the caret remains invisible if the user had hidden it if ( !m_isNativeCaretShown ) diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp index 976c7412d6..c166f73cf5 100644 --- a/src/msw/thread.cpp +++ b/src/msw/thread.cpp @@ -389,6 +389,8 @@ private: wxMutex& m_mutex; wxSemaphore m_semaphore; + + DECLARE_NO_COPY_CLASS(wxConditionInternal) }; wxConditionInternal::wxConditionInternal(wxMutex& mutex) diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 6bc345507e..1c26f2e5e6 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -906,7 +906,10 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) // the DialogProc for all wxWindows dialogs LONG APIENTRY _EXPORT -wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +wxDlgProc(HWND WXUNUSED(hDlg), + UINT message, + WPARAM WXUNUSED(wParam), + LPARAM WXUNUSED(lParam)) { switch ( message ) { -- 2.45.2