From c963116c6f76969fb6b4e18fcab44c41eacc4a93 Mon Sep 17 00:00:00 2001 From: spacy51 Date: Fri, 7 Dec 2007 17:25:36 +0000 Subject: [PATCH] removed display::renderMenu function (was not used anymore) git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@179 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/win32/Direct3D.cpp | 10 ---------- src/win32/DirectDraw.cpp | 7 ------- src/win32/Display.h | 1 - src/win32/OpenGL.cpp | 9 --------- 4 files changed, 27 deletions(-) diff --git a/src/win32/Direct3D.cpp b/src/win32/Direct3D.cpp index 8f1e2d43..d02b2221 100644 --- a/src/win32/Direct3D.cpp +++ b/src/win32/Direct3D.cpp @@ -101,7 +101,6 @@ public: virtual void clear(); virtual void render(); - virtual void renderMenu(); virtual bool changeRenderSize( int w, int h ); virtual void resize( int w, int h ); virtual void setOption( const char *option, int value ); @@ -321,15 +320,6 @@ bool Direct3DDisplay::initialize() } -void Direct3DDisplay::renderMenu() -{ - //checkFullScreen(); - if(theApp.m_pMainWnd) { - theApp.m_pMainWnd->DrawMenuBar(); - } -} - - void Direct3DDisplay::clear() { if( pDevice ) { diff --git a/src/win32/DirectDraw.cpp b/src/win32/DirectDraw.cpp index 50705e47..3789d4e8 100644 --- a/src/win32/DirectDraw.cpp +++ b/src/win32/DirectDraw.cpp @@ -67,7 +67,6 @@ public: virtual void cleanup(); virtual void render(); virtual void checkFullScreen(); - virtual void renderMenu(); virtual void clear(); virtual bool changeRenderSize(int w, int h); virtual DISPLAY_TYPE getType() { return DIRECT_DRAW; }; @@ -534,12 +533,6 @@ void DirectDrawDisplay::clear() ddsPrimary->Flip(NULL, 0); } -void DirectDrawDisplay::renderMenu() -{ - checkFullScreen(); - theApp.m_pMainWnd->DrawMenuBar(); -} - void DirectDrawDisplay::checkFullScreen() { if(theApp.tripleBuffering) diff --git a/src/win32/Display.h b/src/win32/Display.h index 6859747c..bc787915 100644 --- a/src/win32/Display.h +++ b/src/win32/Display.h @@ -34,7 +34,6 @@ class IDisplay { virtual void cleanup() = 0; virtual void render() = 0; virtual void checkFullScreen() {}; - virtual void renderMenu() {}; virtual void clear() = 0; virtual bool changeRenderSize(int w, int h) { return true; }; virtual void resize(int w, int h) {}; diff --git a/src/win32/OpenGL.cpp b/src/win32/OpenGL.cpp index 7f201b26..f18a4e99 100644 --- a/src/win32/OpenGL.cpp +++ b/src/win32/OpenGL.cpp @@ -86,7 +86,6 @@ public: virtual bool initialize(); virtual void cleanup(); virtual void render(); - virtual void renderMenu(); virtual void clear(); virtual bool changeRenderSize( int w, int h ); virtual void resize( int w, int h ); @@ -245,14 +244,6 @@ void OpenGLDisplay::clear() } -void OpenGLDisplay::renderMenu() -{ - checkFullScreen(); - if( theApp.m_pMainWnd ) - theApp.m_pMainWnd->DrawMenuBar(); -} - - void OpenGLDisplay::render() { clear();