Correct decoding of 4-byte integers in png2c script.

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

diff --git a/interface/wx/display.h b/interface/wx/display.h
index 500dc5b06c4b9a9666f934b50aa3d081c3750273..ab7c9920c0db5b7884931bc01694e2bacdd8bec0 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()
 */


@@ -27,7 +27,7 @@ public:
             The index of the display to use. This must be non-negative and
             lower than the value returned by GetCount().
     */
             The index of the display to use. This must be non-negative and
             lower than the value returned by GetCount().
     */

-    wxDisplay(unsigned index = 0);
+    wxDisplay(unsigned int index = 0);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -44,11 +44,6 @@ public:
         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,19 +58,13 @@ 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.
     */
     wxVideoMode GetCurrentMode() const;
 
 
     /**
         Returns the current video mode that this display is in.
     */
     wxVideoMode GetCurrentMode() const;
 

-    /**
-        Returns the bit depth of the display whose index was passed to the
-        constructor.
-    */
-    int GetDepth() const;
-

     /**
         Returns the index of the display on which the given point lies, or
         @c wxNOT_FOUND if the point is not on any connected display.
     /**
         Returns the index of the display on which the given point lies, or
         @c wxNOT_FOUND if the point is not on any connected display.


@@ -122,6 +111,6 @@ public:
         Returns @true if the display is the primary display. The primary
         display is the one whose index is 0.
     */
         Returns @true if the display is the primary display. The primary
         display is the one whose index is 0.
     */

-    bool IsPrimary();
+    bool IsPrimary() const;

 };
 
 };