diff --git a/headers/os/opengl/GLView.h b/headers/os/opengl/GLView.h index f2dbfc24cf..b58a24a3e9 100644 --- a/headers/os/opengl/GLView.h +++ b/headers/os/opengl/GLView.h @@ -118,6 +118,12 @@ private: void _LockDraw(); void _UnlockDraw(); + +// BeOS compatibility +private: + BGLView(BRect rect, char* name, + ulong resizingMode, ulong mode, + ulong options); }; diff --git a/src/add-ons/screen_savers/flurry/Flurry.cpp b/src/add-ons/screen_savers/flurry/Flurry.cpp index c385c3074a..3c44b02097 100644 --- a/src/add-ons/screen_savers/flurry/Flurry.cpp +++ b/src/add-ons/screen_savers/flurry/Flurry.cpp @@ -52,7 +52,7 @@ using namespace BPrivate; FlurryView::FlurryView(BRect bounds) - : BGLView(bounds, NULL, B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW, + : BGLView(bounds, (const char *)NULL, B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW, BGL_RGB | BGL_ALPHA | BGL_DEPTH | BGL_DOUBLE), fOldFrameTime(-1.0), fFlurryInfo_t(NULL) diff --git a/src/kits/opengl/GLView.cpp b/src/kits/opengl/GLView.cpp index 3285ebad11..08e1ee3bcf 100644 --- a/src/kits/opengl/GLView.cpp +++ b/src/kits/opengl/GLView.cpp @@ -461,6 +461,25 @@ void BGLView::_ReservedGLView8() {} // #pragma mark - +// BeOS compatibility +BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode, + ulong options) + : + BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), + fGc(NULL), + fOptions(options), + fDitherCount(0), + fDrawLock("BGLView draw lock"), + fDisplayLock("BGLView display lock"), + fClipInfo(NULL), + fRenderer(NULL), + fRoster(NULL), + fDitherMap(NULL) +{ + fRoster = new GLRendererRoster(this, options); +} + + #if 0 diff --git a/src/libs/mesa/glut/glutWindow.cpp b/src/libs/mesa/glut/glutWindow.cpp index 01816c89fc..979f39e4d6 100644 --- a/src/libs/mesa/glut/glutWindow.cpp +++ b/src/libs/mesa/glut/glutWindow.cpp @@ -72,7 +72,7 @@ __glutDefaultReshape(int width, int height) GlutWindow::GlutWindow(GlutWindow *nparent, const char *name, int x, int y, int width, int height, ulong options) : BGLView(nparent != NULL ? BRect(x, y, x + width - 1, y + height - 1) - : BRect(0, 0, width - 1, height - 1), const_cast(name), + : BRect(0, 0, width - 1, height - 1), name, nparent != NULL ? B_FOLLOW_NONE : B_FOLLOW_ALL_SIDES, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE | B_PULSE_NEEDED, options) diff --git a/src/preferences/opengl/OpenGLView.cpp b/src/preferences/opengl/OpenGLView.cpp index 18822cc329..88526d50dc 100644 --- a/src/preferences/opengl/OpenGLView.cpp +++ b/src/preferences/opengl/OpenGLView.cpp @@ -29,7 +29,7 @@ OpenGLView::OpenGLView() const float kInset = 10; BRect dummy(0, 0, 2, 2); - fGLView = new BGLView(dummy, (char*) "gl info", B_FOLLOW_NONE, 0, + fGLView = new BGLView(dummy, "gl info", B_FOLLOW_NONE, 0, BGL_RGB | BGL_DOUBLE); fGLView->Hide(); AddChild(fGLView);