Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not put semicolons after the definition of an inline function.

Browse Source 
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
This commit is contained in:
Stefan Neis
2011-12-29 14:42:13 +00:00
parent d0a341b34a
commit 6dd0883d55
66 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/checkbox.h
View File

@@ -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

2
include/wx/os2/colour.h
View File

@@ -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:

4
include/wx/os2/control.h
View File

@@ -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);

4
include/wx/os2/frame.h
View File

@@ -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; }

2
include/wx/os2/gauge.h
View File

@@ -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;

2
include/wx/os2/gdiimage.h
View File

@@ -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

4
include/wx/os2/icon.h
View File

@@ -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);

10
include/wx/os2/iniconf.h
View File

@@ -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

2
include/wx/os2/joystick.h
View File

@@ -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
////////////////////////////////////////////////////////////////////////////

2
include/wx/os2/metafile.h
View File

@@ -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)

2
include/wx/os2/pnghand.h
View File

@@ -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

10
include/wx/os2/pngread.h
View File

@@ -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__
// _WX_PNGREAD__

2
include/wx/os2/radiobox.h
View File

@@ -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);

2
include/wx/os2/sound.h
View File

@@ -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();

2
include/wx/os2/statbmp.h
View File

@@ -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

2
include/wx/os2/treectrl.h
View File

@@ -586,7 +586,7 @@ private:
,int nImage
,int nImageSel
);
void DeleteTextCtrl() { };
void DeleteTextCtrl() { }
//
// support for additional item images which we implement using

4
include/wx/os2/window.h
View File

@@ -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