ifacecheck manual fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -101,7 +101,7 @@ public:
|
||||
@param showWaitMsg
|
||||
If @true then a decoration-less window with progress message is displayed.
|
||||
*/
|
||||
bool AddBook(const wxFileName& bookFile, bool showWaitMsg);
|
||||
bool AddBook(const wxFileName& bookFile, bool showWaitMsg = false);
|
||||
|
||||
/**
|
||||
Adds a book (i.e. a @ref overview_html_helpformats ".hhp file"; an HTML Help
|
||||
@@ -115,7 +115,7 @@ public:
|
||||
@param showWaitMsg
|
||||
If @true then a decoration-less window with progress message is displayed.
|
||||
*/
|
||||
bool AddBook(const wxString& bookUrl, bool showWaitMsg);
|
||||
bool AddBook(const wxString& bookUrl, bool showWaitMsg = false);
|
||||
|
||||
/**
|
||||
Displays page @a x.
|
||||
@@ -133,14 +133,14 @@ public:
|
||||
-# try to find x in index (if x is for example "How To ...")
|
||||
-# switch to Search panel and start searching
|
||||
*/
|
||||
void Display(const wxString& x);
|
||||
bool Display(const wxString& x);
|
||||
|
||||
/**
|
||||
@overload
|
||||
|
||||
This alternative form is used to search help contents by numeric IDs.
|
||||
*/
|
||||
void Display(const int id);
|
||||
bool Display(int id);
|
||||
|
||||
/**
|
||||
Displays help window and focuses contents panel.
|
||||
|
@@ -29,7 +29,9 @@ public:
|
||||
wxHtmlHelpFrame(wxWindow* parent, int wxWindowID,
|
||||
const wxString& title = wxEmptyString,
|
||||
int style = wxHF_DEFAULT_STYLE,
|
||||
wxHtmlHelpData* data = NULL);
|
||||
wxHtmlHelpData* data = NULL,
|
||||
wxConfigBase* config = NULL,
|
||||
const wxString& rootpath = wxEmptyString);
|
||||
|
||||
/**
|
||||
You may override this virtual method to add more buttons to the help window's
|
||||
|
@@ -139,7 +139,7 @@ public:
|
||||
/**
|
||||
Parses the m_Source from @a begin_pos to @a end_pos - 1.
|
||||
*/
|
||||
void DoParsing(int begin_pos, int end_pos);
|
||||
void DoParsing(const const_iterator& begin_pos, const const_iterator& end_pos);
|
||||
|
||||
/**
|
||||
Parses the whole m_Source.
|
||||
|
@@ -148,6 +148,7 @@ public:
|
||||
*/
|
||||
bool HasParam(const wxString& par) const;
|
||||
|
||||
//@{
|
||||
/**
|
||||
This method scans the given parameter. Usage is exactly the same as sscanf's
|
||||
usage except that you don't pass a string but a parameter name as the first
|
||||
@@ -161,6 +162,8 @@ public:
|
||||
@param value
|
||||
pointer to a variable to store the value in
|
||||
*/
|
||||
wxString ScanParam(const wxString& par, const wxChar* format, void* value) const;
|
||||
int ScanParam(const wxString& par, const wchar_t* format, void* value) const;
|
||||
int ScanParam(const wxString& par, const char* format, void* value) const;
|
||||
//@}
|
||||
};
|
||||
|
||||
|
@@ -61,12 +61,11 @@ public:
|
||||
Constructor.
|
||||
The parameters are the same as wxScrolled::wxScrolled() constructor.
|
||||
*/
|
||||
wxHtmlWindow(wxWindow parent, wxWindowID id = -1,
|
||||
wxHtmlWindow(wxWindow *parent, wxWindowID id = wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxHW_DEFAULT_STYLE,
|
||||
const wxString& name = "htmlWindow");
|
||||
//@}
|
||||
|
||||
/**
|
||||
Adds @ref overview_html_filters "input filter" to the static list of available
|
||||
@@ -464,7 +463,8 @@ public:
|
||||
*/
|
||||
wxHtmlCellEvent(wxEventType commandType, int id,
|
||||
wxHtmlCell* cell,
|
||||
const wxPoint& point);
|
||||
const wxPoint& point,
|
||||
const wxMouseEvent& ev);
|
||||
|
||||
/**
|
||||
Returns the wxHtmlCellEvent associated with the event.
|
||||
|
@@ -59,7 +59,7 @@ public:
|
||||
<b>Render() changes the DC's user scale and does NOT restore it.</b>
|
||||
*/
|
||||
int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
|
||||
int dont_render = 0, int to = INT_MAX);
|
||||
int dont_render = false, int to = INT_MAX);
|
||||
|
||||
/**
|
||||
Assign DC instance to the renderer.
|
||||
|
Reference in New Issue
Block a user