AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

many automated ifacecheck fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2009-01-10 22:42:09 +00:00
parent 57bf907d8e
commit 382f12e419
38 changed files with 137 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interface/wx/archive.h
View File

@ -358,7 +358,7 @@ public:
When using wxSTREAM_FILEEXT for the second parameter, the first parameter
can be a complete filename rather than just an extension.
*/
static const wxArchiveClassFactory* Find(const wxChar* protocol,
static const wxArchiveClassFactory* Find(const wxString& protocol,
wxStreamProtocolType type = wxSTREAM_PROTOCOL);
/**

3
interface/wx/arrstr.h
View File

@ -142,8 +142,7 @@ public:
If @a nIndex is equal to GetCount() this function behaves as Add().
*/
void Insert(const wxString& str, size_t nIndex,
size_t copies = 1);
void Insert(wxString lItem, size_t nIndex, size_t copies = 1);
/**
Returns @true if the array is empty, @false otherwise. This function returns the

4
interface/wx/aui/auibook.h
View File

@ -248,8 +248,8 @@ public:
The @a direction argument specifies where the pane should go, it should be one
of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
*/
void SetUniformBitmapSize(const wxSize& size);
void Split(size_t page, int direction);
virtual void SetUniformBitmapSize(const wxSize& size);
virtual void Split(size_t page, int direction);
//@}
/**

8
interface/wx/aui/framemanager.h
View File

@ -400,8 +400,8 @@ public:
right, bottom) are subtracted from the layout.
This is the same thing as calling Direction(wxAUI_DOCK_CENTRE).
*/
wxAuiPaneInfo Centre();
wxAuiPaneInfo Center();
wxAuiPaneInfo& Centre();
wxAuiPaneInfo& Center();
//@}
//@{
@ -411,8 +411,8 @@ public:
This function provides an easy way of preparing a pane to be displayed in
the center dock position.
*/
wxAuiPaneInfo CentrePane();
wxAuiPaneInfo CenterPane();
wxAuiPaneInfo& CentrePane();
wxAuiPaneInfo& CenterPane();
//@}
/**

2
interface/wx/bitmap.h
View File

@ -436,7 +436,7 @@ public:
@see wxBitmapHandler
*/
static wxList GetHandlers();
static wxList& GetHandlers();
/**
Gets the height of the bitmap in pixels.

22
interface/wx/bookctrl.h
View File

@ -82,7 +82,7 @@ public:
/**
Returns the image index for the given page.
*/
virtual int GetPageImage(size_t nPage) const;
virtual int GetPageImage(size_t nPage) const = 0;
/**
Sets the image list for the page control.
@ -96,7 +96,7 @@ public:
Sets the image index for the given page. @a image is an index into
the image list which was set with SetImageList().
*/
virtual bool SetPageImage(size_t page, int image);
virtual bool SetPageImage(size_t page, int image) = 0;
//@}
@ -155,7 +155,7 @@ public:
@see GetSelection()
*/
virtual int SetSelection(size_t page);
virtual int SetSelection(size_t page) = 0;
/**
Cycles through the tabs.
@ -170,7 +170,7 @@ public:
This is the only difference with SetSelection().
See @ref overview_eventhandling_prog for more infomation.
*/
virtual int ChangeSelection(size_t page);
virtual int ChangeSelection(size_t page) = 0;
//@}
@ -238,10 +238,8 @@ public:
@see InsertPage()
*/
bool AddPage(wxWindow* page,
const wxString& text,
bool select = false,
int imageId = wxNOT_FOUND);
virtual bool AddPage(wxWindow* page, const wxString& text,
bool select = false, int imageId = wxNOT_FOUND);
/**
Deletes all pages.
@ -252,7 +250,7 @@ public:
Deletes the specified page, and the associated window.
The call to this function generates the page changing events.
*/
bool DeletePage(size_t page);
virtual bool DeletePage(size_t page);
/**
Inserts a new page at the specified position.
@ -283,17 +281,17 @@ public:
/**
Deletes the specified page, without deleting the associated window.
*/
bool RemovePage(size_t page);
virtual bool RemovePage(size_t page);
/**
Returns the number of pages in the control.
*/
size_t GetPageCount() const;
virtual size_t GetPageCount() const;
/**
Returns the window at the given page position.
*/
wxWindow* GetPage(size_t page);
wxWindow* GetPage(size_t page) const;
//@}

4
interface/wx/colour.h
View File

@ -170,8 +170,8 @@ public:
@see wxColourDatabase
*/
wxColour operator =(const wxColour& colour);
wxColour operator =(const wxString& colourName);
wxColour& operator=(const wxColour& colour);
wxColour& operator=(const wxColour& colour);
//@}
/**

44
interface/wx/config.h
View File

@ -348,14 +348,14 @@ public:
/**
Retrieve the current path (always as absolute path).
*/
const wxString GetPath() const;
virtual const wxString& GetPath() const = 0;
/**
Set current path: if the first character is '/', it is the absolute
path, otherwise it is a relative path. '..' is supported. If @a strPath
doesn't exist it is created.
*/
void SetPath(const wxString& strPath);
virtual void SetPath(const wxString& strPath) = 0;
//@}
@ -375,7 +375,7 @@ public:
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
bool GetFirstEntry(wxString& str, long& index) const;
virtual bool GetFirstEntry(wxString& str, long& index) const = 0;
/**
Gets the first group.
@ -385,7 +385,7 @@ public:
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
bool GetFirstGroup(wxString& str, long& index) const;
virtual bool GetFirstGroup(wxString& str, long& index) const = 0;
/**
Gets the next entry.
@ -395,7 +395,7 @@ public:
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
bool GetNextEntry(wxString& str, long& index) const;
virtual bool GetNextEntry(wxString& str, long& index) const = 0;
/**
Gets the next group.
@ -405,18 +405,18 @@ public:
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
bool GetNextGroup(wxString& str, long& index) const;
virtual bool GetNextGroup(wxString& str, long& index) const = 0;
/**
Get number of entries in the current group.
*/
uint GetNumberOfEntries(bool bRecursive = false) const;
virtual size_t GetNumberOfEntries(bool bRecursive = false) const = 0;
/**
Get number of entries/subgroups in the current group, with or without
its subgroups.
*/
uint GetNumberOfGroups(bool bRecursive = false) const;
virtual size_t GetNumberOfGroups(bool bRecursive = false) const = 0;
//@}
@ -438,7 +438,7 @@ public:
/**
@return @true if either a group or an entry with a given name exists.
*/
bool Exists(wxString& strName) const;
bool Exists(const wxString& strName) const;
/**
Returns the type of the given entry or @e Unknown if the entry doesn't
@ -447,17 +447,17 @@ public:
about type mismatch otherwise: e.g., an attempt to read a string value
from an integer key with wxRegConfig will fail.
*/
wxConfigBase::EntryType GetEntryType(const wxString& name) const;
virtual wxConfigBase::EntryType GetEntryType(const wxString& name) const;
/**
@return @true if the entry by this name exists.
*/
bool HasEntry(wxString& strName) const;
virtual bool HasEntry(const wxString& strName) const = 0;
/**
@return @true if the group by this name exists.
*/
bool HasGroup(const wxString& strName) const;
virtual bool HasGroup(const wxString& strName) const = 0;
//@}
@ -491,7 +491,7 @@ public:
Permanently writes all changes (otherwise, they're only written from
object's destructor).
*/
bool Flush(bool bCurrentOnly = false);
virtual bool Flush(bool bCurrentOnly = false) = 0;
/**
Read a string from the key, returning @true if the value was read. If
@ -567,13 +567,13 @@ public:
Reads a bool value from the key and returns it. @a defaultVal is
returned if the key is not found.
*/
long ReadBool(const wxString& key, bool defaultVal) const;
bool ReadBool(const wxString& key, bool defaultVal) const;
/**
Reads a double value from the key and returns it. @a defaultVal is
returned if the key is not found.
*/
long ReadDouble(const wxString& key, double defaultVal) const;
double ReadDouble(const wxString& key, double defaultVal) const;
/**
Reads a long value from the key and returns it. @a defaultVal is
@ -639,7 +639,8 @@ public:
@return @false if @a oldName doesn't exist or if @a newName already
exists.
*/
bool RenameEntry(const wxString& oldName, const wxString& newName);
virtual bool RenameEntry(const wxString& oldName,
const wxString& newName) = 0;
/**
Renames a subgroup of the current group. The subgroup names (both the
@ -649,7 +650,8 @@ public:
@return @false if @a oldName doesn't exist or if @a newName already
exists.
*/
bool RenameGroup(const wxString& oldName, const wxString& newName);
virtual bool RenameGroup(const wxString& oldName,
const wxString& newName) = 0;
//@}
@ -667,14 +669,14 @@ public:
Delete the whole underlying object (disk file, registry key, ...).
Primarly for use by uninstallation routine.
*/
bool DeleteAll();
virtual bool DeleteAll() = 0;
/**
Deletes the specified entry and the group it belongs to if it was the
last key in it and the second parameter is @true.
*/
bool DeleteEntry(const wxString& key,
bool bDeleteGroupIfEmpty = true);
virtual bool DeleteEntry(const wxString& key,
bool bDeleteGroupIfEmpty = true) = 0;
/**
Delete the group (with all subgroups). If the current path is under the
@ -682,7 +684,7 @@ public:
component. E.g. if the current path is @c "/A/B/C/D" and the group @c C
is deleted, the path becomes @c "/A/B".
*/
bool DeleteGroup(const wxString& key);
virtual bool DeleteGroup(const wxString& key) = 0;
//@}

10
interface/wx/ctrlsub.h
View File

@ -40,7 +40,7 @@ public:
@see IsEmpty()
*/
virtual unsigned int GetCount() const;
virtual unsigned int GetCount() const = 0;
/**
Returns @true if the control is empty or @false if it has some items.
@ -58,7 +58,7 @@ public:
@return The label of the item or an empty string if the position was
invalid.
*/
virtual wxString GetString(unsigned int n) const;
virtual wxString GetString(unsigned int n) const = 0;
/**
Returns the array of the labels of all items in the control.
@ -73,7 +73,7 @@ public:
@param string
The label to set.
*/
virtual void SetString(unsigned int n, const wxString& string);
virtual void SetString(unsigned int n, const wxString& string) = 0;
/**
Finds an item whose label matches the given string.
@ -106,7 +106,7 @@ public:
@see SetString(), SetStringSelection()
*/
virtual void SetSelection(int n);
virtual void SetSelection(int n) = 0;
/**
Returns the index of the selected item or @c wxNOT_FOUND if no item is
@ -120,7 +120,7 @@ public:
@see SetSelection(), GetStringSelection()
*/
virtual int GetSelection() const;
virtual int GetSelection() const = 0;
/**
Selects the item with the specified string in the control. This doesn't

45
interface/wx/datetime.h
View File

@ -350,7 +350,7 @@ public:
/**
Sets the day without changing other date components.
*/
wxDateTime& SetDay(short unsigned int);
wxDateTime& SetDay(unsigned short day);
/**
Sets the date from the date and time in DOS format.
@ -360,17 +360,17 @@ public:
/**
Sets the hour without changing other date components.
*/
wxDateTime& SetHour(short unsigned int);
wxDateTime& SetHour(unsigned short hour);
/**
Sets the millisecond without changing other date components.
*/
wxDateTime& SetMillisecond(short unsigned int);
wxDateTime& SetMillisecond(unsigned short millisecond);
/**
Sets the minute without changing other date components.
*/
wxDateTime& SetMinute(short unsigned int);
wxDateTime& SetMinute(unsigned short minute);
/**
Sets the month without changing other date components.
@ -380,7 +380,7 @@ public:
/**
Sets the second without changing other date components.
*/
wxDateTime& SetSecond(short unsigned int);
wxDateTime& SetSecond(unsigned short second);
/**
Sets the date and time of to the current values. Same as assigning the
@ -746,7 +746,7 @@ public:
@see ParseFormat()
*/
wxString Format(const wxChar* format = wxDefaultDateTimeFormat,
wxString Format(const wxString& format = wxDefaultDateTimeFormat,
const TimeZone& tz = Local) const;
/**
@ -1104,8 +1104,7 @@ public:
@return The reference to the modified object itself.
*/
wxDateTime SetToLastMonthDay(Month month = Inv_Month,
int year = Inv_Year);
wxDateTime& SetToLastMonthDay(Month month = Inv_Month, int year = Inv_Year);
/**
The effect of calling this function is the same as of calling
@ -1155,7 +1154,7 @@ public:
@return The reference to the modified object itself.
*/
wxDateTime SetToWeekDayInSameWeek(WeekDay weekday,
wxDateTime& SetToWeekDayInSameWeek(WeekDay weekday,
WeekFlags flags = Monday_First);
/**
@ -1251,13 +1250,13 @@ public:
/**
Same as FromTimezone() but modifies the object in place.
*/
wxDateTime MakeFromTimezone(const TimeZone& tz, bool noDST = false);
wxDateTime& MakeFromTimezone(const TimeZone& tz, bool noDST = false);
/**
Modifies the object in place to represent the date in another time
zone. If @a noDST is @true, no DST adjustments will be made.
*/
wxDateTime MakeTimezone(const TimeZone& tz, bool noDST = false);
wxDateTime& MakeTimezone(const TimeZone& tz, bool noDST = false);
/**
This is the same as calling MakeTimezone() with the argument @c GMT0.
@ -1819,12 +1818,12 @@ public:
/**
Returns the timespan for one day.
*/
static wxTimespan Day();
static wxTimeSpan Day();
/**
Returns the timespan for the given number of days.
*/
static wxTimespan Days(long days);
static wxTimeSpan Days(long days);
/**
Returns the string containing the formatted representation of the time
@ -1892,12 +1891,12 @@ public:
/**
Returns the timespan for one hour.
*/
static wxTimespan Hour();
static wxTimeSpan Hour();
/**
Returns the timespan for the given number of hours.
*/
static wxTimespan Hours(long hours);
static wxTimeSpan Hours(long hours);
/**
Returns @true if two timespans are equal.
@ -1936,22 +1935,22 @@ public:
/**
Returns the timespan for one millisecond.
*/
static wxTimespan Millisecond();
static wxTimeSpan Millisecond();
/**
Returns the timespan for the given number of milliseconds.
*/
static wxTimespan Milliseconds(long ms);
static wxTimeSpan Milliseconds(wxLongLong ms);
/**
Returns the timespan for one minute.
*/
static wxTimespan Minute();
static wxTimeSpan Minute();
/**
Returns the timespan for the given number of minutes.
*/
static wxTimespan Minutes(long min);
static wxTimeSpan Minutes(long min);
/**
Returns the product of this time span by @a n.
@ -1983,12 +1982,12 @@ public:
/**
Returns the timespan for one second.
*/
static wxTimespan Second();
static wxTimeSpan Second();
/**
Returns the timespan for the given number of seconds.
*/
static wxTimespan Seconds(long sec);
static wxTimeSpan Seconds(wxLongLong sec);
/**
Returns the difference of two time spans.
@ -2005,12 +2004,12 @@ public:
/**
Returns the timespan for one week.
*/
static wxTimespan Week();
static wxTimeSpan Week();
/**
Returns the timespan for the given number of weeks.
*/
static wxTimespan Weeks(long weeks);
static wxTimeSpan Weeks(long weeks);
/**
Adds the given wxTimeSpan to this wxTimeSpan and returns the result.

24
interface/wx/dc.h
View File

@ -44,7 +44,8 @@
@library{wxcore}
@category{dc,gdi}
@see @ref overview_dc, wxGraphicsContext
@see @ref overview_dc, wxGraphicsContext, wxDCFontChanger, wxDCTextColourChanger,
wxDCPenChanger, wxDCBrushChanger, wxDCClipper
@todo Precise definition of default/initial state.
@todo Pixelwise definition of operations (e.g. last point of a line not
@ -651,7 +652,7 @@ public:
@endWxPythonOnly
*/
void GetSize(wxCoord* width, wxCoord* height) const;
const wxSize GetSize() const;
wxSize GetSize() const;
//@}
//@{
@ -659,7 +660,7 @@ public:
Returns the horizontal and vertical resolution in millimetres.
*/
void GetSizeMM(wxCoord* width, wxCoord* height) const;
const wxSize GetSizeMM() const;
wxSize GetSizeMM() const;
//@}
/**
@ -700,7 +701,7 @@ public:
wxCoord* descent = NULL,
wxCoord* externalLeading = NULL,
const wxFont* font = NULL) const;
const wxSize GetTextExtent(const wxString& string) const;
wxSize GetTextExtent(const wxString& string) const;
//@}
/**
@ -1117,7 +1118,8 @@ public:
@library{wxcore}
@category{gdi}
@see wxDC::SetClippingRegion()
@see wxDC::SetClippingRegion(), wxDCFontChanger, wxDCTextColourChanger, wxDCPenChanger,
wxDCBrushChanger
*/
class wxDCClipper
{
@ -1149,7 +1151,8 @@ public:
@library{wxcore}
@category{gdi}
@see wxDC::SetBrush()
@see wxDC::SetBrush(), wxDCFontChanger, wxDCTextColourChanger, wxDCPenChanger,
wxDCClipper
*/
class wxDCBrushChanger
{
@ -1180,7 +1183,8 @@ public:
@library{wxcore}
@category{gdi}
@see wxDC::SetPen()
@see wxDC::SetPen(), wxDCFontChanger, wxDCTextColourChanger, wxDCBrushChanger,
wxDCClipper
*/
class wxDCPenChanger
{
@ -1213,7 +1217,8 @@ public:
@library{wxcore}
@category{gdi}
@see wxDC::SetTextForeground()
@see wxDC::SetTextForeground(), wxDCFontChanger, wxDCPenChanger, wxDCBrushChanger,
wxDCClipper
*/
class wxDCTextColourChanger
{
@ -1247,7 +1252,8 @@ public:
@library{wxcore}
@category{gdi}
@see wxDC::SetFont()
@see wxDC::SetFont(), wxDCTextColourChanger, wxDCPenChanger, wxDCBrushChanger,
wxDCClipper
*/
class wxDCFontChanger
{

14
interface/wx/dcsvg.h
View File

@ -316,7 +316,7 @@ public:
@see SetBackground()
*/
wxBrush GetBackground() const;
const wxBrush GetBackground() const;
const wxBrush& GetBackground() const;
//@}
/**
@ -333,7 +333,7 @@ public:
@see SetBrush()
*/
wxBrush GetBrush() const;
const wxBrush GetBrush() const;
const wxBrush& GetBrush() const;
//@}
/**
@ -358,7 +358,7 @@ public:
@see SetFont()
*/
wxFont GetFont() const;
const wxFont GetFont() const;
const wxFont& GetFont() const;
//@}
/**
@ -382,7 +382,7 @@ public:
@see SetPen()
*/
wxPen GetPen() const;
const wxPen GetPen() const;
const wxPen& GetPen() const;
//@}
/**
@ -402,7 +402,7 @@ public:
@see SetTextBackground()
*/
wxColour GetTextBackground() const;
const wxColour& GetTextBackground() const;
const wxColour& GetTextBackground() const;
//@}
@ -440,7 +440,7 @@ public:
@see SetTextForeground()
*/
wxColour GetTextForeground() const;
const wxColour GetTextForeground() const;
const wxColour& GetTextForeground() const;
//@}
/**
@ -500,7 +500,7 @@ public:
Returns @true if the DC is ok to use. @false values arise from being
unable to write the file.
*/
bool IsOk();
bool IsOk() const;
/**
Resets the bounding box. After a call to this function, the bounding

2
interface/wx/display.h
View File

@ -63,7 +63,7 @@ public:
/**
Returns the number of connected displays.
*/
static unsigned GetCount();
static unsigned int GetCount();
/**
Returns the current video mode that this display is in.

2
interface/wx/filename.h
View File

@ -330,7 +330,7 @@ public:
@see GetCwd()
*/
static void AssignCwd(const wxString& volume = wxEmptyString);
void AssignCwd(const wxString& volume = wxEmptyString);
/**
Sets this file name object to the given directory name.

2
interface/wx/filesys.h
View File

@ -59,7 +59,7 @@ public:
handlers are deleted in wxFileSystem's destructor so that you
don't have to care about it.
*/
static void AddHandler(wxFileSystemHandler handler);
static void AddHandler(wxFileSystemHandler* handler);
/**
Sets the current location. @a location parameter passed to OpenFile() is

2
interface/wx/glcanvas.h
View File

@ -243,7 +243,7 @@ public:
@return @true if attributes are supported.
*/
static bool IsDisplaySupported(const int* attribList = NULL);
static bool IsDisplaySupported(const int* attribList);
/**
Returns true if the extension with given name is supported

6
interface/wx/graphics.h
View File

@ -378,13 +378,13 @@ public:
Draws a polygon.
*/
virtual void DrawLines(size_t n, const wxPoint2DDouble* points,
int fillStyle = wxODDEVEN_RULE);
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
/**
Draws the path by first filling and then stroking.
*/
virtual void DrawPath(const wxGraphicsPath& path,
int fillStyle = wxODDEVEN_RULE);
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
/**
Draws a rectangle.
@ -451,7 +451,7 @@ public:
Fills the path with the current brush.
*/
virtual void FillPath(const wxGraphicsPath& path,
int fillStyle = wxODDEVEN_RULE) = 0;
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) = 0;
/**
Returns the native context (CGContextRef for Core Graphics, Graphics

2
interface/wx/html/htmlwin.h
View File

@ -74,7 +74,7 @@ public:
- @c image/* MIME types
- Plain Text filter (this filter is used if no other filter matches)
*/
static void AddFilter(wxHtmlFilter filter);
static void AddFilter(wxHtmlFilter* filter);
/**
Appends HTML fragment to currently displayed text and refreshes the window.

2
interface/wx/html/winpars.h
View File

@ -90,7 +90,7 @@ public:
/**
Adds module() to the list of wxHtmlWinParser tag handler.
*/
static void AddModule(wxHtmlTagsModule module);
static void AddModule(wxHtmlTagsModule* module);
/**
Closes the container, sets actual container to the parent one

2
interface/wx/image.h
View File

@ -702,7 +702,7 @@ public:
@see wxImageHandler
*/
static wxList GetHandlers();
static wxList& GetHandlers();
/**
Gets the height of the image in pixels.

2
interface/wx/intl.h
View File

@ -472,7 +472,7 @@ public:
@see GetLanguageInfo()
*/
static wxLanguageInfo* FindLanguageInfo(const wxString& locale);
static const wxLanguageInfo* FindLanguageInfo(const wxString& locale);
/**
Returns the canonical form of current locale name. Canonical form is the

6
interface/wx/log.h
View File

@ -763,7 +763,7 @@ public:
/**
Returns the current timestamp format string.
*/
static const wxString GetTimestamp();
static const wxString& GetTimestamp();
/**
Returns the current trace mask, see Customization() section for details.
@ -775,7 +775,7 @@ public:
@see AddTraceMask().
*/
static const wxArrayString GetTraceMasks();
static const wxArrayString& GetTraceMasks();
/**
Returns whether the verbose mode is currently active.
@ -793,7 +793,7 @@ public:
Forwards the message at specified level to the @e DoLog() function of the
active log target if there is any, does nothing otherwise.
*/
static void OnLog(wxLogLevel level, const wxString& message);
static void OnLog(wxLogLevel level, const wxString& szString, time_t t);
/**
Remove the @a mask from the list of allowed masks for

2
interface/wx/mimetype.h
View File

@ -271,7 +271,7 @@ public:
function.
*/
static wxString ExpandCommand(const wxString& command,
MessageParameters& params);
const MessageParameters& params);
/**
If the function returns @true, the string pointed to by @a desc is filled

2
interface/wx/object.h
View File

@ -354,7 +354,7 @@ public:
/**
Finds the wxClassInfo object for a class with the given @a name.
*/
static wxClassInfo* FindClass(wxChar* name);
static wxClassInfo* FindClass(const wxString& className);
/**
Returns the name of the first base class (@NULL if none).

2
interface/wx/platinfo.h
View File

@ -169,7 +169,7 @@ public:
Returns the global wxPlatformInfo object, initialized with the values
for the currently running platform.
*/
static const wxPlatformInfo Get();
static const wxPlatformInfo& Get();
/**
Converts the given string to a wxArchitecture enum value or to

2
interface/wx/process.h
View File

@ -202,7 +202,7 @@ public:
@see Exists(), wxKill(), @ref page_samples_exec "Exec sample"
*/
static wxKillError Kill(int pid, wxSignal signal = wxSIGNONE,
static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM,
int flags = wxKILL_NOCHILDREN);
/**

6
interface/wx/renderer.h
View File

@ -409,7 +409,7 @@ public:
/**
Return the currently used renderer.
*/
static wxRendererNative Get();
static wxRendererNative& Get();
/**
Return the default (native) implementation for this platform -- this is also
@ -417,14 +417,14 @@ public:
Set() in which case the return value of this
method may be different from the return value of Get().
*/
static wxRendererNative GetDefault();
static wxRendererNative& GetDefault();
/**
Return the generic implementation of the renderer. Under some platforms, this
is the default renderer implementation, others have platform-specific default
renderer which can be retrieved by calling GetDefault().
*/
static wxRendererNative GetGeneric();
static wxRendererNative& GetGeneric();
/**
Returns the size of a check box.

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

@ -370,7 +370,7 @@ public:
@see SetListStyle(), PromoteList(), NumberList()
*/
bool ClearListStyle(const wxRichTextRange& range,
virtual bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
/**

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

@ -452,7 +452,7 @@ public:
@see SetListStyle(), PromoteList(), NumberList().
*/
bool ClearListStyle(const wxRichTextRange& range,
virtual bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
/**
@ -1391,10 +1391,10 @@ public:
- wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags
are used in this operation.
*/
bool SetStyleEx(const wxRichTextRange& range,
virtual bool SetStyleEx(const wxRichTextRange& range,
const wxTextAttr& style,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
bool SetStyleEx(long start, long end,
virtual bool SetStyleEx(const wxRichTextRange& range,
const wxTextAttr& style,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@}

5
interface/wx/richtext/richtextstyles.h
View File

@ -517,10 +517,7 @@ public:
form is for convenient setting of the most commonly-used attributes.
*/
void SetLevelAttributes(int level, const wxTextAttr& attr);
void SetLevelAttributes(int level, int leftIndent,
int leftSubIndent,
int bulletStyle,
const wxString& bulletSymbol = wxEmptyString);
void SetLevelAttributes(int i, const wxTextAttr& attr);
//@}
};

14
interface/wx/socket.h
View File

@ -657,7 +657,7 @@ public:
Do not destroy a socket using the delete operator directly;
use Destroy() instead. Also, do not create socket objects in the stack.
*/
~wxSocketBase();
virtual ~wxSocketBase();
/**
Destroys the socket safely.
@ -723,14 +723,14 @@ public:
@return @true if no error happened, @false otherwise.
*/
bool GetLocal(wxSockAddress& addr) const;
virtual bool GetLocal(wxSockAddress& addr) const;
/**
Return the peer address field of the socket.
@return @true if no error happened, @false otherwise.
*/
bool GetPeer(wxSockAddress& addr) const;
virtual bool GetPeer(wxSockAddress& addr) const;
/**
Return the socket timeout in seconds.
@ -752,7 +752,7 @@ public:
complete immediately without blocking (unless the @b wxSOCKET_WAITALL flag
is set, in which case the operation might still block).
*/
bool IsData() const;
bool IsData();
/**
Returns @true if the socket is not connected.
@ -837,7 +837,7 @@ public:
The application must therefore be prepared to handle socket event messages even
after calling Close().
*/
void Close();
virtual bool Close();
/**
Shuts down the writing end of the socket.
@ -1002,7 +1002,7 @@ public:
be called for client sockets, if it is, @b bind() is called before @b
connect().
*/
bool SetLocal(const wxIPV4address& local);
virtual bool SetLocal(const wxIPV4address& local);
/**
Set the default socket timeout in seconds.
@ -1011,7 +1011,7 @@ public:
functions if you don't specify a wait interval. Initially, the default
timeout is 10 minutes.
*/
void SetTimeout(int seconds);
void SetTimeout(long seconds);
/**
Put the specified data into the input queue.

2
interface/wx/stdpaths.h
View File

@ -51,7 +51,7 @@ public:
/**
Returns reference to the unique global standard paths object.
*/
static wxStandardPathsBase Get();
static wxStandardPathsBase& Get();
/**
Return the directory containing the system config files.

4
interface/wx/string.h
View File

@ -539,7 +539,7 @@ public:
@see FormatV(), Printf()
*/
static wxString Format(const wxChar format, ...);
static wxString Format(const wxString& format, ...);
/**
This static function returns the string containing the result of calling
@ -547,7 +547,7 @@ public:
@see Format(), PrintfV()
*/
static wxString FormatV(const wxChar format, va_list argptr);
static wxString FormatV(const wxString& format, va_list argptr);
/**
Returns the number of occurrences of @e ch in the string.

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);
static const wxChar* GetEOL(wxTextFileType type = wxTextBuffer::typeDefault);
/**
This method together with GetNextLine() allows more "iterator-like"

2
interface/wx/thread.h
View File

@ -984,7 +984,7 @@ public:
Returns the platform specific thread ID of the current thread as a long.
This can be used to uniquely identify threads, even if they are not wxThreads.
*/
static unsigned long GetCurrentId();
static wxThreadIdType GetCurrentId();
/**
Gets the thread identifier: this is a platform dependent number that uniquely

2
interface/wx/valtext.h
View File

@ -98,7 +98,7 @@ public:
/**
Returns the validator style.
*/
long GetStyle() const;
wxTextValidatorStyle GetStyle() const;
/**
Receives character input from the window and filters it according to

6
interface/wx/window.h
View File

@ -657,7 +657,7 @@ public:
@see FindWindow()
*/
static wxWindow* FindWindowById(long id, wxWindow* parent = NULL);
static wxWindow* FindWindowById(long id, const wxWindow* parent = 0);
/**
Find a window by its label.
@ -671,7 +671,7 @@ public:
@see FindWindow()
*/
static wxWindow* FindWindowByLabel(const wxString& label,
wxWindow* parent = NULL);
const wxWindow* parent = 0);
/**
Find a window by its name (as given in a window constructor or Create()
@ -687,7 +687,7 @@ public:
@see FindWindow()
*/
static wxWindow* FindWindowByName(const wxString& name,
wxWindow* parent = NULL);
const wxWindow* parent = 0);
/**
Sizes the window so that it fits around its subwindows.

4
interface/wx/zipstrm.h
View File

@ -214,7 +214,7 @@ public:
The extra field is used to store platform or application specific
data. See Pkware's document 'appnote.txt' for information on its format.
*/
char* GetExtra() const;
const char* GetExtra() const;
size_t GetExtraLen() const;
void SetExtra(const char* extra, size_t len);
//@}
@ -226,7 +226,7 @@ public:
The extra field is used to store platform or application specific
data. See Pkware's document 'appnote.txt' for information on its format.
*/
char* GetLocalExtra() const;
const char* GetLocalExtra() const;
size_t GetLocalExtraLen() const;
void SetLocalExtra(const char* extra, size_t len);
//@}