added check for self-assignment to wxPrintData::operator=() (thanks HP aCC for a...

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

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 1d4817a7d3a6997550a40b2cf6022956a29ab67a..aec1509076df9835cd59f73cb018b694fbfd5279 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -699,26 +699,26 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)
     }
     else // change to the given mode
     {
     }
     else // change to the given mode
     {

-        wxCHECK_MSG( mode.w && mode.h, false,
+        wxCHECK_MSG( mode.GetWidth() && mode.GetHeight(), false,

                         _T("at least the width and height must be specified") );
 
         wxZeroMemory(dm);
         dm.dmSize = sizeof(dm);
         dm.dmDriverExtra = 0;
         dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
                         _T("at least the width and height must be specified") );
 
         wxZeroMemory(dm);
         dm.dmSize = sizeof(dm);
         dm.dmDriverExtra = 0;
         dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;

-        dm.dmPelsWidth = mode.w;
-        dm.dmPelsHeight = mode.h;
+        dm.dmPelsWidth = mode.GetWidth();
+        dm.dmPelsHeight = mode.GetHeight();

 
 

-        if ( mode.bpp )
+        if ( mode.GetDepth() )

         {
             dm.dmFields |= DM_BITSPERPEL;
         {
             dm.dmFields |= DM_BITSPERPEL;

-            dm.dmBitsPerPel = mode.bpp;
+            dm.dmBitsPerPel = mode.GetDepth();

         }
 
         }
 

-        if ( mode.refresh )
+        if ( mode.GetRefresh() )

         {
             dm.dmFields |= DM_DISPLAYFREQUENCY;
         {
             dm.dmFields |= DM_DISPLAYFREQUENCY;

-            dm.dmDisplayFrequency = mode.refresh;
+            dm.dmDisplayFrequency = mode.GetRefresh();

         }
 
         pDevMode = &dm;
         }
 
         pDevMode = &dm;


@@ -776,7 +776,7 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)
                 if (frameTop && frameTop->IsFullScreen())
                 {
                     wxVideoMode current = GetCurrentMode();
                 if (frameTop && frameTop->IsFullScreen())
                 {
                     wxVideoMode current = GetCurrentMode();

-                    frameTop->SetClientSize(current.w, current.h);
+                    frameTop->SetClientSize(current.GetWidth(), current.GetHeight());

                 }
             }
             return true;
                 }
             }
             return true;


@@ -852,7 +852,7 @@ wxDisplayFactoryDirectDraw::DDEnumExCallback(GUID *pGuid,
     if ( pGuid )
     {
         wxDisplayFactoryDirectDraw * self =
     if ( pGuid )
     {
         wxDisplayFactoryDirectDraw * self =

-            wx_static_cast(wxDisplayFactoryDirectDraw *, lpContext);
+            static_cast<wxDisplayFactoryDirectDraw *>(lpContext);

         self->AddDisplay(*pGuid, hmon, driverName);
     }
     //else: we're called for the primary monitor, skip it
         self->AddDisplay(*pGuid, hmon, driverName);
     }
     //else: we're called for the primary monitor, skip it


@@ -881,7 +881,7 @@ wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n)
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
     wxDisplayInfoDirectDraw *
     wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
 
     wxDisplayInfoDirectDraw *

-        info = wx_static_cast(wxDisplayInfoDirectDraw *, m_displays[n]);
+        info = static_cast<wxDisplayInfoDirectDraw *>(m_displays[n]);

 
     if ( !info->m_pDD2 )
     {
 
     if ( !info->m_pDD2 )
     {


@@ -955,7 +955,7 @@ HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
     if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
     {
         wxDDVideoModesAdder * const vmodes =
     if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
     {
         wxDDVideoModesAdder * const vmodes =

-            wx_static_cast(wxDDVideoModesAdder *, lpContext);
+            static_cast<wxDDVideoModesAdder *>(lpContext);

 
         vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth,
                                 lpDDSurfaceDesc->dwHeight,
 
         vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth,
                                 lpDDSurfaceDesc->dwHeight,