use :: when referring to wxDefaultSize or wxDefaultPosition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -84,9 +84,11 @@ public:
|
||||
Bitmap to be displayed.
|
||||
@param pos
|
||||
Button position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Button size. If wxDefaultSize is specified then the button is sized
|
||||
appropriately for the bitmap.
|
||||
Button size.
|
||||
If ::wxDefaultSize is specified then the button is sized appropriately
|
||||
for the bitmap.
|
||||
@param style
|
||||
Window style. See wxBitmapButton.
|
||||
@param validator
|
||||
|
@@ -71,11 +71,11 @@ public:
|
||||
@param label
|
||||
Text to be displayed next to the checkbox.
|
||||
@param pos
|
||||
Checkbox position. If wxDefaultPosition is specified then a default
|
||||
position is chosen.
|
||||
Checkbox position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Checkbox size. If wxDefaultSize is specified then a default size is
|
||||
chosen.
|
||||
Checkbox size.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxCheckBox.
|
||||
@param validator
|
||||
|
@@ -48,9 +48,10 @@ public:
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the window is sized
|
||||
appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param n
|
||||
Number of strings with which to initialise the control.
|
||||
@param choices
|
||||
|
@@ -50,9 +50,10 @@ public:
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the choice is sized
|
||||
appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the choice is sized appropriately.
|
||||
@param n
|
||||
Number of strings with which to initialise the choice control.
|
||||
@param choices
|
||||
|
@@ -332,9 +332,10 @@ public:
|
||||
Initial selection string. An empty string indicates no selection.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the window is sized
|
||||
appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param style
|
||||
Window style. See wxComboCtrl.
|
||||
@param validator
|
||||
|
@@ -96,9 +96,10 @@ public:
|
||||
string must be one of the valid choices if it is not empty.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the window is sized
|
||||
appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param n
|
||||
Number of strings with which to initialise the control.
|
||||
@param choices
|
||||
|
@@ -256,9 +256,11 @@ public:
|
||||
Button identifier. Defaults to wxID_CONTEXT_HELP.
|
||||
@param pos
|
||||
Button position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Button size. If wxDefaultSize is specified then the button is sized
|
||||
appropriately for the question mark bitmap.
|
||||
Button size.
|
||||
If ::wxDefaultSize is specified then the button is sized appropriately
|
||||
for the question mark bitmap.
|
||||
@param style
|
||||
Window style.
|
||||
|
||||
|
@@ -51,9 +51,10 @@ public:
|
||||
The text shown just before the list control.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the window is sized
|
||||
appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param style
|
||||
Window style. See wxEditableListBox.
|
||||
@param name
|
||||
|
@@ -43,11 +43,11 @@ public:
|
||||
@param id
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position. If wxDefaultPosition is specified then a default
|
||||
position is chosen.
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then a default size
|
||||
is chosen.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxSpinButton.
|
||||
@param min
|
||||
|
@@ -213,8 +213,10 @@ public:
|
||||
Window identifier. A value of -1 indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the window is sized appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param n
|
||||
Number of strings with which to initialise the control.
|
||||
@param choices
|
||||
|
@@ -79,9 +79,10 @@ public:
|
||||
The ID of this control. A value of @c wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
The initial position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
The initial size.
|
||||
If wxDefaultSize is specified then the window is sized appropriately.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param n
|
||||
Number of strings with which to initialise the control.
|
||||
@param choices
|
||||
|
@@ -151,9 +151,10 @@ public:
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size.
|
||||
If wxDefaultSize is specified then the window is sized appropriately.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param style
|
||||
Window style. See wxListCtrl.
|
||||
@param validator
|
||||
|
@@ -125,11 +125,11 @@ public:
|
||||
@param id
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position. If wxDefaultPosition is specified then a default
|
||||
position is chosen.
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then a default size
|
||||
is chosen.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxScrollBar.
|
||||
@param validator
|
||||
|
@@ -131,9 +131,11 @@ public:
|
||||
@param maxValue
|
||||
Maximum slider position.
|
||||
@param pos
|
||||
Window position. If wxDefaultPosition is specified then a default position is chosen.
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then a default size is chosen.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxSlider.
|
||||
@param validator
|
||||
|
@@ -113,10 +113,10 @@ public:
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If wxDefaultPosition is specified then a default position is chosen.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size.
|
||||
If wxDefaultSize is specified then a default size is chosen.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxSpinButton class description.
|
||||
@param name
|
||||
|
@@ -69,10 +69,10 @@ public:
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If wxDefaultPosition is specified then a default position is chosen.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size.
|
||||
If wxDefaultSize is specified then a default size is chosen.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxSpinButton.
|
||||
@param min
|
||||
|
@@ -46,7 +46,7 @@ public:
|
||||
Window identifier. The value wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If wxDefaultPosition is specified then a default position is chosen.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Size. Note that either the height or the width (depending on
|
||||
whether the line if horizontal or vertical) is ignored.
|
||||
|
@@ -47,10 +47,10 @@ public:
|
||||
Text to be displayed next to the toggle button.
|
||||
@param pos
|
||||
Toggle button position.
|
||||
If wxDefaultPosition is specified then a default position is chosen.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Toggle button size.
|
||||
If wxDefaultSize is specified then a default size is chosen.
|
||||
If ::wxDefaultSize is specified then a default size is chosen.
|
||||
@param style
|
||||
Window style. See wxToggleButton.
|
||||
@param val
|
||||
|
@@ -150,9 +150,10 @@ public:
|
||||
Window identifier. The value @c wxID_ANY indicates a default value.
|
||||
@param pos
|
||||
Window position.
|
||||
If ::wxDefaultPosition is specified then a default position is chosen.
|
||||
@param size
|
||||
Window size. If wxDefaultSize is specified then the window is sized
|
||||
appropriately.
|
||||
Window size.
|
||||
If ::wxDefaultSize is specified then the window is sized appropriately.
|
||||
@param style
|
||||
Window style. See wxTreeCtrl.
|
||||
@param validator
|
||||
|
@@ -20,11 +20,9 @@ enum wxURIHostType
|
||||
/**
|
||||
@class wxURI
|
||||
|
||||
wxURI is used to extract information from a URI (Uniform Resource
|
||||
Identifier).
|
||||
wxURI is used to extract information from a URI (Uniform Resource Identifier).
|
||||
|
||||
For information about URIs, see RFC 3986
|
||||
<http://www.ietf.org/rfc/rfc3986.txt>.
|
||||
For information about URIs, see RFC 3986 (http://www.ietf.org/rfc/rfc3986.txt).
|
||||
|
||||
In short, a URL is a URI. In other words, URL is a subset of a URI - all
|
||||
acceptable URLs are also acceptable URIs.
|
||||
@@ -42,7 +40,6 @@ enum wxURIHostType
|
||||
to a @NULL C string.
|
||||
|
||||
Example:
|
||||
|
||||
@code
|
||||
// protocol will hold the http protocol (i.e. "http")
|
||||
wxString protocol;
|
||||
@@ -276,8 +273,7 @@ public:
|
||||
void Resolve(const wxURI& base, int flags = wxURI_STRICT);
|
||||
|
||||
/**
|
||||
Translates all escape sequences (normal characters and returns the
|
||||
result.
|
||||
Translates all escape sequences (normal characters and returns the result.
|
||||
|
||||
If you want to unescape an entire wxURI, use BuildUnescapedURI()
|
||||
instead, as it performs some optimizations over this method.
|
||||
|
Reference in New Issue
Block a user