Add NUM_CUSTOM

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

diff --git a/interface/wx/vidmode.h b/interface/wx/vidmode.h
index a96d3192c92f78ec4aab82bbe67e6cdf9c0f9e55..ba512f52ceee2884465398401db18f850b06deb9 100644 (file)
--- a/interface/wx/vidmode.h
+++ b/interface/wx/vidmode.h
@@ -2,18 +2,17 @@
 // 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
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @struct wxVideoMode
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @struct wxVideoMode

-    @wxheader{display.h}

 
     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


@@ -28,9 +27,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


@@ -59,6 +55,12 @@ 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.
     */


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

-wxVideoMode wxDefaultVideoMode;
+const wxVideoMode wxDefaultVideoMode;