non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / msw / display.cpp

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 3a0844c3cec678ba3fa7bb6b630d249d2c78c479..3e87a50557df25eb42c86385d5dcfaf68a9c82df 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -27,19 +27,19 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

+#include "wx/display.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/app.h"
     #include "wx/frame.h"
 #endif
 

-#include "wx/msw/missing.h"
-

 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 

-#include "wx/display.h"

 #include "wx/display_impl.h"
 #include "wx/display_impl.h"

+#include "wx/msw/missing.h"

 
 // define this to use DirectDraw for display mode switching: this is disabled
 // by default because ddraw.h is now always available and also it's not really
 
 // define this to use DirectDraw for display mode switching: this is disabled
 // by default because ddraw.h is now always available and also it's not really


@@ -175,7 +175,7 @@ WX_DEFINE_ARRAY_PTR(wxDisplayInfo *, wxDisplayInfoArray);
 class wxDisplayImplWin32Base : public wxDisplayImpl
 {
 public:
 class wxDisplayImplWin32Base : public wxDisplayImpl
 {
 public:

-    wxDisplayImplWin32Base(size_t n, wxDisplayInfo& info)
+    wxDisplayImplWin32Base(unsigned n, wxDisplayInfo& info)

         : wxDisplayImpl(n),
           m_info(info)
     {
         : wxDisplayImpl(n),
           m_info(info)
     {


@@ -220,7 +220,7 @@ public:
 
     bool IsOk() const { return !m_displays.empty(); }
 
 
     bool IsOk() const { return !m_displays.empty(); }
 

-    virtual size_t GetCount() { return m_displays.size(); }
+    virtual unsigned GetCount() { return unsigned(m_displays.size()); }

     virtual int GetFromPoint(const wxPoint& pt);
     virtual int GetFromWindow(wxWindow *window);
 
     virtual int GetFromPoint(const wxPoint& pt);
     virtual int GetFromWindow(wxWindow *window);
 


@@ -258,7 +258,7 @@ protected:
 class wxDisplayImplMultimon : public wxDisplayImplWin32Base
 {
 public:
 class wxDisplayImplMultimon : public wxDisplayImplWin32Base
 {
 public:

-    wxDisplayImplMultimon(size_t n, wxDisplayInfo& info)
+    wxDisplayImplMultimon(unsigned n, wxDisplayInfo& info)

         : wxDisplayImplWin32Base(n, info)
     {
     }
         : wxDisplayImplWin32Base(n, info)
     {
     }


@@ -275,7 +275,7 @@ class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
 public:
     wxDisplayFactoryMultimon();
 
 public:
     wxDisplayFactoryMultimon();
 

-    virtual wxDisplayImpl *CreateDisplay(size_t n);
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);

 
 private:
     // EnumDisplayMonitors() callback
 
 private:
     // EnumDisplayMonitors() callback


@@ -325,7 +325,7 @@ struct wxDisplayInfoDirectDraw : wxDisplayInfo
 class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
 {
 public:
 class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
 {
 public:

-    wxDisplayImplDirectDraw(size_t n, wxDisplayInfo& info, IDirectDraw2 *pDD2)
+    wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2)

         : wxDisplayImplWin32Base(n, info),
           m_pDD2(pDD2)
     {
         : wxDisplayImplWin32Base(n, info),
           m_pDD2(pDD2)
     {


@@ -352,7 +352,7 @@ public:
     wxDisplayFactoryDirectDraw();
     virtual ~wxDisplayFactoryDirectDraw();
 
     wxDisplayFactoryDirectDraw();
     virtual ~wxDisplayFactoryDirectDraw();
 

-    virtual wxDisplayImpl *CreateDisplay(size_t n);
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);

 
 private:
     // callback used with DirectDrawEnumerateEx()
 
 private:
     // callback used with DirectDrawEnumerateEx()


@@ -459,7 +459,7 @@ wxRect wxDisplayImplWin32Base::GetClientArea() const
 
 wxString wxDisplayImplWin32Base::GetName() const
 {
 
 wxString wxDisplayImplWin32Base::GetName() const
 {

-    if ( m_info.m_devName.IsEmpty() )
+    if ( m_info.m_devName.empty() )

         m_info.Initialize();
 
     return m_info.m_devName;
         m_info.Initialize();
 
     return m_info.m_devName;


@@ -648,7 +648,7 @@ void wxDisplayFactoryMultimon::AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor)
 // wxDisplayFactoryMultimon inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 
 // wxDisplayFactoryMultimon inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 

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

 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 


@@ -889,7 +889,7 @@ void wxDisplayFactoryDirectDraw::AddDisplay(const GUID& guid,
 // wxDisplayFactoryDirectDraw inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 
 // wxDisplayFactoryDirectDraw inherited pure virtuals implementation
 // ----------------------------------------------------------------------------
 

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

 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
 {
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );