From 6dd0883d556cbed9d47b08c12682ef233717c097 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Thu, 29 Dec 2011 14:42:13 +0000 Subject: [PATCH] Do not put semicolons after the definition of an inline function. Even though most compilers just ignore this, it's just wrong and if you do get warnings about header files, they can become quite overwhelming. Forward port of r70163. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/dc.h | 6 +++--- include/wx/combobox.h | 4 ++-- include/wx/dataview.h | 2 +- include/wx/generic/tabg.h | 2 +- include/wx/glcanvas.h | 2 +- include/wx/gtk/bitmap.h | 2 +- include/wx/gtk/dc.h | 2 +- include/wx/gtk/filectrl.h | 2 +- include/wx/gtk/gauge.h | 4 ++-- include/wx/gtk/private/timer.h | 2 +- include/wx/gtk/toplevel.h | 2 +- include/wx/gtk1/bitmap.h | 2 +- include/wx/gtk1/dc.h | 2 +- include/wx/gtk1/gauge.h | 4 ++-- include/wx/gtk1/msgdlg.h | 2 +- include/wx/gtk1/toplevel.h | 2 +- include/wx/html/webkit.h | 4 ++-- include/wx/list.h | 2 +- include/wx/mdi.h | 2 +- include/wx/motif/colour.h | 4 ++-- include/wx/motif/combobox.h | 4 ++-- include/wx/motif/dnd.h | 6 +++--- include/wx/motif/spinbutt.h | 2 +- include/wx/msw/private/timer.h | 2 +- include/wx/msw/webview_ie.h | 2 +- include/wx/os2/checkbox.h | 2 +- include/wx/os2/colour.h | 2 +- include/wx/os2/control.h | 4 ++-- include/wx/os2/frame.h | 4 ++-- include/wx/os2/gauge.h | 2 +- include/wx/os2/gdiimage.h | 2 +- include/wx/os2/icon.h | 4 ++-- include/wx/os2/iniconf.h | 10 +++++----- include/wx/os2/joystick.h | 2 +- include/wx/os2/metafile.h | 2 +- include/wx/os2/pnghand.h | 2 +- include/wx/os2/pngread.h | 10 +++++----- include/wx/os2/radiobox.h | 2 +- include/wx/os2/sound.h | 2 +- include/wx/os2/statbmp.h | 2 +- include/wx/os2/treectrl.h | 2 +- include/wx/os2/window.h | 4 ++-- include/wx/osx/carbon/statbmp.h | 4 ++-- include/wx/osx/core/colour.h | 6 +++--- include/wx/osx/core/private.h | 6 +++--- include/wx/osx/joystick.h | 2 +- include/wx/osx/listctrl.h | 6 +++--- include/wx/osx/metafile.h | 2 +- include/wx/osx/pnghand.h | 2 +- include/wx/osx/pngread.h | 8 ++++---- include/wx/osx/statbox.h | 4 ++-- include/wx/osx/treectrl.h | 2 +- include/wx/palmos/glcanvas.h | 2 +- include/wx/palmos/mdi.h | 2 +- include/wx/palmos/pen.h | 16 ++++++++-------- include/wx/palmos/radiobox.h | 2 +- include/wx/palmos/sound.h | 2 +- include/wx/palmos/window.h | 2 +- include/wx/propgrid/property.h | 2 +- include/wx/rawbmp.h | 5 +++++ include/wx/richmsgdlg.h | 2 +- include/wx/taskbar.h | 2 +- include/wx/univ/anybutton.h | 2 +- include/wx/x11/bitmap.h | 2 +- include/wx/x11/dnd.h | 6 +++--- include/wx/x11/joystick.h | 2 +- 66 files changed, 112 insertions(+), 107 deletions(-) diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h index 31c565f26c..65af01c0b2 100644 --- a/include/wx/cocoa/dc.h +++ b/include/wx/cocoa/dc.h @@ -80,10 +80,10 @@ public: virtual void Clear(); virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } - virtual void EndDoc(void) {}; + virtual void EndDoc(void) {} - virtual void StartPage(void) {}; - virtual void EndPage(void) {}; + virtual void StartPage(void) {} + virtual void EndPage(void) {} virtual void SetFont(const wxFont& font); virtual void SetPen(const wxPen& pen); diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 831bed1c24..a1a8a4386c 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -53,8 +53,8 @@ public: virtual int GetSelection() const = 0; virtual void GetSelection(long *from, long *to) const = 0; - virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }; - virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }; + virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); } + virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); } // may return value different from GetSelection() when the combobox // dropdown is shown and the user selected, but not yet accepted, a value diff --git a/include/wx/dataview.h b/include/wx/dataview.h index 1252be4a43..85d628841e 100644 --- a/include/wx/dataview.h +++ b/include/wx/dataview.h @@ -1210,7 +1210,7 @@ public: virtual bool HasDefaultCompare() const { return true; } virtual unsigned int GetColumnCount() const - { return 1; }; + { return 1; } virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const { return wxT("wxDataViewIconText"); } diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h index ad11457a9d..a5975e5f8a 100644 --- a/include/wx/generic/tabg.h +++ b/include/wx/generic/tabg.h @@ -130,7 +130,7 @@ public: // Called when a tab is activated virtual void OnTabActivate(int activateId, int deactivateId); // Allows vetoing - virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }; + virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; } // Allows use of application-supplied wxTabControl classes. virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); } diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h index a581b4f463..8e7de1f6e9 100644 --- a/include/wx/glcanvas.h +++ b/include/wx/glcanvas.h @@ -143,7 +143,7 @@ public: #ifdef __WXUNIVERSAL__ // resolve the conflict with wxWindowUniv::SetCurrent() - virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }; + virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); } #endif protected: diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 560dfa24d0..a0ab0f283c 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -94,7 +94,7 @@ public: #if wxUSE_PALETTE wxPalette *GetPalette() const; void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); }; + wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE static void InitStandardHandlers(); diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h index 2e067abc95..1634fdbcd2 100644 --- a/include/wx/gtk/dc.h +++ b/include/wx/gtk/dc.h @@ -23,7 +23,7 @@ public: virtual ~wxGTKDCImpl(); #if wxUSE_PALETTE - void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; + void SetColourMap( const wxPalette& palette ) { SetPalette(palette); } #endif // wxUSE_PALETTE // Resolution in pixels per logical inch diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h index d5c3848e76..8147b79bc0 100644 --- a/include/wx/gtk/filectrl.h +++ b/include/wx/gtk/filectrl.h @@ -88,7 +88,7 @@ public: Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name ); } - virtual ~wxGtkFileCtrl() {}; + virtual ~wxGtkFileCtrl() {} void Init(); bool Create( wxWindow *parent, diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index b06d3bf7f8..728d6b7782 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -43,8 +43,8 @@ public: void SetShadowWidth( int WXUNUSED(w) ) { } void SetBezelFace( int WXUNUSED(w) ) { } - int GetShadowWidth() const { return 0; }; - int GetBezelFace() const { return 0; }; + int GetShadowWidth() const { return 0; } + int GetBezelFace() const { return 0; } // determinate mode API void SetRange( int r ); diff --git a/include/wx/gtk/private/timer.h b/include/wx/gtk/private/timer.h index ada20184e0..f5b58dc9d8 100644 --- a/include/wx/gtk/private/timer.h +++ b/include/wx/gtk/private/timer.h @@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl { public: - wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; }; + wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; } virtual bool Start( int millisecs = -1, bool oneShot = false ); virtual void Stop(); diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index d7b19d6409..f056ed3102 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -55,7 +55,7 @@ public: virtual void ShowWithoutActivating(); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; + virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 14f94a6664..444b5ab700 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -105,7 +105,7 @@ public: #if wxUSE_PALETTE wxPalette *GetPalette() const; void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); }; + wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE static void InitStandardHandlers(); diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h index b057e85126..939e74598d 100644 --- a/include/wx/gtk1/dc.h +++ b/include/wx/gtk1/dc.h @@ -23,7 +23,7 @@ public: virtual ~wxGTKDCImpl() { } #if wxUSE_PALETTE - void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; + void SetColourMap( const wxPalette& palette ) { SetPalette(palette); } #endif // wxUSE_PALETTE // Resolution in pixels per logical inch diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index 680e6690c4..41531b05d1 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -45,8 +45,8 @@ public: void SetBezelFace( int WXUNUSED(w) ) { } void SetRange( int r ); void SetValue( int pos ); - int GetShadowWidth() const { return 0; }; - int GetBezelFace() const { return 0; }; + int GetShadowWidth() const { return 0; } + int GetBezelFace() const { return 0; } int GetRange() const; int GetValue() const; diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h index e3436cb912..30734fd6b7 100644 --- a/include/wx/gtk1/msgdlg.h +++ b/include/wx/gtk1/msgdlg.h @@ -30,7 +30,7 @@ public: virtual ~wxMessageDialog(); int ShowModal(); - virtual bool Show( bool WXUNUSED(show) = true ) { return false; }; + virtual bool Show( bool WXUNUSED(show) = true ) { return false; } protected: // implement some base class methods to do nothing to avoid asserts and diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h index 3a3042dc97..a534a1dc66 100644 --- a/include/wx/gtk1/toplevel.h +++ b/include/wx/gtk1/toplevel.h @@ -51,7 +51,7 @@ public: virtual void Restore(); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; + virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual bool SetShape(const wxRegion& region); diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 4be2ad16a2..2fd45ff5df 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -32,7 +32,7 @@ class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl public: DECLARE_DYNAMIC_CLASS(wxWebKitCtrl) - wxWebKitCtrl() {}; + wxWebKitCtrl() {} wxWebKitCtrl(wxWindow *parent, wxWindowID winID, const wxString& strURL, @@ -42,7 +42,7 @@ public: const wxString& name = wxWebKitCtrlNameStr) { Create(parent, winID, strURL, pos, size, style, validator, name); - }; + } bool Create(wxWindow *parent, wxWindowID winID, const wxString& strURL, diff --git a/include/wx/list.h b/include/wx/list.h index 02453b9fdc..2144dea9db 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -1198,7 +1198,7 @@ class WXDLLIMPEXP_BASE wxList : public wxObjectList { public: #if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS - wxList() { }; + wxList() { } wxDEPRECATED( wxList(int key_type) ); #elif !wxUSE_STD_CONTAINERS wxList(int key_type = wxKEY_NONE); diff --git a/include/wx/mdi.h b/include/wx/mdi.h index 6425de2253..1f5d56e647 100644 --- a/include/wx/mdi.h +++ b/include/wx/mdi.h @@ -81,7 +81,7 @@ public: #if wxUSE_MENUS // return the pointer to the current window menu or NULL if we don't have // because of wxFRAME_NO_WINDOW_MENU style - wxMenu* GetWindowMenu() const { return m_windowMenu; }; + wxMenu* GetWindowMenu() const { return m_windowMenu; } // use the given menu instead of the default window menu // diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index 01a825a2c6..66adbec41e 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/colour.h @@ -38,8 +38,8 @@ public: unsigned char Green() const { return m_green; } unsigned char Blue() const { return m_blue; } - WXPixel GetPixel() const { return m_pixel; }; - void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }; + WXPixel GetPixel() const { return m_pixel; } + void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; } inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h index ddb9c1401c..fdcb802d31 100644 --- a/include/wx/motif/combobox.h +++ b/include/wx/motif/combobox.h @@ -106,8 +106,8 @@ public: WXWidget GetMainWidget() const { return m_mainWidget; } //Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it. - virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }; - virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }; + virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); } + virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); } protected: virtual wxSize DoGetBestSize() const; diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h index ba22792fbf..8d030c9b1d 100644 --- a/include/wx/motif/dnd.h +++ b/include/wx/motif/dnd.h @@ -63,7 +63,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget { public: - wxTextDropTarget() {}; + wxTextDropTarget() {} virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDropText( long x, long y, const char *psz ); @@ -111,7 +111,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget { public: - wxFileDropTarget() {}; + wxFileDropTarget() {} virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDropFiles( long x, long y, @@ -148,7 +148,7 @@ public: void SetData( wxDataObject &data ); wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; }; + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; } // implementation #if 0 diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h index cd3e0c46ce..4e53cb891b 100644 --- a/include/wx/motif/spinbutt.h +++ b/include/wx/motif/spinbutt.h @@ -53,7 +53,7 @@ public: // Implementation virtual void Command(wxCommandEvent& event) - { (void)ProcessCommand(event); }; + { (void)ProcessCommand(event); } virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h index 1e70cd387f..b22a3dc73b 100644 --- a/include/wx/msw/private/timer.h +++ b/include/wx/msw/private/timer.h @@ -19,7 +19,7 @@ class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl { public: - wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }; + wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; } virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual void Stop(); diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index 690f3d3b92..364d867015 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -305,7 +305,7 @@ protected: public: VirtualProtocol(wxSharedPtr handler); - ~VirtualProtocol() {}; + ~VirtualProtocol() {} //IUnknown DECLARE_IUNKNOWN_METHODS; diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index b7d4c9bcfd..e03084b29b 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -110,7 +110,7 @@ class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox private: virtual void SetLabel(const wxString& rsString) - { wxCheckBox::SetLabel(rsString); }; + { wxCheckBox::SetLabel(rsString); } DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) }; #endif diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index e1d44c1c83..7fc1a01c81 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -49,7 +49,7 @@ public: bool operator != (const wxColour& rColour) const { return !(*this == rColour); } - WXCOLORREF GetPixel(void) const { return m_vPixel; }; + WXCOLORREF GetPixel(void) const { return m_vPixel; } private: diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 0fc4ceeba5..9825ad6b0c 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -63,8 +63,8 @@ public: // // For ownerdraw items // - virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }; - virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }; + virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; } + virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; } wxArrayLong& GetSubcontrols() { return m_aSubControls; } void OnEraseBackground(wxEraseEvent& rEvent); diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index c79181518b..ed91205802 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -93,9 +93,9 @@ public: // TODO: should this go into a wxFrameworkSettings class perhaps? static void UseNativeStatusBar(bool bUseNative) - { m_bUseNativeStatusBar = bUseNative; }; + { m_bUseNativeStatusBar = bUseNative; } static bool UsesNativeStatusBar() - { return m_bUseNativeStatusBar; }; + { return m_bUseNativeStatusBar; } #endif // wxUSE_STATUSBAR WXHMENU GetWinMenu() const { return m_hMenu; } diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h index f64df99fc7..083e9f13a7 100644 --- a/include/wx/os2/gauge.h +++ b/include/wx/os2/gauge.h @@ -61,7 +61,7 @@ public: void SetValue(int nPos); inline virtual bool AcceptsFocus(void) const { return FALSE; } - inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}; + inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {} protected: int m_nRangeMax; diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 293b9147cd..aff5c708c1 100644 --- a/include/wx/os2/gdiimage.h +++ b/include/wx/os2/gdiimage.h @@ -54,7 +54,7 @@ public: { m_nWidth = nW; m_nHeight = nH; } // free the ressources we allocated - virtual void Free() { }; + virtual void Free() { } // for compatibility, the member fields are public diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 4f2c392e99..83cef7afa1 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase { public: - wxIconRefData() { }; + wxIconRefData() { } virtual ~wxIconRefData() { Free(); } virtual void Free(); @@ -70,7 +70,7 @@ public: inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); } inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); } - inline bool IsXpm(void) const { return m_bIsXpm; }; + inline bool IsXpm(void) const { return m_bIsXpm; } inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; } void CopyFromBitmap(const wxBitmap& rBmp); diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h index f3849403ff..07cb3ef0ff 100644 --- a/include/wx/os2/iniconf.h +++ b/include/wx/os2/iniconf.h @@ -107,15 +107,15 @@ private: m_strPath; // the rest of the path (no trailing '_'!) // Virtual function hiding virtual bool Read(const wxString& key, bool* val) const - { return(wxConfigBase::Read(key, val));}; + { return(wxConfigBase::Read(key, val));} virtual bool Read(const wxString& key, bool* val, bool defVal) const - { return(wxConfigBase::Read(key, val, defVal));}; + { return(wxConfigBase::Read(key, val, defVal));} virtual bool Write(const wxString& key, double value) - { return(wxConfigBase::Write(key, value));}; + { return(wxConfigBase::Write(key, value));} virtual bool Write(const wxString& key, bool value) - { return(wxConfigBase::Write(key, value));}; + { return(wxConfigBase::Write(key, value));} virtual bool Write(const wxString& key, const char* value) - { return(wxConfigBase::Write(key, value));}; + { return(wxConfigBase::Write(key, value));} }; #endif //_INICONF_H diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h index e413692355..1b348da46f 100644 --- a/include/wx/os2/joystick.h +++ b/include/wx/os2/joystick.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject * Public interface */ - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; + wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 157c3c417a..99b81113b5 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -172,7 +172,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject { public: // ctors - wxMetafileDataObject() { m_width = 0; m_height = 0; }; + wxMetafileDataObject() { m_width = 0; m_height = 0; } wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0) :m_metafile(metafile) ,m_width(width) diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h index b7b53ea184..0d78afc7a0 100644 --- a/include/wx/os2/pnghand.h +++ b/include/wx/os2/pnghand.h @@ -21,7 +21,7 @@ public: m_sName = "PNG bitmap file"; m_sExtension = "bmp"; m_lType = wxBITMAP_TYPE_PNG; - }; + } virtual bool LoadFile( wxBitmap* pBitmap ,const wxString& rName diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h index e66f475a3b..6776c67f63 100644 --- a/include/wx/os2/pngread.h +++ b/include/wx/os2/pngread.h @@ -62,10 +62,10 @@ public: bool ReadFile( wxChar* ImageFileName=0 ); bool SaveFile( wxChar* ImageFileName=0 ); bool SaveXPM(wxChar *filename, wxChar *name = 0); - int GetWidth( void ) const { return Width; }; - int GetHeight( void ) const { return Height; }; - int GetDepth( void ) const { return Depth; }; - int GetColorType( void ) const { return ColorType; }; + int GetWidth( void ) const { return Width; } + int GetHeight( void ) const { return Height; } + int GetDepth( void ) const { return Depth; } + int GetColorType( void ) const { return ColorType; } int GetIndex(int x, int y); bool GetRGB(int x, int y, byte* r, byte* g, byte* b); @@ -285,4 +285,4 @@ inline bool wxPNGReaderIter::PrevStep() } #endif - // _WX_PNGREAD__ \ No newline at end of file + // _WX_PNGREAD__ diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index 26c289b6a0..fda1b8ba18 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -150,7 +150,7 @@ public: inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); } void SetFocus(void); virtual bool SetFont(const wxFont& rFont); - inline void SetLabelFont(const wxFont& WXUNUSED(font)) {}; + inline void SetLabelFont(const wxFont& WXUNUSED(font)) {} virtual void SetSelection(int nIndex); virtual void SetString(unsigned int nNum, const wxString& rsLabel); virtual bool SetStringSelection(const wxString& rsStr); diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h index f19bc3a712..b409029e8b 100644 --- a/include/wx/os2/sound.h +++ b/include/wx/os2/sound.h @@ -29,7 +29,7 @@ public: // Create from data bool Create(size_t size, const void* data); - bool IsOk() const { return (m_waveData ? TRUE : FALSE); }; + bool IsOk() const { return (m_waveData ? TRUE : FALSE); } protected: bool Free(); diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 2fd6032e55..b8c10e29dd 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -43,7 +43,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase inline virtual ~wxStaticBitmap() { Free(); } virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); } - virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }; + virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); } // assert failure is provoked by an attempt to get an icon from bitmap or // vice versa diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h index 26d544ec9a..4a1f678d20 100644 --- a/include/wx/os2/treectrl.h +++ b/include/wx/os2/treectrl.h @@ -586,7 +586,7 @@ private: ,int nImage ,int nImageSel ); - void DeleteTextCtrl() { }; + void DeleteTextCtrl() { } // // support for additional item images which we implement using diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 168405f82f..bd6193b209 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -118,7 +118,7 @@ public: ); inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;} - inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;}; + inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;} #if wxUSE_DRAG_AND_DROP virtual void SetDropTarget(wxDropTarget* pDropTarget); #endif // wxUSE_DRAG_AND_DROP @@ -182,7 +182,7 @@ public: ); // PM 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; } // translate wxWidgets style flags for this control into the PM style // and optional extended style for the corresponding native control diff --git a/include/wx/osx/carbon/statbmp.h b/include/wx/osx/carbon/statbmp.h index f285535583..ce7066580a 100644 --- a/include/wx/osx/carbon/statbmp.h +++ b/include/wx/osx/carbon/statbmp.h @@ -39,8 +39,8 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase virtual void SetBitmap(const wxBitmap& bitmap); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; + virtual void Command(wxCommandEvent& WXUNUSED(event)) {} + virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} void OnPaint( wxPaintEvent &event ) ; wxBitmap GetBitmap() const { return m_bitmap; } diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index f5357bcb70..cefae9a881 100644 --- a/include/wx/osx/core/colour.h +++ b/include/wx/osx/core/colour.h @@ -42,10 +42,10 @@ public: bool operator != (const wxColour& colour) const { return !(*this == colour); } - CGColorRef GetPixel() const { return m_cgColour; }; + CGColorRef GetPixel() const { return m_cgColour; } - CGColorRef GetCGColor() const { return m_cgColour; }; - CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }; + CGColorRef GetCGColor() const { return m_cgColour; } + CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); } #if wxOSX_USE_COCOA_OR_CARBON void GetRGBColor( RGBColor *col ) const; diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 95fee216ea..e9d8430204 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -680,10 +680,10 @@ public : virtual ~wxComboWidgetImpl() {} - virtual int GetSelectedItem() const { return -1; }; - virtual void SetSelectedItem(int WXUNUSED(item)) {}; + virtual int GetSelectedItem() const { return -1; } + virtual void SetSelectedItem(int WXUNUSED(item)) {} - virtual int GetNumberOfItems() const { return -1; }; + virtual int GetNumberOfItems() const { return -1; } virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {} diff --git a/include/wx/osx/joystick.h b/include/wx/osx/joystick.h index da1ba5bf3c..c0f4f5de41 100644 --- a/include/wx/osx/joystick.h +++ b/include/wx/osx/joystick.h @@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject * Public interface */ - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; + wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } // Attributes //////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h index 46b876f3b4..9f9f7f3f60 100644 --- a/include/wx/osx/listctrl.h +++ b/include/wx/osx/listctrl.h @@ -314,10 +314,10 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl bool Update(long item); */ - void Command(wxCommandEvent& event) { ProcessCommand(event); }; + void Command(wxCommandEvent& event) { ProcessCommand(event); } - wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }; - wxIntPtr GetCompareFuncData() { return m_compareFuncData; }; + wxListCtrlCompare GetCompareFunc() { return m_compareFunc; } + wxIntPtr GetCompareFuncData() { return m_compareFuncData; } // public overrides needed for pimpl approach diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h index 01f8734b08..a670312675 100644 --- a/include/wx/osx/metafile.h +++ b/include/wx/osx/metafile.h @@ -145,7 +145,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple public: // ctors wxMetafileDataObject() - : wxDataObjectSimple(wxDF_METAFILE) { }; + : wxDataObjectSimple(wxDF_METAFILE) { } wxMetafileDataObject(const wxMetafile& metafile) : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { } diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h index 6d31539e29..e1ffc9ed89 100644 --- a/include/wx/osx/pnghand.h +++ b/include/wx/osx/pnghand.h @@ -25,7 +25,7 @@ public: SetName(wxT("PNG bitmap file")); SetExtension(wxT("bmp")); SetType(wxBITMAP_TYPE_PNG); - }; + } virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight); diff --git a/include/wx/osx/pngread.h b/include/wx/osx/pngread.h index 222a2c5589..bdf466b8a3 100644 --- a/include/wx/osx/pngread.h +++ b/include/wx/osx/pngread.h @@ -61,10 +61,10 @@ public: bool ReadFile( char* ImageFileName=0 ); bool SaveFile( char* ImageFileName=0 ); bool SaveXPM(char *filename, char *name = 0); - int GetWidth( void ) const { return Width; }; - int GetHeight( void ) const { return Height; }; - int GetDepth( void ) const { return Depth; }; - int GetColorType( void ) const { return ColorType; }; + int GetWidth( void ) const { return Width; } + int GetHeight( void ) const { return Height; } + int GetDepth( void ) const { return Depth; } + int GetColorType( void ) const { return ColorType; } int GetIndex(int x, int y); bool GetRGB(int x, int y, byte* r, byte* g, byte* b); diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h index ab105ea79a..7ba2b0c302 100644 --- a/include/wx/osx/statbox.h +++ b/include/wx/osx/statbox.h @@ -38,8 +38,8 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; + virtual void Command(wxCommandEvent& WXUNUSED(event)) {} + virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; diff --git a/include/wx/osx/treectrl.h b/include/wx/osx/treectrl.h index 38844c7b65..acf069cb5f 100644 --- a/include/wx/osx/treectrl.h +++ b/include/wx/osx/treectrl.h @@ -225,7 +225,7 @@ public: bool SortChildren(long item); bool EnsureVisible(long item); - void Command(wxCommandEvent& event) { ProcessCommand(event); }; + void Command(wxCommandEvent& event) { ProcessCommand(event); } protected: wxTextCtrl* m_textCtrl; diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h index e4e5275523..976991951b 100644 --- a/include/wx/palmos/glcanvas.h +++ b/include/wx/palmos/glcanvas.h @@ -93,7 +93,7 @@ public: void SetCurrent(); #ifdef __WXUNIVERSAL__ - virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }; + virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); } #endif void SetColour(const wxChar *colour); diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h index 97bd63b30f..91ca66810e 100644 --- a/include/wx/palmos/mdi.h +++ b/include/wx/palmos/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) ; // MDI operations diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h index 58eecece9e..28095a27db 100644 --- a/include/wx/palmos/pen.h +++ b/include/wx/palmos/pen.h @@ -104,20 +104,20 @@ public: void SetJoin(wxPenJoin join); void SetCap(wxPenCap cap); - wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }; - int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; - wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; - wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; - wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; + wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); } + int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); } + wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); } + wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); } + wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); } int GetDashes(wxDash **ptr) const { *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); } - wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); }; - inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }; + wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); } + inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); } - inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }; + inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); } // Internal bool RealizeResource(); diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h index d77fce4bfe..26705a8c41 100644 --- a/include/wx/palmos/radiobox.h +++ b/include/wx/palmos/radiobox.h @@ -120,7 +120,7 @@ public: virtual wxPoint GetClientAreaOrigin() const; void SetFocus(); - void SetLabelFont(const wxFont& WXUNUSED(font)) {}; + void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetButtonFont(const wxFont& font) { SetFont(font); } virtual void Refresh( bool eraseBackground = true, diff --git a/include/wx/palmos/sound.h b/include/wx/palmos/sound.h index 279e70687f..c76063757c 100644 --- a/include/wx/palmos/sound.h +++ b/include/wx/palmos/sound.h @@ -30,7 +30,7 @@ public: // Create from data bool Create(size_t size, const void* data); - bool IsOk() const { return (m_waveData ? true : false); }; + bool IsOk() const { return (m_waveData ? true : false); } static void Stop(); diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index 4be644902d..99d7aa0514 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -139,7 +139,7 @@ public: wxWindow *FindItemByWinHandle(WXWINHANDLE handle, bool controlOnly = false) const; // Palm only: true if this control is part of the main control - virtual bool ContainsWinHandle(WXWINHANDLE WXUNUSED(handle)) const { return false; }; + virtual bool ContainsWinHandle(WXWINHANDLE WXUNUSED(handle)) const { return false; } // translate wxWidgets style flags for this control into the Windows style // and optional extended style for the corresponding native control diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index cc5e30fe14..865f6c3846 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -966,7 +966,7 @@ public: } /** Gets a unsigned number identifying this list. */ - wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; }; + wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; } const wxString& GetLabel( unsigned int ind ) const { diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index ff353e3988..6e000ec143 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -172,6 +172,11 @@ typedef wxPixelFormat wxImagePixelFormat; // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 +#elif defined(__WXPM__) + // Under PM, we can use standard RGB or RGBA + typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 #elif defined(__WXDFB__) // Under DirectFB, RGB components are reversed, they're in BGR order diff --git a/include/wx/richmsgdlg.h b/include/wx/richmsgdlg.h index 06f6c4bea1..554a3691d0 100644 --- a/include/wx/richmsgdlg.h +++ b/include/wx/richmsgdlg.h @@ -45,7 +45,7 @@ public: wxString GetDetailedText() const { return m_detailedText; } - virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }; + virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; } protected: const wxString m_detailsExpanderCollapsedLabel; diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index fdc2ea0f3a..714098fc69 100644 --- a/include/wx/taskbar.h +++ b/include/wx/taskbar.h @@ -32,7 +32,7 @@ public: #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) static bool IsAvailable(); #else - static bool IsAvailable() { return true; }; + static bool IsAvailable() { return true; } #endif // Operations: diff --git a/include/wx/univ/anybutton.h b/include/wx/univ/anybutton.h index 6743fa44f2..02670c02ae 100644 --- a/include/wx/univ/anybutton.h +++ b/include/wx/univ/anybutton.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase public: wxAnyButton() {} - virtual ~wxAnyButton() {}; + virtual ~wxAnyButton() {} protected: // choose the default border for this window diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 8b5d956aca..4553382bab 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -117,7 +117,7 @@ public: wxPalette *GetPalette() const; wxPalette *GetColourMap() const - { return GetPalette(); }; + { return GetPalette(); } virtual void SetPalette(const wxPalette& palette); // implementation diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h index 07d88e2a3e..02cae89adb 100644 --- a/include/wx/x11/dnd.h +++ b/include/wx/x11/dnd.h @@ -63,7 +63,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget { public: - wxTextDropTarget() {}; + wxTextDropTarget() {} virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDropText( long x, long y, const char *psz ); @@ -111,7 +111,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget { public: - wxFileDropTarget() {}; + wxFileDropTarget() {} virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDropFiles( long x, long y, @@ -148,7 +148,7 @@ public: void SetData( wxDataObject &data ); wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }; + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; } // implementation #if 0 diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h index bc7c583e6a..c4af3eee3c 100644 --- a/include/wx/x11/joystick.h +++ b/include/wx/x11/joystick.h @@ -22,7 +22,7 @@ public: * Public interface */ - wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; + wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; } // Attributes //////////////////////////////////////////////////////////////////////////// -- 2.45.2