From 47b378bd88260611387af8604a1c8f62355350ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 14 Apr 2007 09:58:37 +0000 Subject: [PATCH] removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/tabmdi.h | 2 +- include/wx/bmpbuttn.h | 6 +- include/wx/cmndata.h | 112 +++++++++---------- include/wx/combo.h | 2 +- include/wx/db.h | 38 +++---- include/wx/dcsvg.h | 56 +++++----- include/wx/docview.h | 26 ++--- include/wx/dynarray.h | 2 +- include/wx/event.h | 4 +- include/wx/generic/laywin.h | 8 +- include/wx/generic/splitter.h | 2 +- include/wx/hash.h | 2 +- include/wx/hashmap.h | 4 +- include/wx/helpbase.h | 2 +- include/wx/html/helpdlg.h | 2 +- include/wx/html/helpfrm.h | 2 +- include/wx/html/winpars.h | 2 +- include/wx/imagbmp.h | 10 +- include/wx/ipcbase.h | 12 +-- include/wx/matrix.h | 2 +- include/wx/msw/colour.h | 2 +- include/wx/msw/control.h | 4 +- include/wx/msw/frame.h | 4 +- include/wx/msw/mdi.h | 2 +- include/wx/msw/ole/automtn.h | 2 +- include/wx/msw/window.h | 2 +- include/wx/protocol/ftp.h | 2 +- include/wx/socket.h | 14 +-- include/wx/tbarbase.h | 4 +- include/wx/unichar.h | 2 +- include/wx/validate.h | 4 +- include/wx/vector.h | 2 +- include/wx/window.h | 2 +- src/common/image.cpp | 4 +- src/common/variant.cpp | 20 ++-- src/generic/animateg.cpp | 4 +- src/generic/datavgen.cpp | 2 +- src/generic/renderg.cpp | 4 +- src/msw/dc.cpp | 2 +- src/msw/listctrl.cpp | 2 +- src/msw/mediactrl_qt.cpp | 120 ++++++++++----------- src/msw/window.cpp | 2 +- src/richtext/richtextbuffer.cpp | 4 +- src/richtext/richtextformatdlg.cpp | 4 +- src/stc/scintilla/include/Platform.h | 6 +- src/stc/scintilla/include/WindowAccessor.h | 2 +- src/stc/scintilla/src/Document.h | 4 +- src/stc/scintilla/src/DocumentAccessor.h | 2 +- src/stc/scintilla/src/ExternalLexer.h | 2 +- src/stc/scintilla/src/Style.h | 2 +- 50 files changed, 264 insertions(+), 264 deletions(-) diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index ac4af06e70..5e94dffd64 100644 --- a/include/wx/aui/tabmdi.h +++ b/include/wx/aui/tabmdi.h @@ -63,7 +63,7 @@ public: wxAuiNotebook* GetNotebook() const; #if wxUSE_MENUS - wxMenu* GetWindowMenu() const { return m_pWindowMenu; }; + wxMenu* GetWindowMenu() const { return m_pWindowMenu; } void SetWindowMenu(wxMenu* pMenu); virtual void SetMenuBar(wxMenuBar *pMenuBar); diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 2c4d1d7767..66fa0c6d93 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -39,11 +39,11 @@ public: void SetBitmapLabel(const wxBitmap& bitmap) { m_bmpNormal = bitmap; OnSetBitmap(); } void SetBitmapSelected(const wxBitmap& sel) - { m_bmpSelected = sel; OnSetBitmap(); }; + { m_bmpSelected = sel; OnSetBitmap(); } void SetBitmapFocus(const wxBitmap& focus) - { m_bmpFocus = focus; OnSetBitmap(); }; + { m_bmpFocus = focus; OnSetBitmap(); } void SetBitmapDisabled(const wxBitmap& disabled) - { m_bmpDisabled = disabled; OnSetBitmap(); }; + { m_bmpDisabled = disabled; OnSetBitmap(); } void SetBitmapHover(const wxBitmap& hover) { m_bmpHover = hover; OnSetBitmap(); } diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 997f4b7cb6..0326128f6f 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -269,35 +269,35 @@ public: wxPrintDialogData(const wxPrintData& printData); virtual ~wxPrintDialogData(); - int GetFromPage() const { return m_printFromPage; }; - int GetToPage() const { return m_printToPage; }; - int GetMinPage() const { return m_printMinPage; }; - int GetMaxPage() const { return m_printMaxPage; }; - int GetNoCopies() const { return m_printNoCopies; }; - bool GetAllPages() const { return m_printAllPages; }; - bool GetSelection() const { return m_printSelection; }; - bool GetCollate() const { return m_printCollate; }; - bool GetPrintToFile() const { return m_printToFile; }; - - void SetFromPage(int v) { m_printFromPage = v; }; - void SetToPage(int v) { m_printToPage = v; }; - void SetMinPage(int v) { m_printMinPage = v; }; - void SetMaxPage(int v) { m_printMaxPage = v; }; - void SetNoCopies(int v) { m_printNoCopies = v; }; - void SetAllPages(bool flag) { m_printAllPages = flag; }; - void SetSelection(bool flag) { m_printSelection = flag; }; - void SetCollate(bool flag) { m_printCollate = flag; }; - void SetPrintToFile(bool flag) { m_printToFile = flag; }; - - void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; }; - void EnableSelection(bool flag) { m_printEnableSelection = flag; }; - void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; }; - void EnableHelp(bool flag) { m_printEnableHelp = flag; }; - - bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; }; - bool GetEnableSelection() const { return m_printEnableSelection; }; - bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; }; - bool GetEnableHelp() const { return m_printEnableHelp; }; + int GetFromPage() const { return m_printFromPage; } + int GetToPage() const { return m_printToPage; } + int GetMinPage() const { return m_printMinPage; } + int GetMaxPage() const { return m_printMaxPage; } + int GetNoCopies() const { return m_printNoCopies; } + bool GetAllPages() const { return m_printAllPages; } + bool GetSelection() const { return m_printSelection; } + bool GetCollate() const { return m_printCollate; } + bool GetPrintToFile() const { return m_printToFile; } + + void SetFromPage(int v) { m_printFromPage = v; } + void SetToPage(int v) { m_printToPage = v; } + void SetMinPage(int v) { m_printMinPage = v; } + void SetMaxPage(int v) { m_printMaxPage = v; } + void SetNoCopies(int v) { m_printNoCopies = v; } + void SetAllPages(bool flag) { m_printAllPages = flag; } + void SetSelection(bool flag) { m_printSelection = flag; } + void SetCollate(bool flag) { m_printCollate = flag; } + void SetPrintToFile(bool flag) { m_printToFile = flag; } + + void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; } + void EnableSelection(bool flag) { m_printEnableSelection = flag; } + void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; } + void EnableHelp(bool flag) { m_printEnableHelp = flag; } + + bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; } + bool GetEnableSelection() const { return m_printEnableSelection; } + bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; } + bool GetEnableHelp() const { return m_printEnableHelp; } // Is this data OK for showing the print dialog? bool Ok() const { return IsOk(); } @@ -344,20 +344,20 @@ public: wxPageSetupDialogData(const wxPrintData& printData); virtual ~wxPageSetupDialogData(); - wxSize GetPaperSize() const { return m_paperSize; }; - wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); }; - wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; }; - wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; }; - wxPoint GetMarginTopLeft() const { return m_marginTopLeft; }; - wxPoint GetMarginBottomRight() const { return m_marginBottomRight; }; - - bool GetDefaultMinMargins() const { return m_defaultMinMargins; }; - bool GetEnableMargins() const { return m_enableMargins; }; - bool GetEnableOrientation() const { return m_enableOrientation; }; - bool GetEnablePaper() const { return m_enablePaper; }; - bool GetEnablePrinter() const { return m_enablePrinter; }; - bool GetDefaultInfo() const { return m_getDefaultInfo; }; - bool GetEnableHelp() const { return m_enableHelp; }; + wxSize GetPaperSize() const { return m_paperSize; } + wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); } + wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; } + wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; } + wxPoint GetMarginTopLeft() const { return m_marginTopLeft; } + wxPoint GetMarginBottomRight() const { return m_marginBottomRight; } + + bool GetDefaultMinMargins() const { return m_defaultMinMargins; } + bool GetEnableMargins() const { return m_enableMargins; } + bool GetEnableOrientation() const { return m_enableOrientation; } + bool GetEnablePaper() const { return m_enablePaper; } + bool GetEnablePrinter() const { return m_enablePrinter; } + bool GetDefaultInfo() const { return m_getDefaultInfo; } + bool GetEnableHelp() const { return m_enableHelp; } // Is this data OK for showing the page setup dialog? bool Ok() const { return IsOk(); } @@ -367,23 +367,23 @@ public: // paper size id member as well. void SetPaperSize(const wxSize& sz); - void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); }; + void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); } // Sets the wxPrintData id, plus the paper width/height if found in the paper database. void SetPaperSize(wxPaperSize id); - void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; }; - void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; }; - void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; }; - void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; }; - void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; }; - void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; }; - - void EnableMargins(bool flag) { m_enableMargins = flag; }; - void EnableOrientation(bool flag) { m_enableOrientation = flag; }; - void EnablePaper(bool flag) { m_enablePaper = flag; }; - void EnablePrinter(bool flag) { m_enablePrinter = flag; }; - void EnableHelp(bool flag) { m_enableHelp = flag; }; + void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; } + void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; } + void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; } + void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; } + void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; } + void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; } + + void EnableMargins(bool flag) { m_enableMargins = flag; } + void EnableOrientation(bool flag) { m_enableOrientation = flag; } + void EnablePaper(bool flag) { m_enablePaper = flag; } + void EnablePrinter(bool flag) { m_enablePrinter = flag; } + void EnableHelp(bool flag) { m_enableHelp = flag; } // Use paper size defined in this object to set the wxPrintData // paper id diff --git a/include/wx/combo.h b/include/wx/combo.h index 74a5bb384b..d1b129f004 100644 --- a/include/wx/combo.h +++ b/include/wx/combo.h @@ -659,7 +659,7 @@ public: // variable has been initialized before the call. // NOTE: It is not in constructor so the derived class doesn't need to redefine // a default constructor of its own. - virtual void Init() { }; + virtual void Init() { } virtual ~wxComboPopup(); diff --git a/include/wx/db.h b/include/wx/db.h index 13c882cdea..0c9b196a2b 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -326,38 +326,38 @@ class WXDLLIMPEXP_ODBC wxDbConnectInf void FreeHenv(); // Accessors - const HENV &GetHenv() { return Henv; }; + const HENV &GetHenv() { return Henv; } - const wxChar *GetDsn() { return Dsn; }; + const wxChar *GetDsn() { return Dsn; } - const wxChar *GetUid() { return Uid; }; - const wxChar *GetUserID() { return Uid; }; + const wxChar *GetUid() { return Uid; } + const wxChar *GetUserID() { return Uid; } - const wxChar *GetAuthStr() { return AuthStr; }; - const wxChar *GetPassword() { return AuthStr; }; + const wxChar *GetAuthStr() { return AuthStr; } + const wxChar *GetPassword() { return AuthStr; } - const wxChar *GetConnectionStr() { return ConnectionStr; }; - bool UseConnectionStr() { return useConnectionStr; }; + const wxChar *GetConnectionStr() { return ConnectionStr; } + bool UseConnectionStr() { return useConnectionStr; } - const wxChar *GetDescription() { return Description; }; - const wxChar *GetFileType() { return FileType; }; - const wxChar *GetDefaultDir() { return DefaultDir; }; + const wxChar *GetDescription() { return Description; } + const wxChar *GetFileType() { return FileType; } + const wxChar *GetDefaultDir() { return DefaultDir; } - void SetHenv(const HENV henv) { Henv = henv; }; + void SetHenv(const HENV henv) { Henv = henv; } void SetDsn(const wxString &dsn); void SetUserID(const wxString &userID); - void SetUid(const wxString &uid) { SetUserID(uid); }; + void SetUid(const wxString &uid) { SetUserID(uid); } void SetPassword(const wxString &password); - void SetAuthStr(const wxString &authstr) { SetPassword(authstr); }; + void SetAuthStr(const wxString &authstr) { SetPassword(authstr); } void SetConnectionStr(const wxString &connectStr); - void SetDescription(const wxString &desc) { Description = desc; }; - void SetFileType(const wxString &fileType) { FileType = fileType; }; - void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; }; + void SetDescription(const wxString &desc) { Description = desc; } + void SetFileType(const wxString &fileType) { FileType = fileType; } + void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; } }; // class wxDbConnectInf @@ -558,8 +558,8 @@ private: public: - void setCached(bool cached) { dbIsCached = cached; }; // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!! - bool IsCached() { return dbIsCached; }; + void setCached(bool cached) { dbIsCached = cached; } // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!! + bool IsCached() { return dbIsCached; } bool GetDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo) { return getDataTypeInfo(fSqlType, structSQLTypeInfo); } diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h index 8808122b8c..ac14323287 100644 --- a/include/wx/dcsvg.h +++ b/include/wx/dcsvg.h @@ -46,13 +46,13 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; } virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *, wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ; void DoCrossHair(wxCoord, wxCoord) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return ; } void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord); @@ -82,14 +82,14 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col), int WXUNUSED(style) = wxFLOOD_SURFACE) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; } - void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } ; + void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ; void DoSetClippingRegionAsRegion(const class wxRegion &) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return ; } void Init (wxString f, int Width, int Height, float dpi); @@ -190,28 +190,28 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC ~wxSVGFileDC(); - bool CanDrawBitmap() const { return true; }; + bool CanDrawBitmap() const { return true; } - bool CanGetTextExtent() const { return true; }; + bool CanGetTextExtent() const { return true; } int GetDepth() const - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; } - void BeginDrawing() { return;}; + void BeginDrawing() { return;} bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false) - { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); }; + { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); } void Clear() - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; } void CrossHair(wxCoord x, wxCoord y) - { DoCrossHair (x,y); return; }; + { DoCrossHair (x,y); return; } virtual void ComputeScaleAndOrigin(); void DestroyClippingRegion() - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; } wxCoord DeviceToLogicalX(wxCoord x) const ; @@ -222,39 +222,39 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC wxCoord DeviceToLogicalYRel(wxCoord y) const ; void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent) - { DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;}; + { DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;} void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) - {DoDrawIcon(icon, x, y) ; return ; }; + {DoDrawIcon(icon, x, y) ; return ; } void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ; void EndDoc() - { return ; }; + { return ; } void EndDrawing() - { return ; }; + { return ; } void EndPage() - { return ; }; + { return ; } void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE) - { DoFloodFill (x, y, *colour, style); return ;} ; + { DoFloodFill (x, y, *colour, style); return ;} wxCoord GetCharHeight() const; wxCoord GetCharWidth() const; void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; } int GetLogicalFunction() - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() Call not implemented")); return wxCOPY ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() Call not implemented")); return wxCOPY ; } int GetMapMode() ; bool GetPixel(wxCoord x, wxCoord y, wxColour *colour) - { return DoGetPixel (x, y, colour) ; } ; + { return DoGetPixel (x, y, colour) ; } void GetUserScale(double *x, double *y) const ; @@ -266,15 +266,15 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC wxCoord LogicalToDeviceYRel(wxCoord y) const ; - bool Ok() const {return m_OK;}; + bool Ok() const {return m_OK;} void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ; void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; } void SetPalette(const wxPalette& WXUNUSED(palette)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; } void SetBackground( const wxBrush &brush ) ; @@ -285,7 +285,7 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC void SetFont(const wxFont& font) ; void SetLogicalFunction(int WXUNUSED(function)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; }; + { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; } void SetLogicalScale( double x, double y ) ; @@ -300,10 +300,10 @@ class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC void SetUserScale(double xScale, double yScale) ; bool StartDoc(const wxString& WXUNUSED(message)) - { return false; }; + { return false; } void StartPage() - { return ; }; + { return ; } }; #endif // __DCSVG_H diff --git a/include/wx/docview.h b/include/wx/docview.h index 79749c12ae..8da6fd7233 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -70,10 +70,10 @@ public: void SetFilename(const wxString& filename, bool notifyViews = false); wxString GetFilename() const { return m_documentFile; } - void SetTitle(const wxString& title) { m_documentTitle = title; }; + void SetTitle(const wxString& title) { m_documentTitle = title; } wxString GetTitle() const { return m_documentTitle; } - void SetDocumentName(const wxString& name) { m_documentTypeName = name; }; + void SetDocumentName(const wxString& name) { m_documentTypeName = name; } wxString GetDocumentName() const { return m_documentTypeName; } bool GetDocumentSaved() const { return m_savedYet; } @@ -180,7 +180,7 @@ public: virtual void SetDocument(wxDocument *doc); wxString GetViewName() const { return m_viewTypeName; } - void SetViewName(const wxString& name) { m_viewTypeName = name; }; + void SetViewName(const wxString& name) { m_viewTypeName = name; } wxWindow *GetFrame() const { return m_viewFrame ; } void SetFrame(wxWindow *frame) { m_viewFrame = frame; } @@ -194,7 +194,7 @@ public: // Called by framework if created automatically by the default document // manager class: gives view a chance to initialise - virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; }; + virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; } // Checks if the view is the last one for the document; if so, asks user // to confirm save data (if modified). If ok, deletes itself and returns @@ -260,21 +260,21 @@ public: // creation virtual bool InitDocument(wxDocument* doc, const wxString& path, long flags = 0); - wxString GetDefaultExtension() const { return m_defaultExt; }; + wxString GetDefaultExtension() const { return m_defaultExt; } wxString GetDescription() const { return m_description; } - wxString GetDirectory() const { return m_directory; }; + wxString GetDirectory() const { return m_directory; } wxDocManager *GetDocumentManager() const { return m_documentManager; } void SetDocumentManager(wxDocManager *manager) { m_documentManager = manager; } - wxString GetFileFilter() const { return m_fileFilter; }; - long GetFlags() const { return m_flags; }; + wxString GetFileFilter() const { return m_fileFilter; } + long GetFlags() const { return m_flags; } virtual wxString GetViewName() const { return m_viewTypeName; } virtual wxString GetDocumentName() const { return m_docTypeName; } - void SetFileFilter(const wxString& filter) { m_fileFilter = filter; }; - void SetDirectory(const wxString& dir) { m_directory = dir; }; - void SetDescription(const wxString& descr) { m_description = descr; }; - void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; }; - void SetFlags(long flags) { m_flags = flags; }; + void SetFileFilter(const wxString& filter) { m_fileFilter = filter; } + void SetDirectory(const wxString& dir) { m_directory = dir; } + void SetDescription(const wxString& descr) { m_description = descr; } + void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; } + void SetFlags(long flags) { m_flags = flags; } bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); } diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index d94afc572e..e0b9d4f730 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -472,7 +472,7 @@ public: \ const_reverse_iterator rbegin() const; \ reverse_iterator rend() { return reverse_iterator(begin() - 1); } \ const_reverse_iterator rend() const; \ - void reserve(size_type n) { base::reserve(n); }; \ + void reserve(size_type n) { base::reserve(n); } \ void resize(size_type n, value_type v = value_type()) \ { base::resize(n, v); } \ } diff --git a/include/wx/event.h b/include/wx/event.h index 4e84b4958a..ae07baef49 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -353,7 +353,7 @@ public: // to allow the event processing by the base classes (calling event.Skip() // is the analog of calling the base class version of a virtual function) void Skip(bool skip = true) { m_skipped = skip; } - bool GetSkipped() const { return m_skipped; }; + bool GetSkipped() const { return m_skipped; } // this function is used to create a copy of the event polymorphically and // all derived classes must implement it because otherwise wxPostEvent() @@ -1728,7 +1728,7 @@ public: virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); } - wxWindow* GetCapturedWindow() const { return m_gainedCapture; }; + wxWindow* GetCapturedWindow() const { return m_gainedCapture; } private: wxWindow* m_gainedCapture; diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h index b2ffb7e536..5b355df4d1 100644 --- a/include/wx/generic/laywin.h +++ b/include/wx/generic/laywin.h @@ -165,11 +165,11 @@ public: const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow")); // Accessors - inline wxLayoutAlignment GetAlignment() const { return m_alignment; }; - inline wxLayoutOrientation GetOrientation() const { return m_orientation; }; + inline wxLayoutAlignment GetAlignment() const { return m_alignment; } + inline wxLayoutOrientation GetOrientation() const { return m_orientation; } - inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }; - inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }; + inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; } + inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; } // Give the window default dimensions inline void SetDefaultSize(const wxSize& size) { m_defaultSize = size; } diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index db76b8e309..81b683af75 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -97,7 +97,7 @@ public: } // Gets the split mode - wxSplitMode GetSplitMode() const { return m_splitMode; }; + wxSplitMode GetSplitMode() const { return m_splitMode; } // Initialize with one window void Initialize(wxWindow *window); diff --git a/include/wx/hash.h b/include/wx/hash.h index 19ca8f06eb..890213f021 100644 --- a/include/wx/hash.h +++ b/include/wx/hash.h @@ -153,7 +153,7 @@ public: typedef wxHashTableBase_Node Node; wxHashTableBase(); - virtual ~wxHashTableBase() { }; + virtual ~wxHashTableBase() { } void Create( wxKeyType keyType = wxKEY_INTEGER, size_t size = wxHASH_SIZE_DEFAULT ); diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 7f7cc6a97f..4d046de57f 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -271,9 +271,9 @@ public: \ const_iterator end() const { return const_iterator( 0, this ); } \ iterator end() { return iterator( 0, this ); } \ const_iterator begin() const \ - { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \ + { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \ iterator begin() \ - { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \ + { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \ \ size_type erase( const const_key_type& key ) \ { \ diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h index 613a87477c..614ccae69d 100644 --- a/include/wx/helpbase.h +++ b/include/wx/helpbase.h @@ -57,7 +57,7 @@ public: virtual bool DisplaySection(int sectionNo) = 0; // Display the section using a context id - virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; }; + virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; } // Display the text in a popup, if possible virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return false; } diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h index 832224824c..b696182d30 100644 --- a/include/wx/html/helpdlg.h +++ b/include/wx/html/helpdlg.h @@ -66,7 +66,7 @@ public: void SetTitleFormat(const wxString& format); // Override to add custom buttons to the toolbar - virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}; + virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {} protected: void Init(wxHtmlHelpData* data = NULL); diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index 4c53f11e40..71735a83ac 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -105,7 +105,7 @@ public: void AddGrabIfNeeded(); // Override to add custom buttons to the toolbar - virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}; + virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {} // we don't want to prevent the app from closing just because a help window // remains opened diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 125183e0b0..c5d6f337dd 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -230,7 +230,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler public: wxHtmlWinTagHandler() : wxHtmlTagHandler() {} - virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}; + virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index cdffc2278b..4e20146d70 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -49,7 +49,7 @@ public: m_extension = _T("bmp"); m_type = wxBITMAP_TYPE_BMP; m_mime = _T("image/x-bmp"); - }; + } #if wxUSE_STREAMS virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); @@ -83,7 +83,7 @@ public: m_extension = _T("ico"); m_type = wxBITMAP_TYPE_ICO; m_mime = _T("image/x-ico"); - }; + } #if wxUSE_STREAMS virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); @@ -112,7 +112,7 @@ public: m_extension = _T("cur"); m_type = wxBITMAP_TYPE_CUR; m_mime = _T("image/x-cur"); - }; + } // VS: This handler's meat is implemented inside wxICOHandler (the two // formats are almost identical), but we hide this fact at @@ -139,11 +139,11 @@ public: m_extension = _T("ani"); m_type = wxBITMAP_TYPE_ANI; m_mime = _T("image/x-ani"); - }; + } #if wxUSE_STREAMS - virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;}; + virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;} virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); virtual int GetImageCount( wxInputStream& stream ); protected: diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index 45f61b66f4..d5c41a52b8 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -73,28 +73,28 @@ public: wxChar *WXUNUSED(data), int WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) - { return false; }; + { return false; } virtual wxChar *OnRequest ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), int *WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) - { return (wxChar *) NULL; }; + { return (wxChar *) NULL; } virtual bool OnPoke ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), int WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) - { return false; }; + { return false; } virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) - { return false; }; + { return false; } virtual bool OnStopAdvise ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) - { return false; }; + { return false; } // Callbacks to CLIENT - override at will virtual bool OnAdvise ( const wxString& WXUNUSED(topic), @@ -102,7 +102,7 @@ public: wxChar *WXUNUSED(data), int WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) - { return false; }; + { return false; } // Callbacks to BOTH - override at will // Default behaviour is to delete connection and return true diff --git a/include/wx/matrix.h b/include/wx/matrix.h index fbdfae5308..465846e8d9 100644 --- a/include/wx/matrix.h +++ b/include/wx/matrix.h @@ -94,7 +94,7 @@ public: // Is the matrix the identity matrix? // Only returns a flag, which is set whenever an operation // is done. - inline bool IsIdentity(void) const { return m_isIdentity; }; + inline bool IsIdentity(void) const { return m_isIdentity; } // This does an actual check. inline bool IsIdentity1(void) const ; diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 0faf3d086e..c3854f50b8 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -56,7 +56,7 @@ public: bool operator != (const wxColour& colour) const { return !(*this == colour); } - WXCOLORREF GetPixel() const { return m_pixel; }; + WXCOLORREF GetPixel() const { return m_pixel; } public: diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index e5b8dc9b9f..a2e56f7159 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -59,8 +59,8 @@ public: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); // For ownerdraw items - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }; - virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }; + virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; } + virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; } const wxArrayLong& GetSubcontrols() const { return m_subControls; } diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index caff90d67d..7b2e01632b 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -70,9 +70,9 @@ public: // TODO: should this go into a wxFrameworkSettings class perhaps? static void UseNativeStatusBar(bool useNative) - { m_useNativeStatusBar = useNative; }; + { m_useNativeStatusBar = useNative; } static bool UsesNativeStatusBar() - { return m_useNativeStatusBar; }; + { return m_useNativeStatusBar; } #endif // wxUSE_STATUSBAR #if wxUSE_MENUS diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 3a45a535aa..cd0b21b28d 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -62,7 +62,7 @@ public: virtual wxMDIClientWindow *OnCreateClient(void); // MDI windows menu - wxMenu* GetWindowMenu() const { return m_windowMenu; }; + wxMenu* GetWindowMenu() const { return m_windowMenu; } void SetWindowMenu(wxMenu* menu) ; virtual void DoMenuUpdates(wxMenu* menu = NULL); diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h index e81b0e9096..dea726397b 100644 --- a/include/wx/msw/ole/automtn.h +++ b/include/wx/msw/ole/automtn.h @@ -38,7 +38,7 @@ public: virtual ~wxAutomationObject(); // Set/get dispatch pointer - inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }; + inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; } inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; } // Get a dispatch pointer from the current object associated diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 46795c86e4..e65781c7a4 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -201,7 +201,7 @@ public: wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; // MSW only: true if this control is part of the main control - virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }; + virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; } #if wxUSE_TOOLTIPS // MSW only: true if this window or any of its children have a tooltip diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h index 03a1a6ba69..01336376e0 100644 --- a/include/wx/protocol/ftp.h +++ b/include/wx/protocol/ftp.h @@ -47,7 +47,7 @@ public: // Parameters set up // set transfer mode now - void SetPassive(bool pasv) { m_bPassive = pasv; }; + void SetPassive(bool pasv) { m_bPassive = pasv; } void SetDefaultTimeout(wxUint32 Value); bool SetBinary() { return SetTransferMode(BINARY); } bool SetAscii() { return SetTransferMode(ASCII); } diff --git a/include/wx/socket.h b/include/wx/socket.h index ee2578f3c2..3c61361a56 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -109,11 +109,11 @@ public: // state inline bool Ok() const { return IsOk(); } - inline bool IsOk() const { return (m_socket != NULL); }; - inline bool Error() const { return m_error; }; - inline bool IsConnected() const { return m_connected; }; - inline bool IsData() { return WaitForRead(0, 0); }; - inline bool IsDisconnected() const { return !IsConnected(); }; + inline bool IsOk() const { return (m_socket != NULL); } + inline bool Error() const { return m_error; } + inline bool IsConnected() const { return m_connected; } + inline bool IsData() { return WaitForRead(0, 0); } + inline bool IsDisconnected() const { return !IsConnected(); } inline wxUint32 LastCount() const { return m_lcount; } inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); } void SaveState(); @@ -134,7 +134,7 @@ public: wxSocketBase& Write(const void *buffer, wxUint32 nbytes); wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes); - void InterruptWait() { m_interrupt = true; }; + void InterruptWait() { m_interrupt = true; } bool Wait(long seconds = -1, long milliseconds = 0); bool WaitForRead(long seconds = -1, long milliseconds = 0); bool WaitForWrite(long seconds = -1, long milliseconds = 0); @@ -146,7 +146,7 @@ public: bool GetOption(int level, int optname, void *optval, int *optlen); bool SetOption(int level, int optname, const void *optval, int optlen); - inline wxUint32 GetLastIOSize() const { return m_lcount; }; + inline wxUint32 GetLastIOSize() const { return m_lcount; } // event handling void *GetClientData() const { return m_clientData; } diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 50cc2bc217..fb221036f6 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -415,14 +415,14 @@ public: // get/set the size of the bitmaps used by the toolbar: should be called // before adding any tools to the toolbar virtual void SetToolBitmapSize(const wxSize& size) - { m_defaultWidth = size.x; m_defaultHeight = size.y; }; + { m_defaultWidth = size.x; m_defaultHeight = size.y; } virtual wxSize GetToolBitmapSize() const { return wxSize(m_defaultWidth, m_defaultHeight); } // the button size in some implementations is bigger than the bitmap size: // get the total button size (by default the same as bitmap size) virtual wxSize GetToolSize() const - { return GetToolBitmapSize(); } ; + { return GetToolBitmapSize(); } // returns a (non separator) tool containing the point (x, y) or NULL if // there is no tool at this point (corrdinates are client) diff --git a/include/wx/unichar.h b/include/wx/unichar.h index fc664c031f..71e4426eae 100644 --- a/include/wx/unichar.h +++ b/include/wx/unichar.h @@ -279,7 +279,7 @@ wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE) #ifdef wxWINT_T_IS_SEPARATE_TYPE -wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE) +//wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE) wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE) #endif diff --git a/include/wx/validate.h b/include/wx/validate.h index f45efe1376..b80ca09b8e 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -50,13 +50,13 @@ public: // Called when the value in the window must be validated. // This function can pop up an error message. - virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; }; + virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; } // Called to transfer data to the window virtual bool TransferToWindow() { return false; } // Called to transfer data from the window - virtual bool TransferFromWindow() { return false; }; + virtual bool TransferFromWindow() { return false; } // accessors wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; } diff --git a/include/wx/vector.h b/include/wx/vector.h index 8ffc4a74f1..f8aa5625eb 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -155,7 +155,7 @@ public:\ #define _WX_DECLARE_VECTOR(obj, cls, exp)\ class exp cls : public wxVectorBase\ {\ - WX_DECLARE_VECTORBASE(obj, cls);\ + WX_DECLARE_VECTORBASE(obj, cls)\ public:\ void push_back(const obj& o)\ {\ diff --git a/include/wx/window.h b/include/wx/window.h index 4c62a7d035..eaffc6b4d3 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1125,7 +1125,7 @@ public: void SetAccessible(wxAccessible* accessible) ; // Returns the accessible object. - wxAccessible* GetAccessible() { return m_accessible; }; + wxAccessible* GetAccessible() { return m_accessible; } // Returns the accessible object, creating if necessary. wxAccessible* GetOrCreateAccessible() ; diff --git a/src/common/image.cpp b/src/common/image.cpp index 8d34124727..9436fdd28e 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -3089,8 +3089,8 @@ class wxImageModule: public wxModule DECLARE_DYNAMIC_CLASS(wxImageModule) public: wxImageModule() {} - bool OnInit() { wxImage::InitStandardHandlers(); return true; }; - void OnExit() { wxImage::CleanUpHandlers(); }; + bool OnInit() { wxImage::InitStandardHandlers(); return true; } + void OnExit() { wxImage::CleanUpHandlers(); } }; IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule) diff --git a/src/common/variant.cpp b/src/common/variant.cpp index fcff39ff5f..a1a29380cb 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -226,7 +226,7 @@ public: virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("long"); }; + virtual wxString GetType() const { return wxT("long"); } protected: long m_value; @@ -377,7 +377,7 @@ public: virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("double"); }; + virtual wxString GetType() const { return wxT("double"); } protected: double m_value; @@ -517,7 +517,7 @@ public: virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("bool"); }; + virtual wxString GetType() const { return wxT("bool"); } protected: bool m_value; @@ -658,7 +658,7 @@ public: virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("char"); }; + virtual wxString GetType() const { return wxT("char"); } protected: wxChar m_value; @@ -793,13 +793,13 @@ public: virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }; + virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; } #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS - virtual wxString GetType() const { return wxT("string"); }; + virtual wxString GetType() const { return wxT("string"); } protected: wxString m_value; @@ -1066,7 +1066,7 @@ public: virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("void*"); }; + virtual wxString GetType() const { return wxT("void*"); } virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } protected: @@ -1190,7 +1190,7 @@ public: virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("datetime"); }; + virtual wxString GetType() const { return wxT("datetime"); } virtual wxVariantData* Clone() { return new wxVariantDataDateTime; } protected: @@ -1356,7 +1356,7 @@ public: virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("arrstring"); }; + virtual wxString GetType() const { return wxT("arrstring"); } virtual wxVariantData* Clone() { return new wxVariantDataArrayString; } protected: @@ -1485,7 +1485,7 @@ public: virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("list"); }; + virtual wxString GetType() const { return wxT("list"); } void Clear(); diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index a2bb840349..d860f2d487 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -255,8 +255,8 @@ class wxAnimationModule: public wxModule DECLARE_DYNAMIC_CLASS(wxAnimationModule) public: wxAnimationModule() {} - bool OnInit() { wxAnimation::InitStandardHandlers(); return true; }; - void OnExit() { wxAnimation::CleanUpHandlers(); }; + bool OnInit() { wxAnimation::InitStandardHandlers(); return true; } + void OnExit() { wxAnimation::CleanUpHandlers(); } }; IMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 860e2394c6..e8da85b5c4 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -332,7 +332,7 @@ public: bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); - bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }; + bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); } bool IsEmpty() { return GetRowCount() == 0; } int GetCountPerPage() const; diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 2991a11d95..38348c5543 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -671,8 +671,8 @@ class wxGenericRendererModule: public wxModule DECLARE_DYNAMIC_CLASS(wxGenericRendererModule) public: wxGenericRendererModule() {} - bool OnInit() { return true; }; - void OnExit() { wxRendererGeneric::Cleanup(); }; + bool OnInit() { return true; } + void OnExit() { wxRendererGeneric::Cleanup(); } }; IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule) diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 344d9105c3..3828683e73 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -214,7 +214,7 @@ public: wxOnceOnlyDLLLoader(const wxChar *dllName) : m_dllName(dllName) { - }; + } // return the symbol with the given name or NULL if the DLL not loaded diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index f5a5554c9e..12870a32fa 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -205,7 +205,7 @@ public: { if (attr) delete attr; - }; + } DECLARE_NO_COPY_CLASS(wxListItemInternalData) }; diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 920ac7f9fd..0a9b63e3eb 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -205,94 +205,94 @@ protected: bool m_ok; public: - wxDL_VOIDMETHOD_DEFINE( StartMovie, (Movie m), (m) ); - wxDL_VOIDMETHOD_DEFINE( StopMovie, (Movie m), (m) ); - wxDL_METHOD_DEFINE( bool, IsMovieDone, (Movie m), (m), false); - wxDL_VOIDMETHOD_DEFINE( GoToBeginningOfMovie, (Movie m), (m) ); - wxDL_METHOD_DEFINE( OSErr, GetMoviesError, (), (), -1); - wxDL_METHOD_DEFINE( OSErr, EnterMovies, (), (), -1); - wxDL_VOIDMETHOD_DEFINE( ExitMovies, (), () ); - wxDL_METHOD_DEFINE( OSErr, InitializeQTML, (long flags), (flags), -1); - wxDL_VOIDMETHOD_DEFINE( TerminateQTML, (), () ); + wxDL_VOIDMETHOD_DEFINE( StartMovie, (Movie m), (m) ) + wxDL_VOIDMETHOD_DEFINE( StopMovie, (Movie m), (m) ) + wxDL_METHOD_DEFINE( bool, IsMovieDone, (Movie m), (m), false) + wxDL_VOIDMETHOD_DEFINE( GoToBeginningOfMovie, (Movie m), (m) ) + wxDL_METHOD_DEFINE( OSErr, GetMoviesError, (), (), -1) + wxDL_METHOD_DEFINE( OSErr, EnterMovies, (), (), -1) + wxDL_VOIDMETHOD_DEFINE( ExitMovies, (), () ) + wxDL_METHOD_DEFINE( OSErr, InitializeQTML, (long flags), (flags), -1) + wxDL_VOIDMETHOD_DEFINE( TerminateQTML, (), () ) wxDL_METHOD_DEFINE( OSErr, NativePathNameToFSSpec, (char* inName, FSSpec* outFile, long flags), - (inName, outFile, flags), -1); + (inName, outFile, flags), -1) wxDL_METHOD_DEFINE( OSErr, OpenMovieFile, (const FSSpec * fileSpec, short * resRefNum, wxInt8 permission), - (fileSpec, resRefNum, permission), -1 ); + (fileSpec, resRefNum, permission), -1 ) wxDL_METHOD_DEFINE( OSErr, CloseMovieFile, - (short resRefNum), (resRefNum), -1); + (short resRefNum), (resRefNum), -1) wxDL_METHOD_DEFINE( OSErr, NewMovieFromFile, (Movie * theMovie, short resRefNum, short * resId, StringPtr resName, short newMovieFlags, bool * dataRefWasChanged), (theMovie, resRefNum, resId, resName, newMovieFlags, - dataRefWasChanged), -1); + dataRefWasChanged), -1) - wxDL_VOIDMETHOD_DEFINE( SetMovieRate, (Movie m, Fixed rate), (m, rate) ); - wxDL_METHOD_DEFINE( Fixed, GetMovieRate, (Movie m), (m), 0); - wxDL_VOIDMETHOD_DEFINE( MoviesTask, (Movie m, long maxms), (m, maxms) ); + wxDL_VOIDMETHOD_DEFINE( SetMovieRate, (Movie m, Fixed rate), (m, rate) ) + wxDL_METHOD_DEFINE( Fixed, GetMovieRate, (Movie m), (m), 0) + wxDL_VOIDMETHOD_DEFINE( MoviesTask, (Movie m, long maxms), (m, maxms) ) wxDL_VOIDMETHOD_DEFINE( BlockMove, - (const char* p1, const char* p2, long s), (p1,p2,s) ); - wxDL_METHOD_DEFINE( Handle, NewHandleClear, (long s), (s), NULL ); + (const char* p1, const char* p2, long s), (p1,p2,s) ) + wxDL_METHOD_DEFINE( Handle, NewHandleClear, (long s), (s), NULL ) wxDL_METHOD_DEFINE( OSErr, NewMovieFromDataRef, (Movie * m, short flags, short * id, Handle dataRef, OSType dataRefType), - (m,flags,id,dataRef,dataRefType), -1 ); + (m,flags,id,dataRef,dataRefType), -1 ) - wxDL_VOIDMETHOD_DEFINE( DisposeHandle, (Handle h), (h) ); - wxDL_VOIDMETHOD_DEFINE( GetMovieNaturalBoundsRect, (Movie m, Rect* r), (m,r) ); + wxDL_VOIDMETHOD_DEFINE( DisposeHandle, (Handle h), (h) ) + wxDL_VOIDMETHOD_DEFINE( GetMovieNaturalBoundsRect, (Movie m, Rect* r), (m,r) ) wxDL_METHOD_DEFINE( void*, GetMovieIndTrackType, (Movie m, long index, OSType type, long flags), - (m,index,type,flags), NULL ); + (m,index,type,flags), NULL ) wxDL_VOIDMETHOD_DEFINE( CreatePortAssociation, - (void* hWnd, void* junk, long morejunk), (hWnd, junk, morejunk) ); - wxDL_METHOD_DEFINE(void*, GetNativeWindowPort, (void* hWnd), (hWnd), NULL); + (void* hWnd, void* junk, long morejunk), (hWnd, junk, morejunk) ) + wxDL_METHOD_DEFINE(void*, GetNativeWindowPort, (void* hWnd), (hWnd), NULL) wxDL_VOIDMETHOD_DEFINE(SetMovieGWorld, (Movie m, CGrafPtr port, void* whatever), - (m, port, whatever) ); - wxDL_VOIDMETHOD_DEFINE(DisposeMovie, (Movie m), (m) ); - wxDL_VOIDMETHOD_DEFINE(SetMovieBox, (Movie m, Rect* r), (m,r)); - wxDL_VOIDMETHOD_DEFINE(SetMovieTimeScale, (Movie m, long s), (m,s)); - wxDL_METHOD_DEFINE(long, GetMovieDuration, (Movie m), (m), 0); - wxDL_METHOD_DEFINE(TimeBase, GetMovieTimeBase, (Movie m), (m), 0); - wxDL_METHOD_DEFINE(TimeScale, GetMovieTimeScale, (Movie m), (m), 0); - wxDL_METHOD_DEFINE(long, GetMovieTime, (Movie m, void* cruft), (m,cruft), 0); - wxDL_VOIDMETHOD_DEFINE(SetMovieTime, (Movie m, TimeRecord* tr), (m,tr) ); - wxDL_METHOD_DEFINE(short, GetMovieVolume, (Movie m), (m), 0); - wxDL_VOIDMETHOD_DEFINE(SetMovieVolume, (Movie m, short sVolume), (m,sVolume) ); - wxDL_VOIDMETHOD_DEFINE(SetMovieTimeValue, (Movie m, long s), (m,s)); - wxDL_METHOD_DEFINE(ComponentInstance, NewMovieController, (Movie m, const Rect* mr, long fl), (m,mr,fl), 0); - wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci)); - wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0); - - wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) ); - wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) ); - wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0); - wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0); - wxDL_METHOD_DEFINE(void*, NewRoutineDescriptor, (WXFARPROC f, int l, void* junk), (f, l, junk), 0); - wxDL_VOIDMETHOD_DEFINE(DisposeRoutineDescriptor, (void* f), (f)); - wxDL_METHOD_DEFINE(void*, GetCurrentArchitecture, (), (), 0); - wxDL_METHOD_DEFINE(int, MCDoAction, (ComponentInstance ci, long f, void* p), (ci,f,p), 0); - wxDL_VOIDMETHOD_DEFINE(MCSetControllerBoundsRect, (ComponentInstance ci, Rect* r), (ci,r)); - wxDL_VOIDMETHOD_DEFINE(DestroyPortAssociation, (CGrafPtr g), (g)); - wxDL_VOIDMETHOD_DEFINE(NativeEventToMacEvent, (MSG* p1, EventRecord* p2), (p1,p2)); - wxDL_VOIDMETHOD_DEFINE(MCIsPlayerEvent, (ComponentInstance ci, EventRecord* p2), (ci, p2)); + (m, port, whatever) ) + wxDL_VOIDMETHOD_DEFINE(DisposeMovie, (Movie m), (m) ) + wxDL_VOIDMETHOD_DEFINE(SetMovieBox, (Movie m, Rect* r), (m,r)) + wxDL_VOIDMETHOD_DEFINE(SetMovieTimeScale, (Movie m, long s), (m,s)) + wxDL_METHOD_DEFINE(long, GetMovieDuration, (Movie m), (m), 0) + wxDL_METHOD_DEFINE(TimeBase, GetMovieTimeBase, (Movie m), (m), 0) + wxDL_METHOD_DEFINE(TimeScale, GetMovieTimeScale, (Movie m), (m), 0) + wxDL_METHOD_DEFINE(long, GetMovieTime, (Movie m, void* cruft), (m,cruft), 0) + wxDL_VOIDMETHOD_DEFINE(SetMovieTime, (Movie m, TimeRecord* tr), (m,tr) ) + wxDL_METHOD_DEFINE(short, GetMovieVolume, (Movie m), (m), 0) + wxDL_VOIDMETHOD_DEFINE(SetMovieVolume, (Movie m, short sVolume), (m,sVolume) ) + wxDL_VOIDMETHOD_DEFINE(SetMovieTimeValue, (Movie m, long s), (m,s)) + wxDL_METHOD_DEFINE(ComponentInstance, NewMovieController, (Movie m, const Rect* mr, long fl), (m,mr,fl), 0) + wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci)) + wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0) + + wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) ) + wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) ) + wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0) + wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0) + wxDL_METHOD_DEFINE(void*, NewRoutineDescriptor, (WXFARPROC f, int l, void* junk), (f, l, junk), 0) + wxDL_VOIDMETHOD_DEFINE(DisposeRoutineDescriptor, (void* f), (f)) + wxDL_METHOD_DEFINE(void*, GetCurrentArchitecture, (), (), 0) + wxDL_METHOD_DEFINE(int, MCDoAction, (ComponentInstance ci, long f, void* p), (ci,f,p), 0) + wxDL_VOIDMETHOD_DEFINE(MCSetControllerBoundsRect, (ComponentInstance ci, Rect* r), (ci,r)) + wxDL_VOIDMETHOD_DEFINE(DestroyPortAssociation, (CGrafPtr g), (g)) + wxDL_VOIDMETHOD_DEFINE(NativeEventToMacEvent, (MSG* p1, EventRecord* p2), (p1,p2)) + wxDL_VOIDMETHOD_DEFINE(MCIsPlayerEvent, (ComponentInstance ci, EventRecord* p2), (ci, p2)) wxDL_METHOD_DEFINE(int, MCSetMovie, (ComponentInstance ci, Movie m, void* p1, Point w), - (ci,m,p1,w),0); + (ci,m,p1,w),0) wxDL_VOIDMETHOD_DEFINE(MCPositionController, - (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk)); + (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk)) wxDL_VOIDMETHOD_DEFINE(MCSetActionFilterWithRefCon, - (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref)); - wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags)); - wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port)); - wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m)); - wxDL_VOIDMETHOD_DEFINE(EndUpdate, (CGrafPtr port), (port)); - wxDL_METHOD_DEFINE( OSErr, GetMoviesStickyError, (), (), -1); + (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref)) + wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags)) + wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port)) + wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m)) + wxDL_VOIDMETHOD_DEFINE(EndUpdate, (CGrafPtr port), (port)) + wxDL_METHOD_DEFINE( OSErr, GetMoviesStickyError, (), (), -1) }; bool wxQuickTimeLibrary::Initialize() diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 0d5c841090..929beded15 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -6641,7 +6641,7 @@ public: } return CallNextHookEx(ms_hMsgHookProc, nCode, wParam, lParam); - }; + } private: static HHOOK ms_hMsgHookProc; diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 4b78f06808..1395c7bd76 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -5905,7 +5905,7 @@ public: wxRichTextBuffer::InitStandardHandlers(); wxRichTextParagraph::InitDefaultTabs(); return true; - }; + } void OnExit() { wxRichTextBuffer::CleanUpHandlers(); @@ -5913,7 +5913,7 @@ public: wxRichTextParagraph::ClearDefaultTabs(); wxRichTextCtrl::ClearAvailableFontNames(); wxRichTextBuffer::SetRenderer(NULL); - }; + } }; IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule) diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index 07307f53bb..501b5b9127 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -379,8 +379,8 @@ class wxRichTextFormattingDialogModule: public wxModule DECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule) public: wxRichTextFormattingDialogModule() {} - bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; }; - void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); }; + bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; } + void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); } }; IMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule) diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h index 9dafa9f7d6..679294cad7 100644 --- a/src/stc/scintilla/include/Platform.h +++ b/src/stc/scintilla/include/Platform.h @@ -302,8 +302,8 @@ private: Surface(const Surface &) {} Surface &operator=(const Surface &) { return *this; } public: - Surface() {}; - virtual ~Surface() {}; + Surface() {} + virtual ~Surface() {} static Surface *Allocate(); virtual void Init(WindowID wid)=0; @@ -443,7 +443,7 @@ public: */ class DynamicLibrary { public: - virtual ~DynamicLibrary() {}; + virtual ~DynamicLibrary() {} /// @return Pointer to function "name", or NULL on failure. virtual Function FindFunction(const char *name) = 0; diff --git a/src/stc/scintilla/include/WindowAccessor.h b/src/stc/scintilla/include/WindowAccessor.h index 6c16b150f2..3d59cd1531 100644 --- a/src/stc/scintilla/include/WindowAccessor.h +++ b/src/stc/scintilla/include/WindowAccessor.h @@ -48,7 +48,7 @@ public: } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); diff --git a/src/stc/scintilla/src/Document.h b/src/stc/scintilla/src/Document.h index d774d5664e..15ba096b8a 100644 --- a/src/stc/scintilla/src/Document.h +++ b/src/stc/scintilla/src/Document.h @@ -28,10 +28,10 @@ public: Range(Position pos=0) : start(pos), end(pos) { - }; + } Range(Position start_, Position end_) : start(start_), end(end_) { - }; + } bool Valid() const { return (start != invalidPosition) && (end != invalidPosition); diff --git a/src/stc/scintilla/src/DocumentAccessor.h b/src/stc/scintilla/src/DocumentAccessor.h index 7406520452..0b94978c2d 100644 --- a/src/stc/scintilla/src/DocumentAccessor.h +++ b/src/stc/scintilla/src/DocumentAccessor.h @@ -58,7 +58,7 @@ public: WindowID GetWindow() { return id; } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); diff --git a/src/stc/scintilla/src/ExternalLexer.h b/src/stc/scintilla/src/ExternalLexer.h index 6308fc28be..1a595ff513 100644 --- a/src/stc/scintilla/src/ExternalLexer.h +++ b/src/stc/scintilla/src/ExternalLexer.h @@ -37,7 +37,7 @@ public: const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_){ strncpy(name, languageName_, sizeof(name)); languageName = name; - }; + } virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const; virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle, diff --git a/src/stc/scintilla/src/Style.h b/src/stc/scintilla/src/Style.h index c0f7eca266..91f0bdb62e 100644 --- a/src/stc/scintilla/src/Style.h +++ b/src/stc/scintilla/src/Style.h @@ -50,7 +50,7 @@ public: void ClearTo(const Style &source); bool EquivalentFontTo(const Style *other) const; void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, bool extraFontFlag = false); - bool IsProtected() const { return !(changeable && visible);}; + bool IsProtected() const { return !(changeable && visible);} }; #endif -- 2.45.2