misc fixes of ctor signatures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,7 +34,8 @@ public:
|
|||||||
@param stream
|
@param stream
|
||||||
The output stream.
|
The output stream.
|
||||||
*/
|
*/
|
||||||
wxDataOutputStream(wxOutputStream& stream);
|
wxDataOutputStream(wxOutputStream& stream,
|
||||||
|
const wxMBConv& conv = wxConvAuto());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructs a datastream object from an output stream. Only write
|
Constructs a datastream object from an output stream. Only write
|
||||||
@@ -179,7 +180,8 @@ public:
|
|||||||
@param stream
|
@param stream
|
||||||
The input stream.
|
The input stream.
|
||||||
*/
|
*/
|
||||||
wxDataInputStream(wxInputStream& stream);
|
wxDataInputStream(wxInputStream& stream,
|
||||||
|
const wxMBConv& conv = wxConvAuto());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructs a datastream object from an input stream. Only read methods
|
Constructs a datastream object from an input stream. Only read methods
|
||||||
|
@@ -227,10 +227,8 @@ public:
|
|||||||
@param modif
|
@param modif
|
||||||
Modification date and time for this file.
|
Modification date and time for this file.
|
||||||
*/
|
*/
|
||||||
wxFSFile(wxInputStream stream,
|
wxFSFile(wxInputStream* stream, const wxString& location,
|
||||||
const wxString& location,
|
const wxString& mimetype, const wxString& anchor,
|
||||||
const wxString& mimetype,
|
|
||||||
const wxString& anchor,
|
|
||||||
wxDateTime modif);
|
wxDateTime modif);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
This cell changes the colour of either the background or the foreground.
|
This cell changes the colour of either the background or the foreground.
|
||||||
|
|
||||||
@library{wxhtml}
|
@library{wxhtml}
|
||||||
@category{FIXME}
|
@category{html}
|
||||||
*/
|
*/
|
||||||
class wxHtmlColourCell : public wxHtmlCell
|
class wxHtmlColourCell : public wxHtmlCell
|
||||||
{
|
{
|
||||||
@@ -48,7 +48,7 @@ public:
|
|||||||
|
|
||||||
change background color
|
change background color
|
||||||
*/
|
*/
|
||||||
wxHtmlColourCell(wxColour clr, int flags = wxHTML_CLR_FOREGROUND);
|
wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Constructor. @a parent is pointer to parent container or @NULL.
|
Constructor. @a parent is pointer to parent container or @NULL.
|
||||||
*/
|
*/
|
||||||
wxHtmlContainerCell(wxHtmlContainerCell parent);
|
wxHtmlContainerCell(wxHtmlContainerCell* parent);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Returns container's horizontal alignment.
|
Returns container's horizontal alignment.
|
||||||
|
@@ -23,9 +23,9 @@ protected:
|
|||||||
yourself. Feel free to ignore the constructor parameters.
|
yourself. Feel free to ignore the constructor parameters.
|
||||||
Have a look at src/html/htmlpars.cpp if you're interested in creating it.
|
Have a look at src/html/htmlpars.cpp if you're interested in creating it.
|
||||||
*/
|
*/
|
||||||
wxHtmlTag(wxHtmlTag* parent, const wxString& source, int pos,
|
wxHtmlTag(wxHtmlTag* parent, const wxString* source,
|
||||||
int end_pos, wxHtmlTagsCache* cache,
|
const const_iterator& pos, const const_iterator& end_pos,
|
||||||
wxHtmlEntitiesParser* entParser);
|
wxHtmlTagsCache* cache, wxHtmlEntitiesParser* entParser);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
|
@@ -421,7 +421,7 @@ public:
|
|||||||
Constructs a log target which sends all the log messages to the given
|
Constructs a log target which sends all the log messages to the given
|
||||||
@c FILE. If it is @NULL, the messages are sent to @c stderr.
|
@c FILE. If it is @NULL, the messages are sent to @c stderr.
|
||||||
*/
|
*/
|
||||||
wxLogStderr(FILE fp = NULL);
|
wxLogStderr(FILE* fp = NULL);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -510,7 +510,7 @@ public:
|
|||||||
Constructs a log target which sends all the log messages to the given text
|
Constructs a log target which sends all the log messages to the given text
|
||||||
control. The @a textctrl parameter cannot be @NULL.
|
control. The @a textctrl parameter cannot be @NULL.
|
||||||
*/
|
*/
|
||||||
wxLogTextCtrl(wxTextCtrl textctrl);
|
wxLogTextCtrl(wxTextCtrl* pTextCtrl);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -234,13 +234,19 @@ wxMimeTypesManager* wxTheMimeTypesManager;
|
|||||||
*/
|
*/
|
||||||
class wxFileType
|
class wxFileType
|
||||||
{
|
{
|
||||||
public:
|
private:
|
||||||
/**
|
/**
|
||||||
The default constructor is private because you should never create objects of
|
The default constructor is private because you should never create objects of
|
||||||
this type: they are only returned by wxMimeTypesManager methods.
|
this type: they are only returned by wxMimeTypesManager methods.
|
||||||
*/
|
*/
|
||||||
wxFileType();
|
wxFileType();
|
||||||
|
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
Copy ctor.
|
||||||
|
*/
|
||||||
|
wxFileType(const wxFileTypeInfo& ftInfo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
The destructor of this class is not virtual, so it should not be derived from.
|
The destructor of this class is not virtual, so it should not be derived from.
|
||||||
*/
|
*/
|
||||||
|
@@ -26,7 +26,7 @@ public:
|
|||||||
@warning
|
@warning
|
||||||
If the buffer is created, it will be destroyed at the destruction of the stream.
|
If the buffer is created, it will be destroyed at the destruction of the stream.
|
||||||
*/
|
*/
|
||||||
wxMemoryOutputStream(char* data = NULL, size_t length = 0);
|
wxMemoryOutputStream(void* data = NULL, size_t length = 0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Destructor.
|
Destructor.
|
||||||
|
@@ -140,10 +140,10 @@ public:
|
|||||||
Pass a print preview object plus other normal frame arguments.
|
Pass a print preview object plus other normal frame arguments.
|
||||||
The print preview object will be destroyed by the frame when it closes.
|
The print preview object will be destroyed by the frame when it closes.
|
||||||
*/
|
*/
|
||||||
wxPreviewFrame(wxPrintPreview* preview, wxWindow* parent,
|
wxPreviewFrame(wxPrintPreviewBase* preview, wxWindow* parent,
|
||||||
const wxString& title,
|
const wxString& title = "Print Preview",
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
long style = wxDEFAULT_FRAME_STYLE,
|
long style = wxDEFAULT_FRAME_STYLE,
|
||||||
const wxString& name = "frame");
|
const wxString& name = "frame");
|
||||||
|
|
||||||
|
@@ -1208,7 +1208,8 @@ public:
|
|||||||
@param flags
|
@param flags
|
||||||
Socket flags (See wxSocketBase::SetFlags())
|
Socket flags (See wxSocketBase::SetFlags())
|
||||||
*/
|
*/
|
||||||
wxDatagramSocket(wxSocketFlags flags = wxSOCKET_NONE);
|
wxDatagramSocket(const wxSockAddress& addr,
|
||||||
|
wxSocketFlags flags = wxSOCKET_NONE);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Destructor. Please see wxSocketBase::Destroy().
|
Destructor. Please see wxSocketBase::Destroy().
|
||||||
|
@@ -43,7 +43,7 @@ public:
|
|||||||
Dialog position.
|
Dialog position.
|
||||||
*/
|
*/
|
||||||
wxPasswordEntryDialog(wxWindow* parent, const wxString& message,
|
wxPasswordEntryDialog(wxWindow* parent, const wxString& message,
|
||||||
const wxString& caption = "Enter password",
|
const wxString& caption = wxGetPasswordFromUserPromptStr,
|
||||||
const wxString& defaultValue = wxEmptyString,
|
const wxString& defaultValue = wxEmptyString,
|
||||||
long style = wxOK | wxCANCEL | wxCENTRE,
|
long style = wxOK | wxCANCEL | wxCENTRE,
|
||||||
const wxPoint& pos = wxDefaultPosition);
|
const wxPoint& pos = wxDefaultPosition);
|
||||||
@@ -84,8 +84,8 @@ public:
|
|||||||
Dialog position.
|
Dialog position.
|
||||||
*/
|
*/
|
||||||
wxTextEntryDialog(wxWindow* parent, const wxString& message,
|
wxTextEntryDialog(wxWindow* parent, const wxString& message,
|
||||||
const wxString& caption = "Please enter text",
|
const wxString& caption = wxGetTextFromUserPromptStr,
|
||||||
const wxString& defaultValue = "",
|
const wxString& value = wxEmptyString,
|
||||||
long style = wxOK | wxCANCEL | wxCENTRE,
|
long style = wxOK | wxCANCEL | wxCENTRE,
|
||||||
const wxPoint& pos = wxDefaultPosition);
|
const wxPoint& pos = wxDefaultPosition);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user