chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows & Darwin temporary fix to RenderBitmap

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 05:59:46 +10:00
parent 1360d9a595
commit aa3e916eb2
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307994509 /home/mark/projects/git/sleepyhead/src/version.h 1307995152 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307994526 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307994893 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>

14
src/graphs/graph.cpp
View File

@ -816,8 +816,13 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
{ {
//pBuffers are evil.. but I need to use them here. //pBuffers are evil.. but I need to use them here.
#if defined(__WXMSW__)
// WGL pBuffer Implementation
return &wxNullBitmap;
#elif defined(__DARWIN__)
return &wxNullBitmap;
#if defined(__UNIX__) #elif defined(__UNIX__)
int attrib[]={ int attrib[]={
GLX_PBUFFER_WIDTH,width, GLX_PBUFFER_WIDTH,width,
@ -828,10 +833,15 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
int ret; int ret;
Display *display=NULL; Display *display=NULL;
GLXFBConfig *fbc=NULL; GLXFBConfig *fbc=NULL;
#if wxCHECK_VERSION(2,9,0) #if wxCHECK_VERSION(2,9,0)
display=wxGetX11Display(); display=wxGetX11Display();
fbc = GetGLXFBConfig(); fbc = GetGLXFBConfig();
#else #else
display=(Display *)wxGetDisplay();
// TODO:
// have to setup a GLXFBConfig structure for wx2.8 because wx2.8 is crap.
// already done this crap but deleted it.. arggghh.....
return &wxNullBitmap; return &wxNullBitmap;
#endif #endif
@ -854,8 +864,8 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
wxLogError(wxT("Couldn't make buffer current")); wxLogError(wxT("Couldn't make buffer current"));
} }
// texfont->FaceSize(14);
#endif #endif
// glClearColor(1,1,0,1); // glClearColor(1,1,0,1);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 5549; static const long BUILD = 5555;
static const long REVISION = 13587; static const long REVISION = 13616;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5647; static const long BUILDS_COUNT = 5661;
#define RC_FILEVERSION 0,7,5549,13587 #define RC_FILEVERSION 0,7,5555,13616
#define RC_FILEVERSION_STRING "0, 7, 5549, 13587\0" #define RC_FILEVERSION_STRING "0, 7, 5555, 13616\0"
static const char FULLVERSION_STRING[] = "0.7.5549.13587"; static const char FULLVERSION_STRING[] = "0.7.5555.13616";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;