added wxListCtrl::GetViewRect()

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 05db85ab8dfb98961d12417551447344f6b366a5..a9eeb86607e3248085ce49f085578ba720b7b09f 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -14,12 +14,14 @@
 
 #if wxUSE_DISPLAY
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "displaybase.h"
 #endif
 
 #include "wx/dynarray.h"
 
+class WXDLLEXPORT wxWindow;
+
 // ----------------------------------------------------------------------------
 // wxVideoMode: contains video mode parameters for a display
 // ----------------------------------------------------------------------------
@@ -100,6 +102,9 @@ public:
     static int GetFromWindow(wxWindow *window);
 
 
+    // return true if the object was initialized successfully
+    virtual bool IsOk() const { return true; }
+
     // get the display size
     virtual wxRect GetGeometry() const = 0;
 
@@ -138,16 +143,16 @@ protected:
     // the index of this display (0 is always the primary one)
     size_t m_index;
 
-    DECLARE_NO_COPY_CLASS(wxDisplayBase);
+    DECLARE_NO_COPY_CLASS(wxDisplayBase)
 };
 
 
 #if defined(__WXMSW__)
     #include "wx/msw/display.h"
 #elif defined(__WXMOTIF__)
-    #include "wx/motif/display.h"
+    #include "wx/unix/displayx11.h"
 #elif defined(__WXGTK__)
-    #include "wx/gtk/display.h"
+    #include "wx/unix/displayx11.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/display.h"
 #elif defined(__WXPM__)