diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2016-04-29 11:19:23 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2016-04-29 11:19:23 +0000 |
| commit | bf45344dfe050e794568925d86646faaa0ce270f (patch) | |
| tree | b84352e706edb999819a42a7ec4189f75d16b04c /src/VBox/Frontends/VBoxSDL/Framebuffer.h | |
| parent | 933fe1657ffad0871810ece4087dedbd5e2f9a71 (diff) | |
| download | VirtualBox-svn-bf45344dfe050e794568925d86646faaa0ce270f.tar.gz | |
Frontends: various cleanups, mostly ATL related, remove code for no longer existing API method
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@60759 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Frontends/VBoxSDL/Framebuffer.h')
| -rw-r--r-- | src/VBox/Frontends/VBoxSDL/Framebuffer.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer.h b/src/VBox/Frontends/VBoxSDL/Framebuffer.h index 0b646bcfec9..8254fd3464e 100644 --- a/src/VBox/Frontends/VBoxSDL/Framebuffer.h +++ b/src/VBox/Frontends/VBoxSDL/Framebuffer.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2015 Oracle Corporation + * Copyright (C) 2006-2016 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -43,7 +43,7 @@ extern DECLSPEC void (SDLCALL *pTTF_Quit)(void); class VBoxSDLFBOverlay; class ATL_NO_VTABLE VBoxSDLFB : - public CComObjectRootEx<CComMultiThreadModel>, + public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>, VBOX_SCRIPTABLE_IMPL(IFramebuffer) { public: @@ -66,7 +66,7 @@ public: BEGIN_COM_MAP(VBoxSDLFB) COM_INTERFACE_ENTRY(IFramebuffer) COM_INTERFACE_ENTRY2(IDispatch,IFramebuffer) - COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.p) + COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.m_p) END_COM_MAP() HRESULT FinalConstruct(); @@ -207,7 +207,7 @@ private: bool mfUpdates; #ifdef RT_OS_WINDOWS - CComPtr <IUnknown> m_pUnkMarshaler; + ComPtr<IUnknown> m_pUnkMarshaler; #endif }; @@ -244,7 +244,6 @@ public: STDMETHOD(COMSETTER(Visible))(BOOL visible); STDMETHOD(COMGETTER(Alpha))(ULONG *alpha); STDMETHOD(COMSETTER(Alpha))(ULONG alpha); - STDMETHOD(COMGETTER(Address))(ULONG *address); STDMETHOD(COMGETTER(BytesPerLine))(ULONG *bytesPerLine); /* These are not used, or return standard values. */ |