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

fix the definition of many static functions marked as 'const' or functions which had incoherent default values for their arguments or duplicated functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-10 22:10:54 +00:00
parent 5fa507c8ca
commit 57bf907d8e
17 changed files with 110 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/wx/access.h
View File

@@ -401,7 +401,7 @@ public:
Allows the application to send an event when something changes in
an accessible object.
*/
virtual static void NotifyEvent(int eventType, wxWindow* window,
static void NotifyEvent(int eventType, wxWindow* window,
wxAccObject objectType,
int objectType);

2
interface/wx/archive.h
View File

@@ -392,7 +392,7 @@ public:
GetFirst() and GetNext() return a pointer to a factory or @NULL if no more
are available. They do not give away ownership of the factory.
*/
static const wxArchiveClassFactory* GetFirst() const;
static const wxArchiveClassFactory* GetFirst();
const wxArchiveClassFactory* GetNext() const;
//@}

12
interface/wx/combobox.h
View File

@@ -157,22 +157,22 @@ public:
Creates the combobox for two-step construction. Derived classes should
call or replace this function. See wxComboBox() for further details.
*/
bool Create(wxWindow* parent, wxWindowID id,
const wxString& value = "",
bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n, const wxString choices[],
int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox");
bool Create(wxWindow* parent, wxWindowID id,
const wxString& name = wxComboBoxNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox");
const wxString& name = wxComboBoxNameStr);
//@}
/**

4
interface/wx/dcps.h
View File

@@ -29,12 +29,12 @@ public:
@see SetResolution()
*/
static int GetResolution() const;
virtual int GetResolution() const;
/**
Set resolution (in pixels per inch) that will be used in PostScript
output. Default is 720ppi.
*/
static void SetResolution(int ppi);
virtual wxRect GetPaperRect() const;
};

5
interface/wx/file.h
View File

@@ -102,6 +102,8 @@ class wxTempFile
public:
/**
Associates wxTempFile with the file to be replaced and opens it.
@warning
You should use IsOpened() to verify that the constructor succeeded.
*/
wxTempFile(const wxString& strName);
@@ -248,6 +250,9 @@ public:
The filename.
@param mode
The mode in which to open the file.
@warning
You should use IsOpened() to verify that the constructor succeeded.
*/
wxFile(const wxString& filename,
wxFile::OpenMode mode = wxFile::read);

2
interface/wx/grid.h
View File

@@ -321,7 +321,7 @@ public:
an empty string otherwise.
*/
static void UseStringValues(const wxString& valueTrue = "1",
const wxString& valueFalse = wxEmptyString) const;
const wxString& valueFalse = wxEmptyString);
};
/**

7
interface/wx/htmllbox.h
View File

@@ -284,15 +284,14 @@ public:
Creates the HTML listbox for two-step construction.
See wxSimpleHtmlListBox() for further details.
*/
bool Create(wxWindow* parent, wxWindowID id,
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n,
const wxString choices[] = NULL,
int n = 0, const wxString choices[] = NULL,
long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSimpleHtmlListBoxNameStr);
bool Create(wxWindow* parent, wxWindowID id,
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,

10
interface/wx/intl.h
View File

@@ -513,7 +513,7 @@ public:
as an argument to this function and in this case the result of
GetSystemLanguage() is used.
*/
static wxLanguageInfo* GetLanguageInfo(int lang) const;
static const wxLanguageInfo* GetLanguageInfo(int lang);
/**
Returns English name of the given language or empty string if this
@@ -521,7 +521,7 @@ public:
See GetLanguageInfo() for a remark about special meaning of @c wxLANGUAGE_DEFAULT.
*/
static wxString GetLanguageName(int lang) const;
static wxString GetLanguageName(int lang);
/**
Returns the locale name as passed to the constructor or Init().
@@ -592,7 +592,7 @@ public:
Returns wxFontEncoding() value or @c wxFONTENCODING_SYSTEM if it
couldn't be determined.
*/
static wxFontEncoding GetSystemEncoding() const;
static wxFontEncoding GetSystemEncoding();
/**
Tries to detect the name of the user's default font encoding.
@@ -602,14 +602,14 @@ public:
Returns a user-readable string value or an empty string if it couldn't be
determined.
*/
static wxString GetSystemEncodingName() const;
static wxString GetSystemEncodingName();
/**
Tries to detect the user's default language setting.
Returns the ::wxLanguage value or @b wxLANGUAGE_UNKNOWN if the language-guessing
algorithm failed.
*/
static int GetSystemLanguage() const;
static int GetSystemLanguage();
/**
Initializes the wxLocale instance.

11
interface/wx/listbox.h
View File

@@ -129,21 +129,20 @@ public:
Creates the listbox for two-step construction.
See wxListBox() for further details.
*/
bool Create(wxWindow* parent, wxWindowID id,
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n,
const wxString choices[] = NULL,
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "listBox");
bool Create(wxWindow* parent, wxWindowID id,
const wxString& name = wxListBoxNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "listBox");
const wxString& name = wxListBoxNameStr);
//@}
/**

21
interface/wx/odcombo.h
View File

@@ -152,22 +152,33 @@ public:
@remarks Derived classes should call or replace this function.
*/
bool Create(wxWindow* parent, wxWindowID id,
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n, const wxString choices[],
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox");
bool Create(wxWindow* parent, wxWindowID id,
const wxString& name = wxComboBoxNameStr);
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
int n,
const wxString choices[],
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = "comboBox");
const wxString& name = wxComboBoxNameStr);
//@}
/**

18
interface/wx/platinfo.h
View File

@@ -181,7 +181,7 @@ public:
/**
Returns the name for the given wxArchitecture enumeration value.
*/
static wxString GetArchName(wxArchitecture arch) const;
static wxString GetArchName(wxArchitecture arch);
/**
Returns the name for the architecture of this wxPlatformInfo instance.
@@ -198,7 +198,7 @@ public:
@c wxENDIAN_INVALID if the given string is not a valid endianness
string (i.e. does not contain nor little nor big strings).
*/
static wxEndianness GetEndianness(const wxString& end) const;
static wxEndianness GetEndianness(const wxString& end);
/**
Returns the endianness ID of this wxPlatformInfo instance.
@@ -208,7 +208,7 @@ public:
/**
Returns name for the given wxEndianness enumeration value.
*/
static wxString GetEndiannessName(wxEndianness end) const;
static wxString GetEndiannessName(wxEndianness end);
/**
Returns the name for the endianness of this wxPlatformInfo instance.
@@ -236,7 +236,7 @@ public:
enumeration value: @c Unix for @c wxOS_UNIX, @c Macintosh for @c wxOS_MAC,
@c Windows for @c wxOS_WINDOWS, @c DOS for @c wxOS_DOS, @c OS/2 for @c wxOS_OS2.
*/
static wxString GetOperatingSystemFamilyName(wxOperatingSystemId os) const;
static wxString GetOperatingSystemFamilyName(wxOperatingSystemId os);
/**
Returns the operating system family name of the OS associated with this
@@ -248,7 +248,7 @@ public:
Converts the given string to a wxOperatingSystemId enum value or to @c
wxOS_UNKNOWN if the given string is not a valid operating system name.
*/
static wxOperatingSystemId GetOperatingSystemId(const wxString& name) const;
static wxOperatingSystemId GetOperatingSystemId(const wxString& name);
/**
Returns the operating system ID of this wxPlatformInfo instance.
@@ -261,7 +261,7 @@ public:
This can be a long name (e.g. <tt>Microsoft Windows NT</tt>);
use GetOperatingSystemFamilyName() to retrieve a short, generic name.
*/
static wxString GetOperatingSystemIdName(wxOperatingSystemId os) const;
static wxString GetOperatingSystemIdName(wxOperatingSystemId os);
/**
Returns the operating system name of the OS associated with this wxPlatformInfo
@@ -275,7 +275,7 @@ public:
if the given string does not match any of the wxWidgets canonical name ports
("wxGTK", "wxMSW", etc) nor any of the short wxWidgets name ports ("gtk", "msw", etc).
*/
static wxPortId GetPortId(const wxString& portname) const;
static wxPortId GetPortId(const wxString& portname);
/**
Returns the wxWidgets port ID associated with this wxPlatformInfo instance.
@@ -289,7 +289,7 @@ public:
The returned string always starts with the "wx" prefix and is a mixed-case string.
*/
static wxString GetPortIdName(wxPortId port, bool usingUniversal) const;
static wxString GetPortIdName(wxPortId port, bool usingUniversal);
/**
Returns the name of the wxWidgets port ID associated with this wxPlatformInfo
@@ -305,7 +305,7 @@ public:
The returned string does not start with the "wx" prefix and is always lower case.
*/
static wxString GetPortIdShortName(wxPortId port,
bool usingUniversal) const;
bool usingUniversal);
/**
Returns the short name of the wxWidgets port ID associated with this

4
interface/wx/richtext/richtextbuffer.h
View File

@@ -361,7 +361,6 @@ public:
*/
virtual void Clear();
//@{
/**
Clears the list style from the given range, clearing list-related attributes
and applying any named paragraph style associated with each paragraph.
@@ -373,9 +372,6 @@ public:
*/
bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@}
/**
Clears the style stack.

4
interface/wx/richtext/richtextctrl.h
View File

@@ -443,7 +443,6 @@ public:
*/
virtual void Clear();
//@{
/**
Clears the list style from the given range, clearing list-related attributes
and applying any named paragraph style associated with each paragraph.
@@ -455,9 +454,6 @@ public:
*/
bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@}
/**
Sends the event to the control.

2
interface/wx/sound.h
View File

@@ -64,7 +64,7 @@ public:
Returns @true if a sound is played at the moment.
This method is currently not implemented under Windows.
*/
static bool IsPlaying() const;
static bool IsPlaying();
//@{
/**

2
interface/wx/stream.h
View File

@@ -561,7 +561,7 @@ public:
GetFirst()/GetNext() return a pointer to a factory or @NULL if no more
are available. They do not give away ownership of the factory.
*/
static const wxFilterClassFactory* GetFirst() const;
static const wxFilterClassFactory* GetFirst();
const wxFilterClassFactory* GetNext() const;
//@}

