Switched loads of settings back on

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

diff --git a/include/wx/msw/display.h b/include/wx/msw/display.h
index 1508887ee7ef91adcf6bab1bd3801aaf2226ef94..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
-// Modified by: 
+// Modified by:
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "display.h"
 #endif
 
@@ -19,9 +19,17 @@
 class WXDLLEXPORT wxDisplay : public wxDisplayBase
 {
 public:
+    // this function may be called *before* using any other wxDisplay methods
+    // to tell it to use DirectX functions instead of the standard Windows ones
+    static void UseDirectX(bool useDX);
+
+    // create the display object for the given physical display
     wxDisplay(size_t index = 0);
 
+    virtual ~wxDisplay();
+
     // implement base class pure virtuals
+    virtual bool IsOk() const;
     virtual wxRect GetGeometry() const;
     virtual wxString GetName() const;
 
@@ -30,11 +38,21 @@ public:
     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;
 
-    DECLARE_NO_COPY_CLASS(wxDisplay);
+    // we have different implementations using DirectDraw and without it
+    wxArrayVideoModes DoGetModesDirectX(const wxVideoMode& modeMatch) const;
+    bool DoChangeModeDirectX(const wxVideoMode& mode);
+
+    wxArrayVideoModes DoGetModesWindows(const wxVideoMode& modeMatch) const;
+    bool DoChangeModeWindows(const wxVideoMode& mode);
+
+
+    DECLARE_NO_COPY_CLASS(wxDisplay)
 };
 
 #endif // _WX_MSW_DISPLAY_H_