Skip to content

Commit a5d0f36

Browse files
committed
Again changed tLuaControl::DoVerb in the default branch
1 parent 5896fc7 commit a5d0f36

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

luacom/tLuaControl.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ STDMETHODIMP tLuaControl::GetClipboardData(DWORD dwReserved, IDataObject** ppDat
737737
STDMETHODIMP tLuaControl::DoVerb(LONG lVerb, LPMSG pMsg, IOleClientSite *pActiveSite,
738738
LONG lIndex, HWND hwndParent, LPCRECT prcPosRect)
739739
{
740-
HRESULT hr = 0; // NJG - to stop warning
740+
HRESULT hr = OLEOBJ_S_INVALIDVERB; // NJG - see: http://lua-users.org/lists/lua-l/2006-09/msg00030.html
741741

742742
switch (lVerb) {
743743
case OLEIVERB_SHOW:
@@ -755,11 +755,6 @@ STDMETHODIMP tLuaControl::DoVerb(LONG lVerb, LPMSG pMsg, IOleClientSite *pActive
755755
// if it's a derived-control defined verb, pass it on to them
756756
//
757757
if (lVerb > 0) {
758-
759-
// FIX-TODO!!! hr is undefined here.
760-
// http://lua-users.org/lists/lua-l/2006-09/msg00030.html
761-
FAIL("FIX - luacom bug lua-l/2006-09/msg00030.html");
762-
763758
if (hr == OLEOBJ_S_INVALIDVERB) {
764759
// unrecognised verb -- just do the primary verb and
765760
// activate the sucker.

0 commit comments

Comments
 (0)