From b7e94bd7ebc205ffba5e2729b0d465778d4e48c6 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Mon, 22 Sep 2008 19:01:17 +0000 Subject: [PATCH] automated virtual/const fixes by ifacecheck git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/choicdlg.h | 4 ++-- interface/wx/choice.h | 8 ++++---- interface/wx/clipbrd.h | 20 ++++++++++---------- interface/wx/clntdata.h | 4 ++-- interface/wx/cmdproc.h | 18 +++++++++--------- interface/wx/cmndata.h | 20 ++++++++++---------- interface/wx/collpane.h | 6 +++--- interface/wx/colordlg.h | 4 ++-- interface/wx/colour.h | 8 ++++---- interface/wx/combobox.h | 8 ++++---- interface/wx/config.h | 2 +- interface/wx/control.h | 2 +- interface/wx/cshelp.h | 2 +- interface/wx/cursor.h | 2 +- interface/wx/object.h | 4 ++-- 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/interface/wx/choicdlg.h b/interface/wx/choicdlg.h index f9dcbc5d57..b0c5779f1b 100644 --- a/interface/wx/choicdlg.h +++ b/interface/wx/choicdlg.h @@ -120,7 +120,7 @@ public: /** Sets selected items from the array of selected items' indexes. */ - void SetSelections(const wxArrayInt& selections) const; + void SetSelections(const wxArrayInt& selections); /** Shows the dialog, returning either wxID_OK or wxID_CANCEL. @@ -265,7 +265,7 @@ public: /** Sets the index of the initially selected item. */ - void SetSelection(int selection) const; + void SetSelection(int selection); /** Shows the dialog, returning either wxID_OK or wxID_CANCEL. diff --git a/interface/wx/choice.h b/interface/wx/choice.h index 57e03c6dfc..0ad3fdbef2 100644 --- a/interface/wx/choice.h +++ b/interface/wx/choice.h @@ -123,7 +123,7 @@ public: /** Destructor, destroying the choice item. */ - ~wxChoice(); + virtual ~wxChoice(); //@{ /** @@ -150,7 +150,7 @@ public: @remarks This is implemented for GTK and Motif only and always returns 1 for the other platforms. */ - int GetColumns() const; + virtual int GetColumns() const; /** Unlike wxControlWithItems::GetSelection() which only returns the @@ -164,7 +164,7 @@ public: In older versions, wxControlWithItems::GetSelection() itself behaved like this. */ - int GetCurrentSelection() const; + virtual int GetCurrentSelection() const; /** Sets the number of columns in this choice item. @@ -175,6 +175,6 @@ public: @remarks This is implemented for GTK and Motif only and doesn’t do anything under other platforms. */ - void SetColumns(int n = 1); + virtual void SetColumns(int n = 1); }; diff --git a/interface/wx/clipbrd.h b/interface/wx/clipbrd.h index 1af79ac1f1..ca3dec1783 100644 --- a/interface/wx/clipbrd.h +++ b/interface/wx/clipbrd.h @@ -70,7 +70,7 @@ public: /** Destructor. */ - ~wxClipboard(); + virtual ~wxClipboard(); /** Call this function to add the data object to the clipboard. You may @@ -82,19 +82,19 @@ public: @see SetData() */ - bool AddData(wxDataObject* data); + virtual bool AddData(wxDataObject* data); /** Clears the global clipboard object and the system's clipboard if possible. */ - void Clear(); + virtual void Clear(); /** Call this function to close the clipboard, having opened it with Open(). */ - void Close(); + virtual void Close(); /** Flushes the clipboard: this means that the data which is currently on @@ -104,18 +104,18 @@ public: @return @false if the operation is unsuccessful for any reason. */ - bool Flush(); + virtual bool Flush(); /** Call this function to fill @a data with data on the clipboard, if available in the required format. Returns @true on success. */ - bool GetData(wxDataObject& data); + virtual bool GetData(wxDataObject& data); /** Returns @true if the clipboard has been opened. */ - bool IsOpened() const; + virtual bool IsOpened() const; /** Returns @true if there is data which matches the data format of the @@ -124,7 +124,7 @@ public: @todo The name of this function is misleading. This should be renamed to something that more accurately indicates what it does. */ - bool IsSupported(const wxDataFormat& format); + virtual bool IsSupported(const wxDataFormat& format); /** Returns @true if we are using the primary selection, @false if @@ -144,7 +144,7 @@ public: @return @true on success. This should be tested (as in the sample shown above). */ - bool Open(); + virtual bool Open(); /** Call this function to set the data object to the clipboard. This @@ -156,7 +156,7 @@ public: @see AddData() */ - bool SetData(wxDataObject* data); + virtual bool SetData(wxDataObject* data); /** On platforms supporting it (all X11-based ports), wxClipboard uses the diff --git a/interface/wx/clntdata.h b/interface/wx/clntdata.h index 561d71ae20..ed81d4b13d 100644 --- a/interface/wx/clntdata.h +++ b/interface/wx/clntdata.h @@ -35,7 +35,7 @@ public: /** Destructor. */ - ~wxClientDataContainer(); + virtual ~wxClientDataContainer(); /** Get the untyped client data. @@ -99,7 +99,7 @@ public: /** Virtual destructor. */ - ~wxClientData(); + virtual ~wxClientData(); }; diff --git a/interface/wx/cmdproc.h b/interface/wx/cmdproc.h index 55970df404..9c0c1e909c 100644 --- a/interface/wx/cmdproc.h +++ b/interface/wx/cmdproc.h @@ -40,12 +40,12 @@ public: /** Destructor. */ - ~wxCommand(); + virtual ~wxCommand(); /** Returns @true if the command can be undone, @false otherwise. */ - bool CanUndo(); + virtual bool CanUndo() const; /** Override this member function to execute the appropriate action when @@ -61,7 +61,7 @@ public: /** Returns the command name. */ - wxString GetName(); + virtual wxString GetName() const; /** Override this member function to un-execute a previous Do. @@ -118,13 +118,13 @@ public: /** Destructor. */ - ~wxCommandProcessor(); + virtual ~wxCommandProcessor(); /** Returns @true if the currently-active command can be undone, @false otherwise. */ - virtual bool CanUndo(); + virtual bool CanUndo() const; /** Deletes all commands in the list and sets the current command pointer @@ -135,7 +135,7 @@ public: /** Returns the list of commands. */ - wxList& GetCommands() const; + wxList& GetCommands(); /** Returns the edit menu associated with the command processor. @@ -180,13 +180,13 @@ public: the last save operation. This only works if MarkAsSaved() is called whenever the project is saved. */ - virtual bool IsDirty(); + virtual bool IsDirty() const; /** You must call this method whenever the project is saved if you plan to use IsDirty(). */ - virtual void MarkAsSaved(); + void MarkAsSaved(); /** Executes (redoes) the current command (the command that has just been @@ -206,7 +206,7 @@ public: Sets the menu labels according to the currently set menu and the current command state. */ - void SetMenuStrings(); + virtual void SetMenuStrings(); /** Sets the string that will be appended to the Redo menu item. diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h index a90ac9457b..4c59595f7f 100644 --- a/interface/wx/cmndata.h +++ b/interface/wx/cmndata.h @@ -41,13 +41,13 @@ public: The default value is @true. */ - bool GetAllowSymbols(); + bool GetAllowSymbols() const; /** Gets the font chosen by the user if the user pressed OK (wxFontDialog::ShowModal() returned wxID_OK). */ - wxFont GetChosenFont(); + wxFont GetChosenFont() const; /** Gets the colour associated with the font dialog. @@ -63,20 +63,20 @@ public: The default value is @true. */ - bool GetEnableEffects(); + bool GetEnableEffects() const; /** Gets the font that will be initially used by the font dialog. This should have previously been set by the application. */ - wxFont GetInitialFont(); + wxFont GetInitialFont() const; /** Returns @true if the Help button will be shown (Windows only). The default value is @false. */ - bool GetShowHelp(); + bool GetShowHelp() const; /** Under Windows, determines whether symbol fonts can be selected. Has no @@ -162,7 +162,7 @@ public: /** Destructor. */ - ~wxPageSetupDialogData(); + virtual ~wxPageSetupDialogData(); /** Enables or disables the "Help" button (Windows only). @@ -365,7 +365,7 @@ public: /** Destructor. */ - ~wxColourData(); + virtual ~wxColourData(); /** Under Windows, determines whether the Windows colour dialog will @@ -383,7 +383,7 @@ public: The default colour is black. */ - wxColour& GetColour() const; + wxColour& GetColour(); /** Returns custom colours associated with the colour dialog. @@ -518,7 +518,7 @@ public: /** Destructor. */ - ~wxPrintData(); + virtual ~wxPrintData(); /** Returns the current bin (papersource). By default, the system is left @@ -691,7 +691,7 @@ public: /** Destructor. */ - ~wxPrintDialogData(); + virtual ~wxPrintDialogData(); /** Enables or disables the "Help" button. diff --git a/interface/wx/collpane.h b/interface/wx/collpane.h index 32c64c4166..d69ae74f60 100644 --- a/interface/wx/collpane.h +++ b/interface/wx/collpane.h @@ -154,7 +154,7 @@ public: /** Collapses or expands the pane window. */ - void Collapse(bool collapse = true); + virtual void Collapse(bool collapse = true); /** Same as calling Collapse(@false). @@ -165,12 +165,12 @@ public: Returns a pointer to the pane window. Add controls to the returned wxWindow to make them collapsible. */ - wxWindow* GetPane() const; + virtual wxWindow* GetPane() const; /** Returns @true if the pane window is currently hidden. */ - bool IsCollapsed() const; + virtual bool IsCollapsed() const; /** Returns @true if the pane window is currently shown. diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h index 531b075122..33abe1b0ca 100644 --- a/interface/wx/colordlg.h +++ b/interface/wx/colordlg.h @@ -37,7 +37,7 @@ public: /** Destructor. */ - ~wxColourDialog(); + virtual ~wxColourDialog(); /** Same as wxColourDialog(). @@ -53,7 +53,7 @@ public: Shows the dialog, returning wxID_OK if the user pressed OK, and wxID_CANCEL otherwise. */ - int ShowModal(); + virtual int ShowModal(); }; diff --git a/interface/wx/colour.h b/interface/wx/colour.h index a51c5a5850..209929c39a 100644 --- a/interface/wx/colour.h +++ b/interface/wx/colour.h @@ -71,12 +71,12 @@ public: Returns the alpha value, on platforms where alpha is not yet supported, this always returns wxALPHA_OPAQUE. */ - unsigned char Alpha() const; + virtual unsigned char Alpha() const; /** Returns the blue intensity. */ - unsigned char Blue() const; + virtual unsigned char Blue() const; /** Converts this colour to a wxString using the given flags. @@ -108,7 +108,7 @@ public: /** Returns the green intensity. */ - unsigned char Green() const; + virtual unsigned char Green() const; /** Returns @true if the colour object is valid (the colour has been initialised @@ -119,7 +119,7 @@ public: /** Returns the red intensity. */ - unsigned char Red() const; + virtual unsigned char Red() const; //@{ /** diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h index f0a56fa4a4..e3324620a1 100644 --- a/interface/wx/combobox.h +++ b/interface/wx/combobox.h @@ -150,7 +150,7 @@ public: /** Destructor, destroying the combobox. */ - ~wxComboBox(); + virtual ~wxComboBox(); //@{ /** @@ -221,7 +221,7 @@ public: and returns the item currently selected in the dropdown list if it's open or the same thing as wxControlWithItems::GetSelection() otherwise. */ - int GetCurrentSelection() const; + virtual int GetCurrentSelection() const; /** Returns the insertion point for the combobox's text field. @@ -243,7 +243,7 @@ public: Currently this method is only implemented in wxMSW and wxGTK. */ - void GetSelection(long* from, long* to) const; + virtual void GetSelection(long* from, long* to) const; /** Returns the current value in the combobox text field. @@ -309,7 +309,7 @@ public: wxControlWithItems::SetSelection(). @endWxPythonOnly */ - void SetSelection(long from, long to); + virtual void SetSelection(long from, long to); /** Sets the text for the combobox text field. diff --git a/interface/wx/config.h b/interface/wx/config.h index 1f1beff987..7c71b949bf 100644 --- a/interface/wx/config.h +++ b/interface/wx/config.h @@ -335,7 +335,7 @@ public: /** Empty but ensures that dtor of all derived classes is virtual. */ - ~wxConfigBase(); + virtual ~wxConfigBase(); /** diff --git a/interface/wx/control.h b/interface/wx/control.h index df89e6b455..e60d68f58f 100644 --- a/interface/wx/control.h +++ b/interface/wx/control.h @@ -27,7 +27,7 @@ public: @see wxCommandEvent */ - void Command(wxCommandEvent& event); + virtual void Command(wxCommandEvent& event); /** Returns the control's text. diff --git a/interface/wx/cshelp.h b/interface/wx/cshelp.h index 116aad6a3f..e581c6fa95 100644 --- a/interface/wx/cshelp.h +++ b/interface/wx/cshelp.h @@ -205,7 +205,7 @@ public: /** Destroys the context help object. */ - ~wxContextHelp(); + virtual ~wxContextHelp(); /** Puts the application into context-sensitive help mode. @a window is the diff --git a/interface/wx/cursor.h b/interface/wx/cursor.h index cd0f232a8b..ec30445c89 100644 --- a/interface/wx/cursor.h +++ b/interface/wx/cursor.h @@ -191,7 +191,7 @@ public: destroyed when the window is destroyed. wxWidgets destroys all cursors on application exit, although it is best to clean them up explicitly. */ - ~wxCursor(); + virtual ~wxCursor(); /** Returns @true if cursor data is present. diff --git a/interface/wx/object.h b/interface/wx/object.h index 3caa4b6982..ea7f553a52 100644 --- a/interface/wx/object.h +++ b/interface/wx/object.h @@ -251,7 +251,7 @@ public: @return @true if the class represented by info is the same class as this one or is derived from it. */ - bool IsKindOf(const wxClassInfo* info); + bool IsKindOf(const wxClassInfo* info) const; /** Returns @true if this object has the same data pointer as @a obj. @@ -263,7 +263,7 @@ public: @see @ref overview_refcount */ - bool IsSameAs(const wxObject& obj); + bool IsSameAs(const wxObject& obj) const; /** Makes this object refer to the data in @a clone. -- 2.45.2