From fc2bf0bc22083848379fe9b987e5e7b5aec053ef Mon Sep 17 00:00:00 2001 From: PB Date: Fri, 17 Jul 2026 09:09:23 +0200 Subject: [PATCH 1/2] Fix drawing color emoji in the drawing sample with MSVS 2015 The old-but-still-supported MSVS 2015 has problem parsing Unicode literals outside the BMP when using the '\U' escape. Use raw octet syntax to work around this. --- samples/drawing/drawing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 58bffe850c..635d75a385 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -1156,7 +1156,7 @@ void MyCanvas::DrawText(wxDC& dc) #ifdef __WXMSW__ " (only when using Direct2D)" #endif - ": \U0001F60A"), dc.FromDIP(400), y); + ": \xF0\x9F\x98\x8A"), dc.FromDIP(400), y); } static const struct From bb21ab03d3f42b44af5899c7e3d27cb4fed062a2 Mon Sep 17 00:00:00 2001 From: PB Date: Fri, 17 Jul 2026 09:12:17 +0200 Subject: [PATCH 2/2] Remove conflicting keyboard shortcut from the menu sample. The sample used for the Get menu info command. However, this conflicted with the shortcut used to invoke the File menu. Fix this by using a different shortcut for the Get menu info. --- samples/menu/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 935dc9b9f1..a216a85eac 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -638,7 +638,7 @@ MyFrame::MyFrame() menuMenu->AppendSeparator(); #endif - menuMenu->Append(Menu_Menu_GetInfo, "Get menu item in&fo\tAlt-F", + menuMenu->Append(Menu_Menu_GetInfo, "Get menu item inf&o\tAlt-O", "Show the state of the last menu item"); #if wxUSE_TEXTDLG menuMenu->Append(Menu_Menu_SetLabel, "Set menu item label\tAlt-L",