From 0f4a7cbf399b38b68ca7ff5041e2de0918297e55 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sat, 18 Jun 2011 13:51:07 +1000
Subject: [PATCH] pBuffer Stuff

---
 Projects/CodeBlocks/SleepyHead.cbp    |  2 --
 Projects/CodeBlocks/SleepyHead.depend |  5 +++--
 Projects/CodeBlocks/SleepyHead.layout |  6 +++---
 src/graphs/gl_pbuffer.cpp             | 10 +++++-----
 src/graphs/gl_pbuffer.h               | 11 ++++++-----
 src/graphs/graph.cpp                  |  6 +++---
 src/version.h                         | 12 ++++++------
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Projects/CodeBlocks/SleepyHead.cbp b/Projects/CodeBlocks/SleepyHead.cbp
index 7c1c7e05..a77b0bf1 100644
--- a/Projects/CodeBlocks/SleepyHead.cbp
+++ b/Projects/CodeBlocks/SleepyHead.cbp
@@ -29,14 +29,12 @@
 				<Option compiler="gcc" />
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
-					<Add option="-pg" />
 					<Add option="-g" />
 					<Add option="`wx-config --version=2.9 --cflags`" />
 					<Add directory="../../src/libs" />
 					<Add directory="../../src" />
 				</Compiler>
 				<Linker>
-					<Add option="-pg" />
 					<Add option="`wx-config --version=2.9 --libs aui,xrc,qa,html,adv,gl,core,net,base`" />
 				</Linker>
 			</Target>
diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend
index ec967594..f594aa46 100644
--- a/Projects/CodeBlocks/SleepyHead.depend
+++ b/Projects/CodeBlocks/SleepyHead.depend
@@ -8309,7 +8309,7 @@
 
 1308026543 D
 
-1308343669 /home/mark/projects/git/sleepyhead/src/version.h
+1308368377 /home/mark/projects/git/sleepyhead/src/version.h
 
 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
 	<wx/dcbuffer.h>
@@ -11061,7 +11061,7 @@
 	<string.h>
 	"freetype-gl/vector.h"
 
-1308311222 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
+1308368376 /home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.h
 	<wx/log.h>
 	<GL/glew.h>
 	<GL/wglew.h>
@@ -11072,6 +11072,7 @@
 	<GL/gl.h>
 	<GL/glx.h>
 	<wx/bitmap.h>
+	<wx/glcanvas.h>
 
 1308337622 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp
 	"gl_pbuffer.h"
diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout
index 67aeb9a0..33a10d2e 100644
--- a/Projects/CodeBlocks/SleepyHead.layout
+++ b/Projects/CodeBlocks/SleepyHead.layout
@@ -7,10 +7,10 @@
 	<File name="../../src/GUIFrame.h" open="0" top="0" tabpos="8">
 		<Cursor position="3128" topLine="100" />
 	</File>
-	<File name="../../src/SleepyHeadApp.cpp" open="0" top="0" tabpos="1">
+	<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
 		<Cursor position="1078" topLine="44" />
 	</File>
-	<File name="../../src/SleepyHeadMain.cpp" open="1" top="1" tabpos="1">
+	<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="1">
 		<Cursor position="24248" topLine="650" />
 	</File>
 	<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="2">
@@ -19,7 +19,7 @@
 	<File name="../../src/graphs/gl_pbuffer.cpp" open="1" top="0" tabpos="5">
 		<Cursor position="3" topLine="0" />
 	</File>
-	<File name="../../src/graphs/gl_pbuffer.h" open="1" top="0" tabpos="6">
+	<File name="../../src/graphs/gl_pbuffer.h" open="1" top="1" tabpos="6">
 		<Cursor position="401" topLine="0" />
 	</File>
 	<File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="3">
diff --git a/src/graphs/gl_pbuffer.cpp b/src/graphs/gl_pbuffer.cpp
index 3f1f45cf..9515714e 100644
--- a/src/graphs/gl_pbuffer.cpp
+++ b/src/graphs/gl_pbuffer.cpp
@@ -30,7 +30,7 @@ long roundup2(long v)
 pBuffer::pBuffer()
 {
 }
-pBuffer::pBuffer(int width, int height)
+pBuffer::pBuffer(int width, int height,wxGLCanvas * gc)
 :m_width(width),m_height(height)
 {
 }
@@ -56,7 +56,7 @@ wxBitmap *pBuffer::Snapshot(int width, int height)
 }
 
 
