From f228bc7f856078220b6c13f8688e6be3f37bc218 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 10 Jun 2011 21:38:12 +0000 Subject: Renamed Print Preview class to avoid conflict with the new one added in VC9 SP1. git-svn-id: http://svn.leocad.org/branches/leocad-0.75@968 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- win/Cadview.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'win/Cadview.cpp') diff --git a/win/Cadview.cpp b/win/Cadview.cpp index f38c80b..e3bedbc 100644 --- a/win/Cadview.cpp +++ b/win/Cadview.cpp @@ -140,7 +140,7 @@ void CCADView::OnFilePrintPreview() // must be done here. if (!DoPrintPreview(IDR_PREVIEW, this, - RUNTIME_CLASS(CPreviewViewEx), pState)) + RUNTIME_CLASS(CCADPreviewView), pState)) { // In derived classes, reverse special window handling here for // Preview failure case @@ -537,7 +537,7 @@ void CCADView::OnEndPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) // pfnwglMakeCurrent(m_pDC->GetSafeHdc(), m_hglRC); } -void CCADView::OnEndPrintPreview(CDC* pDC, CPrintInfo* pInfo, POINT point, CPreviewViewEx* pView) +void CCADView::OnEndPrintPreview(CDC* pDC, CPrintInfo* pInfo, POINT point, CCADPreviewView* pView) { // CView::OnEndPrintPreview(CDC* pDC, CPrintInfo* pInfo, POINT, CPreviewView* pView) ASSERT_VALID(pDC); @@ -615,7 +615,7 @@ BOOL CCADView::DoPrintPreview(UINT nIDResource, CView* pPrintView, CRuntimeClass ASSERT_VALID_IDR(nIDResource); ASSERT_VALID(pPrintView); ASSERT(pPreviewViewClass != NULL); - ASSERT(pPreviewViewClass->IsDerivedFrom(RUNTIME_CLASS(CPreviewViewEx))); + ASSERT(pPreviewViewClass->IsDerivedFrom(RUNTIME_CLASS(CCADPreviewView))); ASSERT(pState != NULL); CFrameWnd* pParent; @@ -633,13 +633,13 @@ BOOL CCADView::DoPrintPreview(UINT nIDResource, CView* pPrintView, CRuntimeClass context.m_pLastView = this; // Create the preview view object - CPreviewViewEx* pView = (CPreviewViewEx*)pPreviewViewClass->CreateObject(); + CCADPreviewView* pView = (CCADPreviewView*)pPreviewViewClass->CreateObject(); if (pView == NULL) { TRACE0("Error: Failed to create preview view.\n"); return FALSE; } - ASSERT_KINDOF(CPreviewViewEx, pView); + ASSERT_KINDOF(CCADPreviewView, pView); pView->m_pPreviewState = pState; // save pointer pParent->OnSetPreviewMode(TRUE, pState); // Take over Frame Window -- cgit v1.2.3