projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clear m_aTypes array in Clear() as well (patch 1165866)
[wxWidgets.git]
/
include
/
wx
/
msw
/
display.h
diff --git
a/include/wx/msw/display.h
b/include/wx/msw/display.h
index b9f849c4bae926844fd90715b4b8533267ebd69f..b34635e90d8a4c18906eaf0dd55087b5eb78cb63 100644
(file)
--- a/
include/wx/msw/display.h
+++ b/
include/wx/msw/display.h
@@
-2,14
+2,14
@@
// Name: display.h
// Purpose: wxDisplay class customization for WXMSW
// Author: Royce Mitchell III
// Name: display.h
// Purpose: wxDisplay class customization for WXMSW
// Author: Royce Mitchell III
-// Modified by:
+// Modified by:
// Created: 06/21/02
// RCS-ID: $Id$
// Created: 06/21/02
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
+// Copyright: (c) wxWi
dget
s team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(
__APPLE__
)
+#if defined(__GNUG__) && !defined(
NO_GCC_PRAGMA
)
#pragma interface "display.h"
#endif
#pragma interface "display.h"
#endif
@@
-38,6
+38,8
@@
public:
virtual wxVideoMode GetCurrentMode() const;
virtual bool ChangeMode(const wxVideoMode& mode = wxVideoMode());
virtual wxVideoMode GetCurrentMode() const;
virtual bool ChangeMode(const wxVideoMode& mode = wxVideoMode());
+ virtual bool IsPrimary() const;
+
private:
// get the display name to use with EnumDisplaySettings()
wxString GetNameForEnumSettings() const;
private:
// get the display name to use with EnumDisplaySettings()
wxString GetNameForEnumSettings() const;
@@
-49,8
+51,8
@@
private:
wxArrayVideoModes DoGetModesWindows(const wxVideoMode& modeMatch) const;
bool DoChangeModeWindows(const wxVideoMode& mode);
wxArrayVideoModes DoGetModesWindows(const wxVideoMode& modeMatch) const;
bool DoChangeModeWindows(const wxVideoMode& mode);
-
- DECLARE_NO_COPY_CLASS(wxDisplay)
;
+
+ DECLARE_NO_COPY_CLASS(wxDisplay)
};
#endif // _WX_MSW_DISPLAY_H_
};
#endif // _WX_MSW_DISPLAY_H_