Commit 9a4b6279 authored by Jon Turney's avatar Jon Turney
Browse files

hw/xwin: Fix lingering uses of libX11 types and values

parent d7010cd9
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <X11/Xwindows.h> #include <X11/Xwindows.h>
#include <X11/Xlib.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xcb_icccm.h> #include <xcb/xcb_icccm.h>
#include <xcb/xcb_image.h> #include <xcb/xcb_image.h>
...@@ -582,7 +581,7 @@ winXIconToHICON(xcb_connection_t *conn, xcb_window_t id, int iconSize) ...@@ -582,7 +581,7 @@ winXIconToHICON(xcb_connection_t *conn, xcb_window_t id, int iconSize)
*/ */
void void
winUpdateIcon(HWND hWnd, xcb_connection_t *conn, Window id, HICON hIconNew) winUpdateIcon(HWND hWnd, xcb_connection_t *conn, xcb_window_t id, HICON hIconNew)
{ {
HICON hIcon, hIconSmall = NULL, hIconOld; HICON hIcon, hIconSmall = NULL, hIconOld;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
void void
winUpdateIcon(HWND hWnd, xcb_connection_t *conn, Window id, HICON hIconNew); winUpdateIcon(HWND hWnd, xcb_connection_t *conn, xcb_window_t id, HICON hIconNew);
void void
winInitGlobalIcons(void); winInitGlobalIcons(void);
......
...@@ -1275,7 +1275,7 @@ winMultiWindowXMsgProc(void *pArg) ...@@ -1275,7 +1275,7 @@ winMultiWindowXMsgProc(void *pArg)
if ((reply->root == reply_qt->parent) && !notify->override_redirect) { if ((reply->root == reply_qt->parent) && !notify->override_redirect) {
xcb_reparent_notify_event_t event_send; xcb_reparent_notify_event_t event_send;
event_send.response_type = ReparentNotify; event_send.response_type = XCB_REPARENT_NOTIFY;
event_send.event = notify->window; event_send.event = notify->window;
event_send.window = notify->window; event_send.window = notify->window;
event_send.parent = reply_qt->parent; event_send.parent = reply_qt->parent;
......
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