X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6108c664af9b48a9fbeb8bb53c757c19c74da72..fb4888a650065c9a24572d6867345f34adafaa37:/docs/latex/wx/display.tex?ds=sidebyside

diff --git a/docs/latex/wx/display.tex b/docs/latex/wx/display.tex
index baf8889cbd..a7ff86db58 100644
--- a/docs/latex/wx/display.tex
+++ b/docs/latex/wx/display.tex
@@ -17,7 +17,7 @@ None
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
-\membersection{wxDisplay::wxDisplay}\label{wxdisplayconstr}
+\membersection{wxDisplay::wxDisplay}\label{wxdisplayctor}
 
 \func{}{wxDisplay}{\param{size\_t }{index = 0}}
 
@@ -29,7 +29,7 @@ Constructor, setting up a wxDisplay instance with the specified display.
 and lower than the value returned by \helpref{GetCount()}{wxdisplaygetcount}.}
 
 
-\membersection{wxDisplay::\destruct{wxDisplay}}
+\membersection{wxDisplay::\destruct{wxDisplay}}\label{wxdisplaydtor}
 
 \func{void}{\destruct{wxDisplay}}{\void}
 
@@ -90,6 +90,23 @@ the point is not on any connected display.
 \docparam{pt}{The point to locate.}
 
 
+\membersection{wxDisplay::GetFromWindow}\label{wxdisplaygetfromwindow}
+
+\func{static int}{GetFromWindow}{\param{wxWindow* }{win}}
+
+Returns the index of the display on which the given window lies.
+
+If the window is on more than one display it gets the display that overlaps the window the most.
+
+Returns -1 if the window is not on any connected display.
+
+Currently wxMSW only.
+
+\wxheading{Parameters}
+
+\docparam{win}{The window to locate.}
+
+
 \membersection{wxDisplay::GetGeometry}\label{wxdisplaygetgeometry}
 
 \constfunc{wxRect }{GetGeometry}{\void}
@@ -115,20 +132,6 @@ supported by this display and match the mode parameter
 Returns the display's name.  A name is not available on all platforms.
 
 
-\membersection{wxDisplay::IsColour}\label{wxdisplayiscolour}
-
-\constfunc{bool }{IsColour}{\void}
-
-Returns true if the display is color (has a depth greater than 1).
-
-
-\membersection{wxDisplay::IsColor}\label{wxdisplayiscolor}
-
-\constfunc{bool }{IsColor}{\void}
-
-Same as \helpref{IsColour()}{wxdisplayiscolour}.
-
-
 \membersection{wxDisplay::IsPrimary}\label{wxdisplayisprimary}
 
 \func{bool }{IsPrimary}{\void}
