Mercurial > vim

comparison src/gui_dwrite.cpp @ 8641:0af716a4f5d2 v7.4.1610

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/cc6cf9b9f9045a7d8b5923ea0c556e9a4c2567d3 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 19 20:51:35 2016 +0100 patch 7.4.1610 Problem: Compiler warnings for non-virtual destructor. Solution: Mark the classe final. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Sat, 19 Mar 2016 21:00:04 +0100
parents 770774e66011
children 2ebc3df65ca2
comparison
equal deleted inserted replaced
8640:51b3ead7e4da 8641:0af716a4f5d2
29 29
30 #ifdef __MINGW32__ 30 #ifdef __MINGW32__
31 # define __maybenull SAL__maybenull 31 # define __maybenull SAL__maybenull
32 # define __in SAL__in 32 # define __in SAL__in
33 # define __out SAL__out 33 # define __out SAL__out
34 #endif
35
36 #if (defined(_MSC_VER) && (_MSC_VER >= 1700)) || (__cplusplus >= 201103L)
37 # define FINAL final
38 #else
39 # define FINAL
34 #endif 40 #endif
35 41
36 #ifdef DYNAMIC_DIRECTX 42 #ifdef DYNAMIC_DIRECTX
37 extern "C" HINSTANCE vimLoadLib(char *name); 43 extern "C" HINSTANCE vimLoadLib(char *name);
38 44
220 cellCount = 1; 226 cellCount = 1;
221 return cellCount * cellWidth; 227 return cellCount * cellWidth;
222 } 228 }
223 }; 229 };
224 230
225 class GdiTextRenderer : public IDWriteTextRenderer 231 class GdiTextRenderer FINAL : public IDWriteTextRenderer
226 { 232 {
227 public: 233 public:
228 GdiTextRenderer( 234 GdiTextRenderer(
229 IDWriteBitmapRenderTarget* bitmapRenderTarget, 235 IDWriteBitmapRenderTarget* bitmapRenderTarget,
230 IDWriteRenderingParams* renderingParams) : 236 IDWriteRenderingParams* renderingParams) :