From dc1b07fd4da4721233cda03471c4eefb786ee6ad Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Tue, 21 Apr 2009 11:21:36 +0000 Subject: [PATCH] use :: when referring to wxDefaultSize or wxDefaultPosition git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/bmpbuttn.h | 6 ++++-- interface/wx/checkbox.h | 8 ++++---- interface/wx/checklst.h | 5 +++-- interface/wx/choice.h | 5 +++-- interface/wx/combo.h | 5 +++-- interface/wx/combobox.h | 5 +++-- interface/wx/cshelp.h | 6 ++++-- interface/wx/editlbox.h | 5 +++-- interface/wx/generic/spinctrg.h | 8 ++++---- interface/wx/htmllbox.h | 4 +++- interface/wx/listbox.h | 3 ++- interface/wx/listctrl.h | 3 ++- interface/wx/scrolbar.h | 8 ++++---- interface/wx/slider.h | 6 ++++-- interface/wx/spinbutt.h | 4 ++-- interface/wx/spinctrl.h | 4 ++-- interface/wx/statline.h | 2 +- interface/wx/tglbtn.h | 4 ++-- interface/wx/treectrl.h | 5 +++-- interface/wx/uri.h | 20 ++++++++------------ 20 files changed, 64 insertions(+), 52 deletions(-) diff --git a/interface/wx/bmpbuttn.h b/interface/wx/bmpbuttn.h index 457995a7ee..ba624b7121 100644 --- a/interface/wx/bmpbuttn.h +++ b/interface/wx/bmpbuttn.h @@ -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 diff --git a/interface/wx/checkbox.h b/interface/wx/checkbox.h index 94516894d0..c4f7543b90 100644 --- a/interface/wx/checkbox.h +++ b/interface/wx/checkbox.h @@ -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 diff --git a/interface/wx/checklst.h b/interface/wx/checklst.h index 982209412b..2ed407f031 100644 --- a/interface/wx/checklst.h +++ b/interface/wx/checklst.h @@ -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 diff --git a/interface/wx/choice.h b/interface/wx/choice.h index 82cb664da2..0d00b7db2d 100644 --- a/interface/wx/choice.h +++ b/interface/wx/choice.h @@ -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 diff --git a/interface/wx/combo.h b/interface/wx/combo.h index 4bcc4c9988..e5cb5c7dc7 100644 --- a/interface/wx/combo.h +++ b/interface/wx/combo.h @@ -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 diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h index 59abf17bb6..93e7f3eee7 100644 --- a/interface/wx/combobox.h +++ b/interface/wx/combobox.h @@ -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 diff --git a/interface/wx/cshelp.h b/interface/wx/cshelp.h index 8c224ac120..c8af32b8de 100644 --- a/interface/wx/cshelp.h +++ b/interface/wx/cshelp.h @@ -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. diff --git a/interface/wx/editlbox.h b/interface/wx/editlbox.h index d489a95be6..6be3673d8f 100644 --- a/interface/wx/editlbox.h +++ b/interface/wx/editlbox.h @@ -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 diff --git a/interface/wx/generic/spinctrg.h b/interface/wx/generic/spinctrg.h index bf1cb0fb41..bccf568a54 100644 --- a/interface/wx/generic/spinctrg.h +++ b/interface/wx/generic/spinctrg.h @@ -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 diff --git a/interface/wx/htmllbox.h b/interface/wx/htmllbox.h index abbca90fc9..723b24ea84 100644 --- a/interface/wx/htmllbox.h +++ b/interface/wx/htmllbox.h @@ -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 diff --git a/interface/wx/listbox.h b/interface/wx/listbox.h index 0877c5b746..fa39ac5dba 100644 --- a/interface/wx/listbox.h +++ b/interface/wx/listbox.h @@ -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 diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h index d194d8ad61..bfd05c44af 100644 --- a/interface/wx/listctrl.h +++ b/interface/wx/listctrl.h @@ -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 diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h index 025767d981..39e1b97a89 100644 --- a/interface/wx/scrolbar.h +++ b/interface/wx/scrolbar.h @@ -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 diff --git a/interface/wx/slider.h b/interface/wx/slider.h index 37290f3d38..9ce912e3f4 100644 --- a/interface/wx/slider.h +++ b/interface/wx/slider.h @@ -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 diff --git a/interface/wx/spinbutt.h b/interface/wx/spinbutt.h index 2c34359884..90e2951dd0 100644 --- a/interface/wx/spinbutt.h +++ b/interface/wx/spinbutt.h @@ -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 diff --git a/interface/wx/spinctrl.h b/interface/wx/spinctrl.h index 62e6f93eaa..fe32009335 100644 --- a/interface/wx/spinctrl.h +++ b/interface/wx/spinctrl.h @@ -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 diff --git a/interface/wx/statline.h b/interface/wx/statline.h index 198e5a8824..5769bd2e2c 100644 --- a/interface/wx/statline.h +++ b/interface/wx/statline.h @@ -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. diff --git a/interface/wx/tglbtn.h b/interface/wx/tglbtn.h index 1c07261ab5..06e6e94104 100644 --- a/interface/wx/tglbtn.h +++ b/interface/wx/tglbtn.h @@ -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 diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h index 38bf3342f6..dff4440b32 100644 --- a/interface/wx/treectrl.h +++ b/interface/wx/treectrl.h @@ -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 diff --git a/interface/wx/uri.h b/interface/wx/uri.h index 0d1002a7be..1fa0cf6ac1 100644 --- a/interface/wx/uri.h +++ b/interface/wx/uri.h @@ -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 - . + 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,13 +40,12 @@ enum wxURIHostType to a @NULL C string. Example: - @code - //protocol will hold the http protocol (i.e. "http") - wxString protocol; - wxURI myuri("http://mysite.com"); - if( myuri.HasScheme() ) - protocol = myuri.GetScheme(); + // protocol will hold the http protocol (i.e. "http") + wxString protocol; + wxURI myuri("http://mysite.com"); + if( myuri.HasScheme() ) + protocol = myuri.GetScheme(); @endcode @note On URIs with a "file" scheme wxURI does not parse the userinfo, @@ -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. -- 2.45.2