yet more extra semicolons removed (patch 1305031)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
index 127a31ba24f737f1b7b8f9c1973ee5cae07c8cfd..e41f15105a13f7a4d9b55a785f039b9dcb1d837f 100644 (file)
--- a/src/common/dbgrid.cpp
+++ b/src/common/dbgrid.cpp
@@ -723,7 +723,7 @@ bool wxDbGridTableBase::Writeback() const
 
 #include "wx/arrimpl.cpp"
 
 
 #include "wx/arrimpl.cpp"
 

-WX_DEFINE_EXPORTED_OBJARRAY(keyarray);
+WX_DEFINE_EXPORTED_OBJARRAY(keyarray)

 
 #endif  // #if wxUSE_GRID
 #endif  // #if wxUSE_ODBC
 
 #endif  // #if wxUSE_GRID
 #endif  // #if wxUSE_ODBC

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index a9a18a6935bf5392349cfb77b70e03b0ee2420c8..c2ef23d7416e29436ecb641f8a81ee08e52446db 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -69,7 +69,7 @@ wxJoystick::wxJoystick(int joystick)
     /* No such joystick, return ID 0 */
     m_joystick = 0;
     return;
     /* No such joystick, return ID 0 */
     m_joystick = 0;
     return;

-};
+}

 
 wxPoint wxJoystick::GetPosition() const
 {
 
 wxPoint wxJoystick::GetPosition() const
 {

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 954c79c0e5f181977a441e7e9f0f880034daf91d..9e418fc892fc0632caa41f4a32eda2021a2382e3 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -58,21 +58,21 @@
         if (! ppvObject)\
         {\
             return E_FAIL;\
         if (! ppvObject)\
         {\
             return E_FAIL;\

-        };\
+        }\

         const char *desc = NULL;\
         cls::_GetInterface(this, iid, ppvObject, desc);\
         if (! *ppvObject)\
         {\
             return E_NOINTERFACE;\
         const char *desc = NULL;\
         cls::_GetInterface(this, iid, ppvObject, desc);\
         if (! *ppvObject)\
         {\
             return E_NOINTERFACE;\

-        };\
+        }\

         ((IUnknown * )(*ppvObject))->AddRef();\
         return S_OK;\
         ((IUnknown * )(*ppvObject))->AddRef();\
         return S_OK;\

-    };\
+    }\

     ULONG STDMETHODCALLTYPE cls::AddRef()\
     {\
         InterlockedIncrement(&refCount.l);\
         return refCount.l;\
     ULONG STDMETHODCALLTYPE cls::AddRef()\
     {\
         InterlockedIncrement(&refCount.l);\
         return refCount.l;\

-    };\
+    }\

     ULONG STDMETHODCALLTYPE cls::Release()\
     {\
         if (refCount.l > 0)\
     ULONG STDMETHODCALLTYPE cls::Release()\
     {\
         if (refCount.l > 0)\


@@ -82,7 +82,7 @@
             {\
                 delete this;\
                 return 0;\
             {\
                 delete this;\
                 return 0;\

-            };\
+            }\

             return refCount.l;\
         }\
         else\
             return refCount.l;\
         }\
         else\


@@ -92,7 +92,7 @@
     {\
         InterlockedIncrement(&lockCount.l);\
         return lockCount.l;\
     {\
         InterlockedIncrement(&lockCount.l);\
         return lockCount.l;\

-    };\
+    }\

     ULONG STDMETHODCALLTYPE cls::ReleaseLock()\
     {\
         if (lockCount.l > 0)\
     ULONG STDMETHODCALLTYPE cls::ReleaseLock()\
     {\
         if (lockCount.l > 0)\


@@ -325,7 +325,7 @@ public:
         if (! SUCCEEDED(hr))
         {
             return E_UNEXPECTED;
         if (! SUCCEEDED(hr))
         {
             return E_UNEXPECTED;

-        };
+        }

 
         hr = QueryInterface(IID_IOleInPlaceUIWindow, (void **) ppDoc);
         if (! SUCCEEDED(hr))
 
         hr = QueryInterface(IID_IOleInPlaceUIWindow, (void **) ppDoc);
         if (! SUCCEEDED(hr))


@@ -333,7 +333,7 @@ public:
             (*ppFrame)->Release();
             *ppFrame = NULL;
             return E_UNEXPECTED;
             (*ppFrame)->Release();
             *ppFrame = NULL;
             return E_UNEXPECTED;

-        };
+        }

 
         RECT rect;
         ::GetClientRect(m_hWndParent, &rect);
 
         RECT rect;
         ::GetClientRect(m_hWndParent, &rect);


@@ -342,13 +342,13 @@ public:
             lprcPosRect->left = lprcPosRect->top = 0;
             lprcPosRect->right = rect.right;
             lprcPosRect->bottom = rect.bottom;
             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;
         if (lprcClipRect)
         {
             lprcClipRect->left = lprcClipRect->top = 0;
             lprcClipRect->right = rect.right;
             lprcClipRect->bottom = rect.bottom;

-        };
+        }

 
         memset(lpFrameInfo, 0, sizeof(OLEINPLACEFRAMEINFO));
         lpFrameInfo->cb = sizeof(OLEINPLACEFRAMEINFO);
 
         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";
         case OLEGETMONIKER_UNASSIGN     : return "OLEGETMONIKER_UNASSIGN";
         case OLEGETMONIKER_TEMPFORUSER  : return "OLEGETMONIKER_TEMPFORUSER";
         default                         : return "Bad Enum";

-        };
-    };
+        }
+    }

 
     const char *OleGetWhicMonikerStr(DWORD dwWhichMoniker)
     {
 
     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";
         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)
     {
     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);
                 return E_FAIL;
 
             m_window->m_docView->SetInPlaceSite(inPlaceSite);

-        };
+        }

 
         m_window->m_docView->UIActivate(TRUE);
         return S_OK;
 
         m_window->m_docView->UIActivate(TRUE);
         return S_OK;

-    };
+    }

 
 
 protected:
 
 
 protected:


@@ -578,7 +578,7 @@ DEFINE_OLE_TABLE(FrameSite)
     OLE_IINTERFACE(IOleDocumentSite)
     OLE_IINTERFACE(IAdviseSink)
     OLE_IINTERFACE(IOleControlSite)
     OLE_IINTERFACE(IOleDocumentSite)
     OLE_IINTERFACE(IAdviseSink)
     OLE_IINTERFACE(IOleControlSite)

-END_OLE_TABLE;
+END_OLE_TABLE

 
 
 wxActiveXContainer::wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk)
 
 
 wxActiveXContainer::wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk)