Changeset 44580 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 7, 2013 11:35:37 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83655

Message:

VBoxBFE: RIP.

Location:

trunk/src/VBox/Main

Files:

• include/MouseImpl.h (modified) (5 diffs)
• src-client/MouseImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/MouseImpl.h

@@ -22 +22 @@
 #include "ConsoleEvents.h"
 #include "ConsoleImpl.h"
-#ifndef VBOXBFE_WITHOUT_COM
 #include "EventImpl.h"
-#endif
 #include <VBox/vmm/pdmdrv.h>
 
@@ -34 +32 @@
 class ATL_NO_VTABLE Mouse :
     public VirtualBoxBase
-#ifndef VBOXBFE_WITHOUT_COM
     , VBOX_SCRIPTABLE_IMPL(IMouse)
-#endif
 {
 public:
@@ -69 +65 @@
     STDMETHOD(PutMouseEventAbsolute)(LONG x, LONG y, LONG dz, LONG dw,
                                      LONG buttonState);
-#ifndef VBOXBFE_WITHOUT_COM
     STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource);
-#endif
 
     static const PDMDRVREG  DrvReg;
@@ -114 +108 @@
     bool supportsRel(void);
 
-#ifdef VBOXBFE_WITHOUT_COM
-    Console *mParent;
-#else
     Console * const         mParent;
-#endif
     /** Pointer to the associated mouse driver. */
     struct DRVMAINMOUSE    *mpDrv[MOUSE_MAX_DEVICES];
@@ -127 +117 @@
     uint32_t mfLastButtons;
 
-#ifndef VBOXBFE_WITHOUT_COM
     const ComObjPtr<EventSource> mEventSource;
     VBoxEventDesc                mMouseEvent;
 
     void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons);
-#else
-    void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons)
-    {}
-#endif
 };
-
-#ifdef VBOXBFE_WITHOUT_COM
-/** @todo make this a member of Console */
-extern Mouse *gMouse;
-
-/** @todo can we get these from the API somehow? */
-enum
-{
-    MouseButtonState_LeftButton = 1,
-    MouseButtonState_RightButton = 2,
-    MouseButtonState_MiddleButton = 4,
-    MouseButtonState_XButton1 = 8,
-    MouseButtonState_XButton2 = 16
-};
-#endif
 
 #endif // !____H_MOUSEIMPL

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -110 +110 @@
     unconst(mParent) = parent;
 
-#ifndef VBOXBFE_WITHOUT_COM
     unconst(mEventSource).createObject();
     HRESULT rc = mEventSource->init(static_cast<IMouse*>(this));
@@ -116 +115 @@
     mMouseEvent.init(mEventSource, VBoxEventType_OnGuestMouse,
                      0, 0, 0, 0, 0);
-#endif
 
     /* Confirm a successful initialization */
@@ -144 +142 @@
     }
 
-#ifdef VBOXBFE_WITHOUT_COM
-    mParent = NULL;
-#else
     mMouseEvent.uninit();
     unconst(mEventSource).setNull();
     unconst(mParent) = NULL;
-#endif
 }
 
@@ -256 +250 @@
 }
 
-#ifndef VBOXBFE_WITHOUT_COM
 STDMETHODIMP Mouse::COMGETTER(EventSource)(IEventSource ** aEventSource)
 {
@@ -269 +262 @@
     return S_OK;
 }
-#endif
 
 /**
@@ -413 +405 @@
 }
 
-#ifndef VBOXBFE_WITHOUT_COM
 void Mouse::fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons)
 {
@@ -430 +421 @@
     }
 }
-#endif