other ifacecheck fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
83fdf79672
commit
50ec54b656
@ -80,7 +80,7 @@ public:
|
|||||||
object by pickling it first.
|
object by pickling it first.
|
||||||
@endWxPythonOnly
|
@endWxPythonOnly
|
||||||
*/
|
*/
|
||||||
virtual void SetData(size_t size, const void data);
|
virtual void SetData(size_t size, const void* data);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Like SetData(), but doesn't copy the data - instead the object takes
|
Like SetData(), but doesn't copy the data - instead the object takes
|
||||||
@ -190,7 +190,7 @@ public:
|
|||||||
required and the data should be returned from the method as a string.
|
required and the data should be returned from the method as a string.
|
||||||
@endWxPythonOnly
|
@endWxPythonOnly
|
||||||
*/
|
*/
|
||||||
virtual bool GetDataHere(void buf) const;
|
virtual bool GetDataHere(void* buf) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Gets the size of our data. Must be implemented in the derived class if
|
Gets the size of our data. Must be implemented in the derived class if
|
||||||
@ -214,7 +214,7 @@ public:
|
|||||||
string parameter rather than the two shown here.
|
string parameter rather than the two shown here.
|
||||||
@endWxPythonOnly
|
@endWxPythonOnly
|
||||||
*/
|
*/
|
||||||
virtual bool SetData(size_t len, const void buf);
|
virtual bool SetData(size_t len, const void* buf);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Sets the supported format.
|
Sets the supported format.
|
||||||
@ -656,7 +656,8 @@ public:
|
|||||||
to by @a formats. There is enough space for GetFormatCount(dir) formats
|
to by @a formats. There is enough space for GetFormatCount(dir) formats
|
||||||
in it.
|
in it.
|
||||||
*/
|
*/
|
||||||
virtual void GetAllFormats(wxDataFormat* formats, Direction dir = Get) const;
|
virtual void GetAllFormats(wxDataFormat* formats,
|
||||||
|
Direction dir = Get) const = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
The method will write the data of the format @a format in the buffer
|
The method will write the data of the format @a format in the buffer
|
||||||
|
@ -877,7 +877,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Deletes given column.
|
Deletes given column.
|
||||||
*/
|
*/
|
||||||
virtual bool DeleteColumn(const wxDataViewColumn* column);
|
virtual bool DeleteColumn(wxDataViewColumn* column);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Call this to ensure that the given item is visible.
|
Call this to ensure that the given item is visible.
|
||||||
@ -1320,7 +1320,8 @@ public:
|
|||||||
The ctor.
|
The ctor.
|
||||||
*/
|
*/
|
||||||
wxDataViewToggleRenderer(const wxString& varianttype = "bool",
|
wxDataViewToggleRenderer(const wxString& varianttype = "bool",
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
|
||||||
|
int align = wxDVR_DEFAULT_ALIGNMENT);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -1340,7 +1341,8 @@ public:
|
|||||||
The ctor.
|
The ctor.
|
||||||
*/
|
*/
|
||||||
wxDataViewDateRenderer(const wxString& varianttype = "datetime",
|
wxDataViewDateRenderer(const wxString& varianttype = "datetime",
|
||||||
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE);
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
|
||||||
|
int align = wxDVR_DEFAULT_ALIGNMENT);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@ -1484,7 +1486,7 @@ public:
|
|||||||
This will ensure that the correct colour, font and vertical alignment will
|
This will ensure that the correct colour, font and vertical alignment will
|
||||||
be chosen so the text will look the same as text drawn by native renderers.
|
be chosen so the text will look the same as text drawn by native renderers.
|
||||||
*/
|
*/
|
||||||
bool RenderText(const wxString& text, int xoffset, wxRect cell,
|
void RenderText(const wxString& text, int xoffset, wxRect cell,
|
||||||
wxDC* dc, int state);
|
wxDC* dc, int state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1621,7 +1623,7 @@ public:
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
Set the bitmap of the column header.
|
Set the bitmap of the column header.
|
||||||
*/e
|
*/
|
||||||
virtual void SetBitmap(const wxBitmap& bitmap);
|
virtual void SetBitmap(const wxBitmap& bitmap);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -78,16 +78,14 @@ protected:
|
|||||||
class wxHtmlWinParser : public wxHtmlParser
|
class wxHtmlWinParser : public wxHtmlParser
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructor.
|
Constructor.
|
||||||
|
|
||||||
Don't use the default one, use constructor with @a wndIface parameter
|
Don't use the default one, use the constructor with @a wndIface parameter
|
||||||
(@a wndIface is a pointer to interface object for the associated wxHtmlWindow
|
(@a wndIface is a pointer to interface object for the associated wxHtmlWindow
|
||||||
or other HTML rendering window such as wxHtmlListBox).
|
or other HTML rendering window such as wxHtmlListBox).
|
||||||
*/
|
*/
|
||||||
wxHtmlWinParser(wxHtmlWindowInterface* wndIface = 0);
|
wxHtmlWinParser(wxHtmlWindowInterface* wndIface = NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Adds module() to the list of wxHtmlWinParser tag handler.
|
Adds module() to the list of wxHtmlWinParser tag handler.
|
||||||
|
@ -409,7 +409,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Returns @true if this class is a kind of (inherits from) the given class.
|
Returns @true if this class is a kind of (inherits from) the given class.
|
||||||
*/
|
*/
|
||||||
bool IsKindOf(const wxClassInfo* info);
|
bool IsKindOf(const wxClassInfo* info) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -151,7 +151,7 @@ public:
|
|||||||
|
|
||||||
@see Broadcast()
|
@see Broadcast()
|
||||||
*/
|
*/
|
||||||
void Signal();
|
wxCondError Signal();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Waits until the condition is signalled.
|
Waits until the condition is signalled.
|
||||||
|
Loading…
Reference in New Issue
Block a user