73
interface/wx/string.h
View File

@@ -488,26 +488,6 @@ public:
*/
int CmpNoCase(const wxString& s) const;
//@{
/**
Comparison operators
*/
bool operator ==(const wxString& x, const wxString& y);
bool operator ==(const wxString& x, wxUniChar ch);
bool operator !=(const wxString& x, const wxString& y);
bool operator !=(const wxString& x, wxUniChar ch);
bool operator(const wxString& x, const wxString& y);
bool operator(const wxString& x, wxUniChar ch);
bool operator =(const wxString& x, const wxString& y);
bool operator =(const wxString& x, wxUniChar ch);
bool operator(const wxString& x, const wxString& y);
bool operator(const wxString& x, wxUniChar ch);
bool operator =(const wxString& x, const wxString& y);
bool operator =(const wxString& x, wxUniChar ch);
//@}
/**
Returns @true if target appears anywhere in wxString; else @false.
This is a wxWidgets 1.xx compatibility function; you should not use it in new
@@ -1119,8 +1099,6 @@ public:
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);
@@ -1368,6 +1346,57 @@ public:
//@}
};
/** @addtogroup group_string_operators */
//@{
/**
Comparison operators for wxString.
*/
inline bool operator==(const wxString& s1, const wxString& s2);
inline bool operator!=(const wxString& s1, const wxString& s2);
inline bool operator< (const wxString& s1, const wxString& s2);
inline bool operator> (const wxString& s1, const wxString& s2);
inline bool operator<=(const wxString& s1, const wxString& s2);
inline bool operator>=(const wxString& s1, const wxString& s2);
inline bool operator==(const wxString& s1, const wxCStrData& s2);
inline bool operator==(const wxCStrData& s1, const wxString& s2);
inline bool operator!=(const wxString& s1, const wxCStrData& s2);
inline bool operator!=(const wxCStrData& s1, const wxString& s2);
inline bool operator==(const wxString& s1, const wxWCharBuffer& s2);
inline bool operator==(const wxWCharBuffer& s1, const wxString& s2);
inline bool operator!=(const wxString& s1, const wxWCharBuffer& s2);
inline bool operator!=(const wxWCharBuffer& s1, const wxString& s2);
inline bool operator==(const wxString& s1, const wxCharBuffer& s2);
inline bool operator==(const wxCharBuffer& s1, const wxString& s2);
inline bool operator!=(const wxString& s1, const wxCharBuffer& s2);
inline bool operator!=(const wxCharBuffer& s1, const wxString& s2);
inline wxString operator+(const wxString& string, const wxWCharBuffer& buf)
inline wxString operator+(const wxWCharBuffer& buf, const wxString& string)
inline wxString operator+(const wxString& string, const wxCharBuffer& buf)
inline wxString operator+(const wxCharBuffer& buf, const wxString& string)
/**
Comparison operators with wxUniChar or wxUniCharRef.
*/
inline bool operator==(const wxUniChar& c, const wxString& s);
inline bool operator==(const wxUniCharRef& c, const wxString& s);
inline bool operator==(char c, const wxString& s);
inline bool operator==(wchar_t c, const wxString& s);
inline bool operator==(int c, const wxString& s);
inline bool operator==(const wxString& s, const wxUniChar& c);
inline bool operator==(const wxString& s, const wxUniCharRef& c);
inline bool operator==(const wxString& s, char c);
inline bool operator==(const wxString& s, wchar_t c);
inline bool operator!=(const wxUniChar& c, const wxString& s);
inline bool operator!=(const wxUniCharRef& c, const wxString& s);
inline bool operator!=(char c, const wxString& s);
inline bool operator!=(wchar_t c, const wxString& s);
inline bool operator!=(int c, const wxString& s);
inline bool operator!=(const wxString& s, const wxUniChar& c);
inline bool operator!=(const wxString& s, const wxUniCharRef& c);
inline bool operator!=(const wxString& s, char c);
inline bool operator!=(const wxString& s, wchar_t c);
//@}
/**
The global wxString instance of an empty string.
Used extensively in the entire wxWidgets API.

2
interface/wx/textfile.h
View File

@@ -145,7 +145,7 @@ public:
compiling with the Apple Developer Tools) and @c wxTextFileType_Mac under
Mac OS (including Mac OS X when compiling with CodeWarrior).
*/
static const char* GetEOL(wxTextFileType type = typeDefault) const;
static const char* GetEOL(wxTextFileType type = typeDefault);
/**
This method together with GetNextLine() allows more "iterator-like"