wxchar.h doesn't have to be C file anymore, it's C++

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

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 1d71c7f038d8238d98f9b2fc6e1ccae40230b325..f08b0bdcaead0427e7ee25bc5f312b1f29fd498e 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -71,7 +71,7 @@ public:
 
     operator const XineramaScreenInfo *() const { return m_screens; }
 
 
     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;
 
 private:
     XineramaScreenInfo *m_screens;


@@ -85,7 +85,7 @@ private:
 class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl
 {
 public:
 class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl
 {
 public:

-    wxDisplayImplX11(size_t n, const XineramaScreenInfo& info)
+    wxDisplayImplX11(unsigned n, const XineramaScreenInfo& info)

         : wxDisplayImpl(n),
           m_rect(info.x_org, info.y_org, info.width, info.height)
     {
         : wxDisplayImpl(n),
           m_rect(info.x_org, info.y_org, info.width, info.height)
     {


@@ -110,8 +110,8 @@ class wxDisplayFactoryX11 : public wxDisplayFactory
 public:
     wxDisplayFactoryX11() { }
 
 public:
     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:
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:


@@ -122,7 +122,7 @@ protected:
 // wxDisplayFactoryX11 implementation
 // ============================================================================
 
 // wxDisplayFactoryX11 implementation
 // ============================================================================
 

-size_t wxDisplayFactoryX11::GetCount()
+unsigned wxDisplayFactoryX11::GetCount()

 {
     return ScreensInfo().GetCount();
 }
 {
     return ScreensInfo().GetCount();
 }


@@ -131,8 +131,8 @@ int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p)
 {
     ScreensInfo screens;
 
 {
     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 &&
     {
         const XineramaScreenInfo& s = screens[i];
         if ( p.x >= s.x_org && p.x < s.x_org + s.width &&


@@ -145,7 +145,7 @@ int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)

 {
     ScreensInfo screens;
 
 {
     ScreensInfo screens;
 


@@ -265,7 +265,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
 
 #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
 
 
 #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
 

-wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
+wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const

 {
     int count_return;
     int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);
 {
     int count_return;
     int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);


@@ -274,7 +274,11 @@ wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
     {
         for ( int x = 0; x < count_return; ++x )
         {
     {
         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);
         }
 
         XFree(depths);


@@ -288,7 +292,7 @@ wxVideoMode wxDisplayImplX11::GetCurrentMode() const
     return wxVideoMode();
 }
 
     return wxVideoMode();
 }
 

-bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
+bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))

 {
     // Not implemented
     return false;
 {
     // Not implemented
     return false;