added adjustOrigin parameter to bounds calculation

[wxWidgets.git] / include / wx / unix / displayx11.h

diff --git a/include/wx/unix/displayx11.h b/include/wx/unix/displayx11.h
index 2edc3d1fca027bbf075d3786aeb4775deb384943..4bb0cdc8f49f80c2cb16cd90a50cde513bac2ee7 100644 (file)
--- a/include/wx/unix/displayx11.h
+++ b/include/wx/unix/displayx11.h
@@ -14,7 +14,7 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "display.h"
 #endif
 
     #pragma interface "display.h"
 #endif
 


@@ -31,6 +31,12 @@ class WXDLLEXPORT wxDisplay : public wxDisplayBase
     virtual wxRect GetGeometry() const;
     virtual int GetDepth() const;
     virtual wxString GetName() const;
     virtual wxRect GetGeometry() const;
     virtual int GetDepth() const;
     virtual wxString GetName() const;

+    virtual wxArrayVideoModes
+        GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const;
+
+    virtual wxVideoMode GetCurrentMode() const;
+
+    virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);

 
     ~wxDisplay();
 
 
     ~wxDisplay();