From dfa13ec8d7c5d39a72f59d64c443ab3a46aacc19 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 30 Jul 1999 04:31:52 +0000
Subject: [PATCH] wxPython documentation updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/bitmap.tex   |  6 ++++--
 docs/latex/wx/settings.tex | 15 +++++++++++++++
 docs/latex/wx/window.tex   |  8 ++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/latex/wx/bitmap.tex b/docs/latex/wx/bitmap.tex
index a1e0e2dd30..efe5732d7b 100644
--- a/docs/latex/wx/bitmap.tex
+++ b/docs/latex/wx/bitmap.tex
@@ -48,9 +48,9 @@ Windows only, I think.
 \func{}{wxBitmap}{\param{const char}{ bits[]}, \param{int}{ width}, \param{int}{ height}\\
   \param{int}{ depth = 1}}
 
-Creates a bitmap from an array of bits. 
+Creates a bitmap from an array of bits.
 
-Note that the bit depth is ignored on GTK+ and Motif. If you want to create a bitmap 
+Note that the bit depth is ignored on GTK+ and Motif. If you want to create a bitmap
 from something else than a 1-bit data array, use the \helpref{wxImage}{wximage} class.
 
 \func{}{wxBitmap}{\param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}}
@@ -143,6 +143,8 @@ Under X, {\it type} defaults to wxBITMAP\_TYPE\_XPM.
 \pythonnote{Constructors supported by wxPython are:\par
 \indented{2cm}{\begin{twocollist}
 \twocolitem{\bf{wxBitmap(name, flag)}}{Loads a bitmap from a file}
+\twocolitem{\bf{wxBitmap(data, type, width, height, depth=1)}}{Creates
+a bitmap from the given data, which can be of arbitrary type.}
 \twocolitem{\bf{wxNoRefBitmap(name, flag)}}{This one won't own the
 reference, so Python won't call the destructor, this is good for toolbars
 and such where the parent will manage the bitmap.}
diff --git a/docs/latex/wx/settings.tex b/docs/latex/wx/settings.tex
index 5ef89d04d2..e78368a43f 100644
--- a/docs/latex/wx/settings.tex
+++ b/docs/latex/wx/settings.tex
@@ -68,6 +68,9 @@ Returns a system colour.
 \twocolitem{{\bf wxSYS\_COLOUR\_BTNHILIGHT}}{Same as wxSYS\_COLOUR\_BTNHIGHLIGHT.}
 \end{twocollist}
 
+\pythonnote{This static method is implemented in Python as a
+standalone function named \tt{wxSystemSettings_GetSystemColour}}
+
 \membersection{wxSystemSettings::GetSystemFont}\label{wxsystemsettingsgetsystemfont}
 
 \func{static wxFont}{GetSystemFont}{\param{int}{ index}}
@@ -87,6 +90,9 @@ Returns a system font.
 Not available in versions of Windows earlier than Windows 95 or Windows NT 4.0.}
 \end{twocollist}
 
+\pythonnote{This static method is implemented in Python as a
+standalone function named \tt{wxSystemSettings_GetSystemFont}}
+
 \membersection{wxSystemSettings::GetSystemMetric}\label{wxsystemsettingsgetsystemmetric}
 
 \func{static int}{GetSystemMetric}{\param{int}{ index}}
@@ -143,3 +149,12 @@ where it would otherwise present the information only in audible form; zero othe
 \twocolitem{{\bf wxSYS\_SWAP\_BUTTONS}}{Non-zero if the meanings of the left and right mouse buttons are swapped; zero otherwise.}
 \end{twocollist}
 
+\pythonnote{This static method is implemented in Python as a
+standalone function named \tt{wxSystemSettings_GetSystemMetric}}
+
+
+
+
+
+
+
diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 26e3a73155..6be39b51f1 100644
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1523,6 +1523,14 @@ Just before the menu is popped up, \helpref{wxMenu::UpdateUI}{wxmenuupdateui} is
 to ensure that the menu items are in the correct state. The menu does not get deleted
 by the window.
 
+\pythonnote{In place of a single overloaded method name, wxPython
+implements the following methods:\par
+\indented{2cm}{\begin{twocollist}
+\twocolitem{\bf{PopupMenu(menu, point)}}{Specifies position with a wxPoint}
+\twocolitem{\bf{PopupMenuXY(menu, x, y)}}{Specifies position with two integers (x, y)}
+\end{twocollist}}
+}
+
 \membersection{wxWindow::PushEventHandler}\label{wxwindowpusheventhandler}
 
 \func{void}{PushEventHandler}{\param{wxEvtHandler* }{handler}}
-- 
2.45.2