allow wxFileConfig be created with empty name (will take it from wxApp) (patch 749749)

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 05db85ab8dfb98961d12417551447344f6b366a5..ddcea733dd1badaa90acd3487e5dc462051255bd 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -20,6 +20,8 @@
 
 #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;
 
@@ -147,7 +152,7 @@ protected:
 #elif defined(__WXMOTIF__)
     #include "wx/motif/display.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__)