From fadc2df6823d988f7a264b94e69a7e1bbcac1337 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Mon, 27 Oct 2008 21:26:54 +0000 Subject: [PATCH] automated ifacecheck fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/arrstr.h | 2 +- interface/wx/dataview.h | 46 +++++++++++++------------- interface/wx/dialup.h | 4 +-- interface/wx/dnd.h | 2 +- interface/wx/docview.h | 9 ++--- interface/wx/filesys.h | 3 +- interface/wx/font.h | 4 +-- interface/wx/fontmap.h | 8 ++--- interface/wx/graphics.h | 34 +++++++++---------- interface/wx/grid.h | 11 +++--- interface/wx/html/helpctrl.h | 4 +-- interface/wx/html/htmlpars.h | 3 +- interface/wx/image.h | 11 +++--- interface/wx/intl.h | 4 +-- interface/wx/log.h | 5 ++- interface/wx/menu.h | 4 +-- interface/wx/msgdlg.h | 5 +-- interface/wx/odcombo.h | 8 ++--- interface/wx/pen.h | 4 +-- interface/wx/print.h | 12 +++---- interface/wx/renderer.h | 12 +++---- interface/wx/richtext/richtextbuffer.h | 8 ++--- interface/wx/richtext/richtextctrl.h | 15 ++++----- interface/wx/richtext/richtexthtml.h | 4 +-- interface/wx/richtext/richtextprint.h | 4 +-- interface/wx/richtext/richtextstyles.h | 2 +- interface/wx/sizer.h | 8 ++--- interface/wx/splitter.h | 8 ++--- interface/wx/stackwalk.h | 4 +-- interface/wx/string.h | 2 +- interface/wx/textfile.h | 2 +- interface/wx/treectrl.h | 40 +++++++++++----------- interface/wx/window.h | 4 +-- 33 files changed, 145 insertions(+), 151 deletions(-) diff --git a/interface/wx/arrstr.h b/interface/wx/arrstr.h index 02a26db543..7303b4d8f2 100644 --- a/interface/wx/arrstr.h +++ b/interface/wx/arrstr.h @@ -302,7 +302,7 @@ public: the @a bCase and @a bFromEnd parameters. */ int Index(const wxString& sz, bool bCase = true, - bool bFromEnd = false); + bool bFromEnd = false) const; /** @warning this function should not be used with sorted arrays because it diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h index 9e12071e23..c5f69353bd 100644 --- a/interface/wx/dataview.h +++ b/interface/wx/dataview.h @@ -237,15 +237,15 @@ public: @see wxDataViewItemAttr. */ - bool GetAttr(const wxDataViewItem& item, unsigned int col, - wxDataViewItemAttr& attr); + virtual bool GetAttr(const wxDataViewItem& item, unsigned int col, + wxDataViewItemAttr& attr); /** Override this so the control can query the child items of an item. Returns the number of items. */ virtual unsigned int GetChildren(const wxDataViewItem& item, - wxDataViewItemArray& children) const; + wxDataViewItemArray& children) const = 0; /** Override this to indicate the number of columns in the model. @@ -415,8 +415,8 @@ public: @see wxDataViewItemAttr. */ - bool GetAttr(unsigned int row, unsigned int col, - wxDataViewItemAttr& attr); + virtual bool GetAttr(unsigned int row, unsigned int col, + wxDataViewItemAttr& attr); /** Returns the wxDataViewItem at the given @e row. @@ -431,8 +431,8 @@ public: /** Override this to allow getting values from the model. */ - void GetValue(wxVariant& variant, unsigned int row, - unsigned int col) const; + virtual void GetValue(wxVariant& variant, unsigned int row, + unsigned int col) const = 0; /** Call this after if the data has to be read again from the model. @@ -481,8 +481,8 @@ public: /** Called in order to set a value in the model. */ - bool SetValue(const wxVariant& variant, unsigned int row, - unsigned int col); + virtual bool SetValue(const wxVariant& variant, unsigned int row, + unsigned int col) = 0; }; @@ -882,8 +882,8 @@ public: /** Call this to ensure that the given item is visible. */ - void EnsureVisible(const wxDataViewItem& item, - const wxDataViewColumn* column = NULL); + virtual void EnsureVisible(const wxDataViewItem& item, + const wxDataViewColumn* column = NULL); /** Expands the item. @@ -919,8 +919,8 @@ public: /** Returns item rect. */ - wxRect GetItemRect(const wxDataViewItem& item, - const wxDataViewColumn* col = NULL) const; + virtual wxRect GetItemRect(const wxDataViewItem& item, + const wxDataViewColumn* col = NULL) const; /** Returns pointer to the data model associated with the control (if any). @@ -946,8 +946,8 @@ public: /** Hittest. */ - void HitTest(const wxPoint& point, wxDataViewItem& item, - wxDataViewColumn*& col) const; + virtual void HitTest(const wxPoint& point, wxDataViewItem& item, + wxDataViewColumn*& col) const; /** Return @true if the item is selected. @@ -1029,8 +1029,8 @@ public: /** Called by owning model. */ - bool ItemAdded(const wxDataViewItem& parent, - const wxDataViewItem& item); + virtual bool ItemAdded(const wxDataViewItem& parent, + const wxDataViewItem& item) = 0; /** Called by owning model. @@ -1040,14 +1040,14 @@ public: /** Called by owning model. */ - bool ItemDeleted(const wxDataViewItem& parent, - const wxDataViewItem& item); + virtual bool ItemDeleted(const wxDataViewItem& parent, + const wxDataViewItem& item) = 0; /** Called by owning model. */ - bool ItemsAdded(const wxDataViewItem& parent, - const wxDataViewItemArray& items); + virtual bool ItemsAdded(const wxDataViewItem& parent, + const wxDataViewItemArray& items); /** Called by owning model. @@ -1057,8 +1057,8 @@ public: /** Called by owning model. */ - bool ItemsDeleted(const wxDataViewItem& parent, - const wxDataViewItemArray& items); + virtual bool ItemsDeleted(const wxDataViewItem& parent, + const wxDataViewItemArray& items); /** Called by owning model. diff --git a/interface/wx/dialup.h b/interface/wx/dialup.h index cc84990bfe..bbc06f5c88 100644 --- a/interface/wx/dialup.h +++ b/interface/wx/dialup.h @@ -157,8 +157,8 @@ public: Sets the commands to start up the network and to hang up again. */ - void SetConnectCommand(const wxString& commandDial = "/usr/bin/pon", - const wxString& commandHangup = "/usr/bin/poff") const; + virtual void SetConnectCommand(const wxString& commandDial = "/usr/bin/pon", + const wxString& commandHangup = "/usr/bin/poff") = 0; /** Sometimes the built-in logic for determining the online status may diff --git a/interface/wx/dnd.h b/interface/wx/dnd.h index 9c8359c7ba..6d71d58d84 100644 --- a/interface/wx/dnd.h +++ b/interface/wx/dnd.h @@ -328,7 +328,7 @@ public: Return @true to accept the data, or @false to veto the operation. */ virtual bool OnDropFiles(wxCoord x, wxCoord y, - const wxArrayString& filenames); + const wxArrayString& filenames) = 0; }; diff --git a/interface/wx/docview.h b/interface/wx/docview.h index bd11e9e13b..76e84f8341 100644 --- a/interface/wx/docview.h +++ b/interface/wx/docview.h @@ -554,8 +554,9 @@ public: will have to choose from is sorted or not when shown the choice box dialog. Default is @false. */ - wxDocTemplate* SelectDocumentType(wxDocTemplate** templates, - int noTemplates, bool sort = false); + virtual wxDocTemplate* SelectDocumentType(wxDocTemplate** templates, + int noTemplates, + bool sort = false); /** Returns a document template by asking the user (if there is more than @@ -575,8 +576,8 @@ public: will have to choose from is sorted or not when shown the choice box dialog. Default is @false. */ - wxDocTemplate* SelectViewType(wxDocTemplate** templates, - int noTemplates, bool sort = false); + virtual wxDocTemplate* SelectViewType(wxDocTemplate** templates, + int noTemplates, bool sort = false); /** Sets the directory to be displayed to the user when opening a file. diff --git a/interface/wx/filesys.h b/interface/wx/filesys.h index a61f76362c..6e9709d8dd 100644 --- a/interface/wx/filesys.h +++ b/interface/wx/filesys.h @@ -443,7 +443,6 @@ public: @param location The absolute location of file. */ - virtual wxFSFile* OpenFile(wxFileSystem& fs, - const wxString& location); + virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) = 0; }; diff --git a/interface/wx/font.h b/interface/wx/font.h index 2a2daa2bf4..3a405db322 100644 --- a/interface/wx/font.h +++ b/interface/wx/font.h @@ -614,7 +614,7 @@ public: See @ref overview_refcount_equality "reference-counted object comparison" for more info. */ - bool operator !=(const wxFont& font); + bool operator!=(const wxFont& font) const; /** Equality operator. @@ -622,7 +622,7 @@ public: See @ref overview_refcount_equality "reference-counted object comparison" for more info. */ - bool operator ==(const wxFont& font); + bool operator==(const wxFont& font) const; /** Assignment operator, using @ref overview_refcount "reference counting". diff --git a/interface/wx/fontmap.h b/interface/wx/fontmap.h index 790e551063..f3bb9ebcd4 100644 --- a/interface/wx/fontmap.h +++ b/interface/wx/fontmap.h @@ -85,8 +85,8 @@ public: idea to call this function from the event handlers for repeatedly generated events such as @c EVT_PAINT. */ - wxFontEncoding CharsetToEncoding(const wxString& charset, - bool interactive = true); + virtual wxFontEncoding CharsetToEncoding(const wxString& charset, + bool interactive = true); /** Get the current font mapper object. If there is no current object, creates one. @@ -167,8 +167,8 @@ public: Check whether given encoding is available in given face or not. If no facename is given, find @e any font in this encoding. */ - bool IsEncodingAvailable(wxFontEncoding encoding, - const wxString& facename = wxEmptyString); + virtual bool IsEncodingAvailable(wxFontEncoding encoding, + const wxString& facename = wxEmptyString); /** Set the current font mapper object and return previous one (may be @NULL). diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 36ff2ca5ad..fbe23c33c7 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -80,8 +80,8 @@ public: Adds a quadratic Bezier curve from the current point, using a control point and an end point. */ - void AddQuadCurveToPoint(wxDouble cx, wxDouble cy, wxDouble x, - wxDouble y); + virtual void AddQuadCurveToPoint(wxDouble cx, wxDouble cy, wxDouble x, + wxDouble y); /** Appends a rectangle as a new closed subpath. @@ -347,8 +347,8 @@ public: Draws the bitmap. In case of a mono bitmap, this is treated as a mask and the current brushed is used for filling. */ - void DrawBitmap(const wxBitmap& bmp, wxDouble x, wxDouble y, - wxDouble w, wxDouble h); + virtual void DrawBitmap(const wxBitmap& bmp, wxDouble x, wxDouble y, + wxDouble w, wxDouble h) = 0; /** Draws an ellipse. @@ -358,26 +358,25 @@ public: /** Draws the icon. */ - void DrawIcon(const wxIcon& icon, wxDouble x, wxDouble y, - wxDouble w, wxDouble h); + virtual void DrawIcon(const wxIcon& icon, wxDouble x, wxDouble y, + wxDouble w, wxDouble h) = 0; /** Draws a polygon. */ - void DrawLines(size_t n, const wxPoint2DDouble* points, - int fillStyle = wxODDEVEN_RULE); + virtual void DrawLines(size_t n, const wxPoint2DDouble* points, + int fillStyle = wxODDEVEN_RULE); /** Draws the path by first filling and then stroking. */ - void DrawPath(const wxGraphicsPath& path, - int fillStyle = wxODDEVEN_RULE); + virtual void DrawPath(const wxGraphicsPath& path, + int fillStyle = wxODDEVEN_RULE); /** Draws a rectangle. */ - void DrawRectangle(wxDouble x, wxDouble y, wxDouble w, - wxDouble h); + virtual void DrawRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h); /** Draws a rounded rectangle. @@ -397,8 +396,8 @@ public: /** Fills the path with the current brush. */ - void FillPath(const wxGraphicsPath& path, - int fillStyle = wxODDEVEN_RULE); + virtual void FillPath(const wxGraphicsPath& path, + int fillStyle = wxODDEVEN_RULE) = 0; /** Returns the native context (CGContextRef for Core Graphics, Graphics pointer @@ -410,8 +409,8 @@ public: Fills the @a widths array with the widths from the beginning of @a text to the corresponding character of @e text. */ - void GetPartialTextExtents(const wxString& text, - wxArrayDouble& widths) const; + virtual void GetPartialTextExtents(const wxString& text, + wxArrayDouble& widths) const = 0; /** Gets the dimensions of the string using the currently selected font. @@ -477,8 +476,7 @@ public: /** Strokes a single line. */ - void StrokeLine(wxDouble x1, wxDouble y1, wxDouble x2, - wxDouble y2); + virtual void StrokeLine(wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2); //@{ /** diff --git a/interface/wx/grid.h b/interface/wx/grid.h index 0ed7fb3ef4..d3d1cf7db9 100644 --- a/interface/wx/grid.h +++ b/interface/wx/grid.h @@ -486,8 +486,8 @@ public: /** Creates the actual edit control. */ - void Create(wxWindow* parent, wxWindowID id, - wxEvtHandler* evtHandler); + virtual void Create(wxWindow* parent, wxWindowID id, + wxEvtHandler* evtHandler) = 0; /** Final cleanup. @@ -515,8 +515,7 @@ public: Draws the part of the cell not occupied by the control: the base class version just fills it with background colour from the attribute. */ - void PaintBackground(const wxRect& rectCell, - wxGridCellAttr* attr); + virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr* attr); /** Reset the value in the control back to its starting value. @@ -817,8 +816,8 @@ public: /** Get the preferred size of the cell for its contents. */ - wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, - int row, int col); + virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, + int row, int col) = 0; }; diff --git a/interface/wx/html/helpctrl.h b/interface/wx/html/helpctrl.h index bb0ebe6302..006cc238c5 100644 --- a/interface/wx/html/helpctrl.h +++ b/interface/wx/html/helpctrl.h @@ -174,8 +174,8 @@ public: KeywordSearch() searches only pages listed in @c ".hhc" file(s). You should list all pages in the contents file. */ - bool KeywordSearch(const wxString& keyword, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); + virtual bool KeywordSearch(const wxString& keyword, + wxHelpSearchMode mode = wxHELP_SEARCH_ALL); /** Reads the controller's setting (position of window, etc.) diff --git a/interface/wx/html/htmlpars.h b/interface/wx/html/htmlpars.h index dc97e2f6bf..9d8a568804 100644 --- a/interface/wx/html/htmlpars.h +++ b/interface/wx/html/htmlpars.h @@ -217,8 +217,7 @@ public: Returned wxFSFile object is not guaranteed to point to url, it might have been redirected! */ - virtual wxFSFile* OpenURL(wxHtmlURLType type, - const wxString& url); + virtual wxFSFile* OpenURL(wxHtmlURLType type, const wxString& url) const; /** Proceeds parsing of the document. This is end-user method. You can simply diff --git a/interface/wx/image.h b/interface/wx/image.h index f78827b117..72d9a52757 100644 --- a/interface/wx/image.h +++ b/interface/wx/image.h @@ -956,8 +956,8 @@ public: @param index See the description in the LoadFile(wxInputStream&, wxBitmapType, int) overload. */ - bool LoadFile(const wxString& name, const wxString& mimetype, - int index = -1); + virtual bool LoadFile(const wxString& name, const wxString& mimetype, + int index = -1); /** @@ -1091,8 +1091,8 @@ public: @see LoadFile() */ - bool SaveFile(wxOutputStream& stream, - const wxString& mimetype) const; + virtual bool SaveFile(wxOutputStream& stream, + const wxString& mimetype) const; /** Saves an image in the named file. @@ -1124,8 +1124,7 @@ public: @param mimetype MIME type. */ - bool SaveFile(const wxString& name, - const wxString& mimetype) const; + virtual bool SaveFile(const wxString& name, const wxString& mimetype) const; /** Saves an image in the named file. diff --git a/interface/wx/intl.h b/interface/wx/intl.h index f6f51f127a..d31d7193d8 100644 --- a/interface/wx/intl.h +++ b/interface/wx/intl.h @@ -520,8 +520,8 @@ public: @remarks Domains are searched in the last to first order, i.e. catalogs added later override those added before. */ - const wxString& GetString(const wxString& origString, - const wxString& domain = wxEmptyString) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& domain = wxEmptyString) const; /** Retrieves the translation for a string in all loaded domains unless the @a domain diff --git a/interface/wx/log.h b/interface/wx/log.h index 1838d28056..0648a57f84 100644 --- a/interface/wx/log.h +++ b/interface/wx/log.h @@ -38,7 +38,7 @@ public: logging them in the log frame (default), @false to only log them in the log frame. */ - wxLogWindow(wxFrame parent, const wxChar title, bool show = true, + wxLogWindow(wxWindow* pParent, const wxString& szTitle, bool show = true, bool passToOld = true); /** @@ -692,8 +692,7 @@ public: corresponding to the log level and then calls DoLogString() with the resulting string. */ - virtual void DoLog(wxLogLevel level, const wxString& msg, - time_t timestamp); + virtual void DoLog(wxLogLevel level, const wxString& msg, time_t timestamp); /** Called to log the specified string. The timestamp is already included in the diff --git a/interface/wx/menu.h b/interface/wx/menu.h index efefdb4821..de697027c9 100644 --- a/interface/wx/menu.h +++ b/interface/wx/menu.h @@ -151,8 +151,8 @@ public: @remarks Any special menu codes are stripped out of source and target strings before matching. */ - int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; + virtual int FindMenuItem(const wxString& menuString, + const wxString& itemString) const; /** Gets the help string associated with the menu item identifier. diff --git a/interface/wx/msgdlg.h b/interface/wx/msgdlg.h index a868777134..0c0c2bdd94 100644 --- a/interface/wx/msgdlg.h +++ b/interface/wx/msgdlg.h @@ -123,8 +123,9 @@ public: Please see the remarks in SetYesNoLabels() documentation. */ - bool SetYesNoCancelLabels(const ButtonLabel& yes, const ButtonLabel& no, - const ButtonLabel& cancel); + virtual bool SetYesNoCancelLabels(const ButtonLabel& yes, + const ButtonLabel& no, + const ButtonLabel& cancel); /** Overrides the default labels of the Yes and No buttons. diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h index 778ea4e202..93ca6bc2d5 100644 --- a/interface/wx/odcombo.h +++ b/interface/wx/odcombo.h @@ -189,8 +189,8 @@ public: @remarks flags has the same meaning as with OnDrawItem(). */ - void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, - int flags) const; + virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, + int flags) const; /** The derived class may implement this function to actually draw the item @@ -209,8 +209,8 @@ public: @param flags A combination of the ::wxOwnerDrawnComboBoxPaintingFlags enumeration values. */ - void OnDrawItem(wxDC& dc, const wxRect& rect, int item, - int flags) const; + virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, + int flags) const; /** The derived class may implement this method to return the height of the diff --git a/interface/wx/pen.h b/interface/wx/pen.h index 8dd77c3093..4fd383c289 100644 --- a/interface/wx/pen.h +++ b/interface/wx/pen.h @@ -334,7 +334,7 @@ public: See @ref overview_refcount_equality "reference-counted object comparison" for more info. */ - bool operator !=(const wxPen& pen); + bool operator!=(const wxPen& pen) const; /** Assignment operator, using @ref overview_refcount. @@ -347,7 +347,7 @@ public: See @ref overview_refcount_equality "reference-counted object comparison" for more info. */ - bool operator ==(const wxPen& pen); + bool operator==(const wxPen& pen) const; }; /** diff --git a/interface/wx/print.h b/interface/wx/print.h index 3e9f660dc1..b6f61dba8b 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -411,8 +411,8 @@ public: context (current printer not set, for example) or the user cancelled printing. Call GetLastError() to get detailed information about the kind of the error. */ - bool Print(wxWindow* parent, wxPrintout* printout, - bool prompt = true); + virtual bool Print(wxWindow* parent, wxPrintout* printout, + bool prompt = true); /** Invokes the print dialog. @@ -429,8 +429,8 @@ public: /** Default error-reporting function. */ - void ReportError(wxWindow* parent, wxPrintout* printout, - const wxString& message); + virtual void ReportError(wxWindow* parent, wxPrintout* printout, + const wxString& message); /** Invokes the print setup dialog. @@ -621,8 +621,8 @@ public: four integers. @endWxPythonOnly */ - void GetPageInfo(int* minPage, int* maxPage, int* pageFrom, - int* pageTo); + virtual void GetPageInfo(int* minPage, int* maxPage, int* pageFrom, + int* pageTo); /** Returns the size of the printer page in millimetres. diff --git a/interface/wx/renderer.h b/interface/wx/renderer.h index e4548ba4da..12f4d16f10 100644 --- a/interface/wx/renderer.h +++ b/interface/wx/renderer.h @@ -328,7 +328,7 @@ public: see @ref wxCONTROL_FLAGS. */ virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0); + int flags = 0) = 0; /** Draw the header control button (used, for example, by wxListCtrl). @@ -372,7 +372,7 @@ public: the @a win. */ virtual void DrawItemSelectionRect(wxWindow* win, wxDC& dc, - const wxRect& rect, int flags = 0); + const wxRect& rect, int flags = 0) = 0; /** Draw a blank push button that looks very similar to wxButton. @@ -387,8 +387,8 @@ public: Draw the border for sash window: this border must be such that the sash drawn by DrawSplitterSash() blends into it well. */ - virtual void DrawSplitterBorder(wxWindow* win, wxDC& dc, - const wxRect& rect, int flags = 0); + virtual void DrawSplitterBorder(wxWindow* win, wxDC& dc, const wxRect& rect, + int flags = 0) = 0; /** Draw a sash. The @a orient parameter defines whether the sash should be @@ -404,8 +404,8 @@ public: To draw an expanded button the @a flags parameter must contain @c wxCONTROL_EXPANDED bit, see @ref wxCONTROL_FLAGS. */ - virtual void DrawTreeItemButton(wxWindow* win, wxDC& dc, - const wxRect& rect, int flags = 0); + virtual void DrawTreeItemButton(wxWindow* win, wxDC& dc, const wxRect& rect, + int flags = 0) = 0; /** Return the currently used renderer. diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h index f86e30529a..d3f3bb1a15 100644 --- a/interface/wx/richtext/richtextbuffer.h +++ b/interface/wx/richtext/richtextbuffer.h @@ -576,8 +576,8 @@ public: to each filter. This can be used to determine the type to pass to LoadFile() given a selected filter. */ - wxString GetExtWildcard(bool combine = false, bool save = false, - wxArrayInt* types = NULL); + static wxString GetExtWildcard(bool combine = false, bool save = false, + wxArrayInt* types = NULL); /** Returns the list of file handlers. @@ -623,8 +623,8 @@ public: changed to bold because this is already specified by the paragraph. However the text colour attributes @e will be changed to show red. */ - bool GetStyleForRange(const wxRichTextRange& range, - wxTextAttr& style); + virtual bool GetStyleForRange(const wxRichTextRange& range, + wxTextAttr& style); /** Returns the current style sheet associated with the buffer, if any. diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h index a3b6aa953d..cb2e6fab52 100644 --- a/interface/wx/richtext/richtextctrl.h +++ b/interface/wx/richtext/richtextctrl.h @@ -627,8 +627,7 @@ public: Helper function for extending the selection, returning @true if the selection was changed. Selections are in caret positions. */ - bool ExtendSelection(long oldPosition, long newPosition, - int flags); + virtual bool ExtendSelection(long oldPosition, long newPosition, int flags); /** Helper function for finding the caret position for the next word. @@ -779,8 +778,8 @@ public: Attributes that differ in value within the range will not be included in @a style flags. */ - bool GetStyleForRange(const wxRichTextRange& range, - wxTextAttr& style); + virtual bool GetStyleForRange(const wxRichTextRange& range, + wxTextAttr& style); /** Returns the style sheet associated with the control, if any. @@ -821,8 +820,8 @@ public: You can use this to implement, for example, bold button updating. @a style must have flags indicating which attributes are of interest. */ - bool HasCharacterAttributes(const wxRichTextRange& range, - const wxTextAttr& style) const; + virtual bool HasCharacterAttributes(const wxRichTextRange& range, + const wxTextAttr& style) const; /** Test if this whole range has paragraph attributes of the specified kind. @@ -830,8 +829,8 @@ public: You can use this to implement, for example, centering button updating. @a style must have flags indicating which attributes are of interest. */ - bool HasParagraphAttributes(const wxRichTextRange& range, - const wxTextAttr& style) const; + virtual bool HasParagraphAttributes(const wxRichTextRange& range, + const wxTextAttr& style) const; /** Returns @true if there is a selection. diff --git a/interface/wx/richtext/richtexthtml.h b/interface/wx/richtext/richtexthtml.h index a4baf9d6d2..b5d9c228fe 100644 --- a/interface/wx/richtext/richtexthtml.h +++ b/interface/wx/richtext/richtexthtml.h @@ -79,8 +79,8 @@ public: This is a static function that can be used to delete the saved locations from an earlier operation, for example after the user has viewed the HTML file. */ - bool DeleteTemporaryImages(int flags, - const wxArrayString& imageLocations); + static bool DeleteTemporaryImages(int flags, + const wxArrayString& imageLocations); /** Saves the buffer content to the HTML stream. diff --git a/interface/wx/richtext/richtextprint.h b/interface/wx/richtext/richtextprint.h index d3a0208ff7..a604aa9eda 100644 --- a/interface/wx/richtext/richtextprint.h +++ b/interface/wx/richtext/richtextprint.h @@ -211,8 +211,8 @@ public: /** Gets the page information. */ - void GetPageInfo(int* minPage, int* maxPage, int* selPageFrom, - int* selPageTo); + virtual void GetPageInfo(int* minPage, int* maxPage, int* selPageFrom, + int* selPageTo); /** Returns a pointer to the buffer being rendered. diff --git a/interface/wx/richtext/richtextstyles.h b/interface/wx/richtext/richtextstyles.h index 23cba9b4a7..43760b46b3 100644 --- a/interface/wx/richtext/richtextstyles.h +++ b/interface/wx/richtext/richtextstyles.h @@ -480,7 +480,7 @@ public: included in the result. */ wxTextAttr GetCombinedStyle(int indent, - wxRichTextStyleSheet* styleSheet = NULL) const; + wxRichTextStyleSheet* styleSheet = NULL); /** This function combines the list style's base attributes and the style for the diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h index 99aab341a6..c389cb2375 100644 --- a/interface/wx/sizer.h +++ b/interface/wx/sizer.h @@ -1418,8 +1418,8 @@ public: Returns @true if the child item was found and removed, @false otherwise. */ - bool Replace(wxWindow* oldwin, wxWindow* newwin, - bool recursive = false); + virtual bool Replace(wxWindow* oldwin, wxWindow* newwin, + bool recursive = false); /** Detaches the given @a oldsz from the sizer and replaces it with the @@ -1433,8 +1433,8 @@ public: Returns @true if the child item was found and removed, @false otherwise. */ - bool Replace(wxSizer* oldsz, wxSizer* newsz, - bool recursive = false); + virtual bool Replace(wxSizer* oldsz, wxSizer* newsz, + bool recursive = false); /** Detaches the given item at position @a index from the sizer and diff --git a/interface/wx/splitter.h b/interface/wx/splitter.h index e1838691d6..3561831d42 100644 --- a/interface/wx/splitter.h +++ b/interface/wx/splitter.h @@ -330,8 +330,8 @@ public: @see SplitVertically(), IsSplit(), Unsplit() */ - bool SplitHorizontally(wxWindow* window1, wxWindow* window2, - int sashPosition = 0); + virtual bool SplitHorizontally(wxWindow* window1, wxWindow* window2, + int sashPosition = 0); /** Initializes the left and right panes of the splitter window. @@ -357,8 +357,8 @@ public: @see SplitHorizontally(), IsSplit(), Unsplit(). */ - bool SplitVertically(wxWindow* window1, wxWindow* window2, - int sashPosition = 0); + virtual bool SplitVertically(wxWindow* window1, wxWindow* window2, + int sashPosition = 0); /** Unsplits the window. diff --git a/interface/wx/stackwalk.h b/interface/wx/stackwalk.h index d3697da841..0777d9b3e0 100644 --- a/interface/wx/stackwalk.h +++ b/interface/wx/stackwalk.h @@ -144,8 +144,8 @@ public: Return @true if at least some values could be retrieved. This function currently is only implemented under Win32 and requires a PDB file. */ - bool GetParam(size_t n, wxString* type, wxString* name, - wxString* value) const; + virtual bool GetParam(size_t n, wxString* type, wxString* name, + wxString* value) const; /** Return the number of parameters of this function (may return 0 if we diff --git a/interface/wx/string.h b/interface/wx/string.h index ece56d259f..47c020601b 100644 --- a/interface/wx/string.h +++ b/interface/wx/string.h @@ -1227,7 +1227,7 @@ public: /** Same as Mid() (substring extraction). */ - wxString operator ()(size_t start, size_t len); + wxString operator()(size_t start, size_t len) const; //@{ /** diff --git a/interface/wx/textfile.h b/interface/wx/textfile.h index f156227a47..60b7d4e2e6 100644 --- a/interface/wx/textfile.h +++ b/interface/wx/textfile.h @@ -269,7 +269,7 @@ public: @true if operation succeeded, @false if it failed. */ bool Write(wxTextFileType typeNew = wxTextFileType_None, - const wxMBConv& conv = wxConvAuto()) const; + const wxMBConv& conv = wxConvAuto()); /** The same as GetLine(). diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h index d390c6307d..3a38670fcf 100644 --- a/interface/wx/treectrl.h +++ b/interface/wx/treectrl.h @@ -350,8 +350,8 @@ public: None. @endWxPythonOnly */ - bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, - bool textOnly = false) const; + virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, + bool textOnly = false) const; /** Returns the buttons image list (from which application-defined button @@ -401,8 +401,8 @@ public: @see GetNextChild(), GetNextSibling() */ - wxTreeItemId GetFirstChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; + virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, + wxTreeItemIdValue& cookie) const; /** Returns the first visible item. @@ -454,8 +454,8 @@ public: - ::wxTreeItemIcon_SelectedExpanded: to get the selected expanded image (which is shown when an expanded item is currently selected). */ - int GetItemImage(const wxTreeItemId& item, - wxTreeItemIcon which = wxTreeItemIcon_Normal) const; + virtual int GetItemImage(const wxTreeItemId& item, + wxTreeItemIcon which = wxTreeItemIcon_Normal) const; /** Returns the item's parent. @@ -509,8 +509,8 @@ public: @see GetFirstChild() */ - wxTreeItemId GetNextChild(const wxTreeItemId& item, - wxTreeItemIdValue& cookie) const; + virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, + wxTreeItemIdValue& cookie) const; /** Returns the next sibling of the specified item; call GetPrevSibling() @@ -699,8 +699,8 @@ public: @see SortChildren() */ - int OnCompareItems(const wxTreeItemId& item1, - const wxTreeItemId& item2); + virtual int OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2); /** Appends an item as the first child of @a parent, return a new item id. @@ -761,8 +761,8 @@ public: /** Sets the colour of the item's background. */ - void SetItemBackgroundColour(const wxTreeItemId& item, - const wxColour& col); + virtual void SetItemBackgroundColour(const wxTreeItemId& item, + const wxColour& col); /** Makes item appear in bold font if @a bold parameter is @true or resets @@ -790,8 +790,8 @@ public: (as opposed to a DnD operation within the tree control, which already is implemented internally). */ - void SetItemDropHighlight(const wxTreeItemId& item, - bool highlight = true); + virtual void SetItemDropHighlight(const wxTreeItemId& item, + bool highlight = true); /** Sets the item's font. All items in the tree should have the same height @@ -808,15 +808,15 @@ public: but instead adding them only when needed, thus minimizing memory usage and loading time. */ - void SetItemHasChildren(const wxTreeItemId& item, - bool hasChildren = true); + virtual void SetItemHasChildren(const wxTreeItemId& item, + bool hasChildren = true); /** Sets the specified item's image. See GetItemImage() for the description of the @a which parameter. */ - void SetItemImage(const wxTreeItemId& item, int image, - wxTreeItemIcon which = wxTreeItemIcon_Normal); + virtual void SetItemImage(const wxTreeItemId& item, int image, + wxTreeItemIcon which = wxTreeItemIcon_Normal); /** Sets the selected item image (this function is obsolete, use @ref @@ -842,8 +842,8 @@ public: /** Sets the colour of the item's text. */ - void SetItemTextColour(const wxTreeItemId& item, - const wxColour& col); + virtual void SetItemTextColour(const wxTreeItemId& item, + const wxColour& col); /** If @true is passed, specifies that the control will use a quick diff --git a/interface/wx/window.h b/interface/wx/window.h index 0aca1090ce..eadd175397 100644 --- a/interface/wx/window.h +++ b/interface/wx/window.h @@ -1809,8 +1809,8 @@ public: @see UnregisterHotKey() */ - bool RegisterHotKey(int hotkeyId, int modifiers, - int virtualKeyCode); + virtual bool RegisterHotKey(int hotkeyId, int modifiers, + int virtualKeyCode); /** Releases mouse input captured with CaptureMouse(). -- 2.45.2