From 933788501306c0639fe001fa14f1f021b1dd0ce7 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 8 Jun 2011 05:14:04 +1000 Subject: [PATCH] Mac fix.. the wxDC thing I tried to test didn't work --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/SleepyHeadMain.cpp | 3 +-- src/graphs/graph.cpp | 2 -- src/version.h | 12 ++++++------ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index b32f5b4d..69d6ed43 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307470427 /home/mark/projects/git/sleepyhead/src/version.h +1307470976 /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" -1307470291 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307470970 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 95d3ec58..879a77fc 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -1046,8 +1046,7 @@ void Daily::RefreshData() } else if (mode==MODE_APAP) { html=html+wxT("")+_("Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH20 Min
"),cpap->summary_min(CPAP_PressureMin))+wxString::Format(wxT("%.2fcmH2O Max"),cpap->summary_max(CPAP_PressureMax))+wxT("\n"); } else if (mode==MODE_BIPAP) { - html=html+wxT("")+_("IPAP Pressure")+wxT("")+wxString::Format(wxT("%.1f cmH2O"),cpap->summary_min(CPAP_PressureMin))+wxT("\n"); - html=html+wxT("")+_("EPAP Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),cpap->summary_max(CPAP_PressureMax))+wxT("\n"); + html=html+wxT("")+_("Pressure")+wxT("")+wxString::Format(wxT("%.2fcmH2O IPAP
"),cpap->summary_min(CPAP_PressureMin))+wxString::Format(wxT("%.2fcmH2O EPAP"),cpap->summary_max(CPAP_PressureMax))+wxT("\n"); } html=html+wxT("")+_("Ramp")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),cpap->summary_min(CPAP_RampStartingPressure))+wxString::Format(wxT(" @ %imin"),(int)cpap->summary_max(CPAP_RampTime))+wxT("\n"); diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 3f508fef..d6f9dc5c 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -405,8 +405,6 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { #if defined(__WXMSW__) wxAutoBufferedPaintDC dc(this); -#elif defined (__WXMAC__) - wxGCDC(this); #else wxPaintDC dc(this); #endif diff --git a/src/version.h b/src/version.h index 2f108357..52e2438d 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 = 3665; - static const long REVISION = 3253; + static const long BUILD = 3666; + static const long REVISION = 3258; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1366; - #define RC_FILEVERSION 0,7,3665,3253 - #define RC_FILEVERSION_STRING "0, 7, 3665, 3253\0" - static const char FULLVERSION_STRING[] = "0.7.3665.3253"; + static const long BUILDS_COUNT = 1369; + #define RC_FILEVERSION 0,7,3666,3258 + #define RC_FILEVERSION_STRING "0, 7, 3666, 3258\0" + static const char FULLVERSION_STRING[] = "0.7.3666.3258"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;