X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2edac25b2ea3876bf57a54d314d59050b5fbd8e7..3a6a00822d9930aab713b4fa924ad7d12798b9a3:/src/msw/display.cpp

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 4ae8806c8e..93c673b3ea 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -256,7 +256,7 @@ protected:
     wxDisplayInfoArray m_displays;
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base);
 };
 
 // ----------------------------------------------------------------------------
@@ -275,7 +275,7 @@ public:
     virtual bool ChangeMode(const wxVideoMode& mode);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplMultimon);
 };
 
 class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
@@ -327,7 +327,7 @@ struct wxDisplayInfoDirectDraw : wxDisplayInfo
     const GUID m_guid;
 
 
-    DECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw);
 };
 
 class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
@@ -351,7 +351,7 @@ public:
 private:
     IDirectDraw2 *m_pDD2;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw);
 };
 
 class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base
@@ -380,7 +380,7 @@ private:
     // dynamically resolved DirectDrawCreate()
     DirectDrawCreate_t m_pfnDirectDrawCreate;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw)
+    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw);
 };
 
 #endif // wxUSE_DIRECTDRAW
@@ -852,7 +852,7 @@ wxDisplayFactoryDirectDraw::DDEnumExCallback(GUID *pGuid,
     if ( pGuid )
     {
         wxDisplayFactoryDirectDraw * self =
-            wx_static_cast(wxDisplayFactoryDirectDraw *, lpContext);
+            static_cast<wxDisplayFactoryDirectDraw *>(lpContext);
         self->AddDisplay(*pGuid, hmon, driverName);
     }
     //else: we're called for the primary monitor, skip it
@@ -881,7 +881,7 @@ wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n)
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
     wxDisplayInfoDirectDraw *
-        info = wx_static_cast(wxDisplayInfoDirectDraw *, m_displays[n]);
+        info = static_cast<wxDisplayInfoDirectDraw *>(m_displays[n]);
 
     if ( !info->m_pDD2 )
     {
@@ -944,7 +944,7 @@ private:
     wxArrayVideoModes& m_modes;
     const wxVideoMode& m_modeMatch;
 
-    DECLARE_NO_COPY_CLASS(wxDDVideoModesAdder)
+    wxDECLARE_NO_COPY_CLASS(wxDDVideoModesAdder);
 };
 
 HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
@@ -955,7 +955,7 @@ HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
     if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
     {
         wxDDVideoModesAdder * const vmodes =
-            wx_static_cast(wxDDVideoModesAdder *, lpContext);
+            static_cast<wxDDVideoModesAdder *>(lpContext);
 
         vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth,
                                 lpDDSurfaceDesc->dwHeight,