undef CreateWindow too, even if we don't use it ourselves it's still a very common...

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

diff --git a/include/wx/display.h b/include/wx/display.h
index d2dcd0f602404563da6fc69f05023c9c596abaa4..b85a04471c4936c080cff0d166cb455a5dfd46c1 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -6,7 +6,7 @@
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002-2003 wxWidgets team
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002-2003 wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_


@@ -24,7 +24,7 @@
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxPoint;
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxPoint;
 class WXDLLEXPORT wxRect;

-class WXDLLEXPORT wxString; 
+class WXDLLEXPORT wxString;

 
 WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 


@@ -67,8 +67,8 @@ public:
     // name may be empty
     virtual wxString GetName() const = 0;
 
     // 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
 
 
     // enumerate all video modes supported by this display matching the given


@@ -111,6 +111,8 @@ protected:
     #include "wx/unix/displayx11.h"
 #elif defined(__WXX11__)
     #include "wx/unix/displayx11.h"
     #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__)
 #elif defined(__WXMAC__)
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)