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:
Francesco Montorsi
2009-04-21 11:21:36 +00:00
parent c94bdf2a19
commit dc1b07fd4d
20 changed files with 64 additions and 52 deletions

View File

@@ -84,9 +84,11 @@ public:
Bitmap to be displayed. Bitmap to be displayed.
@param pos @param pos
Button position. Button position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Button size. If wxDefaultSize is specified then the button is sized Button size.
appropriately for the bitmap. If ::wxDefaultSize is specified then the button is sized appropriately
for the bitmap.
@param style @param style
Window style. See wxBitmapButton. Window style. See wxBitmapButton.
@param validator @param validator

View File

@@ -71,11 +71,11 @@ public:
@param label @param label
Text to be displayed next to the checkbox. Text to be displayed next to the checkbox.
@param pos @param pos
Checkbox position. If wxDefaultPosition is specified then a default Checkbox position.
position is chosen. If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Checkbox size. If wxDefaultSize is specified then a default size is Checkbox size.
chosen. If ::wxDefaultSize is specified then a default size is chosen.
@param style @param style
Window style. See wxCheckBox. Window style. See wxCheckBox.
@param validator @param validator

View File

@@ -48,9 +48,10 @@ public:
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then the window is sized Window size.
appropriately. If ::wxDefaultSize is specified then the window is sized appropriately.
@param n @param n
Number of strings with which to initialise the control. Number of strings with which to initialise the control.
@param choices @param choices

View File

@@ -50,9 +50,10 @@ public:
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then the choice is sized Window size.
appropriately. If ::wxDefaultSize is specified then the choice is sized appropriately.
@param n @param n
Number of strings with which to initialise the choice control. Number of strings with which to initialise the choice control.
@param choices @param choices

View File

@@ -332,9 +332,10 @@ public:
Initial selection string. An empty string indicates no selection. Initial selection string. An empty string indicates no selection.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then the window is sized Window size.
appropriately. If ::wxDefaultSize is specified then the window is sized appropriately.
@param style @param style
Window style. See wxComboCtrl. Window style. See wxComboCtrl.
@param validator @param validator

View File

@@ -96,9 +96,10 @@ public:
string must be one of the valid choices if it is not empty. string must be one of the valid choices if it is not empty.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then the window is sized Window size.
appropriately. If ::wxDefaultSize is specified then the window is sized appropriately.
@param n @param n
Number of strings with which to initialise the control. Number of strings with which to initialise the control.
@param choices @param choices

View File

@@ -256,9 +256,11 @@ public:
Button identifier. Defaults to wxID_CONTEXT_HELP. Button identifier. Defaults to wxID_CONTEXT_HELP.
@param pos @param pos
Button position. Button position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Button size. If wxDefaultSize is specified then the button is sized Button size.
appropriately for the question mark bitmap. If ::wxDefaultSize is specified then the button is sized appropriately
for the question mark bitmap.
@param style @param style
Window style. Window style.

View File

@@ -51,9 +51,10 @@ public:
The text shown just before the list control. The text shown just before the list control.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then the window is sized Window size.
appropriately. If ::wxDefaultSize is specified then the window is sized appropriately.
@param style @param style
Window style. See wxEditableListBox. Window style. See wxEditableListBox.
@param name @param name

View File

@@ -43,11 +43,11 @@ public:
@param id @param id
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. If wxDefaultPosition is specified then a default Window position.
position is chosen. If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then a default size Window size.
is chosen. If ::wxDefaultSize is specified then a default size is chosen.
@param style @param style
Window style. See wxSpinButton. Window style. See wxSpinButton.
@param min @param min

View File

@@ -213,8 +213,10 @@ public:
Window identifier. A value of -1 indicates a default value. Window identifier. A value of -1 indicates a default value.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @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 @param n
Number of strings with which to initialise the control. Number of strings with which to initialise the control.
@param choices @param choices

View File

@@ -79,9 +79,10 @@ public:
The ID of this control. A value of @c wxID_ANY indicates a default value. The ID of this control. A value of @c wxID_ANY indicates a default value.
@param pos @param pos
The initial position. The initial position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
The initial 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 @param n
Number of strings with which to initialise the control. Number of strings with which to initialise the control.
@param choices @param choices

