[commit] r2581 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Feb 17 12:59:48 2015
New Revision: 2581

Log:
Fix printing

Modified:
   trunk/GME/Gme/GMEApp.cpp
   trunk/GME/Gme/GMEView.cpp
   trunk/GME/Gme/resource.h

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Mon Feb 16 08:12:55 2015	(r2580)
+++ trunk/GME/Gme/GMEApp.cpp	Tue Feb 17 12:59:48 2015	(r2581)
@@ -2945,7 +2945,7 @@
 								PD_ENABLESETUPTEMPLATE |
 								PD_ENABLEPRINTHOOK | PD_ENABLESETUPHOOK ;
 	setup.m_pd.hInstance = AfxGetInstanceHandle();
-	setup.m_pd.lpSetupTemplateName = MAKEINTRESOURCE(PRNSETUPDLGORD);
+	setup.m_pd.lpSetupTemplateName = MAKEINTRESOURCE(IDD_PRINTSETUP_DIALOG);
 	DoPrintDialog(&setup);
 }
 

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Mon Feb 16 08:12:55 2015	(r2580)
+++ trunk/GME/Gme/GMEView.cpp	Tue Feb 17 12:59:48 2015	(r2581)
@@ -1347,7 +1347,7 @@
 		pInfo->m_pPD->m_pd.nMinPage = 1;      // one based page numbers
         pInfo->m_pPD->m_pd.nMaxPage = 0xffff; // how many pages is unknown
 		pInfo->m_pPD->m_pd.hInstance = AfxGetInstanceHandle();
-		pInfo->m_pPD->m_pd.lpPrintTemplateName = MAKEINTRESOURCE(PRINTDLGORD);
+		pInfo->m_pPD->m_pd.lpPrintTemplateName = MAKEINTRESOURCE(IDD_PRINT_DIALOG);
 	}
 
 	if (!CScrollZoomView::DoPreparePrinting(pInfo))

Modified: trunk/GME/Gme/resource.h
==============================================================================
--- trunk/GME/Gme/resource.h	Mon Feb 16 08:12:55 2015	(r2580)
+++ trunk/GME/Gme/resource.h	Tue Feb 17 12:59:48 2015	(r2581)
@@ -67,8 +67,6 @@
 #define IDD_SEARCH_DIALOG               188
 #define IDD_PRINTOPTIONS                196
 #define IDR_TOOLBAR_COMPONENTS          197
-#define IDD_PRINTDLGORD                 202
-#define IDD_PRNSETUPDLGORD              203
 #define ID_PANNWIN                      206
 #define IDD_NEW_MULTIUSER_PROJ_DLG      208
 #define IDD_CONSOLE_DIALOG              209