Backport fixing

3 files changed, 42 insertions, 4 deletions

diff --git a/lib/base.cc b/lib/base.cc
index 8741978..310dde3 100644
--- a/lib/base.cc
+++ b/lib/base.cc
@@ -69,3 +69,9 @@ void mogltk::base::setsurface(SDL_Surface * _surface) throw (GeneralException) {
 SDL_Surface * mogltk::base::getsurface() {
     return surface;
 }
+
+void mogltk::base::Enter2DMode() {
+}
+
+void mogltk::base::Leave2DMode() {
+}
diff --git a/lib/glshape.cc b/lib/glshape.cc
index 9257257..e1c1faf 100644
--- a/lib/glshape.cc
+++ b/lib/glshape.cc
@@ -40,10 +40,18 @@ void mogltk::glshape::hline(int x1, int x2, int y, ColorP c1, ColorP c2) {
     box(x1, y, x2, y, c1, c2, c1, c2);
 }
 
+void mogltk::glshape::hline(int x1, int x2, int y, ColorP c) {
+    box(x1, y, x2, y, c, c, c, c);
+}
+
 void mogltk::glshape::vline(int x, int y1, int y2, ColorP c1, ColorP c2) {
     box(x, y1, x, y2, c1, c1, c2, c2);
 }
 
+void mogltk::glshape::vline(int x, int y1, int y2, ColorP c) {
+    box(x, y1, x, y2, c, c, c, c);
+}
+
 void mogltk::glshape::pixel(int x, int y, ColorP c) {
     box(x, y, x, y, c);
 }
@@ -59,8 +67,8 @@ void mogltk::glshape::obox(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2,
 
     hline(x1, x2, y1, c1, c2);
     hline(x1, x2, y2, c3, c4);
-    vline(x1, y1, y2, c1, c3);
-    vline(x2, y1, y2, c2, c4);
+    vline(x1, y1 + 1, y2 - 1, c1, c3);
+    vline(x2, y1 + 1, y2 - 1, c2, c4);
 
     LEAVE;
 }
diff --git a/lib/shape.cc b/lib/shape.cc
index 45280f5..5120a3c 100644
--- a/lib/shape.cc
+++ b/lib/shape.cc
@@ -473,8 +473,8 @@ void mogltk::shape::obox(int x1, int y1, int x2, int y2, ColorP c) {
 
     hline(x1, x2, y1, c);
     hline(x1, x2, y2, c);
-    vline(x1, y1, y2, c);
-    vline(x2, y1, y2, c);
+    vline(x1, y1 + 1, y2 - 1, c);
+    vline(x2, y1 + 1, y2 - 1, c);
 
     LEAVE;
 }
@@ -597,3 +597,27 @@ void mogltk::shape::Leave(bool locked) {
     if (locked)
 	SDL_UnlockSurface(mogltk::engine::base_o->getsurface());
 }
+
+void mogltk::shape::tbox(texture *, int x1, int y1, int x2, int y2, int tx, int ty, double f, ColorP c) {
+}
+
+void mogltk::shape::tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP c) {
+}
+
+void mogltk::shape::tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx, int ty, double f) {
+}
+
+void mogltk::shape::tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2) {
+}
+
+void mogltk::shape::vline(int x, int y1, int y2, ColorP c1, ColorP c2) {
+}
+
+void mogltk::shape::hline(int x1, int x2, int y, ColorP c1, ColorP c2) {
+}
+
+void mogltk::shape::box(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) {
+}
+
+void mogltk::shape::obox(int x1, int y1, int x2, int y2, ColorP c1, ColorP c2, ColorP c3, ColorP c4) {
+}