use ES_RIGHT|ES_NUMBER styles for the buddy control as it's used for numeric entry...

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

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index fdd1dc18b54afc8dbd30cd4ff6f77cb5f62f42d1..f08b0bdcaead0427e7ee25bc5f312b1f29fd498e 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -21,22 +21,23 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_DISPLAY
+
 #include "wx/display.h"
-#include "wx/display_impl.h"
-#include "wx/intl.h"
-#include "wx/log.h"
 
 #ifndef WX_PRECOMP
-  #include "wx/dynarray.h"
-  #include "wx/gdicmn.h"
-  #include "wx/string.h"
-  #include "wx/utils.h"
+    #include "wx/dynarray.h"
+    #include "wx/gdicmn.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif /* WX_PRECOMP */
 
-#if wxUSE_DISPLAY
+#include "wx/display_impl.h"
 
 /* These must be included after the wx files.  Otherwise the Data macro in
  * Xlibint.h conflicts with a function declaration in wx/list.h.  */
@@ -70,7 +71,7 @@ public:
 
     operator const XineramaScreenInfo *() const { return m_screens; }
 
-    size_t GetCount() const { return wx_static_cast(size_t, m_num); }
+    unsigned GetCount() const { return wx_static_cast(unsigned, m_num); }
 
 private:
     XineramaScreenInfo *m_screens;
@@ -84,8 +85,9 @@ private:
 class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl
 {
 public:
-    wxDisplayImplX11(const XineramaScreenInfo& info)
-        : m_rect(info.x_org, info.y_org, info.width, info.height)
+    wxDisplayImplX11(unsigned n, const XineramaScreenInfo& info)
+        : wxDisplayImpl(n),
+          m_rect(info.x_org, info.y_org, info.width, info.height)
     {
     }
 
@@ -106,10 +108,10 @@ private:
 class wxDisplayFactoryX11 : public wxDisplayFactory
 {
 public:
-    wxDisplayFactoryX11();
+    wxDisplayFactoryX11() { }
 
-    virtual wxDisplayImpl *CreateDisplay(size_t n);
-    virtual size_t GetCount();
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+    virtual unsigned GetCount();
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
@@ -120,7 +122,7 @@ protected:
 // wxDisplayFactoryX11 implementation
 // ============================================================================
 
-size_t wxDisplayFactoryX11::GetCount()
+unsigned wxDisplayFactoryX11::GetCount()
 {
     return ScreensInfo().GetCount();
 }
@@ -129,8 +131,8 @@ int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p)
 {
     ScreensInfo screens;
 
-    const size_t numscreens(screens.GetCount());
-    for ( size_t i = 0; i < numscreens; ++i )
+    const unsigned numscreens(screens.GetCount());
+    for ( unsigned i = 0; i < numscreens; ++i )
     {
         const XineramaScreenInfo& s = screens[i];
         if ( p.x >= s.x_org && p.x < s.x_org + s.width &&
@@ -143,11 +145,11 @@ int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p)
     return wxNOT_FOUND;
 }
 
-wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
 {
     ScreensInfo screens;
 
-    return n < screens.GetCount() ? new wxDisplayImplX11(screens[n]) : NULL;
+    return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL;
 }
 
 // ============================================================================
@@ -170,7 +172,7 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n)
 #define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc))
 #define wxCVM(v) wxCVM2(v, v.dotclock)
 
-wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
+wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
 {
     //Convenience...
     Display* pDisplay = (Display*) wxGetDisplay(); //default display
@@ -204,7 +206,7 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
     return Modes;
 }
 
-wxVideoMode wxDisplay::GetCurrentMode() const
+wxVideoMode wxDisplayImplX11::GetCurrentMode() const
 {
   XF86VidModeModeLine VM;
   int nDotClock;
@@ -214,7 +216,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const
   return wxCVM2(VM, nDotClock);
 }
 
-bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
 {
     XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
     int nNumModes; //Number of modes enumerated....
@@ -263,7 +265,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 
 #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
 
-wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
+wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
 {
     int count_return;
     int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);
@@ -272,7 +274,11 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
     {
         for ( int x = 0; x < count_return; ++x )
         {
-            modes.Add(wxVideoMode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]));
+            wxVideoMode mode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]);
+            if ( mode.Matches(modeMatch) )
+            {
+                modes.Add(modeMatch);
+            }
         }
 
         XFree(depths);
@@ -280,13 +286,13 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
     return modes;
 }
 
-wxVideoMode wxDisplay::GetCurrentMode() const
+wxVideoMode wxDisplayImplX11::GetCurrentMode() const
 {
     // Not implemented
     return wxVideoMode();
 }
 
-bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
 {
     // Not implemented
     return false;
@@ -300,10 +306,12 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 
 /* static */ wxDisplayFactory *wxDisplay::CreateFactory()
 {
-    Display *disp = (Display*)wxGetDisplay();
+    if ( XineramaIsActive((Display*)wxGetDisplay()) )
+    {
+        return new wxDisplayFactoryX11;
+    }
 
-    return XineramaIsActive(disp) ? new wxDisplayFactoryX11
-                                  : new wxDisplayFactorySingle;
+    return new wxDisplayFactorySingle;
 }
 
 #endif /* wxUSE_DISPLAY */