Commit 22c56f97 authored by Alexandre Julliard's avatar Alexandre Julliard

comctl32: Use nameless unions/structs.

parent 2c10f747
...@@ -59,8 +59,6 @@ ...@@ -59,8 +59,6 @@
#include <stdlib.h> #include <stdlib.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
...@@ -561,11 +559,11 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo ...@@ -561,11 +559,11 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo
static void taskdialog_add_main_icon(struct taskdialog_info *dialog_info) static void taskdialog_add_main_icon(struct taskdialog_info *dialog_info)
{ {
if (!dialog_info->taskconfig->u.hMainIcon) return; if (!dialog_info->taskconfig->hMainIcon) return;
dialog_info->main_icon = dialog_info->main_icon =
CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL);
taskdialog_set_icon(dialog_info, TDIE_ICON_MAIN, dialog_info->taskconfig->u.hMainIcon); taskdialog_set_icon(dialog_info, TDIE_ICON_MAIN, dialog_info->taskconfig->hMainIcon);
} }
static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const WCHAR *text, HFONT font, BOOL syslink) static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const WCHAR *text, HFONT font, BOOL syslink)
...@@ -790,11 +788,11 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info) ...@@ -790,11 +788,11 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info)
static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info)
{ {
if (!dialog_info->taskconfig->u2.hFooterIcon) return; if (!dialog_info->taskconfig->hFooterIcon) return;
dialog_info->footer_icon = dialog_info->footer_icon =
CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, 0); CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, 0);
taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->hFooterIcon);
} }
static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info)
...@@ -1414,7 +1412,7 @@ HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const ...@@ -1414,7 +1412,7 @@ HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const
taskconfig.hInstance = hinst; taskconfig.hInstance = hinst;
taskconfig.dwCommonButtons = common_buttons; taskconfig.dwCommonButtons = common_buttons;
taskconfig.pszWindowTitle = title; taskconfig.pszWindowTitle = title;
taskconfig.u.pszMainIcon = icon; taskconfig.pszMainIcon = icon;
taskconfig.pszMainInstruction = main_instruction; taskconfig.pszMainInstruction = main_instruction;
taskconfig.pszContent = content; taskconfig.pszContent = content;
return TaskDialogIndirect(&taskconfig, button, NULL, NULL); return TaskDialogIndirect(&taskconfig, button, NULL, NULL);
......
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
...@@ -1229,7 +1227,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, ...@@ -1229,7 +1227,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
static LRESULT static LRESULT
TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL isW) TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL isW)
{ {
const TVITEMEXW *tvItem = &ptdi->u.itemex; const TVITEMEXW *tvItem = &ptdi->itemex;
HTREEITEM insertAfter; HTREEITEM insertAfter;
TREEVIEW_ITEM *newItem, *parentItem; TREEVIEW_ITEM *newItem, *parentItem;
BOOL bTextUpdated = FALSE; BOOL bTextUpdated = FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment