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

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index b877c6b3698a248ba00993fb55a66ba4c74eb145..a38627daf139d6865d7156fe7d9dabd8b4f5d6ec 100644 (file)
--- 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 992e1b0d3415f04ea887700d0193cff22b4b2fff..6451ece88dd3ae809941b9ca88d0b71eb8446ef0 100644 (file)
--- 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 211fc4b783ac950adc4b38589780eb6091fa221a..bad1784c85760fcefc1a0e83beda91de64db564b 100644 (file)
--- 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 a3ccfa38977f363607ce0ea8a318ebdf31b87c41..a6a580c0e9059121ce377b2a22da48f78bb4c701 100644 (file)
--- 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 f203e174d6945b26ce68b8a0feff5b674dd9b767..fcca52421665d12d3580b52d3df266b1511a4e2a 100644 (file)
--- 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 13c668029d3a6ef5903696a5991d1f5628e6cceb..efbaafd617ae6652c2127170a91ea7603dd693cd 100644 (file)
--- 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 451ed9a8a86c8f3226b7a7c8b1aafda6ed813c2d..be1154d9e26be06ab035ba1efd593f87993cd22e 100644 (file)
--- 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 4a11d95c357e1c6fd0480dd2751feeda71b51be5..ef3e50fa9c356fcf890efe4e3038cadbf647be81 100644 (file)
--- 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 3f665d4d9bac860043f4e779f69ae1955ee575df..7f6edb2960b7e9ead4767b15c44e93d2eac2c3f4 100644 (file)
--- 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 a2485979881ced5a65618dad12b366b43ee6fa1c..8ddb73be184eb7238eab1f7c3fb32d2ba513d00c 100644 (file)
--- 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 7d689840228221383a3f7a6ccce869c5c9616469..b2522caca547e13182b25429273d43138246c290 100644 (file)
--- 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 19a4777f64b722ad0f1d5ff6111e4794ade3b58f..52ca20583705e6591e414c705c8515f79a84adcf 100644 (file)
--- 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 8aceb7f09d359d75c442b80e5387614fa717b15e..51699c845cb5e6ef193962a29bc6d1ef3bb945cb 100644 (file)
--- 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 6adcd35417cf48a9857387e6bde01ae7a2369981..b3ab910bfdd1e497f7d06e7cfe3756d57bb1b01d 100644 (file)
--- 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 6adcd35417cf48a9857387e6bde01ae7a2369981..b3ab910bfdd1e497f7d06e7cfe3756d57bb1b01d 100644 (file)
--- 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 3a409efb3bd1fef50d9fd751f3c6487c5fd510ae..ae2ccef9a74461299a3e005cc213ffdc0424e95c 100644 (file)
--- 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 5820490844cc6987eda4b1c057293692324fd56d..51ba976d420f25e714509e9fd2680f0f0b18c353 100644 (file)
--- 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 5820490844cc6987eda4b1c057293692324fd56d..51ba976d420f25e714509e9fd2680f0f0b18c353 100644 (file)
--- 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 2a75efa5b13dbab169ad2e3e486a3c4f7d8f9e08..173e6a9756f9b07adbb90da574dc751ada528f63 100644 (file)
--- 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 f4e01a72a17d7287521fafcbbd2d806f5d83051b..52e247fce2f9f1fadb3a6416c08e27678cd83839 100644 (file)
--- 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 aac533377b575177fdc24c21ff9b33bf1379b6a2..c0f9a2c097a75d4190298e2cdc4ae9ae4d60cf46 100644 (file)
--- 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 fa9bb8143f98e72501b2fd6aee628a9df4fe30b3..72b6990c784860c259109a5c267d555fd20afb9b 100644 (file)
--- 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 10012b320f6b21406889f0c4347bc66a68de6ec6..ecb46d2913b3ce95bf91b4150fc71a9b026ba142 100644 (file)
--- 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 722fda855784ee523a6ee2068f2712473972a6ed..9200b5263d640047063d47e8f9949405957395a0 100644 (file)
--- 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 ac37833d0dc641d830a0c7c7ad7333e7f30811d8..1f2df6cdb267540fe051636091a63ec2537d3baf 100644 (file)
--- 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 095403939d21f0f313185cc3ae98eedcb010e5fe..4c8a59db57d1e85a51ce4ebd8a69e64a56e79638 100644 (file)
--- 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 9f7c9ce1467a57d2039461688a59520bc59bac9a..c4fbe72399dcb96597c002d4d5fc3bcef29f6c7c 100644 (file)
--- 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 a1d6e9d48457589a7e6a01158658494bb773c814..0307c1eff2e9197a8f4045bc9fac838ffbbf8331 100644 (file)
--- 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 cd347f4764966d4b8d9afdd7168bd504e4d63450..33137b7274e83621f4df52b870c3480e901f302f 100644 (file)
--- 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 976c7412d683b887b2f9c33adde2282502275ad5..c166f73cf584de672faaea2e665489588ed43bdd 100644 (file)
--- 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 6bc345507ea02864d3b4ee15dbcb685d4f745a1d..1c26f2e5e6419ca19d704b8b3546c8b1f0335956 100644 (file)
--- 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 )
     {