Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifacecheck fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-08 15:17:16 +00:00
parent 3366d55c57
commit 408776d034
16 changed files with 115 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/wx/dataobj.h
View File

@@ -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

21
interface/wx/dc.h
View File

@@ -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);
//@{
/**
@@ -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);
};

5
interface/wx/dialog.h
View File

@@ -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);
/**

6
interface/wx/dirdlg.h
View File

@@ -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.

74
interface/wx/dnd.h
View File

@@ -187,11 +187,13 @@ 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
@@ -202,18 +204,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 wxIcon& iconCopy = wxNullIcon,
const wxIcon& iconMove = wxNullIcon,
const wxIcon& iconNone = wxNullIcon);
/**
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{wxmsw,wxmac}
@param data
The data associated with the drop source.
@param win
@@ -226,9 +230,59 @@ 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 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
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 wxCursor& iconCopy = wxNullCursor,
const wxCursor& iconMove = wxNullCursor,
const wxCursor& iconNone = wxNullCursor);
/**
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{wxgtk}
@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 wxCursor& iconCopy = wxNullCursor,
const wxCursor& iconMove = wxNullCursor,
const wxCursor& iconNone = wxNullCursor);
/**
Default constructor.

8
interface/wx/docmdi.h
View File

@@ -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.

9
interface/wx/docview.h
View File

@@ -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,

2
interface/wx/editlbox.h
View File

@@ -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.

2
interface/wx/event.h
View File

@@ -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

4
interface/wx/filepicker.h
View File

@@ -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.

2
interface/wx/frame.h
View File

@@ -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.

4
interface/wx/mdi.h
View File

@@ -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.

2
interface/wx/minifram.h
View File

@@ -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.

2
interface/wx/print.h
View File

@@ -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.

4
interface/wx/string.h
View File

@@ -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.

2
interface/wx/toolbar.h
View File

@@ -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.