applied patch 1372197, with some minor mods and cleanup

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

diff --git a/include/wx/unix/displayx11.h b/include/wx/unix/displayx11.h
index 9507f55d6ec41bfec6dab61d1d01761d574a0aad..da642361e2f79e242a04e59da8e04dd3faf88209 100644 (file)
--- a/include/wx/unix/displayx11.h
+++ b/include/wx/unix/displayx11.h
@@ -6,7 +6,7 @@
 // Created:     12/05/02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DISPLAYX11_H_
@@ -14,10 +14,6 @@
 
 #if wxUSE_DISPLAY
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "display.h"
-#endif
-
 class wxRect;
 class wxString;
 class wxDisplayUnixPriv;
@@ -43,7 +39,7 @@ class WXDLLEXPORT wxDisplay : public wxDisplayBase
   private:
     wxDisplayUnixPriv *m_priv;
 
-    DECLARE_NO_COPY_CLASS(wxDisplay);
+    DECLARE_NO_COPY_CLASS(wxDisplay)
 };
 
 #endif // wxUSE_DISPLAY