Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yet more extra semicolons removed (patch 1305031)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-27 11:19:09 +00:00
parent 3ef092d63b
commit ae199d6e4d
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dbgrid.cpp
View File

@@ -723,7 +723,7 @@ bool wxDbGridTableBase::Writeback() const
#include "wx/arrimpl.cpp"
WX_DEFINE_EXPORTED_OBJARRAY(keyarray);
WX_DEFINE_EXPORTED_OBJARRAY(keyarray)
#endif // #if wxUSE_GRID
#endif // #if wxUSE_ODBC

2
src/msw/joystick.cpp
View File

@@ -69,7 +69,7 @@ wxJoystick::wxJoystick(int joystick)
/* No such joystick, return ID 0 */
m_joystick = 0;
return;
};
}
wxPoint wxJoystick::GetPosition() const
{

34
src/msw/ole/activex.cpp
View File

@@ -58,21 +58,21 @@
if (! ppvObject)\
{\
return E_FAIL;\
};\
}\
const char *desc = NULL;\
cls::_GetInterface(this, iid, ppvObject, desc);\
if (! *ppvObject)\
{\
return E_NOINTERFACE;\
};\
}\
((IUnknown * )(*ppvObject))->AddRef();\
return S_OK;\
};\
}\
ULONG STDMETHODCALLTYPE cls::AddRef()\
{\
InterlockedIncrement(&refCount.l);\
return refCount.l;\
};\
}\
ULONG STDMETHODCALLTYPE cls::Release()\
{\
if (refCount.l > 0)\
@@ -82,7 +82,7 @@
{\
delete this;\
return 0;\
};\
}\
return refCount.l;\
}\
else\
@@ -92,7 +92,7 @@
{\
InterlockedIncrement(&lockCount.l);\
return lockCount.l;\
};\
}\
ULONG STDMETHODCALLTYPE cls::ReleaseLock()\
{\
if (lockCount.l > 0)\
@@ -325,7 +325,7 @@ public:
if (! SUCCEEDED(hr))
{
return E_UNEXPECTED;
};
}
hr = QueryInterface(IID_IOleInPlaceUIWindow, (void **) ppDoc);
if (! SUCCEEDED(hr))
@@ -333,7 +333,7 @@ public:
(*ppFrame)->Release();
*ppFrame = NULL;
return E_UNEXPECTED;
};
}
RECT rect;
::GetClientRect(m_hWndParent, &rect);
@@ -342,13 +342,13 @@ public:
lprcPosRect->left = lprcPosRect->top = 0;
lprcPosRect->right = rect.right;
lprcPosRect->bottom = rect.bottom;
};
}
if (lprcClipRect)
{
lprcClipRect->left = lprcClipRect->top = 0;
lprcClipRect->right = rect.right;
lprcClipRect->bottom = rect.bottom;
};
}
memset(lpFrameInfo, 0, sizeof(OLEINPLACEFRAMEINFO));
lpFrameInfo->cb = sizeof(OLEINPLACEFRAMEINFO);
@@ -398,8 +398,8 @@ public:
case OLEGETMONIKER_UNASSIGN : return "OLEGETMONIKER_UNASSIGN";
case OLEGETMONIKER_TEMPFORUSER : return "OLEGETMONIKER_TEMPFORUSER";
default : return "Bad Enum";
};
};
}
}
const char *OleGetWhicMonikerStr(DWORD dwWhichMoniker)
{
@@ -409,8 +409,8 @@ public:
case OLEWHICHMK_OBJREL : return "OLEWHICHMK_OBJREL";
case OLEWHICHMK_OBJFULL : return "OLEWHICHMK_OBJFULL";
default : return "Bad Enum";
};
};
}
}
STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **){return E_FAIL;}
HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer)
{
@@ -535,11 +535,11 @@ public:
return E_FAIL;
m_window->m_docView->SetInPlaceSite(inPlaceSite);
};
}
m_window->m_docView->UIActivate(TRUE);
return S_OK;
};
}
protected:
@@ -578,7 +578,7 @@ DEFINE_OLE_TABLE(FrameSite)
OLE_IINTERFACE(IOleDocumentSite)
OLE_IINTERFACE(IAdviseSink)
OLE_IINTERFACE(IOleControlSite)
END_OLE_TABLE;
END_OLE_TABLE
wxActiveXContainer::wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk)