X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51259762d5f470de93294f2dafa9ee72ec70d045..cc8bc5aa9cd14c158de637acb9e5ed8beb066d57:/include/wx/display.h diff --git a/include/wx/display.h b/include/wx/display.h index c080a21e2e..7c829dc36a 100644 --- 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