[OMPT-svn-commit] OpenMPT r22152 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Nov 10 22:31:50 2024
New Revision: 22152
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22152

Log:
[Fix] Avoid GDI object leaks.

Modified:
   trunk/OpenMPT/mptrack/HighDPISupport.cpp
   trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/mptrack/HighDPISupport.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/HighDPISupport.cpp	Sun Nov 10 22:30:47 2024	(r22151)
+++ trunk/OpenMPT/mptrack/HighDPISupport.cpp	Sun Nov 10 22:31:50 2024	(r22152)
@@ -153,6 +153,7 @@
 	NONCLIENTMETRICS metrics;
 	metrics.cbSize = sizeof(metrics);
 	HighDPISupport::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(metrics), &metrics, 0, hwnd);
+	font.DeleteObject();
 	font.CreateFontIndirect(&metrics.lfMessageFont);
 }
 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Sun Nov 10 22:30:47 2024	(r22151)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Sun Nov 10 22:31:50 2024	(r22152)
@@ -284,6 +284,17 @@
 
 	RecreateImageLists();
 
+	penDarkGray = ::CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW));
+	penGray99 = ::CreatePen(PS_SOLID, 0, RGB(0x99, 0x99, 0x99));
+	penHalfDarkGray = ::CreatePen(PS_DOT, 0, GetSysColor(COLOR_BTNSHADOW));
+
+	// Cursors
+	curDragging = theApp.LoadCursor(IDC_DRAGGING);
+	curArrow = theApp.LoadStandardCursor(IDC_ARROW);
+	curNoDrop = theApp.LoadStandardCursor(IDC_NO);
+	curNoDrop2 = theApp.LoadCursor(IDC_NODRAG);
+	curVSplit = theApp.LoadCursor(AFX_IDC_HSPLITBAR);
+
 	// Pattern note bitmap
 	bmpNotes = LoadDib(MAKEINTRESOURCE(IDB_PATTERNVIEW));
 	// Toolbars
@@ -350,17 +361,6 @@
 	ReleaseDC(dc);
 
 	HighDPISupport::CreateGUIFont(m_hGUIFont, m_hWnd);
-
-	penDarkGray = ::CreatePen(PS_SOLID, 0, GetSysColor(COLOR_BTNSHADOW));
-	penGray99 = ::CreatePen(PS_SOLID, 0, RGB(0x99, 0x99, 0x99));
-	penHalfDarkGray = ::CreatePen(PS_DOT, 0, GetSysColor(COLOR_BTNSHADOW));
-
-	// Cursors
-	curDragging = theApp.LoadCursor(IDC_DRAGGING);
-	curArrow = theApp.LoadStandardCursor(IDC_ARROW);
-	curNoDrop = theApp.LoadStandardCursor(IDC_NO);
-	curNoDrop2 = theApp.LoadCursor(IDC_NODRAG);
-	curVSplit = theApp.LoadCursor(AFX_IDC_HSPLITBAR);
 }