From 408776d0347b651ab4b00c2d613f8e51b1985a91 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sat, 8 Nov 2008 15:17:16 +0000 Subject: [PATCH] ifacecheck fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/dataobj.h | 2 +- interface/wx/dc.h | 23 ++++++------ interface/wx/dialog.h | 5 +-- interface/wx/dirdlg.h | 6 ++-- interface/wx/dnd.h | 74 +++++++++++++++++++++++++++++++++------ interface/wx/docmdi.h | 8 ++--- interface/wx/docview.h | 9 +++-- interface/wx/editlbox.h | 2 +- interface/wx/event.h | 2 +- interface/wx/filepicker.h | 4 +-- interface/wx/frame.h | 2 +- interface/wx/mdi.h | 4 +-- interface/wx/minifram.h | 2 +- interface/wx/print.h | 2 +- interface/wx/string.h | 4 +-- interface/wx/toolbar.h | 22 ++++++------ 16 files changed, 115 insertions(+), 56 deletions(-) diff --git a/interface/wx/dataobj.h b/interface/wx/dataobj.h index 395686a034..efbd5a98ee 100644 --- a/interface/wx/dataobj.h +++ b/interface/wx/dataobj.h @@ -80,7 +80,7 @@ public: object by pickling it first. @endWxPythonOnly */ - virtual void SetData(size_t size, const void* data); + virtual bool SetData(size_t size, const void* data); /** Like SetData(), but doesn't copy the data - instead the object takes diff --git a/interface/wx/dc.h b/interface/wx/dc.h index f7b170c64c..4f19e1be06 100644 --- a/interface/wx/dc.h +++ b/interface/wx/dc.h @@ -121,7 +121,7 @@ public: bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); /** Adds the specified point to the bounding box which can be retrieved @@ -207,7 +207,7 @@ public: @see SetTextForeground(), SetTextBackground(), wxMemoryDC */ void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, - bool transparent); + bool useMask = false); //@{ /** @@ -445,7 +445,7 @@ public: the string. See GetTextExtent() for how to get the dimensions of a text string, which can be used to position the text more precisely. - @note The current @ref GetLogicalFunction() "logical function" is + @note The current @ref GetLogicalFunction() "logical function" is ignored by this function. */ void DrawText(const wxString& text, wxCoord x, wxCoord y); @@ -517,7 +517,7 @@ public: are returned as a tuple. @endWxPythonOnly */ - void GetClippingBox(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const; /** Returns the depth (number of bits/pixel) of this DC. @@ -576,7 +576,7 @@ public: void GetMultiLineTextExtent(const wxString& string, wxCoord* w, wxCoord* h, wxCoord* heightLine = NULL, - wxFont* font = NULL) const; + const wxFont* font = NULL) const; /** Gets the dimensions of the string using the currently selected font. @a string is the text string to measure, @e heightLine, if non @NULL, @@ -588,7 +588,7 @@ public: @see wxFont, SetFont(), GetPartialTextExtents(), GetTextExtent() */ - const wxSize GetMultiLineTextExtent(const wxString& string) const; + wxSize GetMultiLineTextExtent(const wxString& string) const; /** Fills the @a widths array with the widths from the beginning of @a text @@ -1068,12 +1068,12 @@ public: setting the @c no-maskblt option to 1. @param xsrcMask Source x position on the mask. If both xsrcMask and ysrcMask are - -1, xsrc and ysrc will be assumed for the mask source position. - Currently only implemented on Windows. + wxDefaultCoord, @a xsrc and @a ysrc will be assumed for the mask + source position. Currently only implemented on Windows. @param ysrcMask Source y position on the mask. If both xsrcMask and ysrcMask are - -1, xsrc and ysrc will be assumed for the mask source position. - Currently only implemented on Windows. + wxDefaultCoord, @a xsrc and @a ysrc will be assumed for the mask + source position. Currently only implemented on Windows. There is partial support for Blit() in wxPostScriptDC, under X. @@ -1091,7 +1091,8 @@ public: wxCoord srcWidth, wxCoord srcHeight, int logicalFunc = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); + wxCoord xsrcMask = wxDefaultCoord, + wxCoord ysrcMask = wxDefaultCoord); }; diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h index 0c4140b2b9..0ffb51d883 100644 --- a/interface/wx/dialog.h +++ b/interface/wx/dialog.h @@ -167,7 +167,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = "dialogBox"); + const wxString& name = wxDialogNameStr); /** Destructor. Deletes any child windows before deleting the physical @@ -207,7 +207,8 @@ public: */ bool Create(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 536877056, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); /** diff --git a/interface/wx/dirdlg.h b/interface/wx/dirdlg.h index cf6364f31b..23d7285ee0 100644 --- a/interface/wx/dirdlg.h +++ b/interface/wx/dirdlg.h @@ -67,12 +67,12 @@ public: The dialog name, not used. */ wxDirDialog(wxWindow* parent, - const wxString& message = "Choose a directory", - const wxString& defaultPath = "", + const wxString& message = wxDirSelectorPromptStr, + const wxString& defaultPath = wxEmptyString, long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const wxString& name = "wxDirCtrl"); + const wxString& name = wxDirDialogNameStr); /** Destructor. diff --git a/interface/wx/dnd.h b/interface/wx/dnd.h index f93a5b12ed..a40930ba69 100644 --- a/interface/wx/dnd.h +++ b/interface/wx/dnd.h @@ -187,11 +187,63 @@ public: /** This constructor requires that you must call SetData() later. - Note that the exact type of @a iconCopy and subsequent parameters - differs between wxMSW and wxGTK: these are cursors under Windows but + Note that the type of @a iconCopy and subsequent parameters + differs between different ports: these are cursors under Windows but icons for GTK. You should use the macro wxDROP_ICON() in portable programs instead of directly using either of these types. + @onlyfor{wxmsw,wxmac} + + @param win + The window which initiates the drag and drop operation. + @param iconCopy + The icon or cursor used for feedback for copy operation. + @param iconMove + The icon or cursor used for feedback for move operation. + @param iconNone + The icon or cursor used for feedback when operation can't be done. + */ + wxDropSource(wxWindow* win = NULL, + const wxIcon& iconCopy = wxNullIcon, + const wxIcon& iconMove = wxNullIcon, + const wxIcon& iconNone = wxNullIcon); + + /** + The constructor for wxDataObject. + + Note that the type of @a iconCopy and subsequent parameters + differs between different ports: these are cursors under Windows but + icons for GTK. You should use the macro wxDROP_ICON() in portable + programs instead of directly using either of these types. + + @onlyfor{wxmsw,wxmac} + + @param data + The data associated with the drop source. + @param win + The window which initiates the drag and drop operation. + @param iconCopy + The icon or cursor used for feedback for copy operation. + @param iconMove + The icon or cursor used for feedback for move operation. + @param iconNone + The icon or cursor used for feedback when operation can't be done. + */ + wxDropSource(wxDataObject& data, wxWindow* win = NULL, + const wxIcon& iconCopy = wxNullIcon, + const wxIcon& iconMove = wxNullIcon, + const wxIcon& iconNone = wxNullIcon); + + /** + This constructor requires that you must call SetData() later. + + Note that the type of @a iconCopy and subsequent parameters + differs between different ports: these are cursors under Windows but + icons for GTK. You should use the macro wxDROP_ICON() in portable + programs instead of directly using either of these types. + + @onlyfor{wxgtk} + @param win The window which initiates the drag and drop operation. @param iconCopy @@ -202,18 +254,20 @@ public: The icon or cursor used for feedback when operation can't be done. */ wxDropSource(wxWindow* win = NULL, - const wxIconOrCursor& iconCopy = wxNullIconOrCursor, - const wxIconOrCursor& iconMove = wxNullIconOrCursor, - const wxIconOrCursor& iconNone = wxNullIconOrCursor); + const wxCursor& iconCopy = wxNullCursor, + const wxCursor& iconMove = wxNullCursor, + const wxCursor& iconNone = wxNullCursor); /** The constructor for wxDataObject. - Note that the exact type of @a iconCopy and subsequent parameters - differs between wxMSW and wxGTK: these are cursors under Windows but + Note that the type of @a iconCopy and subsequent parameters + differs between different ports: these are cursors under Windows but icons for GTK. You should use the macro wxDROP_ICON() in portable programs instead of directly using either of these types. + @onlyfor{wxgtk} + @param data The data associated with the drop source. @param win @@ -226,9 +280,9 @@ public: The icon or cursor used for feedback when operation can't be done. */ wxDropSource(wxDataObject& data, wxWindow* win = NULL, - const wxIconOrCursor& iconCopy = wxNullIconOrCursor, - const wxIconOrCursor& iconMove = wxNullIconOrCursor, - const wxIconOrCursor& iconNone = wxNullIconOrCursor); + const wxCursor& iconCopy = wxNullCursor, + const wxCursor& iconMove = wxNullCursor, + const wxCursor& iconNone = wxNullCursor); /** Default constructor. diff --git a/interface/wx/docmdi.h b/interface/wx/docmdi.h index 1aa4c4c2c5..a5688dc186 100644 --- a/interface/wx/docmdi.h +++ b/interface/wx/docmdi.h @@ -35,7 +35,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); //@} /** @@ -51,7 +51,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Deletes all views and documents. If no user input cancelled the @@ -100,12 +100,12 @@ public: Constructor. */ wxDocMDIChildFrame(wxDocument* doc, wxView* view, - wxFrame* parent, wxWindowID id, + wxMDIParentFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. diff --git a/interface/wx/docview.h b/interface/wx/docview.h index 33806cf5d0..e884ee0ba5 100644 --- a/interface/wx/docview.h +++ b/interface/wx/docview.h @@ -851,7 +851,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. @@ -933,7 +933,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. @@ -1106,12 +1106,15 @@ public: */ virtual wxString GetUserReadableName() const; + //@{ /** Returns the list whose elements are the views on the document. @see GetFirstView() */ - wxList GetViews() const; + wxList& GetViews() const; + const wxList& GetViews() const; + //@} /** Returns @true if the document has been modified since the last save, diff --git a/interface/wx/editlbox.h b/interface/wx/editlbox.h index d1d1bd57d9..d489a95be6 100644 --- a/interface/wx/editlbox.h +++ b/interface/wx/editlbox.h @@ -66,7 +66,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxEL_DEFAULT_STYLE, - const wxString& name = "editableListBox"); + const wxString& name = wxEditableListBoxNameStr); /** Destructor, destroying the list box. diff --git a/interface/wx/event.h b/interface/wx/event.h index 00c3bcadec..9b35297a12 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -1921,7 +1921,7 @@ public: /** Constructor. */ - wxCommandEvent(wxEventType commandEventType = 0, int id = 0); + wxCommandEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0); /** Returns client data pointer for a listbox or choice selection event diff --git a/interface/wx/filepicker.h b/interface/wx/filepicker.h index e7be724a10..f3a46de190 100644 --- a/interface/wx/filepicker.h +++ b/interface/wx/filepicker.h @@ -187,12 +187,12 @@ public: */ wxDirPickerCtrl(wxWindow* parent, wxWindowID id, const wxString& path = wxEmptyString, - const wxString& message = "Select a folder", + const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, - const wxString& name = "dirpickerctrl"); + const wxString& name = wxDirPickerCtrlNameStr); /** Creates the widgets with the given parameters. diff --git a/interface/wx/frame.h b/interface/wx/frame.h index ded99c8ec6..78ea432f42 100644 --- a/interface/wx/frame.h +++ b/interface/wx/frame.h @@ -156,7 +156,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. Destroys all child windows and menu bar if present. diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h index 8cf3e594e5..dbb43f994b 100644 --- a/interface/wx/mdi.h +++ b/interface/wx/mdi.h @@ -168,7 +168,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. @@ -395,7 +395,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. Destroys all child windows and menu bar if present. diff --git a/interface/wx/minifram.h b/interface/wx/minifram.h index c37afc418d..f9e621d723 100644 --- a/interface/wx/minifram.h +++ b/interface/wx/minifram.h @@ -92,7 +92,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION | wxRESIZE_BORDER, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. Destroys all child windows and menu bar if present. diff --git a/interface/wx/print.h b/interface/wx/print.h index 7d9c05ce32..c8c6e68ed2 100644 --- a/interface/wx/print.h +++ b/interface/wx/print.h @@ -145,7 +145,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = "frame"); + const wxString& name = wxFrameNameStr); /** Destructor. diff --git a/interface/wx/string.h b/interface/wx/string.h index 43a8f3651f..ed2afa915f 100644 --- a/interface/wx/string.h +++ b/interface/wx/string.h @@ -498,7 +498,7 @@ public: /** Appends the string literal @e psz with max length @e nLen. */ - wxString& Append(const wchar_t* pwz); + wxString& Append(const char* psz, size_t nLen); /** Appends the wide string literal @e psz with max length @e nLen. @@ -508,7 +508,7 @@ public: /** Appends the string @e s. */ - wxString& Append(const wchar_t* pwz, size_t nLen); + wxString& Append(const wxString& s); /** Appends the character @e ch @e count times. diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index fc50cb0b3c..1292dfdfb1 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -49,7 +49,7 @@ @code if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32) @endcode - + There are several different types of tools you can add to a toolbar. These types are controlled by the ::wxItemKind enumeration. @@ -115,7 +115,7 @@ displays the default dropdown menu set using wxToolBar::SetDropdownMenu(). @endEventTable - + The toolbar class emits menu commands in the same way that a frame menubar does, so you can use one EVT_MENU() macro for both a menu item and a toolbar button. The event handler functions take a wxCommandEvent argument. For most @@ -165,7 +165,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTB_HORIZONTAL | wxBORDER_NONE, - const wxString& name = wxPanelNameStr); + const wxString& name = wxToolBarNameStr); /** Toolbar destructor. @@ -211,7 +211,7 @@ public: previously pressed button is automatically released. You should avoid having the radio groups of only one element as it would be impossible for the user to use such button. - + By default, the first button in the radio group is initially pressed, the others are not. @@ -247,14 +247,14 @@ public: virtual wxToolBarToolBase* AddTool(wxToolBarToolBase* tool); /** - Adds a tool to the toolbar. This most commonly used version has fewer + Adds a tool to the toolbar. This most commonly used version has fewer parameters than the full version below which specifies the more rarely used button features. @param toolId An integer by which the tool may be identified in subsequent operations. - @param label + @param label The string to be displayed with the tool. @param bitmap The primary tool bitmap. @@ -264,7 +264,7 @@ public: May be ::wxITEM_NORMAL for a normal button (default), ::wxITEM_CHECK for a checkable tool (such tool stays pressed after it had been toggled) or ::wxITEM_RADIO for a checkable tool which makes part of - a radio group of tools each of which is automatically unchecked + a radio group of tools each of which is automatically unchecked whenever another button in the group is checked. ::wxITEM_DROPDOWN specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call SetDropdownMenu() afterwards. @@ -286,13 +286,13 @@ public: @param toolId An integer by which the tool may be identified in subsequent operations. - @param label + @param label The string to be displayed with the tool. @param bitmap The primary tool bitmap. @param bmpDisabled The bitmap used when the tool is disabled. If it is equal to - ::wxNullBitmap (default), the disabled bitmap is automatically + ::wxNullBitmap (default), the disabled bitmap is automatically generated by greying the normal one. @param shortHelpString This string is used for the tools tooltip. @@ -303,7 +303,7 @@ public: May be ::wxITEM_NORMAL for a normal button (default), ::wxITEM_CHECK for a checkable tool (such tool stays pressed after it had been toggled) or ::wxITEM_RADIO for a checkable tool which makes part of - a radio group of tools each of which is automatically unchecked + a radio group of tools each of which is automatically unchecked whenever another button in the group is checked. ::wxITEM_DROPDOWN specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call SetDropdownMenu() afterwards. @@ -716,7 +716,7 @@ public: @param packing The value for packing. - @remarks The packing is used for spacing in the vertical direction if + @remarks The packing is used for spacing in the vertical direction if the toolbar is horizontal, and for spacing in the horizontal direction if the toolbar is vertical. -- 2.45.2