fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index fe867c595d40e2cdf97de67d2834d6a0a3aca757..f8dcb43e856f1a4155a19d2e8fbda1178e3aea75 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -145,7 +145,7 @@ wxDisplay::~wxDisplay()
     return Factory().GetFromPoint(pt);
 }
 
     return Factory().GetFromPoint(pt);
 }
 

-/* static */ int wxDisplay::GetFromWindow(wxWindow *window)
+/* static */ int wxDisplay::GetFromWindow(const wxWindow *window)

 {
     wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
 
 {
     wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
 


@@ -205,7 +205,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
     return m_impl->ChangeMode(mode);
 }
 
     return m_impl->ChangeMode(mode);
 }
 

-#endif // wxUSE_DIRECTDRAW
+#endif // wxUSE_DISPLAY

 
 // ----------------------------------------------------------------------------
 // static functions implementation
 
 // ----------------------------------------------------------------------------
 // static functions implementation


@@ -235,7 +235,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 // wxDisplayFactory implementation
 // ============================================================================
 
 // wxDisplayFactory implementation
 // ============================================================================
 

-int wxDisplayFactory::GetFromWindow(wxWindow *window)
+int wxDisplayFactory::GetFromWindow(const wxWindow *window)

 {
     // consider that the window belongs to the display containing its centre
     const wxRect r(window->GetRect());
 {
     // consider that the window belongs to the display containing its centre
     const wxRect r(window->GetRect());