Fixed and refactored wxPropertyGridManager decsription text box painting

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

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 87ab205039b97a4b12bc0d86fb1171a2692b08f2..23d28857a6b86545a9d5c47f061264859ca1ea26 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -71,7 +71,7 @@ public:
 
     operator const XineramaScreenInfo *() const { return m_screens; }
 
-    unsigned GetCount() const { return wx_static_cast(unsigned, m_num); }
+    unsigned GetCount() const { return static_cast<unsigned>(m_num); }
 
 private:
     XineramaScreenInfo *m_screens;
@@ -252,9 +252,9 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
         for (int i = 0; i < nNumModes; ++i)
         {
             if (!bRet &&
-                ppXModes[i]->hdisplay == mode.w &&
-                ppXModes[i]->vdisplay == mode.h &&
-                wxCRR((*ppXModes[i])) == mode.refresh)
+                ppXModes[i]->hdisplay == mode.GetWidth() &&
+                ppXModes[i]->vdisplay == mode.GetHeight() &&
+                wxCRR((*ppXModes[i])) == mode.GetRefresh())
             {
                 //switch!
                 bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
@@ -343,6 +343,8 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 
 #else // !wxUSE_LIBHILDON
 
+#include "wx/log.h"
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>