From 2b886bd2cd8c49666a06686b7ed12d679ec0b23d Mon Sep 17 00:00:00 2001
From: Richard Gill <richard@houbathecat.fr>
Date: Thu, 13 May 2021 15:22:52 +0200
Subject: [PATCH] fixes for PR inclusion

---
 .gitignore                   |  1 -
 demo/xcb_cairo/main.c        | 12 ++++++------
 demo/xcb_cairo/nuklear_xcb.h | 20 ++------------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 015175d..8a7695f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ docs/src
 *.tmp
 *.swo
 *.swp
-.vscode
diff --git a/demo/xcb_cairo/main.c b/demo/xcb_cairo/main.c
index 3546b0f..907e784 100644
--- a/demo/xcb_cairo/main.c
+++ b/demo/xcb_cairo/main.c
@@ -4,11 +4,11 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-/*#include <limits.h>*/
-/*#include <math.h>*/
-/*#include <sys/time.h>*/
-/*#include <unistd.h>*/
-/*#include <time.h>*/
+#include <limits.h>
+#include <math.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <time.h>
 
 #define NK_INCLUDE_FIXED_TYPES
 #define NK_INCLUDE_STANDARD_IO
@@ -17,7 +17,7 @@
 #define NK_IMPLEMENTATION
 #include "../../nuklear.h"
 
-#define NK_XCB_IMPLEMENTATION
+#define NK_XCB_CAIRO_IMPLEMENTATION
 #include "nuklear_xcb.h"
 
 static void die(const char *fmt, ...)
diff --git a/demo/xcb_cairo/nuklear_xcb.h b/demo/xcb_cairo/nuklear_xcb.h
index 092e526..5603a7f 100644
--- a/demo/xcb_cairo/nuklear_xcb.h
+++ b/demo/xcb_cairo/nuklear_xcb.h
@@ -35,11 +35,6 @@
 #ifndef NK_XCB_CAIRO_H
 #define NK_XCB_CAIRO_H
 
-/* just to make my IDE happy */
-#ifndef NK_NUKLEAR_H_
-#include "../../nuklear.h"
-#endif
-
 struct nk_xcb_context;
 struct nk_cairo_context;
 
@@ -83,7 +78,7 @@ NK_API void nk_xcb_resize_cairo_surface(struct nk_xcb_context *xcb_ctx, void *su
  *
  ****************************************************************************/
 
-/*#ifdef NK_XCB_CAIRO_IMPLEMENTATION*/
+#ifdef NK_XCB_CAIRO_IMPLEMENTATION
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_util.h>
@@ -163,10 +158,7 @@ NK_API struct nk_xcb_context *nk_xcb_init(const char *title, int pos_x, int pos_
         | XCB_EVENT_MASK_KEY_RELEASE
         | XCB_EVENT_MASK_BUTTON_PRESS
         | XCB_EVENT_MASK_BUTTON_RELEASE
-        /*| XCB_EVENT_MASK_ENTER_WINDOW*/
-        /*| XCB_EVENT_MASK_LEAVE_WINDOW*/
         | XCB_EVENT_MASK_POINTER_MOTION
-        /*| XCB_EVENT_MASK_POINTER_MOTION_HINT*/
         | XCB_EVENT_MASK_BUTTON_1_MOTION
         | XCB_EVENT_MASK_BUTTON_2_MOTION
         | XCB_EVENT_MASK_BUTTON_3_MOTION
@@ -175,15 +167,7 @@ NK_API struct nk_xcb_context *nk_xcb_init(const char *title, int pos_x, int pos_
         | XCB_EVENT_MASK_BUTTON_MOTION
         | XCB_EVENT_MASK_KEYMAP_STATE
         | XCB_EVENT_MASK_EXPOSURE
-        /*| XCB_EVENT_MASK_VISIBILITY_CHANGE*/
         | XCB_EVENT_MASK_STRUCTURE_NOTIFY
-        /*| XCB_EVENT_MASK_RESIZE_REDIRECT*/
-        /*| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY*/
-        /*| XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT*/
-        /*| XCB_EVENT_MASK_FOCUS_CHANGE*/
-        /*| XCB_EVENT_MASK_PROPERTY_CHANGE*/
-        /*| XCB_EVENT_MASK_COLOR_MAP_CHANGE*/
-        /*| XCB_EVENT_MASK_OWNER_GRAB_BUTTON*/
         ;
     xcb_create_window(conn, XCB_COPY_FROM_PARENT, window, screen->root,
             pos_x, pos_y, width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
@@ -849,4 +833,4 @@ NK_API int nk_cairo_render(struct nk_cairo_context *cairo_ctx, struct nk_context
     return nk_true;
 }
 
-/*#endif /* NK_XCB_CAIRO_IMPLEMENTATION */
+#endif /* NK_XCB_CAIRO_IMPLEMENTATION */