From 78e37b46a4c1581822bab8d99486bc35c0f360ea Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Thu, 30 Oct 2008 11:11:00 +0000 Subject: [PATCH] fixed missing semicolons, as reported by check_syntax.sh git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/grid.h | 2 +- interface/wx/list.h | 2 +- interface/wx/ptr_shrd.h | 2 +- interface/wx/rawbmp.h | 2 +- interface/wx/stream.h | 2 +- interface/wx/string.h | 24 +++++++++++++----------- interface/wx/vidmode.h | 9 ++++++--- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/interface/wx/grid.h b/interface/wx/grid.h index ba410c4ace..2d400ab0f2 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -388,7 +388,7 @@ public: neither associated with this table by SetAttrProvider() nor created on demand by any other methods. */ - wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; } + wxGridCellAttrProvider *GetAttrProvider() const; /** Return the attribute for the given cell. diff --git a/interface/wx/list.h b/interface/wx/list.h index bd35298d39..44311a3d37 100644 --- a/interface/wx/list.h +++ b/interface/wx/list.h @@ -236,7 +236,7 @@ public: /** Clears the list and adds @a n items with value @a v to it. */ - void assign(size_type n, const_reference v = value_type()) \ + void assign(size_type n, const_reference v = value_type()); /** Returns the last item of the list. diff --git a/interface/wx/ptr_shrd.h b/interface/wx/ptr_shrd.h index c7f29474b2..718e452a52 100644 --- a/interface/wx/ptr_shrd.h +++ b/interface/wx/ptr_shrd.h @@ -79,7 +79,7 @@ public: Releases any previously held pointer and creates a reference to the same object as @a topcopy. */ - wxSharedPtr& operator=(const wxSharedPtr& tocopy) + wxSharedPtr& operator=(const wxSharedPtr& tocopy); /** Reset pointer to @a ptr. diff --git a/interface/wx/rawbmp.h b/interface/wx/rawbmp.h index 8fd55984de..a802ac29a6 100644 --- a/interface/wx/rawbmp.h +++ b/interface/wx/rawbmp.h @@ -94,7 +94,7 @@ public: Create pixel data object representing the area of the image defined by @a pt and @a sz. */ - wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz) + wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz); /** Return @true of if we could get access to bitmap data successfully. diff --git a/interface/wx/stream.h b/interface/wx/stream.h index f301b70314..b2a8c9cb90 100644 --- a/interface/wx/stream.h +++ b/interface/wx/stream.h @@ -748,7 +748,7 @@ public: /** Calls Sync() and changes the stream position. */ - virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) + virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart); /** Flushes the buffer and calls Sync() on the parent stream. diff --git a/interface/wx/string.h b/interface/wx/string.h index 255058dac2..43a8f3651f 100644 --- a/interface/wx/string.h +++ b/interface/wx/string.h @@ -493,7 +493,7 @@ public: /** Appends the wide string literal @e pwz. */ - wxString& Append(const wchar_t* pwz) + wxString& Append(const wchar_t* pwz); /** Appends the string literal @e psz with max length @e nLen. @@ -503,7 +503,7 @@ public: /** Appends the wide string literal @e psz with max length @e nLen. */ - wxString& Append(const wchar_t* pwz, size_t nLen) + wxString& Append(const wchar_t* pwz, size_t nLen); /** Appends the string @e s. @@ -1198,22 +1198,23 @@ public: */ friend istream operator>>(istream& is, wxString& str); + //@{ /** These functions work as C++ stream insertion operators. They insert the given value into the string. Precision and format cannot be set using them. Use Printf() instead. */ wxString& operator<<(const wxString& s); - wxString& operator<<(const char* psz) - wxString& operator<<(const wchar_t* pwz) - wxString& operator<<(const wxCStrData& psz) wxString& operator<<(const char* psz); - wxString& operator<<(wxUniCharRef ch) - wxString& operator<<(char ch) - wxString& operator<<(unsigned char ch) - wxString& operator<<(wchar_t ch) - wxString& operator<<(const wxCharBuffer& s) - wxString& operator<<(const wxWCharBuffer& s) + wxString& operator<<(const wchar_t* pwz); + wxString& operator<<(const wxCStrData& psz); + wxString& operator<<(const char* psz); + wxString& operator<<(wxUniCharRef ch); + wxString& operator<<(char ch); + wxString& operator<<(unsigned char ch); + wxString& operator<<(wchar_t ch); + wxString& operator<<(const wxCharBuffer& s); + wxString& operator<<(const wxWCharBuffer& s); wxString& operator<<(wxUniCharRef ch); wxString& operator<<(unsigned int ui); wxString& operator<<(long l); @@ -1222,6 +1223,7 @@ public: wxString& operator<<(wxULongLong_t ul); wxString& operator<<(float f); wxString& operator<<(double d); + //@} /** Same as Mid() (substring extraction). diff --git a/interface/wx/vidmode.h b/interface/wx/vidmode.h index cd381dddd6..ec2e197527 100644 --- a/interface/wx/vidmode.h +++ b/interface/wx/vidmode.h @@ -27,9 +27,6 @@ public: */ wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0); - bool operator==(const wxVideoMode& m) const - bool operator!=(const wxVideoMode& mode) const - /** Returns true if this mode matches the other one in the sense that all non zero fields of the other mode have the same value in this one @@ -58,6 +55,12 @@ public: */ bool IsOk() const; + + bool operator==(const wxVideoMode& m) const; + bool operator!=(const wxVideoMode& mode) const; + + + /** The screen width in pixels (e.g. 640), 0 means unspecified. */ -- 2.47.2