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 cd381dddd6d4407c39f63b1bfaa4f2ebc6be92fb..b8a1bcf7ff15f56a22e6130931a01f596006855e 100644 (file)
--- a/interface/wx/vidmode.h
+++ b/interface/wx/vidmode.h
@@ -2,8 +2,7 @@
 // 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 license
+// Licence:     wxWindows licence

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


@@ -12,7 +11,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}

 
     @stdobjects
     ::wxDefaultVideoMode
 
     @stdobjects
     ::wxDefaultVideoMode


@@ -27,9 +26,6 @@ public:
     */
     wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0);
 
     */
     wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0);
 

-    bool operator==(const wxVideoMode& m) const
-    bool operator!=(const wxVideoMode& mode) const
-

     /**
         Returns true if this mode matches the other one in the sense that all
         non zero fields of the other mode have the same value in this one
     /**
         Returns true if this mode matches the other one in the sense that all
         non zero fields of the other mode have the same value in this one


@@ -38,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;


@@ -58,18 +54,24 @@ public:
     */
     bool IsOk() const;
 
     */
     bool IsOk() const;
 

+
+    bool operator==(const wxVideoMode& m) const;
+    bool operator!=(const wxVideoMode& mode) const;
+
+
+

     /**
     /**

-        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;


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

-wxVideoMode wxDefaultVideoMode;
+const wxVideoMode wxDefaultVideoMode;