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

further ifacecheck fixes (now only 3.3% of documented methods have a wrong signature\!)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-13 21:32:53 +00:00
parent a70ab3b804
commit 11e3af6e7e
34 changed files with 120 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/wx/cmndata.h
View File

@@ -661,7 +661,7 @@ public:
/** /**
Assigns print data to this object. Assigns print data to this object.
*/ */
void operator =(const wxPrintData& data); wxPrintData& operator =(const wxPrintData& data);
}; };

30
interface/wx/config.h
View File

@@ -504,64 +504,64 @@ public:
@return @true if value was really read, @false if the default was used. @return @true if value was really read, @false if the default was used.
*/ */
const bool Read(const wxString& key, wxString* str, bool Read(const wxString& key, wxString* str,
const wxString& defaultVal) const; const wxString& defaultVal) const;
/** /**
Another version of Read(), returning the string value directly. Another version of Read(), returning the string value directly.
*/ */
const wxString Read(const wxString& key, const wxString Read(const wxString& key,
const wxString& defaultVal) const; const wxString& defaultVal) const;
/** /**
Reads a long value, returning @true if the value was found. If the Reads a long value, returning @true if the value was found. If the
value was not found, @a l is not changed. value was not found, @a l is not changed.
*/ */
const bool Read(const wxString& key, long* l) const; bool Read(const wxString& key, long* l) const;
/** /**
Reads a long value, returning @true if the value was found. If the Reads a long value, returning @true if the value was found. If the
value was not found, @a defaultVal is used instead. value was not found, @a defaultVal is used instead.
*/ */
const bool Read(const wxString& key, long* l, bool Read(const wxString& key, long* l,
long defaultVal) const; long defaultVal) const;
/** /**
Reads a double value, returning @true if the value was found. If the Reads a double value, returning @true if the value was found. If the
value was not found, @a d is not changed. value was not found, @a d is not changed.
*/ */
const bool Read(const wxString& key, double* d) const; bool Read(const wxString& key, double* d) const;
/** /**
Reads a double value, returning @true if the value was found. If the Reads a double value, returning @true if the value was found. If the
value was not found, @a defaultVal is used instead. value was not found, @a defaultVal is used instead.
*/ */
const bool Read(const wxString& key, double* d, bool Read(const wxString& key, double* d,
double defaultVal) const; double defaultVal) const;
/** /**
Reads a bool value, returning @true if the value was found. If the Reads a bool value, returning @true if the value was found. If the
value was not found, @a b is not changed. value was not found, @a b is not changed.
*/ */
const bool Read(const wxString& key, bool* b) const; bool Read(const wxString& key, bool* b) const;
/** /**
Reads a bool value, returning @true if the value was found. If the Reads a bool value, returning @true if the value was found. If the
value was not found, @a defaultVal is used instead. value was not found, @a defaultVal is used instead.
*/ */
const bool Read(const wxString& key, bool* d, bool Read(const wxString& key, bool* d,
bool defaultVal) const; bool defaultVal) const;
/** /**
Reads a binary block, returning @true if the value was found. If the Reads a binary block, returning @true if the value was found. If the
value was not found, @a buf is not changed. value was not found, @a buf is not changed.
*/ */
const bool Read(const wxString& key, wxMemoryBuffer* buf) const; bool Read(const wxString& key, wxMemoryBuffer* buf) const;
/** /**
Reads a value of type T, for which function wxFromString() is defined, Reads a value of type T, for which function wxFromString() is defined,
returning @true if the value was found. If the value was not found, returning @true if the value was found. If the value was not found,
@a value is not changed. @a value is not changed.
*/ */
const bool Read(const wxString& key, T* value) const; bool Read(const wxString& key, T* value) const;
/** /**
Reads a value of type T, for which function wxFromString() is defined, Reads a value of type T, for which function wxFromString() is defined,
returning @true if the value was found. If the value was not found, returning @true if the value was found. If the value was not found,
@a defaultVal is used instead. @a defaultVal is used instead.
*/ */
const bool Read(const wxString& key, T* value, bool Read(const wxString& key, T* value,
const T& defaultVal) const; const T& defaultVal) const;
/** /**
Reads a bool value from the key and returns it. @a defaultVal is Reads a bool value from the key and returns it. @a defaultVal is

2
interface/wx/dcprint.h
View File

@@ -42,7 +42,7 @@ public:
backward compatibility. backward compatibility.
*/ */
wxPrinterDC(const wxString& driver, const wxString& device, wxPrinterDC(const wxString& driver, const wxString& device,
const wxString& output, const bool interactive = true, const wxString& output, bool interactive = true,
int orientation = wxPORTRAIT); int orientation = wxPORTRAIT);
/** /**

30
interface/wx/dcsvg.h
View File

@@ -36,21 +36,11 @@
class wxSVGFileDC : public wxDC class wxSVGFileDC : public wxDC
{ {
public: public:
/**
Initializes a wxSVGFileDC with the given @a f filename with a default
size (340x240) at 72.0 dots per inch (a frequent screen resolution).
*/
wxSVGFileDC(wxString f);
/**
Initializes a wxSVGFileDC with the given @a f filename with the given
@a Width and @a Height at 72.0 dots per inch.
*/
wxSVGFileDC(wxString f, int Width, int Height);
/** /**
Initializes a wxSVGFileDC with the given @a f filename with the given Initializes a wxSVGFileDC with the given @a f filename with the given
@a Width and @a Height at @a dpi resolution. @a Width and @a Height at @a dpi resolution.
*/ */
wxSVGFileDC(wxString f, int Width, int Height, float dpi); wxSVGFileDC(const wxString& filename, int width = 320, int height = 240, double dpi = 72);
/** /**
Destructor. Destructor.
@@ -66,9 +56,9 @@ public:
@see wxDC::Blit() @see wxDC::Blit()
*/ */
bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxSVGFileDC* source, wxCoord xsrc, wxCoord ysrc, wxDC* source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY,
int logicalFunc = wxCOPY, bool useMask = FALSE, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord,
wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); wxCoord ysrcMask = wxDefaultCoord);
/** /**
Adds the specified point to the bounding box which can be retrieved Adds the specified point to the bounding box which can be retrieved
@@ -131,7 +121,7 @@ public:
/** /**
Draw a bitmap on the device context at the specified point. If Draw a bitmap on the device context at the specified point. If
@a transparent is @true and the bitmap has a transparency mask, the @a useMask is @true and the bitmap has a transparency mask, the
bitmap will be drawn transparently. bitmap will be drawn transparently.
When drawing a mono-bitmap, the current text foreground colour will be When drawing a mono-bitmap, the current text foreground colour will be
@@ -142,7 +132,7 @@ public:
@see wxDC::SetTextForeground(), wxDC::SetTextBackground(), wxMemoryDC @see wxDC::SetTextForeground(), wxDC::SetTextBackground(), wxMemoryDC
*/ */
void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y,
bool transparent); bool useMask = false);
//@{ //@{
/** /**
@@ -283,7 +273,7 @@ public:
The spline is drawn using a series of lines, using an algorithm taken from The spline is drawn using a series of lines, using an algorithm taken from
the X drawing program "XFIG". the X drawing program "XFIG".
*/ */
void DrawSpline(wxList* points); void DrawSpline(const wxPointList* points);
/** /**
Draws a three-point spline using the current pen. Draws a three-point spline using the current pen.
@@ -319,7 +309,7 @@ public:
/** /**
Not implemented. Not implemented.
*/ */
void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, bool FloodFill(wxCoord x, wxCoord y, const wxColour& colour,
int style = wxFLOOD_SURFACE); int style = wxFLOOD_SURFACE);
//@{ //@{
@@ -362,7 +352,7 @@ public:
/** /**
Not implemented. Not implemented.
*/ */
void GetClippingBox(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height);
//@{ //@{
/** /**
@@ -444,7 +434,7 @@ public:
void GetTextExtent(const wxString& string, wxCoord* w, wxCoord* h, void GetTextExtent(const wxString& string, wxCoord* w, wxCoord* h,
wxCoord* descent = NULL, wxCoord* descent = NULL,
wxCoord* externalLeading = NULL, wxCoord* externalLeading = NULL,
wxFont* font = NULL); const wxFont* font = NULL) const;
//@{ //@{
/** /**

4
interface/wx/dialog.h
View File

@@ -190,7 +190,7 @@ public:
@see @ref overview_dialog_autoscrolling (for more on layout adaptation) @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
*/ */
bool CanDoLayoutAdapation(); bool CanDoLayoutAdaptation();
/** /**
Centres the dialog box on the display. Centres the dialog box on the display.
@@ -251,7 +251,7 @@ public:
@see @ref overview_dialog_autoscrolling (for more on layout adaptation) @see @ref overview_dialog_autoscrolling (for more on layout adaptation)
*/ */
bool DoLayoutAdapation(); bool DoLayoutAdaptation();
/** /**
This function is called when the titlebar OK button is pressed This function is called when the titlebar OK button is pressed

8
interface/wx/font.h
View File

@@ -312,7 +312,7 @@ public:
*/ */
wxFont(int pointSize, wxFontFamily family, int style, wxFont(int pointSize, wxFontFamily family, int style,
wxFontWeight weight, wxFontWeight weight,
const bool underline = false, bool underline = false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -361,7 +361,7 @@ public:
*/ */
wxFont(const wxSize& pixelSize, wxFontFamily family, wxFont(const wxSize& pixelSize, wxFontFamily family,
int style, wxFontWeight weight, int style, wxFontWeight weight,
const bool underline = false, bool underline = false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
//@} //@}
@@ -475,7 +475,7 @@ public:
*/ */
static wxFont* New(int pointSize, wxFontFamily family, int style, static wxFont* New(int pointSize, wxFontFamily family, int style,
wxFontWeight weight, wxFontWeight weight,
const bool underline = false, bool underline = false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont* New(int pointSize, wxFontFamily family, static wxFont* New(int pointSize, wxFontFamily family,
@@ -486,7 +486,7 @@ public:
wxFontFamily family, wxFontFamily family,
int style, int style,
wxFontWeight weight, wxFontWeight weight,
const bool underline = false, bool underline = false,
const wxString& faceName = "", const wxString& faceName = "",
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
static wxFont* New(const wxSize& pixelSize, static wxFont* New(const wxSize& pixelSize,

4
interface/wx/grid.h
View File

@@ -2306,8 +2306,8 @@ public:
@true even if the cell is only partially visible. @true even if the cell is only partially visible.
*/ */
bool IsVisible(int row, int col, bool wholeCellVisible = true) const; bool IsVisible(int row, int col, bool wholeCellVisible = true) const;
const bool IsVisible(const wxGridCellCoords& coords, bool IsVisible(const wxGridCellCoords& coords,
bool wholeCellVisible = true) const; bool wholeCellVisible = true) const;
//@} //@}
//@{ //@{

34
interface/wx/htmllbox.h
View File

@@ -233,14 +233,14 @@ public:
@param name @param name
Window name. Window name.
*/ */
wxHtmlListBox(wxWindow* parent, wxWindowID id, wxSimpleHtmlListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, int n = 0,
const wxString choices[] = NULL, const wxString choices[] = NULL,
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = wxSimpleHtmlListBoxNameStr);
/** /**
Constructor, creating and showing the HTML list box. Constructor, creating and showing the HTML list box.
@@ -262,13 +262,13 @@ public:
@param name @param name
Window name. Window name.
*/ */
wxHtmlListBox(wxWindow* parent, wxWindowID id, wxSimpleHtmlListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = wxSimpleHtmlListBoxNameStr);
/** /**
Default constructor, you must call Create() later. Default constructor, you must call Create() later.
@@ -292,14 +292,14 @@ public:
const wxString choices[] = NULL, const wxString choices[] = NULL,
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = wxSimpleHtmlListBoxNameStr);
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
long style = wxHLB_DEFAULT_STYLE, long style = wxHLB_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "simpleHtmlListBox"); const wxString& name = wxSimpleHtmlListBoxNameStr);
//@} //@}
}; };

4
interface/wx/print.h
View File

@@ -231,8 +231,8 @@ public:
Use IsOk() to check whether the wxPrintPreview object was created correctly. Use IsOk() to check whether the wxPrintPreview object was created correctly.
*/ */
wxPrintPreview(wxPrintout* printout, wxPrintPreview(wxPrintout* printout,
wxPrintout* printoutForPrinting, wxPrintout* printoutForPrinting = NULL,
wxPrintData* data = NULL); wxPrintDialogData* data = NULL);
/** /**
Destructor. Destructor.

2
interface/wx/printdlg.h
View File

@@ -121,6 +121,6 @@ public:
Shows the dialog, returning @c wxID_OK if the user pressed OK, and Shows the dialog, returning @c wxID_OK if the user pressed OK, and
@c wxID_CANCEL otherwise. @c wxID_CANCEL otherwise.
*/ */
int ShowModal(); virtual int ShowModal();
}; };

2
interface/wx/progdlg.h
View File

@@ -105,7 +105,7 @@ public:
If "Skip" button was pressed since last Update() call, If "Skip" button was pressed since last Update() call,
this is set to @true. this is set to @true.
*/ */
virtual bool Update(int value, const wxString& newmsg = "", virtual bool Update(int value, const wxString& newmsg = wxEmptyString,
bool* skip = NULL); bool* skip = NULL);
}; };

2
interface/wx/propdlg.h
View File

@@ -116,7 +116,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = "dialogBox"); const wxString& name = wxDialogNameStr);
/** /**
Override this if you wish to add the book control in a way different from the Override this if you wish to add the book control in a way different from the

14
interface/wx/radiobox.h
View File

@@ -85,10 +85,10 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int n = 0, int n = 0,
const wxString choices[] = NULL, const wxString choices[] = NULL,
int majorDimension = 0, int majorDimension = 1,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "radioBox"); const wxString& name = wxRadioBoxNameStr);
/** /**
Constructor, creating and showing a radiobox. Constructor, creating and showing a radiobox.
@@ -125,10 +125,10 @@ public:
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
const wxArrayString& choices, const wxArrayString& choices,
int majorDimension = 0, int majorDimension = 1,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "radioBox"); const wxString& name = wxRadioBoxNameStr);
/** /**
Destructor, destroying the radiobox item. Destructor, destroying the radiobox item.
@@ -148,7 +148,7 @@ public:
int majorDimension = 0, int majorDimension = 0,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "radioBox"); const wxString& name = wxRadioBoxNameStr);
/** /**
Creates the radiobox for two-step construction. See wxRadioBox() Creates the radiobox for two-step construction. See wxRadioBox()
@@ -162,7 +162,7 @@ public:
int majorDimension = 0, int majorDimension = 0,
long style = wxRA_SPECIFY_COLS, long style = wxRA_SPECIFY_COLS,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "radioBox"); const wxString& name = wxRadioBoxNameStr);
/** /**
Enables or disables an individual button in the radiobox. Enables or disables an individual button in the radiobox.
@@ -314,5 +314,5 @@ public:
@endWxPythonOnly @endWxPythonOnly
*/ */
virtual bool Show(unsigned int item, const bool show = true); virtual bool Show(unsigned int item, bool show = true);
}; };

2
interface/wx/radiobut.h
View File

@@ -83,7 +83,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "radioButton"); const wxString& name = wxRadioButtonNameStr);
/** /**
Destructor, destroying the radio button item. Destructor, destroying the radio button item.

4
interface/wx/regex.h
View File

@@ -198,7 +198,7 @@ public:
May only be called after successful call to Compile(). May only be called after successful call to Compile().
*/ */
bool Matches(const wxChar* text, int flags = 0) const; bool Matches(const wxChar* text, int flags = 0) const;
const bool Matches(const wxChar* text, int flags, size_t len) const; bool Matches(const wxChar* text, int flags, size_t len) const;
//@} //@}
/** /**
@@ -210,7 +210,7 @@ public:
May only be called after successful call to Compile(). May only be called after successful call to Compile().
*/ */
const bool Matches(const wxString& text, int flags = 0) const; bool Matches(const wxString& text, int flags = 0) const;
/** /**
Replaces the current regular expression in the string pointed to by Replaces the current regular expression in the string pointed to by

10
interface/wx/region.h
View File

@@ -120,7 +120,7 @@ public:
A wxPython alias for this operator is called Next. A wxPython alias for this operator is called Next.
@endWxPythonOnly @endWxPythonOnly
*/ */
void operator ++(); wxRegionIterator& operator ++();
/** /**
Returns @true if there are still some rectangles; otherwise returns @false. Returns @true if there are still some rectangles; otherwise returns @false.
@@ -181,7 +181,7 @@ public:
in the provided array. in the provided array.
@a fillStyle parameter may have values @c wxWINDING_RULE or @c wxODDEVEN_RULE. @a fillStyle parameter may have values @c wxWINDING_RULE or @c wxODDEVEN_RULE.
*/ */
wxRegion(size_t n, const wxPoint* points, int fillStyle = wxWINDING_RULE); wxRegion(size_t n, const wxPoint* points, int fillStyle = wxODDEVEN_RULE);
/** /**
Constructs a region using a bitmap. See Union() for more details. Constructs a region using a bitmap. See Union() for more details.
*/ */
@@ -210,7 +210,7 @@ public:
@return The return value is one of @c wxOutRegion and @c wxInRegion. @return The return value is one of @c wxOutRegion and @c wxInRegion.
*/ */
wxRegionContain Contains(long& x, long& y) const; wxRegionContain Contains(wxCoord x, wxCoord y) const;
/** /**
Returns a value indicating whether the given point is contained within the region. Returns a value indicating whether the given point is contained within the region.
@@ -227,7 +227,7 @@ public:
::wxInRegion then indicates that all or some part of the region is ::wxInRegion then indicates that all or some part of the region is
contained in this region. contained in this region.
*/ */
wxRegionContain Contains(long& x, long& y, long& width, long& height) const; wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord width, wxCoord height) const;
/** /**
Returns a value indicating whether the given rectangle is contained within the Returns a value indicating whether the given rectangle is contained within the
region. region.
@@ -252,7 +252,7 @@ public:
*/ */
void GetBox(wxCoord& x, wxCoord& y, wxCoord& width, void GetBox(wxCoord& x, wxCoord& y, wxCoord& width,
wxCoord& height) const; wxCoord& height) const;
const wxRect GetBox() const; wxRect GetBox() const;
//@} //@}
/** /**

21
interface/wx/richtext/richtextbuffer.h
View File

@@ -524,13 +524,12 @@ public:
/** /**
Finds a handler by type. Finds a handler by type.
*/ */
wxRichTextFileHandler* FindHandler(int imageType); static wxRichTextFileHandler* FindHandler(wxRichTextFileType imageType);
/** /**
Finds a handler by extension and type. Finds a handler by extension and type.
*/ */
wxRichTextFileHandler* FindHandler(const wxString& extension, static wxRichTextFileHandler* FindHandler(const wxString& extension, wxRichTextFileType imageType);
int imageType);
/** /**
Finds a handler by name. Finds a handler by name.
@@ -698,14 +697,14 @@ public:
/** /**
Loads content from a stream. Loads content from a stream.
*/ */
bool LoadFile(wxInputStream& stream, virtual bool LoadFile(wxInputStream& stream,
int type = wxRICHTEXT_TYPE_ANY); wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
/** /**
Loads content from a file. Loads content from a file.
*/ */
bool LoadFile(const wxString& filename, virtual bool LoadFile(const wxString& filename,
int type = wxRICHTEXT_TYPE_ANY); wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
/** /**
Marks the buffer as modified or unmodified. Marks the buffer as modified or unmodified.
@@ -794,14 +793,14 @@ public:
/** /**
Saves content to a stream. Saves content to a stream.
*/ */
bool SaveFile(wxOutputStream& stream, virtual bool SaveFile(wxOutputStream& stream,
int type = wxRICHTEXT_TYPE_ANY); wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
/** /**
Saves content to a file. Saves content to a file.
*/ */
bool SaveFile(const wxString& filename, virtual bool SaveFile(const wxString& filename,
int type = wxRICHTEXT_TYPE_ANY); wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
/** /**
Sets the basic (overall) style. This is the style of the whole Sets the basic (overall) style. This is the style of the whole

2
interface/wx/richtext/richtextctrl.h
View File

@@ -1456,7 +1456,7 @@ public:
/** /**
Loads an image from a file and writes it at the current insertion point. Loads an image from a file and writes it at the current insertion point.
*/ */
bool WriteImage(const wxString& filename, int bitmapType); virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType);
/** /**
Writes an image block at the current insertion point. Writes an image block at the current insertion point.

2
interface/wx/scrolbar.h
View File

@@ -144,7 +144,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSB_HORIZONTAL, long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "scrollBar"); const wxString& name = wxScrollBarNameStr);
/** /**
Destructor, destroying the scrollbar. Destructor, destroying the scrollbar.

14
interface/wx/sizer.h
View File

@@ -1079,7 +1079,7 @@ public:
@see Remove() @see Remove()
*/ */
bool Detach(size_t index); virtual bool Detach(int index);
/** /**
Tell the sizer to resize the @a window so that its client area matches the Tell the sizer to resize the @a window so that its client area matches the
@@ -1374,7 +1374,7 @@ public:
@return @true if the child item was found and removed, @false otherwise. @return @true if the child item was found and removed, @false otherwise.
*/ */
bool Remove(wxWindow* window); virtual bool Remove(wxWindow* window);
/** /**
Removes a sizer child from the sizer and destroys it. Removes a sizer child from the sizer and destroys it.
@@ -1403,7 +1403,7 @@ public:
@return @true if the child item was found and removed, @false otherwise. @return @true if the child item was found and removed, @false otherwise.
*/ */
bool Remove(size_t index); virtual bool Remove(int index);
/** /**
Detaches the given @a oldwin from the sizer and replaces it with the Detaches the given @a oldwin from the sizer and replaces it with the
@@ -1473,7 +1473,7 @@ public:
@see wxSizerItem::SetMinSize() @see wxSizerItem::SetMinSize()
*/ */
void SetItemMinSize(wxWindow* window, int width, int height); bool SetItemMinSize(wxWindow* window, int width, int height);
/** /**
Set an item's minimum size by window, sizer, or position. Set an item's minimum size by window, sizer, or position.
@@ -1484,7 +1484,7 @@ public:
@see wxSizerItem::SetMinSize() @see wxSizerItem::SetMinSize()
*/ */
void SetItemMinSize(wxSizer* sizer, int width, int height); bool SetItemMinSize(wxSizer* sizer, int width, int height);
/** /**
Set an item's minimum size by window, sizer, or position. Set an item's minimum size by window, sizer, or position.
@@ -1495,7 +1495,7 @@ public:
@see wxSizerItem::SetMinSize() @see wxSizerItem::SetMinSize()
*/ */
void SetItemMinSize(size_t index, int width, int height); bool SetItemMinSize(size_t index, int width, int height);
/** /**
Call this to give the sizer a minimal size. Call this to give the sizer a minimal size.
@@ -1678,7 +1678,7 @@ public:
/** /**
This constructor creates a new static box with the given label and parent window. This constructor creates a new static box with the given label and parent window.
*/ */
wxStaticBoxSizer(int orient, wxWindow parent, wxStaticBoxSizer(int orient, wxWindow *parent,
const wxString& label = wxEmptyString); const wxString& label = wxEmptyString);
/** /**

2
interface/wx/slider.h
View File

@@ -151,7 +151,7 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = "slider"); const wxString& name = wxSliderNameStr);
/** /**
Destructor, destroying the slider. Destructor, destroying the slider.

7
interface/wx/spinbutt.h
View File

@@ -124,10 +124,10 @@ public:
@see Create() @see Create()
*/ */
wxSpinButton(wxWindow* parent, wxWindowID id, wxSpinButton(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSP_HORIZONTAL, long style = wxSP_VERTICAL,
const wxString& name = "spinButton"); const wxString& name = "spinButton");
/** /**
@@ -141,7 +141,8 @@ public:
*/ */
bool Create(wxWindow* parent, wxWindowID id = -1, bool Create(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxSP_HORIZONTAL, const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL,
const wxString& name = "wxSpinButton"); const wxString& name = "wxSpinButton");
/** /**

4
interface/wx/spinctrl.h
View File

@@ -79,13 +79,13 @@ public:
@see Create() @see Create()
*/ */
wxSpinCtrl(wxWindow* parent, wxWindowID id = -1, wxSpinCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSP_ARROW_KEYS, long style = wxSP_ARROW_KEYS,
int min = 0, int max = 100, int min = 0, int max = 100,
int initial = 0, const wxString& name = _T("wxSpinCtrl")); int initial = 0, const wxString& name = "wxSpinCtrl");
/** /**
Creation function called by the spin control constructor. Creation function called by the spin control constructor.

2
interface/wx/splitter.h
View File

@@ -95,7 +95,7 @@ public:
@see Initialize(), SplitVertically(), SplitHorizontally(), Create() @see Initialize(), SplitVertically(), SplitHorizontally(), Create()
*/ */
wxSplitterWindow(wxWindow* parent, wxWindowID id, wxSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSP_3D, long style = wxSP_3D,

2
interface/wx/srchctrl.h
View File

@@ -87,7 +87,7 @@ public:
@see wxTextCtrl::Create, wxValidator @see wxTextCtrl::Create, wxValidator
*/ */
wxSearchCtrl(wxWindow* parent, wxWindowID id, wxSearchCtrl(wxWindow* parent, wxWindowID id,
const wxString& value = "", const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,

2
interface/wx/stackwalk.h
View File

@@ -47,7 +47,7 @@ public:
/** /**
Constructor does nothing, use Walk() to walk the stack. Constructor does nothing, use Walk() to walk the stack.
*/ */
wxStackWalker(); wxStackWalker(const char* argv0 = NULL);
/** /**
Destructor does nothing neither but should be virtual as this class is used as Destructor does nothing neither but should be virtual as this class is used as

2
interface/wx/statbmp.h
View File

@@ -56,7 +56,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = "staticBitmap"); const wxString& name = wxStaticBitmapNameStr);
/** /**
Creation function, for two-step construction. For details see wxStaticBitmap(). Creation function, for two-step construction. For details see wxStaticBitmap().

2
interface/wx/statbox.h
View File

@@ -63,7 +63,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = "staticBox"); const wxString& name = wxStaticBoxNameStr);
/** /**
Destructor, destroying the group box. Destructor, destroying the group box.

2
interface/wx/statline.h
View File

@@ -61,7 +61,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString& name = "staticLine"); const wxString& name = wxStaticLineNameStr);
/** /**
Creates the static line for two-step construction. Creates the static line for two-step construction.

2
interface/wx/stattext.h
View File

@@ -76,7 +76,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = "staticText"); const wxString& name = wxStaticTextNameStr);
/** /**
Creation function, for two-step construction. For details see wxStaticText(). Creation function, for two-step construction. For details see wxStaticText().

2
interface/wx/statusbr.h
View File

@@ -56,7 +56,7 @@ public:
*/ */
wxStatusBar(wxWindow* parent, wxWindowID id = wxID_ANY, wxStatusBar(wxWindow* parent, wxWindowID id = wxID_ANY,
long style = wxST_SIZEGRIP, long style = wxST_SIZEGRIP,
const wxString& name = "statusBar"); const wxString& name = wxStatusBarNameStr);
/** /**
Destructor. Destructor.

6
interface/wx/stream.h
View File

@@ -290,7 +290,7 @@ public:
@see Write() @see Write()
*/ */
Return value size_t Read(wxStreamBuffer* buffer); size_t Read(wxStreamBuffer* buffer);
/** /**
Resets to the initial state variables concerning the buffer. Resets to the initial state variables concerning the buffer.
@@ -326,7 +326,7 @@ public:
@see wxStreamBuffer(), Fixed(), Flushable() @see wxStreamBuffer(), Fixed(), Flushable()
*/ */
void SetBufferIO(char* buffer_start, char* buffer_end); void SetBufferIO(void* start, void* end, bool takeOwnership = false);
/** /**
Destroys or invalidates the previous IO buffer and allocates a new one of the Destroys or invalidates the previous IO buffer and allocates a new one of the
@@ -463,7 +463,7 @@ public:
This function returns a reference on the current object, so the user can This function returns a reference on the current object, so the user can
test any states of the stream right away. test any states of the stream right away.
*/ */
wxOutputStream& Write(const void* buffer, size_t size); virtual wxOutputStream& Write(const void* buffer, size_t size);
/** /**
Reads data from the specified input stream and stores them Reads data from the specified input stream and stores them

4
interface/wx/textctrl.h
View File

@@ -1636,7 +1636,7 @@ public:
/** /**
Sets the new text control value. Sets the new text control value.
It also marks the control as not-modified which means that IsModified() It also marks the control as not-modified which means that IsModified()
would return @false immediately after the call to SetValue(). would return @false immediately after the call to SetValue().
@@ -1771,7 +1771,7 @@ public:
@param ostr @param ostr
The C++ stream to redirect, cout is used if it is @NULL The C++ stream to redirect, cout is used if it is @NULL
*/ */
wxStreamToTextRedirector(wxTextCtrl text, ostream* ostr = NULL); wxStreamToTextRedirector(wxTextCtrl *text, ostream* ostr);
/** /**
When a wxStreamToTextRedirector object is destroyed, the redirection is ended When a wxStreamToTextRedirector object is destroyed, the redirection is ended

18
interface/wx/variant.h
View File

@@ -384,9 +384,9 @@ public:
bool operator !=(const wxString& value) const; bool operator !=(const wxString& value) const;
bool operator !=(const wxChar* value) const; bool operator !=(const wxChar* value) const;
bool operator !=(wxChar value) const; bool operator !=(wxChar value) const;
bool operator !=(const long value) const; bool operator !=(long value) const;
bool operator !=(const bool value) const; bool operator !=(bool value) const;
bool operator !=(const double value) const; bool operator !=(double value) const;
bool operator !=(void* value) const; bool operator !=(void* value) const;
bool operator !=(wxObject* value) const; bool operator !=(wxObject* value) const;
bool operator !=(const wxVariantList& value) const; bool operator !=(const wxVariantList& value) const;
@@ -404,9 +404,9 @@ public:
void operator =(const wxString& value); void operator =(const wxString& value);
void operator =(const wxChar* value); void operator =(const wxChar* value);
void operator =(wxChar value); void operator =(wxChar value);
void operator =(const long value); void operator =(long value);
void operator =(const bool value); void operator =(bool value);
void operator =(const double value); void operator =(double value);
void operator =(void* value); void operator =(void* value);
void operator =(wxObject* value); void operator =(wxObject* value);
void operator =(const wxVariantList& value); void operator =(const wxVariantList& value);
@@ -422,9 +422,9 @@ public:
bool operator ==(const wxString& value) const; bool operator ==(const wxString& value) const;
bool operator ==(const wxChar* value) const; bool operator ==(const wxChar* value) const;
bool operator ==(wxChar value) const; bool operator ==(wxChar value) const;
bool operator ==(const long value) const; bool operator ==(long value) const;
bool operator ==(const bool value) const; bool operator ==(bool value) const;
bool operator ==(const double value) const; bool operator ==(double value) const;
bool operator ==(void* value) const; bool operator ==(void* value) const;
bool operator ==(wxObject* value) const; bool operator ==(wxObject* value) const;
bool operator ==(const wxVariantList& value) const; bool operator ==(const wxVariantList& value) const;