diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index f6fd8e23..85aaa879 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8310,7 +8310,7 @@ 1308026543 D -1308391347 /home/mark/projects/git/sleepyhead/src/version.h +1308392510 /home/mark/projects/git/sleepyhead/src/version.h 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed @@ -8363,7 +8363,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1308388351 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1308392525 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp "freetype-gl/font-manager.h" "freetype-gl/texture-font.h" "graph.h" @@ -11075,7 +11075,7 @@ -1308383636 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp +1308392505 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 5cd05bde..cc60cfaf 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -19,13 +19,13 @@ - + - + diff --git a/src/graphs/gl_pbuffer.cpp b/src/graphs/gl_pbuffer.cpp index 79738135..26be56bb 100644 --- a/src/graphs/gl_pbuffer.cpp +++ b/src/graphs/gl_pbuffer.cpp @@ -453,7 +453,7 @@ pBufferGLX::pBufferGLX(int width, int height,wxGLContext * gc) } #if !wxCHECK_VERSION(2,9,0) - XFree(fbc); + //XFree(fbc); #endif glXMakeCurrent(display,hBuffer,m_shared); diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index bba9ec64..985f939c 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1024,7 +1024,7 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) throw GLException(wxT("Macintrash")); //pbuffer=new pBufferAGL(width,height); #elif defined(__UNIX__) - throw GLException(wxT("Linux pBuffer Sucks on some cards"); + throw GLException(wxT("Linux pBuffer Sucks on some cards")); //pbuffer=new pBufferGLX(res.GetWidth(),res.GetHeight(),shared_context); #endif diff --git a/src/version.h b/src/version.h index 5de520c9..b45d8357 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 = 6747; - static const long _REVISION = 20084; + static const long _BUILD = 6748; + static const long _REVISION = 20090; //Miscellaneous Version Types - static const long _BUILDS_COUNT = 8337; - #define _RC_FILEVERSION 0,7,6747,20084 - #define _RC_FILEVERSION_STRING "0, 7, 6747, 20084\0" - static const char _FULLVERSION_STRING[] = "0.7.6747.20084"; + static const long _BUILDS_COUNT = 8340; + #define _RC_FILEVERSION 0,7,6748,20090 + #define _RC_FILEVERSION_STRING "0, 7, 6748, 20090\0" + static const char _FULLVERSION_STRING[] = "0.7.6748.20090"; //These values are to keep track of your versioning state, don't modify them. static const long _BUILD_HISTORY = 0;