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

Disabled broken UNIX screenshot enhancements

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 14:40:48 +10:00
parent 87b7149ba6
commit cedd0a9e5e
4 changed files with 283 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

544
Projects/CodeBlocks/SleepyHead.depend
View File

File diff suppressed because it is too large Load Diff

4
src/SleepyHeadMain.cpp
View File

@ -205,12 +205,12 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event )
wxRect r=GetRect(); wxRect r=GetRect();
#if defined(__UNIX__) // Borrowed.. this need fixing. #if defined(__UNIX__) // Borrowed.. this need fixing.
int cx=r.x, cy=r.y; /* int cx=r.x, cy=r.y;
ClientToScreen(&cx,&cy); ClientToScreen(&cx,&cy);
int border_width = cx - r.x; int border_width = cx - r.x;
int title_bar_height = cy - r.y; int title_bar_height = cy - r.y;
r.width += (border_width * 2); r.width += (border_width * 2);
r.height += title_bar_height; // + border_width; r.height += title_bar_height; // + border_width; */
#endif #endif
wxScreenDC sdc; wxScreenDC sdc;

6
src/graphs/graph.cpp
View File

@ -1682,8 +1682,10 @@ void EventData::Reload(Day *day)
lastp=p; lastp=p;
} }
np[vc]=t; np[vc]=t;
tt+=t; if (t>0) {
vc++; tt+=t;
vc++;
}
} }
if (tt>0) { if (tt>0) {

10
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 = 3352; static const long BUILD = 3354;
static const long REVISION = 1440; static const long REVISION = 1457;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 547; static const long BUILDS_COUNT = 547;
#define RC_FILEVERSION 0,7,3352,1440 #define RC_FILEVERSION 0,7,3354,1457
#define RC_FILEVERSION_STRING "0, 7, 3352, 1440\0" #define RC_FILEVERSION_STRING "0, 7, 3354, 1457\0"
static const char FULLVERSION_STRING[] = "0.7.3352.1440"; static const char FULLVERSION_STRING[] = "0.7.3354.1457";
//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;