Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/vidmode.h b/interface/wx/vidmode.h
index c4120ef91d1984f1965fb790325b064c521c0e55..b8a1bcf7ff15f56a22e6130931a01f596006855e 100644 (file)
--- a/interface/wx/vidmode.h
+++ b/interface/wx/vidmode.h
@@ -2,7 +2,6 @@
 // Name:        vidmode.h
 // Purpose:     interface of wxVideoMode
 // Author:      wxWidgets team
 // Name:        vidmode.h
 // Purpose:     interface of wxVideoMode
 // Author:      wxWidgets team

-// RCS-ID:      $Id: display.h 52634 2008-03-20 13:45:17Z VS $

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -35,17 +34,17 @@ public:
     bool Matches(const wxVideoMode& other) const;
 
     /**
     bool Matches(const wxVideoMode& other) const;
 
     /**

-        Returns the screen width in pixels (e.g. 640), 0 means unspecified.
+        Returns the screen width in pixels (e.g.\ 640), 0 means unspecified.

     */
     int GetWidth() const;
 
     /**
     */
     int GetWidth() const;
 
     /**

-        Returns the screen height in pixels (e.g. 480), 0 means unspecified.
+        Returns the screen height in pixels (e.g.\ 480), 0 means unspecified.

     */
     int GetHeight() const;
 
     /**
     */
     int GetHeight() const;
 
     /**

-        Returns bits per pixel (e.g. 32), 1 is monochrome and 0 means
+        Returns bits per pixel (e.g.\ 32), 1 is monochrome and 0 means

         unspecified/known.
     */
     int GetDepth() const;
         unspecified/known.
     */
     int GetDepth() const;


@@ -62,17 +61,17 @@ public:
 
 
     /**
 
 
     /**

-        The screen width in pixels (e.g. 640), 0 means unspecified.
+        The screen width in pixels (e.g.\ 640), 0 means unspecified.

     */
     int w;
 
     /**
     */
     int w;
 
     /**

-        The screen height in pixels (e.g. 480), 0 means unspecified.
+        The screen height in pixels (e.g.\ 480), 0 means unspecified.

     */
     int h;
 
     /**
     */
     int h;
 
     /**

-        Bits per pixel (e.g. 32), 1 is monochrome and 0 means
+        Bits per pixel (e.g.\ 32), 1 is monochrome and 0 means

         unspecified/known.
     */
     int bpp;
         unspecified/known.
     */
     int bpp;


@@ -86,5 +85,5 @@ public:
 /**
     A global wxVideoMode instance used by wxDisplay.
 */
 /**
     A global wxVideoMode instance used by wxDisplay.
 */

-wxVideoMode wxDefaultVideoMode;
+const wxVideoMode wxDefaultVideoMode;