use :: when referring to wxDefaultSize or wxDefaultPosition

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/bmpbuttn.h b/interface/wx/bmpbuttn.h
index 457995a7ee49dd9ba3525de183978529ecad773b..ba624b712186565c1751513369bfb082818f7294 100644 (file)
--- 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 94516894d0f2c75239204c287f2784c6fcd1925d..c4f7543b90d4f673467dba6e964597499c8fb15c 100644 (file)
--- 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 982209412b23a867c891f14ded6d204bb596ed68..2ed407f03191d8f572bbea7b85f009b549f1c4e4 100644 (file)
--- 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 82cb664da29542c7180657de866c0223a72b0433..0d00b7db2ded8b35896d72ab28cf5b2e492724b6 100644 (file)
--- 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 4bcc4c9988cf864c790ce26416267c5a3074fc57..e5cb5c7dc7d9f0781f771bb87203178d6fcb3acc 100644 (file)
--- 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 59abf17bb6600cc7dba66c1162b4e89f586001b0..93e7f3eee7a4266a494064127c01d3a60a57bdab 100644 (file)
--- 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 8c224ac12058d27803880f24ffe0bd09ba166e76..c8af32b8ded50a8dab4c895e472dc950b8a0cc70 100644 (file)
--- 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 d489a95be619fdbb338798b6654150d88be31e01..6be3673d8f5feac229bb0f60e7e68b45622787bf 100644 (file)
--- 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 bf1cb0fb412ede9d00ed9972a27f591a423a8549..bccf568a54c9beb4075c56041fafcb0457341721 100644 (file)
--- 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 abbca90fc9ff9e48f99040c631c176828fc49633..723b24ea848d12b9eec47dae4710cdc8280d3697 100644 (file)
--- 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 0877c5b74690eb12ecfe98f4823af0d07e6e92c6..fa39ac5dbaa22c0418ccb7a5a4833a31df03ed5e 100644 (file)
--- 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 d194d8ad6158a46d204ef5344ef621f5410d429a..bfd05c44af3b28cf69b1f71bbcd09a106931fc39 100644 (file)
--- 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 025767d981cbdd3421935beb6d946959f1aea83e..39e1b97a89fd6f48a67fdb1858ea471b334a7424 100644 (file)
--- 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 37290f3d38123f36ab705d7a593097511e529a17..9ce912e3f43f4d206cd60f8d4831e76ac72904ff 100644 (file)
--- 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 2c343598840c8b204cd875626e1890df33b8561a..90e2951dd00bf9819f6f638b691e8238e765fc5d 100644 (file)
--- 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 62e6f93eaa92b3475016b93f69404dc07c89ce8f..fe320093354b3833374b82935b773cf9119a7d72 100644 (file)
--- 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 198e5a8824d59e47c043ecd5ca347eba8857c2b9..5769bd2e2c0c954900304affbfa26a4853a603af 100644 (file)
--- 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 1c07261ab5390ce94b3d0dce2f439ba53683d891..06e6e94104fffaa4903adabe5a0de43073420f89 100644 (file)
--- 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 38bf3342f688ed1bc925e8c56dee124043313ab2..dff4440b32e1ed7c48ede901dca46e7a0153a9d7 100644 (file)
--- 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 0d1002a7becf832dbed8db8b16a283cf773747bf..1fa0cf6ac156b2a44629659c02cd98f73434a08e 100644 (file)
--- 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
-    <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,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.