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

misc fixes of ctor signatures

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-10-13 13:46:42 +00:00
parent cc0972a251
commit 8067ee1174
10 changed files with 238 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/wx/datstrm.h
View File

@@ -34,7 +34,8 @@ public:
@param stream
The output stream.
*/
wxDataOutputStream(wxOutputStream& stream);
wxDataOutputStream(wxOutputStream& stream,
const wxMBConv& conv = wxConvAuto());
/**
Constructs a datastream object from an output stream. Only write
@@ -179,7 +180,8 @@ public:
@param 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

6
interface/wx/filesys.h
View File

@@ -227,10 +227,8 @@ public:
@param modif
Modification date and time for this file.
*/
wxFSFile(wxInputStream stream,
const wxString& location,
const wxString& mimetype,
const wxString& anchor,
wxFSFile(wxInputStream* stream, const wxString& location,
const wxString& mimetype, const wxString& anchor,
wxDateTime modif);
/**

408
interface/wx/html/htmlcell.h
View File

@@ -12,43 +12,43 @@
This cell changes the colour of either the background or the foreground.
@library{wxhtml}
@category{FIXME}
@category{html}
*/
class wxHtmlColourCell : public wxHtmlCell
{
public:
/**
Constructor.
@param clr
The color
@param flags
Can be one of following:
wxHTML_CLR_FOREGROUND
change color of text
wxHTML_CLR_BACKGROUND
change background color
*/
wxHtmlColourCell(wxColour clr, int flags = wxHTML_CLR_FOREGROUND);
wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND);
};
@@ -71,7 +71,7 @@ class wxHtmlWidgetCell : public wxHtmlCell
public:
/**
Constructor.
@param wnd
Connected window. It is parent window must be the wxHtmlWindow object within
which it is displayed!
@@ -124,7 +124,7 @@ public:
/**
Renders the cell.
@param dc
Device context to which the cell is to be drawn
@param x,y
@@ -146,7 +146,7 @@ public:
cell is certainly out of the screen (and thus invisible). This is not
nonsense - some tags (like wxHtmlColourCell
or font setter) must be drawn even if they are invisible!
@param dc
Device context to which the cell is to be drawn
@param x,y
@@ -164,7 +164,7 @@ public:
It is recommended way how to obtain pointer to particular cell or
to cell of some type (e.g. wxHtmlAnchorCell reacts on
wxHTML_COND_ISANCHOR condition)
@param condition
Unique integer identifier of condition
@param param
@@ -202,7 +202,7 @@ public:
Returns hypertext link if associated with this cell or @NULL otherwise.
See wxHtmlLinkInfo.
(Note: this makes sense only for visible tags).
@param x,y
Coordinates of position where the user pressed mouse button.
These coordinates are used e.g. by COLORMAP. Values are relative to the
@@ -212,7 +212,7 @@ public:
/**
Returns cursor to show when mouse pointer is over the cell.
@param window
interface to the parent HTML window
*/
@@ -266,14 +266,14 @@ public:
over a cell within wxHtmlWindow this method of that
cell is called. Default behavior is to call
wxHtmlWindow::LoadPage.
@param window
interface to the parent HTML window
@param pos
coordinates of mouse click (this is relative to cell's origin
@param event
mouse event that triggered the call
@return @true if a link was clicked, @false otherwise.
*/
virtual bool ProcessMouseClick(wxHtmlWindowInterface* window,
@@ -328,7 +328,7 @@ public:
/**
Constructor. @a parent is pointer to parent container or @NULL.
*/
wxHtmlContainerCell(wxHtmlContainerCell parent);
wxHtmlContainerCell(wxHtmlContainerCell* parent);
/**
Returns container's horizontal alignment.
@@ -378,95 +378,95 @@ public:
/**
Sets the container's @e horizontal alignment. During wxHtmlCell::Layout
each line is aligned according to @a al value.
@param al
new horizontal alignment. May be one of these values:
wxHTML_ALIGN_LEFT
lines are left-aligned (default)
wxHTML_ALIGN_JUSTIFY
lines are justified
wxHTML_ALIGN_CENTER
lines are centered
wxHTML_ALIGN_RIGHT
lines are right-aligned
*/
void SetAlignHor(int al);
/**
Sets the container's @e vertical alignment. This is per-line alignment!
@param al
new vertical alignment. May be one of these values:
wxHTML_ALIGN_BOTTOM
cells are over the line (default)
wxHTML_ALIGN_CENTER
cells are centered on line
wxHTML_ALIGN_TOP
cells are under the line
*/
void SetAlignVer(int al);
@@ -478,7 +478,7 @@ public:
/**
Sets the border (frame) colours. A border is a rectangle around the container.
@param clr1
Colour of top and left lines
@param clr2
@@ -488,114 +488,114 @@ public:
/**
Sets the indentation (free space between borders of container and subcells).
@param i
Indentation value.
@param what
Determines which of the four borders we're setting. It is OR
combination of following constants:
wxHTML_INDENT_TOP
top border
wxHTML_INDENT_BOTTOM
bottom
wxHTML_INDENT_LEFT
left
wxHTML_INDENT_RIGHT
right
wxHTML_INDENT_HORIZONTAL
left and right
wxHTML_INDENT_VERTICAL
top and bottom
wxHTML_INDENT_ALL
all 4 borders
@param units
Units of i. This parameter affects interpretation of value.
wxHTML_UNITS_PIXELS
i is number of pixels
wxHTML_UNITS_PERCENT
i is interpreted as percents of width
of parent container
*/
@@ -608,7 +608,7 @@ public:
by layed-out subcells. Calling this method guarantees you that the height
of container is never smaller than @a h - even if the subcells cover
much smaller area.
@param h
The minimal height.
@param align
@@ -629,7 +629,7 @@ public:
parent container (and thus you can have only one sub-container per line).
You can change this by setting FWA.
@a pixel_scale is number of real pixels that equals to 1 HTML pixel.
@param w
Width of the container. If the value is negative it means
complement to full width of parent container (e.g.
@@ -638,28 +638,28 @@ public:
creating tables - you can call SetWidthFloat(50) and SetWidthFloat(-50))
@param units
Units of w This parameter affects the interpretation of value.
wxHTML_UNITS_PIXELS
w is number of pixels
wxHTML_UNITS_PERCENT
w is interpreted as percents of width
of parent container
@param tag

6
interface/wx/html/htmltag.h
View File

@@ -23,9 +23,9 @@ protected:
yourself. Feel free to ignore the constructor parameters.
Have a look at src/html/htmlpars.cpp if you're interested in creating it.
*/
wxHtmlTag(wxHtmlTag* parent, const wxString& source, int pos,
int end_pos, wxHtmlTagsCache* cache,
wxHtmlEntitiesParser* entParser);
wxHtmlTag(wxHtmlTag* parent, const wxString* source,
const const_iterator& pos, const const_iterator& end_pos,
wxHtmlTagsCache* cache, wxHtmlEntitiesParser* entParser);
public:
/**

18
interface/wx/log.h
View File

@@ -421,7 +421,7 @@ public:
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.
*/
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
control. The @a textctrl parameter cannot be @NULL.
*/
wxLogTextCtrl(wxTextCtrl textctrl);
wxLogTextCtrl(wxTextCtrl* pTextCtrl);
};
@@ -531,7 +531,7 @@ public:
you may not even know about its existence.
@section overview_wxLog_deriving Deriving your own log target
There are two functions which must be implemented by any derived class to
actually process the log messages: DoLog() and
DoLogString(). The second function receives a string
@@ -573,7 +573,7 @@ public:
current mask while a message using string mask will be logged simply if the
mask had been added before to the list of allowed ones.
For example,
@code
wxLogTrace( wxTraceRefCount|wxTraceOleCalls, "Active object ref count: %d", nRef );
@endcode
@@ -584,9 +584,9 @@ public:
@code
wxLogTrace( wxTRACE_OleCalls, "IFoo::Bar() called" );
@endcode
will log the message if it was preceded by
@code
wxLog::AddTraceMask( wxTRACE_OleCalls);
@endcode
@@ -622,8 +622,8 @@ public:
default because otherwise it would be impossible to directly go to the line
from which the log message was generated by simply clicking in the debugger
window on the corresponding error message. If you wish to enable it, please
use SetTimestamp() explicitly.
use SetTimestamp() explicitly.
@section overview_wxLog_Target Manipulating the log target
The functions in this section work with and manipulate the active log
@@ -753,7 +753,7 @@ public:
/**
Returns @true if the @a mask is one of allowed masks for
wxLogTrace().
See also: AddTraceMask(), RemoveTraceMask()
*/
static bool IsAllowedTraceMask(const wxString& mask);

8
interface/wx/mimetype.h
View File

@@ -234,13 +234,19 @@ wxMimeTypesManager* wxTheMimeTypesManager;
*/
class wxFileType
{
public:
private:
/**
The default constructor is private because you should never create objects of
this type: they are only returned by wxMimeTypesManager methods.
*/
wxFileType();
public:
/**
Copy ctor.
*/
wxFileType(const wxFileTypeInfo& ftInfo);
/**
The destructor of this class is not virtual, so it should not be derived from.
*/

2
interface/wx/mstream.h
View File

@@ -26,7 +26,7 @@ public:
@warning
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.

6
interface/wx/print.h
View File

@@ -140,10 +140,10 @@ public:
Pass a print preview object plus other normal frame arguments.
The print preview object will be destroyed by the frame when it closes.
*/
wxPreviewFrame(wxPrintPreview* preview, wxWindow* parent,
const wxString& title,
wxPreviewFrame(wxPrintPreviewBase* preview, wxWindow* parent,
const wxString& title = "Print Preview",
const wxPoint& pos = wxDefaultPosition,
const wxSize& size size = wxDefaultSize,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame");

3
interface/wx/socket.h
View File

@@ -1208,7 +1208,8 @@ public:
@param flags
Socket flags (See wxSocketBase::SetFlags())
*/
wxDatagramSocket(wxSocketFlags flags = wxSOCKET_NONE);
wxDatagramSocket(const wxSockAddress& addr,
wxSocketFlags flags = wxSOCKET_NONE);
/**
Destructor. Please see wxSocketBase::Destroy().

6
interface/wx/textdlg.h
View File

@@ -43,7 +43,7 @@ public:
Dialog position.
*/
wxPasswordEntryDialog(wxWindow* parent, const wxString& message,
const wxString& caption = "Enter password",
const wxString& caption = wxGetPasswordFromUserPromptStr,
const wxString& defaultValue = wxEmptyString,
long style = wxOK | wxCANCEL | wxCENTRE,
const wxPoint& pos = wxDefaultPosition);
@@ -84,8 +84,8 @@ public:
Dialog position.
*/
wxTextEntryDialog(wxWindow* parent, const wxString& message,
const wxString& caption = "Please enter text",
const wxString& defaultValue = "",
const wxString& caption = wxGetTextFromUserPromptStr,
const wxString& value = wxEmptyString,
long style = wxOK | wxCANCEL | wxCENTRE,
const wxPoint& pos = wxDefaultPosition);