Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / datetime.h

diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h
index ab0adf6e5910e38bc5a8a2077f839e36f4d7f68d..e7ebd8d9470958101b95b9e29bac16b95f8e19e1 100644 (file)
--- a/interface/wx/datetime.h
+++ b/interface/wx/datetime.h
@@ -50,7 +50,7 @@
     ParseFormat() which can parse any date in the given (rigid) format.
     ParseRfc822Date() is another function for parsing dates in predefined
     format -- the one of RFC 822 which (still...) defines the format of email
     ParseFormat() which can parse any date in the given (rigid) format.
     ParseRfc822Date() is another function for parsing dates in predefined
     format -- the one of RFC 822 which (still...) defines the format of email

-    messages on the Internet. This format can not be described with
+    messages on the Internet. This format cannot be described with

     @c strptime(3)-like format strings used by Format(), hence the need for a
     separate function.
 
     @c strptime(3)-like format strings used by Format(), hence the need for a
     separate function.
 


@@ -102,7 +102,7 @@ public:
         Local,
 
         //@{
         Local,
 
         //@{

-        /// zones from GMT (= Greenwhich Mean Time): they're guaranteed to be
+        /// zones from GMT (= Greenwich Mean Time): they're guaranteed to be

         /// consequent numbers, so writing something like `GMT0 + offset' is
         /// safe if abs(offset) <= 12
 
         /// consequent numbers, so writing something like `GMT0 + offset' is
         /// safe if abs(offset) <= 12
 


@@ -233,7 +233,7 @@ public:
         in the functions whose result depends on it (GetWeekOfYear() and
         GetWeekOfMonth()).
 
         in the functions whose result depends on it (GetWeekOfYear() and
         GetWeekOfMonth()).
 

-        The desired behvaiour may be specified by giving one of the following
+        The desired behaviour may be specified by giving one of the following

         constants as argument to these functions.
     */
     enum WeekFlags
         constants as argument to these functions.
     */
     enum WeekFlags


@@ -286,7 +286,7 @@ public:
         Constructors and various Set() methods are collected here. If you
         construct a date object from separate values for day, month and year,
         you should use IsValid() method to check that the values were correct
         Constructors and various Set() methods are collected here. If you
         construct a date object from separate values for day, month and year,
         you should use IsValid() method to check that the values were correct

-        as constructors can not return an error code.
+        as constructors cannot return an error code.

     */
     //@{
 
     */
     //@{
 


@@ -811,7 +811,7 @@ public:
         Returns the combined date-time representation in the ISO 8601 format
         @c "YYYY-MM-DDTHH:MM:SS". The @a sep parameter default value produces
         the result exactly corresponding to the ISO standard, but it can also
         Returns the combined date-time representation in the ISO 8601 format
         @c "YYYY-MM-DDTHH:MM:SS". The @a sep parameter default value produces
         the result exactly corresponding to the ISO standard, but it can also

-        be useful to use a space as seprator if a more human-readable combined
+        be useful to use a space as separator if a more human-readable combined

         date-time representation is needed.
 
         @see FormatISODate(), FormatISOTime(), ParseISOCombined()
         date-time representation is needed.
 
         @see FormatISODate(), FormatISOTime(), ParseISOCombined()


@@ -856,7 +856,7 @@ public:
 
         This function tries as hard as it can to interpret the given string as
         date and time. Unlike ParseRfc822Date(), it will accept anything that
 
         This function tries as hard as it can to interpret the given string as
         date and time. Unlike ParseRfc822Date(), it will accept anything that

-        may be accepted and will only reject strings which can not be parsed in
+        may be accepted and will only reject strings which cannot be parsed in

         any way at all. Notice that the function will fail if either date or
         time part is present but not both, use ParseDate() or ParseTime() to
         parse strings containing just the date or time component.
         any way at all. Notice that the function will fail if either date or
         time part is present but not both, use ParseDate() or ParseTime() to
         parse strings containing just the date or time component.


@@ -1385,7 +1385,7 @@ public:
     static time_t GetTimeNow();
 
     /**
     static time_t GetTimeNow();
 
     /**

-        Returns the current time broken down using the buffer whose adress is
+        Returns the current time broken down using the buffer whose address is

         passed to the function with @a tm to store the result.
     */
     static tm* GetTmNow(struct tm *tm);
         passed to the function with @a tm to store the result.
     */
     static tm* GetTmNow(struct tm *tm);