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

Forgot to reenable cropping

Browse Source
This commit is contained in:
Mark Watkins 2011-06-17 01:47:42 +10:00
parent e013e6dad9
commit 24364814a0
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8309,7 +8309,7 @@
1308026543 D 1308026543 D
1308238797 /home/mark/projects/git/sleepyhead/src/version.h 1308239244 /home/mark/projects/git/sleepyhead/src/version.h
1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
<wx/dcbuffer.h> <wx/dcbuffer.h>

6
src/graphs/graph.cpp
View File

@ -2250,8 +2250,8 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
glColor4ub(col.Red(),col.Green(),col.Blue(),255); glColor4ub(col.Red(),col.Green(),col.Blue(),255);
// Crop to inside the margins. // Crop to inside the margins.
//glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height);
//glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glLineWidth (1); glLineWidth (1);
bool antialias=pref["UseAntiAliasing"]; bool antialias=pref["UseAntiAliasing"];
@ -2269,7 +2269,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
//glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
} }
gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot) gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot)

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 = 6388; static const long _BUILD = 6390;
static const long _REVISION = 18175; static const long _REVISION = 18183;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long _BUILDS_COUNT = 7450; static const long _BUILDS_COUNT = 7453;
#define _RC_FILEVERSION 0,7,6388,18175 #define _RC_FILEVERSION 0,7,6390,18183
#define _RC_FILEVERSION_STRING "0, 7, 6388, 18175\0" #define _RC_FILEVERSION_STRING "0, 7, 6390, 18183\0"
static const char _FULLVERSION_STRING[] = "0.7.6388.18175"; static const char _FULLVERSION_STRING[] = "0.7.6390.18183";
//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;