From 1360d9a5957243f835204304d0797a19825dd599 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 14 Jun 2011 05:50:51 +1000
Subject: [PATCH] Fix for wx28 Linux build
---
Projects/CodeBlocks/SleepyHead.depend | 6 +++---
src/graphs/graph.cpp | 11 ++++++++---
src/libs/freetype-gl/text-markup.cpp | 2 +-
src/version.h | 12 ++++++------
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend
index e365a5e0..c4169a52 100644
--- a/Projects/CodeBlocks/SleepyHead.depend
+++ b/Projects/CodeBlocks/SleepyHead.depend
@@ -8306,7 +8306,7 @@
<sleeplib/machine.h>
<list>
-1307993659 /home/mark/projects/git/sleepyhead/src/version.h
+1307994509 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@@ -8344,7 +8344,7 @@
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
-1307993659 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
+1307994526 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/graphics.h>
@@ -11010,7 +11010,7 @@
<wchar.h>
"font-manager.h"
-1307973382 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp
+1307994477 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp
<assert.h>
<stdlib.h>
<string.h>
diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp
index bd9b7797..66fd13d0 100644
--- a/src/graphs/graph.cpp
+++ b/src/graphs/graph.cpp
@@ -826,9 +826,14 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height)
};
int ret;
-
- Display *display=wxGetX11Display();
- GLXFBConfig *fbc = GetGLXFBConfig();
+ Display *display=NULL;
+ GLXFBConfig *fbc=NULL;
+#if wxCHECK_VERSION(2,9,0)
+ display=wxGetX11Display();
+ fbc = GetGLXFBConfig();
+#else
+ return &wxNullBitmap;
+#endif
GLXPbuffer pBuffer=glXCreatePbuffer(display, fbc[0], attrib );
if (pBuffer == 0) {
diff --git a/src/libs/freetype-gl/text-markup.cpp b/src/libs/freetype-gl/text-markup.cpp
index ba4ea6bd..9412c951 100644
--- a/src/libs/freetype-gl/text-markup.cpp
+++ b/src/libs/freetype-gl/text-markup.cpp
@@ -32,7 +32,7 @@ TextMarkup::TextMarkup()
wxColor white(255,255,255,255);
- family = wxString("monotype");
+ family = wxT("monotype");
italic = 0;
bold = 0;
size = 16;
diff --git a/src/version.h b/src/version.h
index 1dd5777c..f32e8569 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 = 5544;
- static const long REVISION = 13556;
+ static const long BUILD = 5549;
+ static const long REVISION = 13587;
//Miscellaneous Version Types
- static const long BUILDS_COUNT = 5634;
- #define RC_FILEVERSION 0,7,5544,13556
- #define RC_FILEVERSION_STRING "0, 7, 5544, 13556\0"
- static const char FULLVERSION_STRING[] = "0.7.5544.13556";
+ static const long BUILDS_COUNT = 5647;
+ #define RC_FILEVERSION 0,7,5549,13587
+ #define RC_FILEVERSION_STRING "0, 7, 5549, 13587\0"
+ static const char FULLVERSION_STRING[] = "0.7.5549.13587";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;