fixed yet another memory leak in LoadGnomeDataFromKeyFile() (coverity checker CID 51)

[wxWidgets.git] / src / unix / displayx11.cpp

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 4736e995234fc3abec862cb18eca1e4889394e50..341ce07819de8e0326e0f2e0bee31e6c1962b7fb 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "display.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -37,11 +33,13 @@
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */
 extern "C" {
   #include <X11/Xlib.h>
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */
 extern "C" {
   #include <X11/Xlib.h>

+#ifndef __VMS

   #include <X11/Xlibint.h>
   #include <X11/Xlibint.h>

-  #include <X11/extensions/Xinerama.h>
+# include <X11/extensions/Xinerama.h>

 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
   #include <X11/extensions/xf86vmode.h>
 #endif
 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
   #include <X11/extensions/xf86vmode.h>
 #endif

+#endif

 }
 
 class wxDisplayUnixPriv
 }
 
 class wxDisplayUnixPriv


@@ -55,7 +53,8 @@ size_t wxDisplayBase::GetCount()
 {
   Display *disp = (Display*)wxGetDisplay();
 
 {
   Display *disp = (Display*)wxGetDisplay();
 

-  if ( XineramaIsActive(disp) )
+#ifndef __VMS
+   if ( XineramaIsActive(disp) )

   {
     XineramaScreenInfo *screenarr;
     int numscreens;
   {
     XineramaScreenInfo *screenarr;
     int numscreens;


@@ -64,6 +63,7 @@ size_t wxDisplayBase::GetCount()
     return numscreens;
   }
   else
     return numscreens;
   }
   else

+#endif   

   {
     return 1;
   }
   {
     return 1;
   }


@@ -73,7 +73,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
 {
   Display *disp = (Display*)wxGetDisplay();
 
 {
   Display *disp = (Display*)wxGetDisplay();
 

-  if ( XineramaIsActive(disp) )
+#ifndef __VMS
+   if ( XineramaIsActive(disp) )

   {
     int which_screen = -1;
     XineramaScreenInfo *screenarr;
   {
     int which_screen = -1;
     XineramaScreenInfo *screenarr;


@@ -96,7 +97,8 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
     return which_screen;
   }
   else
     return which_screen;
   }
   else

-  {
+#endif
+     {

     wxSize size = wxGetDisplaySize();
     if (p.x >= 0 &&
         p.x < size.GetWidth() &&
     wxSize size = wxGetDisplaySize();
     if (p.x >= 0 &&
         p.x < size.GetWidth() &&


@@ -114,7 +116,8 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
 {
   Display *disp = (Display*)wxGetDisplay();
 
 {
   Display *disp = (Display*)wxGetDisplay();
 

-  if ( XineramaIsActive(disp) )
+#ifndef __VMS
+   if ( XineramaIsActive(disp) )

   {
     XineramaScreenInfo *screenarr;
     int numscreens;
   {
     XineramaScreenInfo *screenarr;
     int numscreens;


@@ -126,7 +129,8 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
     XFree(screenarr);
   }
   else
     XFree(screenarr);
   }
   else

-  {
+#endif
+     {

     wxSize size = wxGetDisplaySize();
     m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight());
     m_priv->m_depth = wxDisplayDepth();
     wxSize size = wxGetDisplaySize();
     m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight());
     m_priv->m_depth = wxDisplayDepth();