Start/EndDrawingOnTop are still used under Motif, don't deprecate them

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 835a233b23f9abb1d110f1cc3036ea0c84983ae5..7c829dc36a2f9e51efb4a5627f5e25f8fac2db32 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin (resolution changes, display modes, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) 2002-2003 wxWindows team
+// Copyright:   (c) 2002-2003 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,22 +14,18 @@
 
 #if wxUSE_DISPLAY
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "displaybase.h"
-#endif
-
 #include "wx/dynarray.h"
 #include "wx/vidmode.h"
 
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxPoint;
 class WXDLLEXPORT wxRect;
-class WXDLLEXPORT wxString; 
+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
@@ -109,6 +105,10 @@ protected:
     #include "wx/unix/displayx11.h"
 #elif defined(__WXGTK__)
     #include "wx/unix/displayx11.h"
+#elif defined(__WXX11__)
+    #include "wx/unix/displayx11.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/display.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)