Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/display.h b/interface/wx/display.h
index 682946576935143a85740b7e9beed5f0345083c1..a54f4a9fe3646f965212493cc520b761ee11f2d0 100644 (file)
--- a/interface/wx/display.h
+++ b/interface/wx/display.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxDisplay
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxDisplay
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -12,7 +12,7 @@
     Determines the sizes and locations of displays connected to the system.
 
     @library{wxcore}
     Determines the sizes and locations of displays connected to the system.
 
     @library{wxcore}

-    @category{misc}
+    @category{cfg}

 
     @see wxClientDisplayRect(), wxDisplaySize(), wxDisplaySizeMM()
 */
 
     @see wxClientDisplayRect(), wxDisplaySize(), wxDisplaySizeMM()
 */


@@ -40,15 +40,10 @@ public:
 
         If wxDefaultVideoMode is passed in as the mode parameter, the defined
         behaviour is that wxDisplay will reset the video mode to the default
 
         If wxDefaultVideoMode is passed in as the mode parameter, the defined
         behaviour is that wxDisplay will reset the video mode to the default

-        mode used by the display. On Windows, the behavior is normal. However,
+        mode used by the display. On Windows, the behaviour is normal. However,

         there are differences on other platforms. On Unix variations using X11
         extensions it should behave as defined, but some irregularities may
         occur.
         there are differences on other platforms. On Unix variations using X11
         extensions it should behave as defined, but some irregularities may
         occur.

-
-        On wxMac passing in wxDefaultVideoMode as the mode parameter does
-        nothing. This happens because carbon no longer has access to
-        @c DMUseScreenPrefs(), an undocumented function that changed the video
-        mode to the system default by using the system's "scrn" resource.

     */
     bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
 
     */
     bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
 


@@ -63,7 +58,7 @@ public:
     /**
         Returns the number of connected displays.
     */
     /**
         Returns the number of connected displays.
     */

-    static unsigned GetCount();
+    static unsigned int GetCount();

 
     /**
         Returns the current video mode that this display is in.
 
     /**
         Returns the current video mode that this display is in.