Line-up interfaces to use size_t for GetCount()s (and count related api).

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

diff --git a/include/wx/display.h b/include/wx/display.h
index c080a21e2e228c9725a36aaabfa42d753d8eb052..acf445c8c8cff880ed34cf52a4543a7db4fd9df8 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -14,10 +14,6 @@
 
 #if wxUSE_DISPLAY
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "displaybase.h"
-#endif
-
 #include "wx/dynarray.h"
 #include "wx/vidmode.h"
 
@@ -29,7 +25,7 @@ class WXDLLEXPORT wxString;
 WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 
 // default, uninitialized, video mode object
-WXDLLEXPORT_DATA(extern const wxVideoMode) wxDefaultVideoMode;
+extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode;
 
 // ----------------------------------------------------------------------------
 // wxDisplayBase: represents a display/monitor attached to the system
@@ -67,8 +63,8 @@ public:
     // name may be empty
     virtual wxString GetName() const = 0;
 
-    // display 0 is always the primary display
-    bool IsPrimary() const { return m_index == 0; }
+    // display 0 is usually the primary display
+    virtual bool IsPrimary() const { return m_index == 0; }
 
 
     // enumerate all video modes supported by this display matching the given
@@ -117,6 +113,8 @@ protected:
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)
     #include "wx/os2/display.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/display.h"
 #endif
 
 #endif // wxUSE_DISPLAY