[commit] r2613 - in trunk/GME: CSGUI Gme PartBrowser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Nov  9 13:56:46 2015
New Revision: 2613

Log:
Cleanup

Modified:
   trunk/GME/CSGUI/ReferenceSwitcher.cs
   trunk/GME/Gme/GMEView.cpp
   trunk/GME/Gme/GMEView.h
   trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp

Modified: trunk/GME/CSGUI/ReferenceSwitcher.cs
==============================================================================
--- trunk/GME/CSGUI/ReferenceSwitcher.cs	Wed Oct  7 06:55:49 2015	(r2612)
+++ trunk/GME/CSGUI/ReferenceSwitcher.cs	Mon Nov  9 13:56:46 2015	(r2613)
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Windows.Forms;
 using GME.MGA.Core;
 using GME.CSharp;
 using GME;

Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp	Wed Oct  7 06:55:49 2015	(r2612)
+++ trunk/GME/Gme/GMEView.cpp	Mon Nov  9 13:56:46 2015	(r2613)
@@ -290,7 +290,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CGMEView
 
-bool CGMEView::offScreenCreated = false;
+int CGMEView::offScreenCreated = 0;
 CDC * CGMEView::offScreen;
 CBitmap *CGMEView::ofsbmp;
 int CGMEView::instanceCount = 0;
@@ -697,9 +697,10 @@
 		// update & disable some components
 		theApp.UpdateCompList4CurrentKind( CGMEApp::m_no_model_open_string);
 
+        ::RestoreDC(*offScreen, offScreenCreated);
 		delete offScreen;
 		delete ofsbmp;
-		offScreenCreated = false;
+		offScreenCreated = 0;
 		if( CMainFrame::theInstance != NULL ) {
 			CMainFrame::theInstance->SetPartBrowserMetaModel(NULL);
 			CMainFrame::theInstance->SetPartBrowserBg(::GetSysColor(COLOR_APPWORKSPACE));
@@ -2926,7 +2927,6 @@
 {
 	if(offScreenCreated)
 		return;
-	offScreenCreated = true;
 	offScreen = new CDC;
 	BOOL success = offScreen->CreateCompatibleDC(dc);
 	ASSERT(success);
@@ -2942,7 +2942,9 @@
 	success = ofsbmp->CreateCompatibleBitmap(dc,offScreenWidth,offScreenHeight);
 	ASSERT(success);
 	// HACK: what about palettes?
-	offScreen->SelectObject(ofsbmp);
+    offScreenCreated = SaveDC(*offScreen);
+    ASSERT(offScreenCreated);
+    offScreen->SelectObject(ofsbmp);
 }
 
 void CGMEView::SetScroll()

Modified: trunk/GME/Gme/GMEView.h
==============================================================================
--- trunk/GME/Gme/GMEView.h	Wed Oct  7 06:55:49 2015	(r2612)
+++ trunk/GME/Gme/GMEView.h	Mon Nov  9 13:56:46 2015	(r2613)
@@ -78,7 +78,7 @@
 	static bool				inRWTransaction;
 	static bool				inEventHandler;
 	static int				instanceCount;
-	static bool				offScreenCreated;
+	static int				offScreenCreated;
 	static CDC*				offScreen;
 	static CBitmap*			ofsbmp;
 	static HCURSOR			autoconnectCursor;

Modified: trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp
==============================================================================
--- trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp	Wed Oct  7 06:55:49 2015	(r2612)
+++ trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp	Mon Nov  9 13:56:46 2015	(r2613)
@@ -20,7 +20,9 @@
 	: CDialog(CPartBrowserPaneFrame::IDD, pParent),
 	vScrollWidth (::GetSystemMetrics (SM_CXVSCROLL)),	// WinXP default style: 17
 	lineSize (20),
-	pageSize (60)
+	pageSize (60),
+    pageHeight(100), // maybe fix UNINITIALIZED READ: reading register edx PartBrowser.OCX!CPartBrowserPaneFrame::Resize [c:\users\kevin\documents\gme\gme\partbrowser\partbrowserpaneframe.cpp:57]
+    logicalHeight(100)
 {
 	//{{AFX_DATA_INIT(CPartBrowserPaneFrame)
 		// NOTE: the ClassWizard will add member initialization here