From: Francesco Montorsi Date: Thu, 8 Jan 2009 16:33:08 +0000 (+0000) Subject: even more fixes detected using ifacecheck X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ccf39540bb96a0e5d067451ad79c82397579aceb even more fixes detected using ifacecheck git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h index 6f0f34a906..0efdf5a17b 100644 --- a/interface/wx/dcsvg.h +++ b/interface/wx/dcsvg.h @@ -298,11 +298,6 @@ public: */ void EndDoc(); - /** - Does nothing. - */ - void EndDrawing(); - /** Does nothing. */ @@ -505,7 +500,7 @@ public: Returns @true if the DC is ok to use. @false values arise from being unable to write the file. */ - bool Ok(); + bool IsOk(); /** Resets the bounding box. After a call to this function, the bounding diff --git a/interface/wx/dirctrl.h b/interface/wx/dirctrl.h index 09067ef001..4769c92772 100644 --- a/interface/wx/dirctrl.h +++ b/interface/wx/dirctrl.h @@ -68,7 +68,7 @@ public: const wxString& dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDIRCTRL_3D_INTERNAL|wxBORDER_SUNKEN, + long style = wxDIRCTRL_3D_INTERNAL, const wxString& filter = wxEmptyString, int defaultFilter = 0, const wxString& name = wxTreeCtrlNameStr); diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index df59fbe9c8..d463c3e630 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -513,7 +513,7 @@ public: /** Sets the brush for filling paths. */ - void SetBrush(const wxGraphicsBrush& brush); + virtual void SetBrush(const wxGraphicsBrush& brush); /** Sets the font for drawing text. @@ -522,16 +522,16 @@ public: /** Sets the font for drawing text. */ - void SetFont(const wxGraphicsFont& font); + virtual void SetFont(const wxGraphicsFont& font); /** Sets the pen used for stroking. */ - void SetPen(const wxGraphicsPen& pen); + void SetPen(const wxPen& pen); /** Sets the pen used for stroking. */ - void SetPen(const wxPen& pen); + virtual void SetPen(const wxGraphicsPen& pen); /** Sets the current transformation matrix of this context @@ -547,13 +547,13 @@ public: Stroke disconnected lines from begin to end points, fastest method available for this purpose. */ - void StrokeLines(size_t n, const wxPoint2DDouble* beginPoints, - const wxPoint2DDouble* endPoints); + virtual void StrokeLines(size_t n, const wxPoint2DDouble* beginPoints, + const wxPoint2DDouble* endPoints); /** Stroke disconnected lines from begin to end points, fastest method available for this purpose. */ - void StrokeLines(size_t n, const wxPoint2DDouble* points); + virtual void StrokeLines(size_t n, const wxPoint2DDouble* points); /** Strokes along a path with the current pen. diff --git a/interface/wx/grid.h b/interface/wx/grid.h index 93358c81fb..3aef602582 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -480,7 +480,7 @@ public: /** Default constructor. */ - wxGridCellAttr(); + wxGridCellAttr(wxGridCellAttr* attrDefault = NULL); /** Constructor specifying some of the often used attributes. */ @@ -3434,8 +3434,7 @@ public: */ wxGridEvent(int id, wxEventType type, wxObject* obj, int row = -1, int col = -1, int x = -1, int y = -1, - bool sel = true, bool control = false, bool shift = false, - bool alt = false, bool meta = false); + bool sel = true, const wxKeyboardState& kbd = wxKeyboardState()); /** Returns @true if the Alt key was down at the time of the event. @@ -3516,8 +3515,7 @@ public: */ wxGridSizeEvent(int id, wxEventType type, wxObject* obj, int rowOrCol = -1, int x = -1, int y = -1, - bool control = false, bool shift = false, - bool alt = false, bool meta = false); + const wxKeyboardState& kbd = wxKeyboardState()); /** Returns @true if the Alt key was down at the time of the event. @@ -3581,9 +3579,7 @@ public: wxObject* obj, const wxGridCellCoords& topLeft, const wxGridCellCoords& bottomRight, - bool sel = true, bool control = false, - bool shift = false, bool alt = false, - bool meta = false); + bool sel = true, const wxKeyboardState& kbd = wxKeyboardState()); /** Returns @true if the Alt key was down at the time of the event. diff --git a/interface/wx/html/helpwnd.h b/interface/wx/html/helpwnd.h index 690d799c7a..1b0b0c7991 100644 --- a/interface/wx/html/helpwnd.h +++ b/interface/wx/html/helpwnd.h @@ -110,13 +110,6 @@ public: void ReadCustomization(wxConfigBase* cfg, const wxString& path = wxEmptyString); - /** - Sets the frame's title format. - - @a format must contain exactly one "%s" (it will be replaced by the page title). - */ - void SetTitleFormat(const wxString& format); - /** Associates a wxConfig object with the help window. It is recommended that you use wxHtmlHelpController::UseConfig instead. diff --git a/interface/wx/html/htmlwin.h b/interface/wx/html/htmlwin.h index ecadb27cfc..34c231c82c 100644 --- a/interface/wx/html/htmlwin.h +++ b/interface/wx/html/htmlwin.h @@ -428,7 +428,7 @@ public: /** The constructor is not normally used by the user code. */ - wxHyperlinkEvent(int id, const wxHtmlLinkInfo& linkinfo); + wxHtmlLinkEvent(int id, const wxHtmlLinkInfo& linkinfo); /** Returns the wxHtmlLinkInfo which contains info about the cell clicked diff --git a/interface/wx/hyperlink.h b/interface/wx/hyperlink.h index 115db369cb..4fdf631ae3 100644 --- a/interface/wx/hyperlink.h +++ b/interface/wx/hyperlink.h @@ -91,13 +91,13 @@ public: /** Constructor. See Create() for more info. */ - wxHyperLink(wxWindow* parent, wxWindowID id, - const wxString& label, - const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = "hyperlink"); + wxHyperLinkCtrl(wxWindow* parent, wxWindowID id, + const wxString& label, + const wxString& url, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxHL_DEFAULT_STYLE, + const wxString& name = wxHyperlinkCtrlNameStr); /** Creates the hyperlink control. diff --git a/interface/wx/region.h b/interface/wx/region.h index 7710f308c3..45e42d730e 100644 --- a/interface/wx/region.h +++ b/interface/wx/region.h @@ -181,7 +181,7 @@ public: in the provided array. @a fillStyle parameter may have values @c wxWINDING_RULE or @c wxODDEVEN_RULE. */ - wxRegion(size_t n, const wxPoint* points, int fillStyle = wxODDEVEN_RULE); + wxRegion(size_t n, const wxPoint* points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); /** Constructs a region using a bitmap. See Union() for more details. */ diff --git a/interface/wx/richtext/richtextformatdlg.h b/interface/wx/richtext/richtextformatdlg.h index 3eb9bc722e..5ef56d5c6a 100644 --- a/interface/wx/richtext/richtextformatdlg.h +++ b/interface/wx/richtext/richtextformatdlg.h @@ -135,6 +135,10 @@ public: The pages to show. @param parent The dialog's parent. + @param title + The dialog's title. + @param id + The dialog's ID. @param pos The dialog's position. @param sz @@ -142,10 +146,9 @@ public: @param style The dialog's window style. */ - wxRichTextFormattingDialog(long flags, wxWindow* parent, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE); + wxRichTextFormattingDialog(long flags, wxWindow* parent, const wxString& title = "Formatting", + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, + const wxSize& sz = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE); /** Destructor. diff --git a/interface/wx/socket.h b/interface/wx/socket.h index 3efa425a6c..286c05cd00 100644 --- a/interface/wx/socket.h +++ b/interface/wx/socket.h @@ -6,6 +6,98 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// + +/** + @class wxIPaddress + + wxIPaddress is an abstract base class for all internet protocol address + objects. Currently, only wxIPV4address is implemented. An experimental + implementation for IPV6, wxIPV6address, is being developed. + + @library{wxbase} + @category{net} +*/ +class wxIPaddress : public wxSockAddress +{ +public: + /** + Internally, this is the same as setting the IP address to @b INADDR_ANY. + + On IPV4 implementations, 0.0.0.0 + + On IPV6 implementations, :: + + @return @true on success, @false if something went wrong. + */ + bool AnyAddress(); + + /** + Internally, this is the same as setting the IP address to @b INADDR_BROADCAST. + + On IPV4 implementations, 255.255.255.255 + + @return @true on success, @false if something went wrong. + */ + virtual bool BroadcastAddress() = 0; + + /** + Set the address to hostname, which can be a host name or an IP-style address + in a format dependent on implementation. + + @return @true on success, @false if something goes wrong (invalid + hostname or invalid IP address). + */ + bool Hostname(const wxString& hostname); + + /** + Returns the hostname which matches the IP address. + */ + wxString Hostname() const; + + /** + Returns a wxString containing the IP address. + */ + virtual wxString IPAddress() const = 0; + + /** + Determines if current address is set to localhost. + + @return @true if address is localhost, @false if internet address. + */ + virtual bool IsLocalHost() const = 0; + + /** + Set address to localhost. + + On IPV4 implementations, 127.0.0.1 + + On IPV6 implementations, ::1 + + @return @true on success, @false if something went wrong. + */ + bool LocalHost(); + + /** + Set the port to that corresponding to the specified service. + + @return @true on success, @false if something goes wrong (invalid @a service). + */ + bool Service(const wxString& service); + + /** + Set the port to that corresponding to the specified service. + + @return @true on success, @false if something goes wrong (invalid @a service). + */ + bool Service(unsigned short service); + + /** + Returns the current service. + */ + unsigned short Service() const; +}; + + /** @class wxIPV4address @@ -70,12 +162,12 @@ public: @return @true on success, @false if something goes wrong (invalid @a service). */ - bool Service(unsigned short service) = 0; + bool Service(unsigned short service); /** Returns the current service. */ - unsigned short Service() const = 0; + unsigned short Service() const; }; @@ -174,99 +266,6 @@ public: }; - -/** - @class wxIPaddress - - wxIPaddress is an abstract base class for all internet protocol address - objects. Currently, only wxIPV4address is implemented. An experimental - implementation for IPV6, wxIPV6address, is being developed. - - @library{wxbase} - @category{net} -*/ -class wxIPaddress : public wxSockAddress -{ -public: - /** - Internally, this is the same as setting the IP address to @b INADDR_ANY. - - On IPV4 implementations, 0.0.0.0 - - On IPV6 implementations, :: - - @return @true on success, @false if something went wrong. - */ - bool AnyAddress(); - - /** - Internally, this is the same as setting the IP address to @b INADDR_BROADCAST. - - On IPV4 implementations, 255.255.255.255 - - @return @true on success, @false if something went wrong. - */ - virtual bool BroadcastAddress() = 0; - - /** - Set the address to hostname, which can be a host name or an IP-style address - in a format dependent on implementation. - - @return @true on success, @false if something goes wrong (invalid - hostname or invalid IP address). - */ - virtual bool Hostname(const wxString& hostname) = 0; - - /** - Returns the hostname which matches the IP address. - */ - virtual wxString Hostname() const = 0; - - /** - Returns a wxString containing the IP address. - */ - virtual wxString IPAddress() const = 0; - - /** - Determines if current address is set to localhost. - - @return @true if address is localhost, @false if internet address. - */ - virtual bool IsLocalHost() const = 0; - - /** - Set address to localhost. - - On IPV4 implementations, 127.0.0.1 - - On IPV6 implementations, ::1 - - @return @true on success, @false if something went wrong. - */ - bool LocalHost(); - - /** - Set the port to that corresponding to the specified service. - - @return @true on success, @false if something goes wrong (invalid @a service). - */ - virtual bool Service(const wxString& service) = 0; - - /** - Set the port to that corresponding to the specified service. - - @return @true on success, @false if something goes wrong (invalid @a service). - */ - virtual bool Service(unsigned short service) = 0; - - /** - Returns the current service. - */ - virtual unsigned short Service() const = 0; -}; - - - /** @class wxSocketClient diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h index e6f3aae4ac..7cd22db8f0 100644 --- a/interface/wx/textctrl.h +++ b/interface/wx/textctrl.h @@ -1044,7 +1044,7 @@ public: @see Create(), wxValidator */ wxTextCtrl(wxWindow* parent, wxWindowID id, - const wxString& value = "", + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, diff --git a/interface/wx/textfile.h b/interface/wx/textfile.h index 101b9debb1..044dc9529e 100644 --- a/interface/wx/textfile.h +++ b/interface/wx/textfile.h @@ -106,7 +106,7 @@ public: It will fail if the file already exists, Open() should be used in this case. */ - bool Create() const; + bool Create(); /** Creates the file with the given name. @@ -114,7 +114,7 @@ public: It will fail if the file already exists, Open() should be used in this case. */ - bool Create(const wxString& strFile) const; + bool Create(const wxString& strFile); /** Returns @true if the current line is the last one. diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index 0d36ef377f..cef105a0dc 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -160,7 +160,7 @@ public: wxToolBar(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxTB_HORIZONTAL | wxBORDER_NONE, + long style = wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr); /**