From 2d80d6d063ef30d96d93bdd3683a634cce33b2b0 Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Sun, 14 Oct 2018 15:50:06 -0600
Subject: [PATCH] general: Add missing includes and remove deprecated type

Credit for missing includes to @treamology in Git commit
16cfac482923bc734447d234fd8eaaa99483847d

CGTableCount removed; modern macOS seems to call this
a uint32_t instead. I can find no reference to CGTableCount
in any documentation, and the (very old) source code I dig
up just typedefs it anyway.
---
 panda/src/cocoadisplay/cocoaPandaApp.mm         | 1 +
 panda/src/display/subprocessWindow.cxx          | 2 ++
 panda/src/osxdisplay/osxGraphicsStateGuardian.h | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/panda/src/cocoadisplay/cocoaPandaApp.mm b/panda/src/cocoadisplay/cocoaPandaApp.mm
index e7226786da..83f0b8ef42 100644
--- a/panda/src/cocoadisplay/cocoaPandaApp.mm
+++ b/panda/src/cocoadisplay/cocoaPandaApp.mm
@@ -12,6 +12,7 @@
  */
 
 #import "cocoaPandaApp.h"
+#include "config_cocoadisplay.h"
 
 @implementation CocoaPandaApp
 - (void) sendEvent: (NSEvent *) event {
diff --git a/panda/src/display/subprocessWindow.cxx b/panda/src/display/subprocessWindow.cxx
index fe4b2eff5d..5ea85c3cc9 100644
--- a/panda/src/display/subprocessWindow.cxx
+++ b/panda/src/display/subprocessWindow.cxx
@@ -18,6 +18,8 @@
 #include "graphicsEngine.h"
 #include "config_display.h"
 #include "nativeWindowHandle.h"
+#include "mouseButton.h"
+#include "throw_event.h"
 
 using std::string;
 
diff --git a/panda/src/osxdisplay/osxGraphicsStateGuardian.h b/panda/src/osxdisplay/osxGraphicsStateGuardian.h
index 038ba42055..96c86f28dd 100644
--- a/panda/src/osxdisplay/osxGraphicsStateGuardian.h
+++ b/panda/src/osxdisplay/osxGraphicsStateGuardian.h
@@ -64,7 +64,7 @@ private:
   CGGammaValue _gOriginalRedTable[ 256 ];
   CGGammaValue _gOriginalGreenTable[ 256 ];
   CGGammaValue _gOriginalBlueTable[ 256 ];
-  CGTableCount _sampleCount;
+  uint32_t _sampleCount;
   CGDisplayErr _cgErr;
 
 public: