wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/msw/display.h b/include/wx/msw/display.h
index 1508887ee7ef91adcf6bab1bd3801aaf2226ef94..a49805f4632bf4545f17e95aae4698b38937ecaa 100644 (file)
--- a/include/wx/msw/display.h
+++ b/include/wx/msw/display.h
@@ -9,7 +9,7 @@
 // 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
 


@@ -19,9 +19,17 @@
 class WXDLLEXPORT wxDisplay : public wxDisplayBase
 {
 public:
 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);
 
     wxDisplay(size_t index = 0);
 

+    virtual ~wxDisplay();
+

     // implement base class pure virtuals
     // implement base class pure virtuals

+    virtual bool IsOk() const;

     virtual wxRect GetGeometry() const;
     virtual wxString GetName() const;
 
     virtual wxRect GetGeometry() const;
     virtual wxString GetName() const;
 


@@ -34,7 +42,15 @@ private:
     // get the display name to use with EnumDisplaySettings()
     wxString GetNameForEnumSettings() const;
 
     // 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_
 };
 
 #endif // _WX_MSW_DISPLAY_H_