From 51cf4252d4ada26bec8c5e2a3feeb762965b9d90 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 7 Jun 2011 15:47:17 +1000 Subject: [PATCH] UNIX Screenshot fix --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/SleepyHeadMain.cpp | 12 +++++------- src/version.h | 12 ++++++------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index c6101dfe..35c351fb 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307421624 /home/mark/projects/git/sleepyhead/src/version.h +1307425559 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8312,7 +8312,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307418393 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307425549 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 1a91df54..356a772b 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -204,13 +204,11 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event ) { wxRect r=GetRect(); -#if defined(__UNIX__) // Borrowed.. this need fixing. -/* int cx=r.x, cy=r.y; - ClientToScreen(&cx,&cy); - int border_width = cx - r.x; - int title_bar_height = cy - r.y; - r.width += (border_width * 2); - r.height += title_bar_height; // + border_width; */ +#if defined(__UNIX__) + // Height of statusbar needs adding in + wxRect j=statusBar->GetRect(); + + r.height += j.height; #endif wxScreenDC sdc; diff --git a/src/version.h b/src/version.h index cb3b0a19..f5b0b653 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 = 3354; - static const long REVISION = 1457; + static const long BUILD = 3355; + static const long REVISION = 1458; //Miscellaneous Version Types - static const long BUILDS_COUNT = 547; - #define RC_FILEVERSION 0,7,3354,1457 - #define RC_FILEVERSION_STRING "0, 7, 3354, 1457\0" - static const char FULLVERSION_STRING[] = "0.7.3354.1457"; + static const long BUILDS_COUNT = 553; + #define RC_FILEVERSION 0,7,3355,1458 + #define RC_FILEVERSION_STRING "0, 7, 3355, 1458\0" + static const char FULLVERSION_STRING[] = "0.7.3355.1458"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;