Skip to content

Commit 89f70e9

Browse files
authored
Merge pull request godotengine#89513 from bruvzg/menu_mingw_fix
[NativeMenu] Fix MinGW build.
2 parents c9c17d6 + 016107f commit 89f70e9

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

platform/windows/native_menu_windows.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ int NativeMenuWindows::add_submenu_item(const RID &p_rid, const String &p_label,
256256
item.fType = MFT_STRING;
257257
item.hSubMenu = md_sub->menu;
258258
item.dwItemData = (ULONG_PTR)item_data;
259-
item.dwTypeData = (LPWSTR)label.ptrw();
259+
item.dwTypeData = (LPWSTR)label.get_data();
260260

261261
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
262262
memdelete(item_data);
@@ -289,7 +289,7 @@ int NativeMenuWindows::add_item(const RID &p_rid, const String &p_label, const C
289289
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
290290
item.fType = MFT_STRING;
291291
item.dwItemData = (ULONG_PTR)item_data;
292-
item.dwTypeData = label.ptrw() ? (LPWSTR)label.ptrw() : L"";
292+
item.dwTypeData = (LPWSTR)label.get_data();
293293

294294
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
295295
memdelete(item_data);
@@ -322,7 +322,7 @@ int NativeMenuWindows::add_check_item(const RID &p_rid, const String &p_label, c
322322
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
323323
item.fType = MFT_STRING;
324324
item.dwItemData = (ULONG_PTR)item_data;
325-
item.dwTypeData = (LPWSTR)label.ptrw();
325+
item.dwTypeData = (LPWSTR)label.get_data();
326326

327327
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
328328
memdelete(item_data);
@@ -361,7 +361,7 @@ int NativeMenuWindows::add_icon_item(const RID &p_rid, const Ref<Texture2D> &p_i
361361
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
362362
item.fType = MFT_STRING;
363363
item.dwItemData = (ULONG_PTR)item_data;
364-
item.dwTypeData = (LPWSTR)label.ptrw();
364+
item.dwTypeData = (LPWSTR)label.get_data();
365365
item.hbmpItem = item_data->bmp;
366366

367367
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
@@ -401,7 +401,7 @@ int NativeMenuWindows::add_icon_check_item(const RID &p_rid, const Ref<Texture2D
401401
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
402402
item.fType = MFT_STRING;
403403
item.dwItemData = (ULONG_PTR)item_data;
404-
item.dwTypeData = (LPWSTR)label.ptrw();
404+
item.dwTypeData = (LPWSTR)label.get_data();
405405
item.hbmpItem = item_data->bmp;
406406

407407
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
@@ -435,7 +435,7 @@ int NativeMenuWindows::add_radio_check_item(const RID &p_rid, const String &p_la
435435
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
436436
item.fType = MFT_STRING | MFT_RADIOCHECK;
437437
item.dwItemData = (ULONG_PTR)item_data;
438-
item.dwTypeData = (LPWSTR)label.ptrw();
438+
item.dwTypeData = (LPWSTR)label.get_data();
439439

440440
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
441441
memdelete(item_data);
@@ -474,7 +474,7 @@ int NativeMenuWindows::add_icon_radio_check_item(const RID &p_rid, const Ref<Tex
474474
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
475475
item.fType = MFT_STRING | MFT_RADIOCHECK;
476476
item.dwItemData = (ULONG_PTR)item_data;
477-
item.dwTypeData = (LPWSTR)label.ptrw();
477+
item.dwTypeData = (LPWSTR)label.get_data();
478478
item.hbmpItem = item_data->bmp;
479479

480480
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
@@ -508,7 +508,7 @@ int NativeMenuWindows::add_multistate_item(const RID &p_rid, const String &p_lab
508508
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
509509
item.fType = MFT_STRING;
510510
item.dwItemData = (ULONG_PTR)item_data;
511-
item.dwTypeData = (LPWSTR)label.ptrw();
511+
item.dwTypeData = (LPWSTR)label.get_data();
512512

513513
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
514514
memdelete(item_data);
@@ -949,7 +949,7 @@ void NativeMenuWindows::set_item_text(const RID &p_rid, int p_idx, const String
949949
item.cbSize = sizeof(item);
950950
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
951951
if (GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
952-
item.dwTypeData = label.ptrw() ? (LPWSTR)label.ptrw() : L"";
952+
item.dwTypeData = (LPWSTR)label.get_data();
953953
SetMenuItemInfoW(md->menu, p_idx, true, &item);
954954
}
955955
}

0 commit comments

Comments
 (0)