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

Fixed those stupid bitmap errors.. (wxNullBitmap != NULL)

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 19:14:55 +10:00
parent a6839ffc06
commit 92f7295e11
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8295,7 +8295,7 @@
<sleeplib/machine.h>
<list>
1307522091 /home/mark/projects/git/sleepyhead/src/version.h
1307524444 /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"
1307518841 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
1307524444 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>

13
src/SleepyHeadMain.cpp
View File

@ -304,7 +304,7 @@ void SleepyHeadFrame::OnViewMenuDaily( wxCommandEvent& event )
int idx=main_auinotebook->GetPageIndex(daily);
if (idx==wxNOT_FOUND) {
daily=new Daily(this,profile);
main_auinotebook->AddPage(daily,_("Daily"),true);
main_auinotebook->AddPage(daily,_("Daily"),true,wxNullBitmap);
daily->RefreshData();
daily->Refresh();
@ -320,7 +320,7 @@ void SleepyHeadFrame::OnViewMenuSummary( wxCommandEvent& event )
int idx=main_auinotebook->GetPageIndex(summary);
if (idx==wxNOT_FOUND) {
summary=new Summary(this,profile);
main_auinotebook->AddPage(summary,_("Summary"),true);
main_auinotebook->AddPage(summary,_("Summary"),true,wxNullBitmap);
summary->ResetProfile(profile);
summary->RefreshData();
summary->Refresh();
@ -560,8 +560,8 @@ Daily::Daily(wxWindow *win,Profile *p)
EventTree=new wxTreeCtrl(this);
this->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( Daily::OnEventTreeSelection), NULL, this);
Notebook->AddPage(HTMLInfo,wxT("Details"),false,NULL);
Notebook->AddPage(EventTree,wxT("Events"),false,NULL);
Notebook->AddPage(HTMLInfo,wxT("Details"),false,wxNullBitmap);
Notebook->AddPage(EventTree,wxT("Events"),false,wxNullBitmap);
AddCPAPData(tap_eap=new TAPData(CPAP_EAP));
AddCPAPData(tap_iap=new TAPData(CPAP_IAP));
AddCPAPData(tap=new TAPData(CPAP_Pressure));
@ -1095,8 +1095,9 @@ void Daily::RefreshData()
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Session Files")+wxT("</i></td></tr>\n");
for (vector<Session *>::iterator i=cpap->begin();i!=cpap->end();i++) {
html=html+wxT("<tr><td colspan=2 align=left>")+(*i)->first().Format(wxT("%d-%m-%Y&nbsp;%H:%M"))+wxT("&nbsp;")+(*i)->last().Format(wxT("%H:%M"))+wxT("&nbsp;")+wxString::Format(wxT("#%06i"),(*i)->session())+wxT("</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=left>")+(*i)->first().Format(wxT("%d-%m-%Y&nbsp;%H:%M"))+wxT("&nbsp;");
html=html+(*i)->last().Format(wxT("%H:%M"))+wxT("&nbsp;");
html=html+wxString::Format(wxT("#%06li"),(*i)->session())+wxT("</td></tr>\n");
}
}

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 3701;
static const long REVISION = 3457;
static const long BUILD = 3709;
static const long REVISION = 3483;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 1491;
#define RC_FILEVERSION 0,7,3701,3457
#define RC_FILEVERSION_STRING "0, 7, 3701, 3457\0"
static const char FULLVERSION_STRING[] = "0.7.3701.3457";
static const long BUILDS_COUNT = 1525;
#define RC_FILEVERSION 0,7,3709,3483
#define RC_FILEVERSION_STRING "0, 7, 3709, 3483\0"
static const char FULLVERSION_STRING[] = "0.7.3709.3483";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;