From 48796f14ba18bc5cd2037b9025203342f85a70db Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 17 Jun 2011 20:23:36 +1000
Subject: [PATCH] Mac pBuffer stub cleanup

---
 Projects/CodeBlocks/SleepyHead.depend |  6 ++++--
 Projects/CodeBlocks/SleepyHead.layout |  8 ++++----
 src/graphs/gl_pbuffer.cpp             | 12 ++++++------
 src/graphs/gl_pbuffer.h               | 12 ++++++++++--
 src/version.h                         | 10 +++++-----
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend
index b41b059d..8b32f168 100644
--- a/Projects/CodeBlocks/SleepyHead.depend
+++ b/Projects/CodeBlocks/SleepyHead.depend
@@ -8309,7 +8309,7 @@
 
 1308026543 D
 
-1308304657 /home/mark/projects/git/sleepyhead/src/version.h
+1308306194 /home/mark/projects/git/sleepyhead/src/version.h
 
 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
 	<wx/dcbuffer.h>
@@ -11062,12 +11062,14 @@
 	<string.h>
 	"freetype-gl/vector.h"
 
-1308302350 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
+1308306186 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
 	<wx/log.h>
 	<GL/glew.h>
 	<GL/wglew.h>
 	<OpenGL/gl.h>
 	<AGL/agl.h>
+	<Carbon/Carbon.h>
+	<Cocoa/Cocoa.h>
 	<GL/gl.h>
 	<GL/glx.h>
 
diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout
index b5841f5e..1fb83e66 100644
--- a/Projects/CodeBlocks/SleepyHead.layout
+++ b/Projects/CodeBlocks/SleepyHead.layout
@@ -16,14 +16,14 @@
 	<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2">
 		<Cursor position="2035" topLine="47" />
 	</File>
-	<File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="0" tabpos="5">
-		<Cursor position="8152" topLine="220" />
+	<File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="1" tabpos="5">
+		<Cursor position="7612" topLine="222" />
 	</File>
 	<File name="../../src/graphs/gl_pbuffer.h" open="1" top="0" tabpos="6">
 		<Cursor position="644" topLine="58" />
 	</File>
-	<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="3">
-		<Cursor position="454" topLine="0" />
+	<File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="3">
+		<Cursor position="2743" topLine="83" />
 	</File>
 	<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="4">
 		<Cursor position="10808" topLine="297" />
diff --git a/src/graphs/gl_pbuffer.cpp b/src/graphs/gl_pbuffer.cpp
index 7b1a5b88..15ebc27e 100644
--- a/src/graphs/gl_pbuffer.cpp
+++ b/src/graphs/gl_pbuffer.cpp
@@ -338,7 +338,7 @@ pBufferAGL::pBufferAGL(int width, int height)
         AGL_DEPTH_SIZE, 24,
         AGL_NONE
     };
-    display2 = CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID());
+    /*display2 = CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID());
 
     display = GetMainDevice();
     wxRect windowRect = { 100, 100, 100 + width, 100 + height };
@@ -378,7 +378,7 @@ pBufferAGL::pBufferAGL(int width, int height)
     // initialize window context & draw window
     GLuint texid;
     init( context, pbuffer, &texid );
-    drawWindow( context, texid );
+    drawWindow( context, texid ); */
     // stub event loop
 }
 
@@ -386,19 +386,19 @@ pBufferAGL::pBufferAGL(int width, int height)
 }
 pBufferAGL::~pBufferAGL()
 {
-    aglSetCurrentContext( NULL );
+    /*aglSetCurrentContext( NULL );
     aglDestroyContext( context );
     aglDestroyContext( pbContext );
-    aglDestroyPBuffer( pbuffer );
+    aglDestroyPBuffer( pbuffer ); */
 
 }
 void pBufferAGL::UseBuffer(bool b)
 {
-    if (b) {
+/*    if (b) {
         wglMakeCurrent(hdc, hGlRc);
     } else {
         wglMakeCurrent(saveHdc, saveHglrc);
-    }
+    } */
 }
 
 #endif
diff --git a/src/graphs/gl_pbuffer.h b/src/graphs/gl_pbuffer.h
index dcaa259e..abc839c3 100644
--- a/src/graphs/gl_pbuffer.h
+++ b/src/graphs/gl_pbuffer.h
@@ -26,6 +26,14 @@ License: GPL
 #include <OpenGL/gl.h>
 #include <AGL/agl.h>
 
+// Not sure about these
+#if defined(__WXCARBON__)
+#include <Carbon/Carbon.h>
+#elif defined(__WXCOCOA__)
+#include <Cocoa/Cocoa.h>
+#endif
+
+
 #elif defined(__UNIX__)
 #include <GL/gl.h>
 #include <GL/glx.h>
@@ -102,12 +110,12 @@ public:
     virtual ~pBufferAGL();
     virtual void UseBuffer(bool b);
 protected:
-    AGLPixelFormat pixelFormat;
+/*    AGLPixelFormat pixelFormat;
     AGLPbuffer pbuffer;
     AGLContext context, pbContext;
     long virtualScreen;
     GDHandle display2;
-    GDHandle display;
+    GDHandle display; */
 };
 #endif
 
diff --git a/src/version.h b/src/version.h
index 0f32fa78..9fff5638 100644
--- a/src/version.h
+++ b/src/version.h
@@ -16,14 +16,14 @@ namespace AutoVersion{
 	//Standard Version Type
 	static const long  _MAJOR = 0;
 	static const long  _MINOR = 7;
-	static const long  _BUILD = 6515;
-	static const long  _REVISION = 18840;
+	static const long  _BUILD = 6516;
+	static const long  _REVISION = 18844;
 	
 	//Miscellaneous Version Types
 	static const long  _BUILDS_COUNT = 7759;
-	#define  _RC_FILEVERSION 0,7,6515,18840
-	#define  _RC_FILEVERSION_STRING "0, 7, 6515, 18840\0"
-	static const char  _FULLVERSION_STRING[] = "0.7.6515.18840";
+	#define  _RC_FILEVERSION 0,7,6516,18844
+	#define  _RC_FILEVERSION_STRING "0, 7, 6516, 18844\0"
+	static const char  _FULLVERSION_STRING[] = "0.7.6516.18844";
 	
 	//These values are to keep track of your versioning state, don't modify them.
 	static const long  _BUILD_HISTORY = 0;