Index: src/ch/MemDC.h
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/MemDC.h	(.../MemDC.h)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/MemDC.h	(.../MemDC.h)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -49,58 +49,57 @@
 class CMemDC : public CDC
 {
 public:
-
-    // constructor sets up the memory DC
-    CMemDC(CDC* pDC, LPCRECT lpSrcRect) : CDC()
-    {
-        ASSERT(pDC != NULL);
+	// constructor sets up the memory DC
+	CMemDC(CDC* pDC, LPCRECT lpSrcRect) : CDC()
+	{
+		ASSERT(pDC != nullptr);
 		if(!pDC)
 			return;
 		m_rect.CopyRect(lpSrcRect);
-        m_pDC = pDC;
-        m_pOldBitmap = NULL;
-        m_bMemDC = !pDC->IsPrinting();
-              
-        if (m_bMemDC)    // Create a Memory DC
-        {
-            CreateCompatibleDC(pDC);
-            m_bitmap.CreateCompatibleBitmap(pDC, m_rect.Width(), m_rect.Height());
-            m_pOldBitmap = SelectObject(&m_bitmap);
-            SetWindowOrg(m_rect.left, m_rect.top);
-        }
-        else        // Make a copy of the relevent parts of the current DC for printing
-        {
-            m_bPrinting = pDC->m_bPrinting;
-            m_hDC       = pDC->m_hDC;
-            m_hAttribDC = pDC->m_hAttribDC;
-        }
-    }
-    
-    // Destructor copies the contents of the mem DC to the original DC
-    ~CMemDC()
-    {
-        if (m_bMemDC) 
-        {    
-            // Copy the offscreen bitmap onto the screen.
-            m_pDC->BitBlt(m_rect.left, m_rect.top, m_rect.Width(), m_rect.Height(),
-                          this, m_rect.left, m_rect.top, SRCCOPY);
+		m_pDC = pDC;
+		m_pOldBitmap = nullptr;
+		m_bMemDC = !pDC->IsPrinting();
 
-            //Swap back the original bitmap.
-            SelectObject(m_pOldBitmap);
-        } else {
-            // All we need to do is replace the DC with an illegal value,
-            // this keeps us from accidently deleting the handles associated with
-            // the CDC that was passed to the constructor.
-            m_hDC = m_hAttribDC = NULL;
-        }
-    }
+		if (m_bMemDC)    // Create a Memory DC
+		{
+			CreateCompatibleDC(pDC);
+			m_bitmap.CreateCompatibleBitmap(pDC, m_rect.Width(), m_rect.Height());
+			m_pOldBitmap = SelectObject(&m_bitmap);
+			SetWindowOrg(m_rect.left, m_rect.top);
+		}
+		else        // Make a copy of the relevent parts of the current DC for printing
+		{
+			m_bPrinting = pDC->m_bPrinting;
+			m_hDC       = pDC->m_hDC;
+			m_hAttribDC = pDC->m_hAttribDC;
+		}
+	}
 
+	// Destructor copies the contents of the mem DC to the original DC
+	~CMemDC()
+	{
+		if (m_bMemDC) 
+		{    
+			// Copy the offscreen bitmap onto the screen.
+			m_pDC->BitBlt(m_rect.left, m_rect.top, m_rect.Width(), m_rect.Height(),
+				this, m_rect.left, m_rect.top, SRCCOPY);
+
+			//Swap back the original bitmap.
+			SelectObject(m_pOldBitmap);
+		} else {
+			// All we need to do is replace the DC with an illegal value,
+			// this keeps us from accidently deleting the handles associated with
+			// the CDC that was passed to the constructor.
+			m_hDC = m_hAttribDC = nullptr;
+		}
+	}
+
 private:
-    CBitmap  m_bitmap;      // Offscreen bitmap
-    CBitmap* m_pOldBitmap;  // bitmap originally found in BCMenuMemDC
-    CDC*     m_pDC;         // Saves CDC passed in constructor
-    CRect    m_rect;        // Rectangle of drawing area.
-    BOOL     m_bMemDC;      // TRUE if CDC really is a Memory DC.
+	CBitmap  m_bitmap;      // Offscreen bitmap
+	CBitmap* m_pOldBitmap = nullptr;  // bitmap originally found in BCMenuMemDC
+	CDC*     m_pDC = nullptr;         // Saves CDC passed in constructor
+	CRect    m_rect;        // Rectangle of drawing area.
+	BOOL     m_bMemDC = FALSE;      // TRUE if CDC really is a Memory DC.
 };
 
 #endif
\ No newline at end of file