From 6fb99eb3b7063388672255335abf7a34405f51bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 13 Oct 2004 14:04:19 +0000 Subject: [PATCH] Semicolon fixes according to Vadim's note about being danger (OW,BCC,MinGW,DMC tested). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/access.h | 4 ++-- include/wx/clntdata.h | 2 +- include/wx/docview.h | 2 +- include/wx/dynload.h | 2 +- include/wx/generic/dirctrlg.h | 2 +- include/wx/generic/gridctrl.h | 2 +- include/wx/generic/splash.h | 2 +- include/wx/html/helpctrl.h | 2 +- include/wx/html/winpars.h | 4 ++-- include/wx/ipcbase.h | 6 +++--- include/wx/log.h | 2 +- include/wx/msw/fontenum.h | 2 +- include/wx/msw/helpwin.h | 4 ++-- include/wx/msw/radiobox.h | 2 +- include/wx/msw/regconf.h | 2 +- include/wx/variant.h | 2 +- include/wx/window.h | 10 +++++----- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/wx/access.h b/include/wx/access.h index e5b99406c8..4d320fef47 100644 --- a/include/wx/access.h +++ b/include/wx/access.h @@ -233,8 +233,8 @@ class WXDLLEXPORT wxAccessibleBase : public wxObject DECLARE_NO_COPY_CLASS(wxAccessibleBase) public: - wxAccessibleBase(wxWindow* win): m_window(win) {}; - virtual ~wxAccessibleBase() {}; + wxAccessibleBase(wxWindow* win): m_window(win) {} + virtual ~wxAccessibleBase() {} // Overridables diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h index 1fc54ba6a4..83cdd0cf4b 100644 --- a/include/wx/clntdata.h +++ b/include/wx/clntdata.h @@ -117,7 +117,7 @@ WX_DECLARE_VECTOR(wxClientDataDictionaryPair,wxClientDataDictionaryPairVector); class WXDLLIMPEXP_BASE wxClientDataDictionary { public: - wxClientDataDictionary() {}; + wxClientDataDictionary() {} // deletes all the data void DestroyData() diff --git a/include/wx/docview.h b/include/wx/docview.h index 2ea29e2bf9..96eeeb8b83 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -193,7 +193,7 @@ public: virtual void OnDraw(wxDC *dc) = 0; virtual void OnPrint(wxDC *dc, wxObject *info); virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL); - virtual void OnClosingDocument() {}; + virtual void OnClosingDocument() {} virtual void OnChangeFilename(); // Called by framework if created automatically by the default document diff --git a/include/wx/dynload.h b/include/wx/dynload.h index 2c80bede4f..6223cc385b 100644 --- a/include/wx/dynload.h +++ b/include/wx/dynload.h @@ -121,7 +121,7 @@ public: // Instance methods. - wxPluginManager() : m_entry(NULL) {}; + wxPluginManager() : m_entry(NULL) {} wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT) { Load(libname, flags); diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h index d9680ecaea..4edf3f18cc 100644 --- a/include/wx/generic/dirctrlg.h +++ b/include/wx/generic/dirctrlg.h @@ -222,7 +222,7 @@ public: void Init(); - ~wxDirFilterListCtrl() {}; + ~wxDirFilterListCtrl() {} //// Operations void FillFilterList(const wxString& filter, int defaultFilter); diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 3a717e2fd8..ddcc1bc69d 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -101,7 +101,7 @@ class WXDLLIMPEXP_ADV wxGridCellEnumEditor : public wxGridCellChoiceEditor { public: wxGridCellEnumEditor( const wxString& choices = wxEmptyString ); - virtual ~wxGridCellEnumEditor() {}; + virtual ~wxGridCellEnumEditor() {} virtual wxGridCellEditor* Clone() const; diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h index 498eee8eec..c073c52436 100644 --- a/include/wx/generic/splash.h +++ b/include/wx/generic/splash.h @@ -44,7 +44,7 @@ class WXDLLIMPEXP_ADV wxSplashScreen: public wxFrame { public: // for RTTI macros only - wxSplashScreen() {}; + wxSplashScreen() {} wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index 8514d2e705..bb7e1e2126 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -79,7 +79,7 @@ public: wxHtmlHelpData *GetHelpData() { return &m_helpData; } virtual bool Quit() ; - virtual void OnQuit() {}; + virtual void OnQuit() {} void OnCloseFrame(wxCloseEvent& evt); diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 1ebf7092fa..9185b51423 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -211,7 +211,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler) public: - wxHtmlWinTagHandler() : wxHtmlTagHandler() {}; + wxHtmlWinTagHandler() : wxHtmlTagHandler() {} virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}; @@ -239,7 +239,7 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule) public: - wxHtmlTagsModule() : wxModule() {}; + wxHtmlTagsModule() : wxModule() {} virtual bool OnInit(); virtual void OnExit(); diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index 11a7fae78d..04f023f783 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -135,7 +135,7 @@ class WXDLLIMPEXP_BASE wxServerBase: public wxObject public: inline wxServerBase(void) {} - inline ~wxServerBase(void) {}; + inline ~wxServerBase(void) {} // Returns false on error (e.g. port number is already in use) virtual bool Create(const wxString& serverName) = 0; @@ -149,8 +149,8 @@ class WXDLLIMPEXP_BASE wxClientBase: public wxObject DECLARE_CLASS(wxClientBase) public: - inline wxClientBase(void) {}; - inline ~wxClientBase(void) {}; + inline wxClientBase(void) {} + inline ~wxClientBase(void) {} virtual bool ValidHost(const wxString& host) = 0; diff --git a/include/wx/log.h b/include/wx/log.h index 2bb8b30302..4ceeace557 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -123,7 +123,7 @@ class WXDLLIMPEXP_BASE wxLog { public: // ctor - wxLog(){}; + wxLog(){} // Internal buffer. diff --git a/include/wx/msw/fontenum.h b/include/wx/msw/fontenum.h index d8e1612279..e4d1d4cf50 100644 --- a/include/wx/msw/fontenum.h +++ b/include/wx/msw/fontenum.h @@ -24,7 +24,7 @@ class wxFontEnumerator: public wxObject { DECLARE_CLASS(wxFontEnumerator) public: - wxFontEnumerator() {}; + wxFontEnumerator() {} // Enumerate the fonts. bool Enumerate(); diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index 3d2e609b7d..dfcfcde018 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -27,8 +27,8 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase DECLARE_CLASS(wxWinHelpController) public: - wxWinHelpController() {}; - ~wxWinHelpController() {}; + wxWinHelpController() {} + ~wxWinHelpController() {} // Must call this to set the filename virtual bool Initialize(const wxString& file); diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index 4b2dc0b5fd..298850b905 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -93,7 +93,7 @@ public: virtual bool Show(bool show = true); void SetFocus(); virtual bool Enable(bool enable = true); - void SetLabelFont(const wxFont& WXUNUSED(font)) {}; + void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetButtonFont(const wxFont& font) { SetFont(font); } void Command(wxCommandEvent& event); diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h index d0d0172bd5..0e5d3f317d 100644 --- a/include/wx/msw/regconf.h +++ b/include/wx/msw/regconf.h @@ -39,7 +39,7 @@ public: long style = wxCONFIG_USE_GLOBAL_FILE); // dtor will save unsaved data - virtual ~wxRegConfig(){}; + virtual ~wxRegConfig(){} // implement inherited pure virtual functions // ------------------------------------------ diff --git a/include/wx/variant.h b/include/wx/variant.h index ed248edd92..3d3ad32484 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -52,7 +52,7 @@ DECLARE_ABSTRACT_CLASS(wxVariantData) public: // Construction & destruction - wxVariantData() {}; + wxVariantData() {} // Override these to provide common functionality // Copy to data diff --git a/include/wx/window.h b/include/wx/window.h index 7a20ca1615..f641fc3dca 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -368,7 +368,7 @@ public: { DoSetSizeHints(minW, minH, maxW, maxH, incW, incH); } - + void SetSizeHints( const wxSize& minSize, const wxSize& maxSize=wxDefaultSize, const wxSize& incSize=wxDefaultSize) @@ -377,7 +377,7 @@ public: maxSize.x, maxSize.y, incSize.x, incSize.y); } - + virtual void DoSetSizeHints(int minW, int minH, int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, int incW = wxDefaultCoord, int incH = wxDefaultCoord ); @@ -502,7 +502,7 @@ public: // return the window which currently has the focus or NULL static wxWindow *FindFocus(); - + static wxWindow *DoFindFocus() /* = 0: implement in derived classes */; // can this window have focus? @@ -1085,7 +1085,7 @@ protected: // returns the main window of composite control; this is the window // that FindFocus returns if the focus is in one of composite control's // windows - virtual wxWindow *GetMainWindowOfCompositeControl() + virtual wxWindow *GetMainWindowOfCompositeControl() { return (wxWindow*)this; } // the window id - a number which uniquely identifies a window among @@ -1412,7 +1412,7 @@ class WXDLLEXPORT wxWindowAccessible: public wxAccessible { public: wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); } - virtual ~wxWindowAccessible() {}; + virtual ~wxWindowAccessible() {} // Overridables -- 2.45.2