removed unneeded prototype

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index ecd5b6798c2ee96be3ce099ba8a06b380972b370..49734796248978fdfdca885e63c882b038726613 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1987,9 +1987,7 @@ default value is {\tt false}.}
 
 \membersection{wxWindow::PopupMenu}\label{wxwindowpopupmenu}
 
 
 \membersection{wxWindow::PopupMenu}\label{wxwindowpopupmenu}
 

-\func{bool}{PopupMenu}{\param{wxMenu* }{menu}}
-
-\func{bool}{PopupMenu}{\param{wxMenu* }{menu}, \param{const wxPoint\& }{pos}}
+\func{bool}{PopupMenu}{\param{wxMenu* }{menu}, \param{const wxPoint\& }{pos = wxDefaultPosition}}

 
 \func{bool}{PopupMenu}{\param{wxMenu* }{menu}, \param{int }{x}, \param{int }{y}}
 
 
 \func{bool}{PopupMenu}{\param{wxMenu* }{menu}, \param{int }{x}, \param{int }{y}}
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 67e839fd66db80ad4353312a513736a31b602962..96385dd616fd2e99a9b1b4f0d5e510fb0703cbd0 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -804,9 +804,7 @@ public:
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
 
 #if wxUSE_MENUS
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
 
 #if wxUSE_MENUS

-    bool PopupMenu(wxMenu *menu)
-        { return DoPopupMenu(menu, -1, -1); }
-    bool PopupMenu(wxMenu *menu, const wxPoint& pos)
+    bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition)

         { return DoPopupMenu(menu, pos.x, pos.y); }
     bool PopupMenu(wxMenu *menu, int x, int y)
         { return DoPopupMenu(menu, x, y); }
         { return DoPopupMenu(menu, pos.x, pos.y); }
     bool PopupMenu(wxMenu *menu, int x, int y)
         { return DoPopupMenu(menu, x, y); }