From: Francesco Montorsi Date: Mon, 24 Mar 2008 01:02:55 +0000 (+0000) Subject: final prototype fixes (done using ifacecheck) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8d483c9b752524c3808a1ca7e52713898f2094f9 final prototype fixes (done using ifacecheck) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/interface/accel.h b/interface/accel.h index 761ac864a6..e200513125 100644 --- a/interface/accel.h +++ b/interface/accel.h @@ -195,7 +195,7 @@ public: Destroys the wxAcceleratorTable object. See @ref overview_refcount_destruct for more info. */ - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); /** Returns @true if the accelerator table is valid. diff --git a/interface/animate.h b/interface/animate.h index 83f5731c74..6352f63c6f 100644 --- a/interface/animate.h +++ b/interface/animate.h @@ -98,7 +98,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxAC_DEFAULT_STYLE, - const wxString& name = "animationctrl"); + const wxString& name = wxAnimationCtrlNameStr); /** Returns the animation associated with this control. @@ -156,7 +156,7 @@ public: Note that the inactive bitmap, if smaller than the control's size, will be centered in the control; if bigger, it will be stretched to fit it. */ - void SetInactiveBitmap(const wxBitmap& bmp); + virtual void SetInactiveBitmap(const wxBitmap& bmp); /** Stops playing the animation. @@ -207,7 +207,7 @@ public: Destructor. See @ref overview_refcount_destruct for more info. */ - ~wxAnimation(); + virtual ~wxAnimation(); /** Returns the delay for the i-th frame in milliseconds. diff --git a/interface/app.h b/interface/app.h index 295b3ba3fa..d23bbd2153 100644 --- a/interface/app.h +++ b/interface/app.h @@ -225,10 +225,11 @@ public: the message specified as argument to wxASSERT_MSG or wxFAIL_MSG, will be @NULL if just wxASSERT or wxFAIL was used */ - virtual void OnAssertFailure(const wxChar file, int line, - const wxChar func, - const wxChar cond, - const wxChar msg); + virtual void OnAssertFailure(const wxChar *file, + int line, + const wxChar *func, + const wxChar *cond, + const wxChar *msg); /** Called when command line parsing fails (i.e. an incorrect command line option @@ -537,7 +538,7 @@ public: If this function returns @false and you need to attract users attention to the application, you may use wxTopLevelWindow::RequestUserAttention to do it. */ - bool IsActive() const; + virtual bool IsActive() const; /** Windows-only function for processing a message. This function is called @@ -573,7 +574,7 @@ public: @see wxIdleEvent */ - bool SendIdleEvents(wxWindow* win, wxIdleEvent& event); + virtual bool SendIdleEvents(wxWindow* win, wxIdleEvent& event); /** Allows the programmer to specify whether the application will exit when the diff --git a/interface/apptrait.h b/interface/apptrait.h index 0522911b07..4192b22041 100644 --- a/interface/apptrait.h +++ b/interface/apptrait.h @@ -78,6 +78,11 @@ public: Returns the wxStandardPaths object for the application. It's normally the same for wxBase and wxGUI except in the case of wxMac and wxCocoa. + + @todo the real function returns a reference to wxStandardPathsBase; + user looking at these docs will write code: + wxStandardPaths &ref = ...->GetStandardPaths(); + which won't compile... */ virtual wxStandardPaths& GetStandardPaths(); @@ -93,8 +98,7 @@ public: and put in given pointers the versions of the GTK library in use. See wxPlatformInfo for more details. */ - virtual wxPortId GetToolkitVersion(int* major = NULL, - int* minor = NULL); + virtual wxPortId GetToolkitVersion(int* major = NULL, int* minor = NULL) const; /** Returns @true if @c fprintf(stderr) goes somewhere, @false otherwise. @@ -105,7 +109,7 @@ public: Returns @true if the library was built as wxUniversal. Always returns @false for wxBase-only apps. */ - bool IsUsingUniversalWidgets() const; + virtual bool IsUsingUniversalWidgets() const; /** Shows the assert dialog with the specified message in GUI mode or just prints diff --git a/interface/archive.h b/interface/archive.h index ae31f17758..991208d4f7 100644 --- a/interface/archive.h +++ b/interface/archive.h @@ -34,7 +34,7 @@ public: Closes the current entry. On a non-seekable stream reads to the end of the current entry first. */ - bool CloseEntry(); + virtual bool CloseEntry(); /** Closes the current entry if one is open, then reads the meta-data for @@ -50,7 +50,7 @@ public: @a entry must be from the same archive file that this wxArchiveInputStream is reading, and it must be reading it from a seekable stream. */ - bool OpenEntry(wxArchiveEntry& entry); + virtual bool OpenEntry(wxArchiveEntry& entry); }; @@ -77,7 +77,7 @@ public: /** Calls Close() if it has not already been called. */ - ~wxArchiveOutputStream(); + virtual ~wxArchiveOutputStream(); /** Closes the archive, returning @true if it was successfully written. diff --git a/interface/arrstr.h b/interface/arrstr.h index a5c24c3493..f813945b76 100644 --- a/interface/arrstr.h +++ b/interface/arrstr.h @@ -135,8 +135,7 @@ public: This function uses linear search for wxArrayString. Returns index of the first item matched or @c wxNOT_FOUND if there is no match. */ - int Index(const wxString& sz, bool bCase = true, - bool bFromEnd = false); + int Index(const wxString& sz, bool bCase = true, bool bFromEnd = false) const; /** Insert the given number of @a copies of the new element in the array before the @@ -156,23 +155,23 @@ public: Returns @true if the array is empty, @false otherwise. This function returns the same result as @e GetCount() == 0 but is probably easier to read. */ - bool IsEmpty(); + bool IsEmpty() const; /** - Return the array element at position @e nIndex. An assert failure will + Return the array element at position @a nIndex. An assert failure will result from an attempt to access an element beyond the end of array in debug mode, but no check is done in release mode. @see operator[] for the operator version. */ - wxString Item(size_t nIndex) const; + wxString& Item(size_t nIndex) const; /** Returns the last element of the array. Attempt to access the last element of an empty array will result in assert failure in debug build, however no checks are done in release mode. */ - wxString Last(); + wxString& Last() const; /** Removes the first item matching this value. An assert failure is provoked by @@ -243,7 +242,7 @@ public: /** Assignment operator. */ - wxArrayString operator =(const wxArrayString& array); + wxArrayString& operator=(const wxArrayString&); /** Compares 2 arrays respecting the case. Returns @true only if the arrays have @@ -252,13 +251,13 @@ public: bool operator ==(const wxArrayString& array) const; /** - Return the array element at position @e nIndex. An assert failure will + Return the array element at position @a nIndex. An assert failure will result from an attempt to access an element beyond the end of array in debug mode, but no check is done in release mode. This is the operator version of the Item() method. */ - wxString operator[](size_t nIndex); + wxString& operator[](size_t nIndex) const; }; diff --git a/interface/artprov.h b/interface/artprov.h index 858d0fc934..2f70d26e76 100644 --- a/interface/artprov.h +++ b/interface/artprov.h @@ -161,7 +161,7 @@ public: The destructor automatically removes the provider from the provider stack used by GetBitmap(). */ - ~wxArtProvider(); + virtual ~wxArtProvider(); /** Derived art provider classes must override this method to create requested art diff --git a/interface/aui/aui.h b/interface/aui/aui.h index 35d719941e..47c876cec5 100644 --- a/interface/aui/aui.h +++ b/interface/aui/aui.h @@ -85,7 +85,7 @@ enum wxAuiManagerOption @section wxauimanager_layers Layers, Rows and Directions, Positions - Inside wxAUI, the docking layout is figured out by checking several pane + Inside wxAUI, the docking layout is figured out by checking several pane parameters. Four of these are important for determining where a pane will end up: @li Direction: Each docked pane has a direction, Top, Bottom, Left, Right, or Center. @@ -95,9 +95,9 @@ enum wxAuiManagerOption being docked on the left side of a window. One pane can be placed over another. In proportionally managed docks, the pane position indicates its sequential position, starting with zero. So, in our scenario with two panes docked on the left side, - the top pane in the dock would have position 0, and the second one would occupy + the top pane in the dock would have position 0, and the second one would occupy position 1. - @li Row: A row can allow for two docks to be placed next to each other. One of the + @li Row: A row can allow for two docks to be placed next to each other. One of the most common places for this to happen is in the toolbar. Multiple toolbar rows are allowed, the first row being row 0, and the second row 1. Rows can also be used on vertically docked panes. @@ -128,7 +128,7 @@ public: /** Dtor. */ - ~wxAuiManager(); + virtual ~wxAuiManager(); //@{ /** @@ -183,7 +183,7 @@ public: /** Calling this method will return the wxAuiManager for a given window. - The @a window parameter should specify any child window or sub-child + The @a window parameter should specify any child window or sub-child window of the frame or window managed by wxAuiManager. The @a window parameter need not be managed by the manager itself, nor does it @@ -198,9 +198,9 @@ public: or by pane name, which acts as a unique id for a window pane. The returned wxAuiPaneInfo object may then be modified to change a pane's - look, state or position. After one or more modifications to wxAuiPaneInfo, - wxAuiManager::Update() should be called to commit the changes to the user - interface. If the lookup failed (meaning the pane could not be found in the + look, state or position. After one or more modifications to wxAuiPaneInfo, + wxAuiManager::Update() should be called to commit the changes to the user + interface. If the lookup failed (meaning the pane could not be found in the manager), a call to the returned wxAuiPaneInfo's IsOk() method will return @false. */ wxAuiPaneInfo GetPane(wxWindow* window); @@ -266,7 +266,7 @@ public: /** Instructs wxAuiManager to use art provider specified by parameter - @a art_provider for all drawing calls. + @a art_provider for all drawing calls. This allows plugable look-and-feel features. The previous art provider object, if any, will be deleted by wxAuiManager. @@ -277,7 +277,7 @@ public: /** When a user creates a new dock by dragging a window into a docked position, often times the large size of the window will create a dock that is unwieldly - large. wxAuiManager by default limits the size of any new dock to 1/3 of the + large. wxAuiManager by default limits the size of any new dock to 1/3 of the window size. For horizontal docks, this would be 1/3 of the window height. For vertical docks, 1/3 of the width. @@ -304,16 +304,16 @@ public: /** This function is used by controls to explicitly show a hint window at the specified rectangle. It is rarely called, and is mostly used by controls - implementing custom pane drag/drop behaviour. + implementing custom pane drag/drop behaviour. The specified rectangle should be in screen coordinates. */ void ShowHint(const wxRect& rect); /** Uninitializes the framework and should be called before a managed frame or - window is destroyed. UnInit() is usually called in the managed wxFrame's - destructor. It is necessary to call this function before the managed frame - or window is destroyed, otherwise the manager cannot remove its custom event + window is destroyed. UnInit() is usually called in the managed wxFrame's + destructor. It is necessary to call this function before the managed frame + or window is destroyed, otherwise the manager cannot remove its custom event handlers from a window. */ void UnInit(); @@ -342,7 +342,7 @@ public: wxAuiPaneInfo specifies all the parameters for a pane. These parameters specify where the pane is on the screen, whether it is docked or floating, or hidden. - In addition, these parameters specify the pane's docked position, floating + In addition, these parameters specify the pane's docked position, floating position, preferred size, minimum size, caption text among many other parameters. @library{wxbase} @@ -406,7 +406,7 @@ public: //@{ /** CentrePane() specifies that the pane should adopt the default center pane - settings. Centre panes usually do not have caption bars. + settings. Centre panes usually do not have caption bars. This function provides an easy way of preparing a pane to be displayed in the center dock position. */ @@ -426,7 +426,7 @@ public: /** DestroyOnClose() indicates whether a pane should be detroyed when it is closed. - Normally a pane is simply hidden when the close button is clicked. + Normally a pane is simply hidden when the close button is clicked. Setting DestroyOnClose to @true will cause the window to be destroyed when the user clicks the pane's close button. */ @@ -446,7 +446,7 @@ public: /** DockFixed() causes the containing dock to have no resize sash. This is useful - for creating panes that span the entire width or height of a dock, but should + for creating panes that span the entire width or height of a dock, but should not be resizable in the other direction. */ wxAuiPaneInfo DockFixed(bool b = true); @@ -627,8 +627,8 @@ public: /** Layer() determines the layer of the docked pane. The dock layer is similar to - an onion, the inner-most layer being layer 0. Each shell moving in the outward - direction has a higher layer number. This allows for more complex docking layout + an onion, the inner-most layer being layer 0. Each shell moving in the outward + direction has a higher layer number. This allows for more complex docking layout formation. */ wxAuiPaneInfo Layer(int layer); @@ -678,7 +678,7 @@ public: /** Name() sets the name of the pane so it can be referenced in lookup functions. - If a name is not specified by the user, a random name is assigned to the pane + If a name is not specified by the user, a random name is assigned to the pane when it is added to the manager. */ wxAuiPaneInfo Name(const wxString& n); @@ -754,9 +754,9 @@ public: wxAuiPaneInfo TopDockable(bool b = true); /** - Window() assigns the window pointer that the wxAuiPaneInfo should use. - This normally does not need to be specified, as the window pointer is - automatically assigned to the wxAuiPaneInfo structure as soon as it is added + Window() assigns the window pointer that the wxAuiPaneInfo should use. + This normally does not need to be specified, as the window pointer is + automatically assigned to the wxAuiPaneInfo structure as soon as it is added to the manager. */ wxAuiPaneInfo Window(wxWindow* w);