diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 30fc4483..e4000913 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8304,14 +8304,14 @@ -1307634592 /home/mark/projects/git/sleepyhead/src/version.h +1307671170 /home/mark/projects/git/sleepyhead/src/version.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" "machine_loader.h" "profiles.h" -1307620763 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h +1307636478 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h "profiles.h" 1307620828 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.h @@ -8392,7 +8392,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307627182 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp +1307634591 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index 8af1c2e0..333fa072 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -4,46 +4,55 @@ - + - + - - + + - + - - + + - + - - + + - - + + - - + + + + + + + + - - + + + + + diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index f9ad02b7..e7197f8e 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -713,7 +713,7 @@ Daily::Daily(wxWindow *win,Profile *p) // SF->SetMargins(10,15,20,80); // #if defined(__UNIX__) - FRW->LinkZoom(SF); + /* FRW->LinkZoom(SF); FRW->LinkZoom(PRD); FRW->LinkZoom(LEAK); FRW->LinkZoom(SNORE); @@ -732,7 +732,7 @@ Daily::Daily(wxWindow *win,Profile *p) SNORE->LinkZoom(SF); SNORE->LinkZoom(FRW); SNORE->LinkZoom(PRD); - SNORE->LinkZoom(LEAK); + SNORE->LinkZoom(LEAK); */ // #endif diff --git a/src/libs/sleeplib/machine_loader.h b/src/libs/sleeplib/machine_loader.h index e3d1679c..645445a1 100644 --- a/src/libs/sleeplib/machine_loader.h +++ b/src/libs/sleeplib/machine_loader.h @@ -16,9 +16,9 @@ class MachineLoader public: MachineLoader(); virtual ~MachineLoader(); - virtual bool Open(wxString &,Profile *profile){}; - virtual int Version(){}; - virtual const wxString & ClassName(){}; + virtual bool Open(wxString &,Profile *profile)=0; + virtual int Version()=0; + virtual const wxString & ClassName()=0; }; diff --git a/src/version.h b/src/version.h index a199bede..a1be4b93 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 = 4240; - static const long REVISION = 6350; + static const long BUILD = 4242; + static const long REVISION = 6367; //Miscellaneous Version Types - static const long BUILDS_COUNT = 2742; - #define RC_FILEVERSION 0,7,4240,6350 - #define RC_FILEVERSION_STRING "0, 7, 4240, 6350\0" - static const char FULLVERSION_STRING[] = "0.7.4240.6350"; + static const long BUILDS_COUNT = 2749; + #define RC_FILEVERSION 0,7,4242,6367 + #define RC_FILEVERSION_STRING "0, 7, 4242, 6367\0" + static const char FULLVERSION_STRING[] = "0.7.4242.6367"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;