From 07c474a1d464cad6899e3c88e8750d29baf2ee86 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 17 Jun 2011 10:48:20 +1000 Subject: [PATCH] Forgot to reenable Render --- Projects/CodeBlocks/SleepyHead.depend | 6 +++--- src/SleepyHeadMain.cpp | 2 +- src/graphs/graph.cpp | 2 +- src/version.h | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 34b9c0c7..61585839 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8309,7 +8309,7 @@ 1308026543 D -1308270969 /home/mark/projects/git/sleepyhead/src/version.h +1308271423 /home/mark/projects/git/sleepyhead/src/version.h 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed @@ -8341,7 +8341,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1308264665 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1308271319 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8362,7 +8362,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1308265075 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1308271422 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp "freetype-gl/font-manager.h" "freetype-gl/texture-font.h" "graph.h" diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index aae20847..e181bf62 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -866,7 +866,7 @@ Daily::~Daily() //this->Disconnect(wxEVT_SCROLLWIN_THUMBTRACK, EVT_SCROLLWIN_THUMBTRACK(Daily::OnWinScroll)); //this->Disconnect(wxEVT_SCROLLWIN_THUMBRELEASE, EVT_SCROLLWIN_THUMBRELEASE(Daily::OnWinScroll)); - this->Disconnect(wxID_ANY, wxEVT_REFRESH_DAILY, wxCommandEventHandler(Daily::RefreshData)); + this->Disconnect(wxID_ANY, wxEVT_REFRESH_DAILY, wxCommandEventHandler(Daily::DoRefreshData)); this->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( Daily::OnEventTreeSelection), NULL, this); } void Daily::OnWinScroll(wxScrollWinEvent &event) diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 7faabff9..a256787f 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1115,7 +1115,7 @@ void gGraphWindow::OnPaint(wxPaintEvent& event) GetClientSize(&m_scrX, &m_scrY); - // Render(m_scrX,m_scrY); + Render(m_scrX,m_scrY); if (m_mouseLDown) { if (m_mouseRBrect.width>0) diff --git a/src/version.h b/src/version.h index 6e5ac85c..c2200227 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 = 6465; - static const long _REVISION = 18575; + static const long _BUILD = 6467; + static const long _REVISION = 18579; //Miscellaneous Version Types - static const long _BUILDS_COUNT = 7623; - #define _RC_FILEVERSION 0,7,6465,18575 - #define _RC_FILEVERSION_STRING "0, 7, 6465, 18575\0" - static const char _FULLVERSION_STRING[] = "0.7.6465.18575"; + static const long _BUILDS_COUNT = 7630; + #define _RC_FILEVERSION 0,7,6467,18579 + #define _RC_FILEVERSION_STRING "0, 7, 6467, 18579\0" + static const char _FULLVERSION_STRING[] = "0.7.6467.18579"; //These values are to keep track of your versioning state, don't modify them. static const long _BUILD_HISTORY = 0;