From: Robin Dunn Date: Fri, 12 Oct 2001 18:11:46 +0000 (+0000) Subject: Added style parameter to wxPopupWindow ctors so they match the Create method. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/758bce950ba9236d0a9edc4c880c3ec73b5173f3 Added style parameter to wxPopupWindow ctors so they match the Create method. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h index 63c17d793d..d01ecdff01 100644 --- a/include/wx/gtk/popupwin.h +++ b/include/wx/gtk/popupwin.h @@ -30,17 +30,18 @@ public: #ifdef __DARWIN__ virtual ~wxPopupWindow() { } #endif - - wxPopupWindow(wxWindow *parent) { (void)Create(parent); } + + wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) + { (void)Create(parent, flags); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE); virtual bool Show( bool show = TRUE ); - + // implementation // -------------- virtual void DoMoveWindow(int x, int y, int width, int height); - + virtual void OnInternalIdle(); diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h index 63c17d793d..d01ecdff01 100644 --- a/include/wx/gtk1/popupwin.h +++ b/include/wx/gtk1/popupwin.h @@ -30,17 +30,18 @@ public: #ifdef __DARWIN__ virtual ~wxPopupWindow() { } #endif - - wxPopupWindow(wxWindow *parent) { (void)Create(parent); } + + wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) + { (void)Create(parent, flags); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE); virtual bool Show( bool show = TRUE ); - + // implementation // -------------- virtual void DoMoveWindow(int x, int y, int width, int height); - + virtual void OnInternalIdle(); diff --git a/include/wx/mgl/popupwin.h b/include/wx/mgl/popupwin.h index bebd35d9fe..fd56a9b5cb 100644 --- a/include/wx/mgl/popupwin.h +++ b/include/wx/mgl/popupwin.h @@ -20,7 +20,8 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase public: wxPopupWindow() { } - wxPopupWindow(wxWindow *parent) { (void)Create(parent); } + wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) + { (void)Create(parent, flags); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE) { diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h index 616b22679d..3586d958bb 100644 --- a/include/wx/msw/popupwin.h +++ b/include/wx/msw/popupwin.h @@ -21,7 +21,8 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase public: wxPopupWindow() { } - wxPopupWindow(wxWindow *parent) { (void)Create(parent); } + wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) + { (void)Create(parent, flags); } bool Create(wxWindow *parent, int flags = wxBORDER_NONE) { diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 7a666aaf7d..85ce6295e6 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -71,7 +71,7 @@ class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow public: // ctors wxPopupTransientWindow() { Init(); } - wxPopupTransientWindow(wxWindow *parent); + wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE); virtual ~wxPopupTransientWindow(); diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index ae9ab6392e..581d20333d 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -147,11 +147,11 @@ void wxPopupTransientWindow::Init() m_focus = (wxWindow *)NULL; } -wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent) +wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) { Init(); - (void)Create(parent); + (void)Create(parent, style); } wxPopupTransientWindow::~wxPopupTransientWindow()