- hwnd2 = CreateWindowW(L"Button", L" ", i, 0, 0, 72, 72, hwnd1, NULL, NULL, NULL);
- ok (hwnd2 != NULL, "Expected CreateWindowW to succeed\n");
+ if (i >= BS_CHECKBOX)
+ {
+ hwnd1 = CreateWindowW(L"Button", L" ", i|WS_CHILD, 0, 0, 72, 72, hwnd2, NULL, NULL, NULL);
+ ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n");
+ memset(&s, 0, sizeof(s));
+ ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s);
+ ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n");
+ ok_size(s, 72, 72);
+
+ SetWindowTheme(hwnd1, L"", L"");
+ memset(&s, 0, sizeof(s));
+ ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s);
+ ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n");
+ ok_size(s, 72, 72);
+ DestroyWindow(hwnd1);
+
+ hwnd1 = CreateWindowW(L"Button", L" ", i|WS_CHILD, 0, 0, 12, 12, hwnd2, NULL, NULL, NULL);
+ ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n");
+ memset(&s, 0, sizeof(s));
+ ret = SendMessageW(hwnd1, BCM_GETIDEALSIZE, 0, (LPARAM)&s);
+ ok (ret == TRUE, "Expected BCM_GETIDEALSIZE to succeed\n");
+ ok_size(s, 12, 12);
+ DestroyWindow(hwnd1);
+ }
+
+ hwnd1 = CreateWindowW(L"Button", L"", i|WS_CHILD, 0, 0, 72, 72, hwnd2, NULL, NULL, NULL);
+ ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n");