wxTinderbox build fixes.

[wxWidgets.git] / src / common / dpycmn.cpp

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index 87f303c06570d87b51500116dafbff23fb3096e7..6527fc64de765c6d8ac09eb2e019404d5cee8832 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/dpycmn.cpp
+// Name:        src/common/dpycmn.cpp

 // Purpose:     wxDisplayBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.03.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     wxDisplayBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.03.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "displaybase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,12 +24,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/display.h"
-

 #if wxUSE_DISPLAY
 
 #if wxUSE_DISPLAY
 

+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+    #include "wx/window.h"
+#endif //WX_PRECOMP
+
+#include "wx/display.h"
+

 #include "wx/arrimpl.cpp"
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxArrayVideoModes);
+WX_DEFINE_OBJARRAY(wxArrayVideoModes)

 
 const wxVideoMode wxDefaultVideoMode;
 
 
 const wxVideoMode wxDefaultVideoMode;
 


@@ -44,9 +45,22 @@ const wxVideoMode wxDefaultVideoMode;
 wxDisplayBase::wxDisplayBase(size_t index)
              : m_index (index)
 {
 wxDisplayBase::wxDisplayBase(size_t index)
              : m_index (index)
 {

-    wxASSERT_MSG( m_index < wxDisplayBase::GetCount(),
+    wxASSERT_MSG( m_index < GetCount(),

                     wxT("An invalid index was passed to wxDisplay") );
 }
 
                     wxT("An invalid index was passed to wxDisplay") );
 }
 

-#endif // wxUSE_DISPLAY
+// MSW has its own specific implementation of this
+#ifndef __WXMSW__
+
+int wxDisplayBase::GetFromWindow(wxWindow *window)
+{
+    wxCHECK_MSG( window, wxNOT_FOUND, _T("NULL window") );

 
 

+    // consider that the window belong to the display containing its centre
+    const wxRect r(window->GetRect());
+    return GetFromPoint(wxPoint(r.x + r.width/2, r.y + r.height/2));
+}
+
+#endif // !__WXMSW__
+
+#endif // wxUSE_DISPLAY