Compilation fix for VC++ 5 and 6

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 0714805e5c4af9491cf90eb5ce7158292c861cc7..99423b6479757465e9da2c10af87384d5228e851 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -5,14 +5,14 @@
 // Modified by: Vadim Zeitlin (resolution changes, display modes, ...)
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 

-#ifdef wxUSE_DISPLAY
+#if wxUSE_DISPLAY

 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "displaybase.h"
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "displaybase.h"


@@ -24,12 +24,12 @@
 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);
 
 // default, uninitialized, video mode object
 
 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
 
 // ----------------------------------------------------------------------------
 // wxDisplayBase: represents a display/monitor attached to the system


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


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