View File

@@ -151,9 +151,10 @@ public:
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window 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 @param style
Window style. See wxListCtrl. Window style. See wxListCtrl.
@param validator @param validator

View File

@@ -125,11 +125,11 @@ public:
@param id @param id
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. If wxDefaultPosition is specified then a default Window position.
position is chosen. If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then a default size Window size.
is chosen. If ::wxDefaultSize is specified then a default size is chosen.
@param style @param style
Window style. See wxScrollBar. Window style. See wxScrollBar.
@param validator @param validator

View File

@@ -131,9 +131,11 @@ public:
@param maxValue @param maxValue
Maximum slider position. Maximum slider position.
@param pos @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 @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 @param style
Window style. See wxSlider. Window style. See wxSlider.
@param validator @param validator

View File

@@ -113,10 +113,10 @@ public:
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If wxDefaultPosition is specified then a default position is chosen. If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window 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 @param style
Window style. See wxSpinButton class description. Window style. See wxSpinButton class description.
@param name @param name

View File

@@ -69,10 +69,10 @@ public:
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If wxDefaultPosition is specified then a default position is chosen. If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window 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 @param style
Window style. See wxSpinButton. Window style. See wxSpinButton.
@param min @param min

View File

@@ -46,7 +46,7 @@ public:
Window identifier. The value wxID_ANY indicates a default value. Window identifier. The value wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If wxDefaultPosition is specified then a default position is chosen. If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Size. Note that either the height or the width (depending on Size. Note that either the height or the width (depending on
whether the line if horizontal or vertical) is ignored. whether the line if horizontal or vertical) is ignored.

View File

@@ -47,10 +47,10 @@ public:
Text to be displayed next to the toggle button. Text to be displayed next to the toggle button.
@param pos @param pos
Toggle button position. 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 @param size
Toggle button 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 @param style
Window style. See wxToggleButton. Window style. See wxToggleButton.
@param val @param val

View File

@@ -150,9 +150,10 @@ public:
Window identifier. The value @c wxID_ANY indicates a default value. Window identifier. The value @c wxID_ANY indicates a default value.
@param pos @param pos
Window position. Window position.
If ::wxDefaultPosition is specified then a default position is chosen.
@param size @param size
Window size. If wxDefaultSize is specified then the window is sized Window size.
appropriately. If ::wxDefaultSize is specified then the window is sized appropriately.
@param style @param style
Window style. See wxTreeCtrl. Window style. See wxTreeCtrl.
@param validator @param validator

View File

@@ -20,11 +20,9 @@ enum wxURIHostType
/** /**
@class wxURI @class wxURI
wxURI is used to extract information from a URI (Uniform Resource wxURI is used to extract information from a URI (Uniform Resource Identifier).
Identifier).
For information about URIs, see RFC 3986 For information about URIs, see RFC 3986 (http://www.ietf.org/rfc/rfc3986.txt).
<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 In short, a URL is a URI. In other words, URL is a subset of a URI - all
acceptable URLs are also acceptable URIs. acceptable URLs are also acceptable URIs.
@@ -42,9 +40,8 @@ enum wxURIHostType
to a @NULL C string. to a @NULL C string.
Example: Example:
@code @code
//protocol will hold the http protocol (i.e. "http") // protocol will hold the http protocol (i.e. "http")
wxString protocol; wxString protocol;
wxURI myuri("http://mysite.com"); wxURI myuri("http://mysite.com");
if( myuri.HasScheme() ) if( myuri.HasScheme() )
@@ -276,8 +273,7 @@ public:
void Resolve(const wxURI& base, int flags = wxURI_STRICT); void Resolve(const wxURI& base, int flags = wxURI_STRICT);
/** /**
Translates all escape sequences (normal characters and returns the Translates all escape sequences (normal characters and returns the result.
result.
If you want to unescape an entire wxURI, use BuildUnescapedURI() If you want to unescape an entire wxURI, use BuildUnescapedURI()
instead, as it performs some optimizations over this method. instead, as it performs some optimizations over this method.