git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57992
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
38 files changed:
When using wxSTREAM_FILEEXT for the second parameter, the first parameter
can be a complete filename rather than just an extension.
*/
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);
/**
wxStreamProtocolType type = wxSTREAM_PROTOCOL);
/**
If @a nIndex is equal to GetCount() this function behaves as Add().
*/
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
/**
Returns @true if the array is empty, @false otherwise. This function returns the
The @a direction argument specifies where the pane should go, it should be one
of the following: wxTOP, wxBOTTOM, wxLEFT, or wxRIGHT.
*/
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);
right, bottom) are subtracted from the layout.
This is the same thing as calling Direction(wxAUI_DOCK_CENTRE).
*/
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();
This function provides an easy way of preparing a pane to be displayed in
the center dock position.
*/
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();
- static wxList GetHandlers();
+ static wxList& GetHandlers();
/**
Gets the height of the bitmap in pixels.
/**
Gets the height of the bitmap in pixels.
/**
Returns the image index for the given page.
*/
/**
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.
/**
Sets the image list for the page control.
Sets the image index for the given page. @a image is an index into
the image list which was set with SetImageList().
*/
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;
- virtual int SetSelection(size_t page);
+ virtual int SetSelection(size_t page) = 0;
/**
Cycles through the tabs.
/**
Cycles through the tabs.
This is the only difference with SetSelection().
See @ref overview_eventhandling_prog for more infomation.
*/
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;
- 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 the specified page, and the associated window.
The call to this function generates the page changing events.
*/
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.
/**
Inserts a new page at the specified position.
/**
Deletes the specified page, without deleting the associated window.
*/
/**
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.
*/
/**
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.
*/
/**
Returns the window at the given page position.
*/
- wxWindow* GetPage(size_t page);
+ wxWindow* GetPage(size_t page) const;
- wxColour operator =(const wxColour& colour);
- wxColour operator =(const wxString& colourName);
+ wxColour& operator=(const wxColour& colour);
+ wxColour& operator=(const wxColour& colour);
/**
Retrieve the current path (always as absolute path).
*/
/**
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.
*/
/**
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;
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
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.
/**
Gets the first group.
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
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;
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
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;
continue flag, the value string, and the index for the next call.
@endWxPythonOnly
*/
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.
*/
/**
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.
*/
/**
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;
/**
@return @true if either a group or an entry with a given name exists.
*/
/**
@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
/**
Returns the type of the given entry or @e Unknown if the entry doesn't
about type mismatch otherwise: e.g., an attempt to read a string value
from an integer key with wxRegConfig will fail.
*/
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.
*/
/**
@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.
*/
/**
@return @true if the group by this name exists.
*/
- bool HasGroup(const wxString& strName) const;
+ virtual bool HasGroup(const wxString& strName) const = 0;
Permanently writes all changes (otherwise, they're only written from
object's destructor).
*/
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
/**
Read a string from the key, returning @true if the value was read. If
Reads a bool value from the key and returns it. @a defaultVal is
returned if the key is not found.
*/
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.
*/
/**
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
/**
Reads a long value from the key and returns it. @a defaultVal is
@return @false if @a oldName doesn't exist or if @a newName already
exists.
*/
@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
/**
Renames a subgroup of the current group. The subgroup names (both the
@return @false if @a oldName doesn't exist or if @a newName already
exists.
*/
@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;
Delete the whole underlying object (disk file, registry key, ...).
Primarly for use by uninstallation routine.
*/
Delete the whole underlying object (disk file, registry key, ...).
Primarly for use by uninstallation routine.
*/
+ 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.
*/
/**
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
/**
Delete the group (with all subgroups). If the current path is under the
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".
*/
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;
- 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.
/**
Returns @true if the control is empty or @false if it has some items.
@return The label of the item or an empty string if the position was
invalid.
*/
@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.
/**
Returns the array of the labels of all items in the control.
@param string
The label to set.
*/
@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.
/**
Finds an item whose label matches the given string.
@see SetString(), SetStringSelection()
*/
@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
/**
Returns the index of the selected item or @c wxNOT_FOUND if no item is
@see SetSelection(), GetStringSelection()
*/
@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
/**
Selects the item with the specified string in the control. This doesn't
/**
Sets the day without changing other date components.
*/
/**
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.
/**
Sets the date from the date and time in DOS format.
/**
Sets the hour without changing other date components.
*/
/**
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.
*/
/**
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.
*/
/**
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.
/**
Sets the month without changing other date components.
/**
Sets the second without changing other date components.
*/
/**
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
/**
Sets the date and time of to the current values. Same as assigning the
- wxString Format(const wxChar* format = wxDefaultDateTimeFormat,
+ wxString Format(const wxString& format = wxDefaultDateTimeFormat,
const TimeZone& tz = Local) const;
/**
const TimeZone& tz = Local) const;
/**
@return The reference to the modified object itself.
*/
@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
/**
The effect of calling this function is the same as of calling
@return The reference to the modified object itself.
*/
@return The reference to the modified object itself.
*/
- wxDateTime SetToWeekDayInSameWeek(WeekDay weekday,
+ wxDateTime& SetToWeekDayInSameWeek(WeekDay weekday,
WeekFlags flags = Monday_First);
/**
WeekFlags flags = Monday_First);
/**
/**
Same as FromTimezone() but modifies the object in place.
*/
/**
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.
*/
/**
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.
/**
This is the same as calling MakeTimezone() with the argument @c GMT0.
/**
Returns the timespan for one day.
*/
/**
Returns the timespan for one day.
*/
- static wxTimespan Day();
+ static wxTimeSpan Day();
/**
Returns the timespan for the given number of days.
*/
/**
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
/**
Returns the string containing the formatted representation of the time
/**
Returns the timespan for one hour.
*/
/**
Returns the timespan for one hour.
*/
- static wxTimespan Hour();
+ static wxTimeSpan Hour();
/**
Returns the timespan for the given number of hours.
*/
/**
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.
/**
Returns @true if two timespans are equal.
/**
Returns the timespan for one millisecond.
*/
/**
Returns the timespan for one millisecond.
*/
- static wxTimespan Millisecond();
+ static wxTimeSpan Millisecond();
/**
Returns the timespan for the given number of milliseconds.
*/
/**
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.
*/
/**
Returns the timespan for one minute.
*/
- static wxTimespan Minute();
+ static wxTimeSpan Minute();
/**
Returns the timespan for the given number of minutes.
*/
/**
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.
/**
Returns the product of this time span by @a n.
/**
Returns the timespan for one second.
*/
/**
Returns the timespan for one second.
*/
- static wxTimespan Second();
+ static wxTimeSpan Second();
/**
Returns the timespan for the given number of seconds.
*/
/**
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.
/**
Returns the difference of two time spans.
/**
Returns the timespan for one week.
*/
/**
Returns the timespan for one week.
*/
- static wxTimespan Week();
+ static wxTimeSpan Week();
/**
Returns the timespan for the given number of weeks.
*/
/**
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.
/**
Adds the given wxTimeSpan to this wxTimeSpan and returns the result.
@library{wxcore}
@category{dc,gdi}
@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
@todo Precise definition of default/initial state.
@todo Pixelwise definition of operations (e.g. last point of a line not
@endWxPythonOnly
*/
void GetSize(wxCoord* width, wxCoord* height) const;
@endWxPythonOnly
*/
void GetSize(wxCoord* width, wxCoord* height) const;
- const wxSize GetSize() const;
+ wxSize GetSize() const;
Returns the horizontal and vertical resolution in millimetres.
*/
void GetSizeMM(wxCoord* width, wxCoord* height) const;
Returns the horizontal and vertical resolution in millimetres.
*/
void GetSizeMM(wxCoord* width, wxCoord* height) const;
- const wxSize GetSizeMM() const;
+ wxSize GetSizeMM() const;
wxCoord* descent = NULL,
wxCoord* externalLeading = NULL,
const wxFont* font = NULL) const;
wxCoord* descent = NULL,
wxCoord* externalLeading = NULL,
const wxFont* font = NULL) const;
- const wxSize GetTextExtent(const wxString& string) const;
+ wxSize GetTextExtent(const wxString& string) const;
@library{wxcore}
@category{gdi}
@library{wxcore}
@category{gdi}
- @see wxDC::SetClippingRegion()
+ @see wxDC::SetClippingRegion(), wxDCFontChanger, wxDCTextColourChanger, wxDCPenChanger,
+ wxDCBrushChanger
@library{wxcore}
@category{gdi}
@library{wxcore}
@category{gdi}
+ @see wxDC::SetBrush(), wxDCFontChanger, wxDCTextColourChanger, wxDCPenChanger,
+ wxDCClipper
*/
class wxDCBrushChanger
{
*/
class wxDCBrushChanger
{
@library{wxcore}
@category{gdi}
@library{wxcore}
@category{gdi}
+ @see wxDC::SetPen(), wxDCFontChanger, wxDCTextColourChanger, wxDCBrushChanger,
+ wxDCClipper
*/
class wxDCPenChanger
{
*/
class wxDCPenChanger
{
@library{wxcore}
@category{gdi}
@library{wxcore}
@category{gdi}
- @see wxDC::SetTextForeground()
+ @see wxDC::SetTextForeground(), wxDCFontChanger, wxDCPenChanger, wxDCBrushChanger,
+ wxDCClipper
*/
class wxDCTextColourChanger
{
*/
class wxDCTextColourChanger
{
@library{wxcore}
@category{gdi}
@library{wxcore}
@category{gdi}
+ @see wxDC::SetFont(), wxDCTextColourChanger, wxDCPenChanger, wxDCBrushChanger,
+ wxDCClipper
*/
class wxDCFontChanger
{
*/
class wxDCFontChanger
{
@see SetBackground()
*/
wxBrush GetBackground() const;
@see SetBackground()
*/
wxBrush GetBackground() const;
- const wxBrush GetBackground() const;
+ const wxBrush& GetBackground() const;
@see SetBrush()
*/
wxBrush GetBrush() const;
@see SetBrush()
*/
wxBrush GetBrush() const;
- const wxBrush GetBrush() const;
+ const wxBrush& GetBrush() const;
@see SetFont()
*/
wxFont GetFont() const;
@see SetFont()
*/
wxFont GetFont() const;
- const wxFont GetFont() const;
+ const wxFont& GetFont() const;
@see SetPen()
*/
wxPen GetPen() const;
@see SetPen()
*/
wxPen GetPen() const;
- const wxPen GetPen() const;
+ const wxPen& GetPen() const;
@see SetTextBackground()
*/
@see SetTextBackground()
*/
- wxColour GetTextBackground() const;
+ const wxColour& GetTextBackground() const;
const wxColour& GetTextBackground() const;
//@}
const wxColour& GetTextBackground() const;
//@}
@see SetTextForeground()
*/
wxColour GetTextForeground() const;
@see SetTextForeground()
*/
wxColour GetTextForeground() const;
- const wxColour GetTextForeground() const;
+ const wxColour& GetTextForeground() const;
Returns @true if the DC is ok to use. @false values arise from being
unable to write the file.
*/
Returns @true if the DC is ok to use. @false values arise from being
unable to write the file.
*/
/**
Resets the bounding box. After a call to this function, the bounding
/**
Resets the bounding box. After a call to this function, the bounding
/**
Returns the number of connected displays.
*/
/**
Returns the number of connected displays.
*/
- static unsigned GetCount();
+ static unsigned int GetCount();
/**
Returns the current video mode that this display is in.
/**
Returns the current video mode that this display is in.
- static void AssignCwd(const wxString& volume = wxEmptyString);
+ void AssignCwd(const wxString& volume = wxEmptyString);
/**
Sets this file name object to the given directory name.
/**
Sets this file name object to the given directory name.
handlers are deleted in wxFileSystem's destructor so that you
don't have to care about it.
*/
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
/**
Sets the current location. @a location parameter passed to OpenFile() is
@return @true if attributes are supported.
*/
@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
/**
Returns true if the extension with given name is supported
Draws a polygon.
*/
virtual void DrawLines(size_t n, const wxPoint2DDouble* points,
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,
/**
Draws the path by first filling and then stroking.
*/
virtual void DrawPath(const wxGraphicsPath& path,
- int fillStyle = wxODDEVEN_RULE);
+ wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
Fills the path with the current brush.
*/
virtual void FillPath(const wxGraphicsPath& path,
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
/**
Returns the native context (CGContextRef for Core Graphics, Graphics
- @c image/* MIME types
- Plain Text filter (this filter is used if no other filter matches)
*/
- @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.
/**
Appends HTML fragment to currently displayed text and refreshes the window.
/**
Adds module() to the list of wxHtmlWinParser tag handler.
*/
/**
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
/**
Closes the container, sets actual container to the parent one
- static wxList GetHandlers();
+ static wxList& GetHandlers();
/**
Gets the height of the image in pixels.
/**
Gets the height of the image in pixels.
@see GetLanguageInfo()
*/
@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
/**
Returns the canonical form of current locale name. Canonical form is the
/**
Returns the current timestamp format string.
*/
/**
Returns the current timestamp format string.
*/
- static const wxString GetTimestamp();
+ static const wxString& GetTimestamp();
/**
Returns the current trace mask, see Customization() section for details.
/**
Returns the current trace mask, see Customization() section for details.
- static const wxArrayString GetTraceMasks();
+ static const wxArrayString& GetTraceMasks();
/**
Returns whether the verbose mode is currently active.
/**
Returns whether the verbose mode is currently active.
Forwards the message at specified level to the @e DoLog() function of the
active log target if there is any, does nothing otherwise.
*/
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
/**
Remove the @a mask from the list of allowed masks for
function.
*/
static wxString ExpandCommand(const wxString& command,
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
/**
If the function returns @true, the string pointed to by @a desc is filled
/**
Finds the wxClassInfo object for a class with the given @a name.
*/
/**
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).
/**
Returns the name of the first base class (@NULL if none).
Returns the global wxPlatformInfo object, initialized with the values
for the currently running platform.
*/
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
/**
Converts the given string to a wxArchitecture enum value or to
@see Exists(), wxKill(), @ref page_samples_exec "Exec sample"
*/
@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);
/**
int flags = wxKILL_NOCHILDREN);
/**
/**
Return the currently used renderer.
*/
/**
Return the currently used renderer.
*/
- static wxRendererNative Get();
+ static wxRendererNative& Get();
/**
Return the default (native) implementation for this platform -- this is also
/**
Return the default (native) implementation for this platform -- this is also
Set() in which case the return value of this
method may be different from the return value of Get().
*/
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().
*/
/**
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.
/**
Returns the size of a check box.
@see SetListStyle(), PromoteList(), NumberList()
*/
@see SetListStyle(), PromoteList(), NumberList()
*/
- bool ClearListStyle(const wxRichTextRange& range,
+ virtual bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
/**
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
/**
@see SetListStyle(), PromoteList(), NumberList().
*/
@see SetListStyle(), PromoteList(), NumberList().
*/
- bool ClearListStyle(const wxRichTextRange& range,
+ virtual bool ClearListStyle(const wxRichTextRange& range,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
/**
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
/**
- wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags
are used in this operation.
*/
- 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);
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);
//@}
const wxTextAttr& style,
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
//@}
form is for convenient setting of the most commonly-used attributes.
*/
void SetLevelAttributes(int level, const wxTextAttr& attr);
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);
Do not destroy a socket using the delete operator directly;
use Destroy() instead. Also, do not create socket objects in the stack.
*/
Do not destroy a socket using the delete operator directly;
use Destroy() instead. Also, do not create socket objects in the stack.
*/
+ virtual ~wxSocketBase();
/**
Destroys the socket safely.
/**
Destroys the socket safely.
@return @true if no error happened, @false otherwise.
*/
@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.
*/
/**
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.
/**
Return the socket timeout in seconds.
complete immediately without blocking (unless the @b wxSOCKET_WAITALL flag
is set, in which case the operation might still block).
*/
complete immediately without blocking (unless the @b wxSOCKET_WAITALL flag
is set, in which case the operation might still block).
*/
/**
Returns @true if the socket is not connected.
/**
Returns @true if the socket is not connected.
The application must therefore be prepared to handle socket event messages even
after calling Close().
*/
The application must therefore be prepared to handle socket event messages even
after calling Close().
*/
/**
Shuts down the writing end of the socket.
/**
Shuts down the writing end of the socket.
be called for client sockets, if it is, @b bind() is called before @b
connect().
*/
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.
/**
Set the default socket timeout in seconds.
functions if you don't specify a wait interval. Initially, the default
timeout is 10 minutes.
*/
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.
/**
Put the specified data into the input queue.
/**
Returns reference to the unique global standard paths object.
*/
/**
Returns reference to the unique global standard paths object.
*/
- static wxStandardPathsBase Get();
+ static wxStandardPathsBase& Get();
/**
Return the directory containing the system config files.
/**
Return the directory containing the system config files.
@see FormatV(), Printf()
*/
@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
/**
This static function returns the string containing the result of calling
@see Format(), PrintfV()
*/
@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.
/**
Returns the number of occurrences of @e ch in the string.
compiling with the Apple Developer Tools) and @c wxTextFileType_Mac under
Mac OS (including Mac OS X when compiling with CodeWarrior).
*/
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"
/**
This method together with GetNextLine() allows more "iterator-like"
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.
*/
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
/**
Gets the thread identifier: this is a platform dependent number that uniquely
/**
Returns the validator style.
*/
/**
Returns the validator style.
*/
+ wxTextValidatorStyle GetStyle() const;
/**
Receives character input from the window and filters it according to
/**
Receives character input from the window and filters it according to
- static wxWindow* FindWindowById(long id, wxWindow* parent = NULL);
+ static wxWindow* FindWindowById(long id, const wxWindow* parent = 0);
/**
Find a window by its label.
/**
Find a window by its label.
@see FindWindow()
*/
static wxWindow* FindWindowByLabel(const wxString& label,
@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()
/**
Find a window by its name (as given in a window constructor or Create()
@see FindWindow()
*/
static wxWindow* FindWindowByName(const wxString& name,
@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.
/**
Sizes the window so that it fits around its subwindows.
The extra field is used to store platform or application specific
data. See Pkware's document 'appnote.txt' for information on its format.
*/
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);
//@}
size_t GetExtraLen() const;
void SetExtra(const char* extra, size_t len);
//@}
The extra field is used to store platform or application specific
data. See Pkware's document 'appnote.txt' for information on its format.
*/
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);
//@}
size_t GetLocalExtraLen() const;
void SetLocalExtra(const char* extra, size_t len);
//@}
projects / wxWidgets.git / commitdiff