-FBO::FBO(int width, int height)
+FBO::FBO(int width, int height,wxGLCanvas * gc)
 :pBuffer()
 {
     //wxGLContext a((wxGLCanvas *)NULL,(wxGLContext *)NULL);
@@ -173,7 +173,7 @@ wxBitmap *FBO::Snapshot(int width,int height)
 #endif
 
 
-pBufferWGL::pBufferWGL(int width, int height)
+pBufferWGL::pBufferWGL(int width, int height,wxGLCanvas * gc)
 :m_texture(0)
 {
 
@@ -368,7 +368,7 @@ bool pBufferWGL::InitGLStuff()
 GLXContext real_shared_context=NULL;
 
 
-pBufferGLX::pBufferGLX(int width, int height)
+pBufferGLX::pBufferGLX(int width, int height,wxGLCanvas * gc)
 :pBuffer()
 {
 
@@ -461,7 +461,7 @@ void pBufferGLX::UseBuffer(bool b)
 }
 #elif defined(__DARWIN__) || defined(__WXMAC__)
 
-pBufferAGL::pBufferAGL(int width, int height)
+pBufferAGL::pBufferAGL(int width, int height,wxGLCanvas * gc)
 :pBuffer()
 {
     m_width=width;
diff --git a/src/graphs/gl_pbuffer.h b/src/graphs/gl_pbuffer.h
index aa6fa277..fb8bb000 100644
--- a/src/graphs/gl_pbuffer.h
+++ b/src/graphs/gl_pbuffer.h
@@ -43,6 +43,7 @@ License: GPL
 #define MAX(a,b) (((a)<(b)) ? (b) : (a));
 
 #include <wx/bitmap.h>
+#include <wx/glcanvas.h>
 
 long roundup2(long v);
 
@@ -56,7 +57,7 @@ public:
 class pBuffer {
 public:
     pBuffer();
-    pBuffer(int width, int height);
+    pBuffer(int width, int height,wxGLCanvas * gc);
     virtual ~pBuffer();
     virtual void UseBuffer(bool b) {};
     int Width() { return m_width; };
@@ -70,7 +71,7 @@ protected:
 class FBO:public pBuffer
 {
 public:
-    FBO(int width, int height);
+    FBO(int width, int height,wxGLCanvas * gc);
     virtual ~FBO();
     virtual void UseBuffer(bool b);
     virtual wxBitmap *Snapshot(int width, int height);
@@ -87,7 +88,7 @@ protected:
 class pBufferWGL:public pBuffer
 {
 public:
-    pBufferWGL(int width, int height);
+    pBufferWGL(int width, int height,wxGLCanvas * gc);
     virtual ~pBufferWGL();
     virtual void UseBuffer(bool b);
 protected:
@@ -112,7 +113,7 @@ extern GLXContext real_shared_context;
 class pBufferGLX:public pBuffer
 {
 public:
-    pBufferGLX(int width, int height);
+    pBufferGLX(int width, int height,wxGLCanvas * gc);
     virtual ~pBufferGLX();
     virtual void UseBuffer(bool b);
 protected:
@@ -127,7 +128,7 @@ protected:
 class pBufferAGL:public pBuffer
 {
 public:
-    pBufferAGL(int width, int height);
+    pBufferAGL(int width, int height,wxGLCanvas * gc);
     virtual ~pBufferAGL();
     virtual void UseBuffer(bool b);
 protected:
diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp
index a13c72f0..f4efbaf3 100644
--- a/src/graphs/graph.cpp
+++ b/src/graphs/graph.cpp
@@ -1017,13 +1017,13 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
     if (!pbuffer) {
         try {
 #if defined(__WXMSW__)
-            pbuffer=new pBufferWGL(width,height);
+            pbuffer=new pBufferWGL(width,height,this);
 #elif defined(__WXMAC__) || defined(__WXDARWIN__)
             // Do nothing and load the FBO
             throw GLException(wxT("Macintrash"));
             //pbuffer=new pBufferAGL(width,height);
 #elif defined(__UNIX__)
-            pbuffer=new pBufferGLX(width,height);
+            pbuffer=new pBufferGLX(width,height,this);
 #endif
 
         } catch(GLException e) {
@@ -1039,7 +1039,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
             // Trickier than it sounds, and I didn't want to kludge
 
             wxSize res=wxGetDisplaySize(); // Not entirely sure if this is the limit..
-            pbuffer=new FBO(res.GetWidth(),res.GetHeight());
+            pbuffer=new FBO(res.GetWidth(),res.GetHeight(),this);
         } catch(GLException e) {
             wxLogError(wxT("No offscreen rendering capabilities detected on this machine."));
             pbuffer=NULL;
diff --git a/src/version.h b/src/version.h
index b75da7aa..0183e6de 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 = 6645;
-	static const long  _REVISION = 19581;
+	static const long  _BUILD = 6650;
+	static const long  _REVISION = 19612;
 	
 	//Miscellaneous Version Types
-	static const long  _BUILDS_COUNT = 8090;
-	#define  _RC_FILEVERSION 0,7,6645,19581
-	#define  _RC_FILEVERSION_STRING "0, 7, 6645, 19581\0"
-	static const char  _FULLVERSION_STRING[] = "0.7.6645.19581";
+	static const long  _BUILDS_COUNT = 8104;
+	#define  _RC_FILEVERSION 0,7,6650,19612
+	#define  _RC_FILEVERSION_STRING "0, 7, 6650, 19612\0"
+	static const char  _FULLVERSION_STRING[] = "0.7.6650.19612";
 	
 	//These values are to keep track of your versioning state, don't modify them.
 	static const long  _BUILD_HISTORY = 0;