diff --git a/include/wx/event.h b/include/wx/event.h index de8e772d35..c13e7336b1 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -210,7 +210,7 @@ private: }; // A plain method functor for the untyped legacy event types: -class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor +class wxObjectEventFunctor : public wxEventFunctor { public: wxObjectEventFunctor(wxObjectEventFunction method, wxEvtHandler *handler) diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h index f2ddc00787..2235ff1090 100644 --- a/include/wx/propgrid/propgridiface.h +++ b/include/wx/propgrid/propgridiface.h @@ -326,7 +326,7 @@ public: // If 'id' refers to invalid property, then we will return dummy // attributes (i.e. root property's attributes, which contents should // should always be empty and of no consequence). - wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes()); + wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes()) return p->GetAttributes(); } diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index 651fd3de0a..deefbc5b30 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -1703,7 +1703,7 @@ wxString BugsGridTable::GetTypeName(int WXUNUSED(row), int col) { case Col_Id: case Col_Priority: - return wxGRID_VALUE_NUMBER;; + return wxGRID_VALUE_NUMBER; case Col_Severity: // fall thorugh (TODO should be a list) @@ -2501,7 +2501,7 @@ void GridFrame::OnRenderPaint( wxPaintEvent& event ) canvas->PrepareDC( dc ); if ( !m_gridBitmap.IsOk() ) - return;; + return; wxMemoryDC memDc( m_gridBitmap ); diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 1100b486d8..cfdffeb8fd 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -83,7 +83,7 @@ public: return col; } return *wxWHITE; - }; + } return wxColour(); } diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp index 50fe873796..10b1e7703d 100644 --- a/samples/sockets/baseclient.cpp +++ b/samples/sockets/baseclient.cpp @@ -218,13 +218,13 @@ Client::OnCmdLineParsed(wxCmdLineParser& pParser) if (!file.IsOpened()) { wxLogError("Cannot open file %s",fname); return false; - }; + } if (!file.ReadAll(&m_message)) { wxLogError("Cannot read content of file %s",fname); return false; - }; + } m_sendType = SEND_MESSAGE; - }; + } if (pParser.Found("s",&m_stressWorkers)) m_sendType = STRESS_TEST; @@ -440,7 +440,7 @@ Client::OnWorkerEvent(WorkerEvent& pEvent) { m_statDone++; m_statDisconnecting--; break; - }; + } if (pEvent.isFailed() || pEvent.m_eventType == WorkerEvent::DONE) { @@ -719,7 +719,7 @@ wxThread::ExitCode ThreadWorker::Entry() etype = WorkerEvent::DISCONNECTING; WorkerEvent e(this,etype); wxGetApp().AddPendingEvent(e); - }; + } m_clientSocket->Close(); m_clientSocket->Destroy(); m_clientSocket = NULL; diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp index 1884715ee1..8b763a5b83 100644 --- a/samples/sockets/baseserver.cpp +++ b/samples/sockets/baseserver.cpp @@ -408,7 +408,7 @@ void Server::OnSocketEvent(wxSocketEvent& pEvent) else { wxLogError("Server: cannot create next thread (current threads: %d", m_threadWorkers.size()); - }; + } } else { diff --git a/src/common/event.cpp b/src/common/event.cpp index 52b7d90819..7d269005ba 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -2042,7 +2042,7 @@ bool wxEventBlocker::ProcessEvent(wxEvent& event) return true; // yes, it should: mark this event as processed } - return wxEvtHandler::ProcessEvent(event);; + return wxEvtHandler::ProcessEvent(event); } #endif // wxUSE_GUI diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp index 399e998342..a4fdfdba90 100644 --- a/src/common/stockitem.cpp +++ b/src/common/stockitem.cpp @@ -212,7 +212,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags) default: wxFAIL_MSG( wxT("invalid stock item ID") ); break; - }; + } #undef STOCKITEM @@ -314,7 +314,7 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id) // there's no stock accelerator for that. ret.Set(0, 0, id); break; - }; + } #undef STOCKITEM diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index af768bc7bd..d6d2798ab2 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -737,7 +737,7 @@ size_t wxStrlen(const wxChar32 *s ) { if (!s) return 0; size_t i=0; - while (*s!=0) { ++i; ++s; }; + while (*s!=0) { ++i; ++s; } return i; } diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index 245a1f3de2..0b5cc4b287 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -806,7 +806,7 @@ bool wxDDEConnection::DoAdvise(const wxString& item, case wxIPC_LOCALE: wxFAIL_MSG( "Unsupported IPC format for Advise()" ); return false; - }; + } bool ok = DdePostAdvise(DDEIdInst, topic_atom, item_atom) != 0; if ( !ok ) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 951b2e447c..adf9ec9b1a 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -821,7 +821,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) } #endif // wxUSE_TASKBARBUTTON - return wxFrameBase::HandleCommand(id, cmd, control);; + return wxFrameBase::HandleCommand(id, cmd, control); } // --------------------------------------------------------------------------- diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index 2225a2998a..ca7ad6bfae 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -170,7 +170,7 @@ static void PixelsToHimetric(SIZEL &sz) logX = GetDeviceCaps(dc, LOGPIXELSX); logY = GetDeviceCaps(dc, LOGPIXELSY); ReleaseDC(NULL, dc); - }; + } #define HIMETRIC_INCH 2540 #define CONVERT(x, logpixels) wxMulDivInt32(HIMETRIC_INCH, (x), (logpixels)) diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index 558107053f..659320b96f 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -119,7 +119,7 @@ bool wxSlider::Create(wxWindow *parent, // no, choose default style |= wxSL_BOTTOM | wxSL_HORIZONTAL; } - }; + } wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL), wxT("incompatible slider direction and orientation") ); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 90ab60fae0..2d5f51c671 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -5082,7 +5082,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName, break; default: wxFAIL_MSG(wxT("unsupported theme colour")); - }; + } wxUxThemeHandle hTheme((const wxWindow *)this, themeName); COLORREF col; diff --git a/src/ribbon/art_msw.cpp b/src/ribbon/art_msw.cpp index b64ee75f77..6242050c13 100644 --- a/src/ribbon/art_msw.cpp +++ b/src/ribbon/art_msw.cpp @@ -2053,7 +2053,7 @@ void wxRibbonMSWArtProvider::DrawGalleryButton(wxDC& dc, rect.y++; if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL) { - rect.width--;; + rect.width--; rect.height -= 2; } else @@ -3179,7 +3179,7 @@ bool wxRibbonMSWArtProvider::GetButtonBarButtonSize( } break; } - }; + } return true; } diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp index e96f85c2ab..bb53511cf5 100644 --- a/src/ribbon/bar.cpp +++ b/src/ribbon/bar.cpp @@ -672,7 +672,7 @@ void wxRibbonBar::RecalculateTabSizes() continue; if(info->small_must_have_separator_width * (int)(numtabs - i) <= width) { - info->rect.width = info->small_must_have_separator_width;; + info->rect.width = info->small_must_have_separator_width; } else { diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index 4d61368a36..6d1e571cef 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -874,7 +874,7 @@ wxString wxRichTextFontListBox::CreateHTML(const wxString& facename) const { wxString str = wxT("Create(m_parentAsWindow, GetID(), diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp index ec3218370d..3e6a6be5fb 100644 --- a/src/xrc/xh_dlg.cpp +++ b/src/xrc/xh_dlg.cpp @@ -50,7 +50,7 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler() wxObject *wxDialogXmlHandler::DoCreateResource() { - XRC_MAKE_INSTANCE(dlg, wxDialog); + XRC_MAKE_INSTANCE(dlg, wxDialog) dlg->Create(m_parentAsWindow, GetID(), diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp index 1e1483d4c7..b8599c3f97 100644 --- a/src/xrc/xh_frame.cpp +++ b/src/xrc/xh_frame.cpp @@ -55,7 +55,7 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler() wxObject *wxFrameXmlHandler::DoCreateResource() { - XRC_MAKE_INSTANCE(frame, wxFrame); + XRC_MAKE_INSTANCE(frame, wxFrame) frame->Create(m_parentAsWindow, GetID(), diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp index c67d272adc..c66a3cfc5b 100644 --- a/src/xrc/xh_mdi.cpp +++ b/src/xrc/xh_mdi.cpp @@ -59,7 +59,7 @@ wxWindow *wxMdiXmlHandler::CreateFrame() { if (m_class == wxT("wxMDIParentFrame")) { - XRC_MAKE_INSTANCE(frame, wxMDIParentFrame); + XRC_MAKE_INSTANCE(frame, wxMDIParentFrame) frame->Create(m_parentAsWindow, GetID(), @@ -80,7 +80,7 @@ wxWindow *wxMdiXmlHandler::CreateFrame() return NULL; } - XRC_MAKE_INSTANCE(frame, wxMDIChildFrame); + XRC_MAKE_INSTANCE(frame, wxMDIChildFrame) frame->Create(mdiParent, GetID(), diff --git a/src/xrc/xh_ribbon.cpp b/src/xrc/xh_ribbon.cpp index b47434cee1..c79e2dc01b 100644 --- a/src/xrc/xh_ribbon.cpp +++ b/src/xrc/xh_ribbon.cpp @@ -115,7 +115,7 @@ void wxRibbonXmlHandler::Handle_RibbonArtProvider(wxRibbonControl *control) wxObject* wxRibbonXmlHandler::Handle_buttonbar() { - XRC_MAKE_INSTANCE (buttonBar, wxRibbonButtonBar); + XRC_MAKE_INSTANCE (buttonBar, wxRibbonButtonBar) if (!buttonBar->Create (wxDynamicCast(m_parent, wxWindow), GetID(), GetPosition(), GetSize(), GetStyle())) @@ -225,7 +225,7 @@ wxObject* wxRibbonXmlHandler::Handle_control() wxObject* wxRibbonXmlHandler::Handle_page() { - XRC_MAKE_INSTANCE (ribbonPage, wxRibbonPage); + XRC_MAKE_INSTANCE (ribbonPage, wxRibbonPage) if (!ribbonPage->Create (wxDynamicCast(m_parent, wxRibbonBar), GetID(), GetText ("label"), GetBitmap ("icon"), GetStyle())) @@ -248,7 +248,7 @@ wxObject* wxRibbonXmlHandler::Handle_page() wxObject* wxRibbonXmlHandler::Handle_gallery() { - XRC_MAKE_INSTANCE (ribbonGallery, wxRibbonGallery); + XRC_MAKE_INSTANCE (ribbonGallery, wxRibbonGallery) if (!ribbonGallery->Create (wxDynamicCast(m_parent, wxWindow), GetID(), GetPosition(), GetSize(), GetStyle())) @@ -281,7 +281,7 @@ wxObject* wxRibbonXmlHandler::Handle_galleryitem() wxObject* wxRibbonXmlHandler::Handle_panel() { - XRC_MAKE_INSTANCE (ribbonPanel, wxRibbonPanel); + XRC_MAKE_INSTANCE (ribbonPanel, wxRibbonPanel) if (!ribbonPanel->Create (wxDynamicCast(m_parent, wxWindow), GetID(), GetText ("label"), GetBitmap ("icon"), GetPosition(), GetSize(), @@ -301,7 +301,7 @@ wxObject* wxRibbonXmlHandler::Handle_panel() wxObject* wxRibbonXmlHandler::Handle_bar() { - XRC_MAKE_INSTANCE (ribbonBar, wxRibbonBar); + XRC_MAKE_INSTANCE (ribbonBar, wxRibbonBar) Handle_RibbonArtProvider (ribbonBar); diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp index 49b5d09fea..912abf251c 100644 --- a/src/xrc/xh_split.cpp +++ b/src/xrc/xh_split.cpp @@ -43,7 +43,7 @@ wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler( wxObject *wxSplitterWindowXmlHandler::DoCreateResource() { - XRC_MAKE_INSTANCE(splitter, wxSplitterWindow); + XRC_MAKE_INSTANCE(splitter, wxSplitterWindow) splitter->Create(m_parentAsWindow, GetID(),