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
This commit is contained in:
@@ -31,7 +31,8 @@ public:
|
|||||||
virtual ~wxPopupWindow() { }
|
virtual ~wxPopupWindow() { }
|
||||||
#endif
|
#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);
|
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||||
|
|
||||||
virtual bool Show( bool show = TRUE );
|
virtual bool Show( bool show = TRUE );
|
||||||
|
@@ -31,7 +31,8 @@ public:
|
|||||||
virtual ~wxPopupWindow() { }
|
virtual ~wxPopupWindow() { }
|
||||||
#endif
|
#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);
|
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||||
|
|
||||||
virtual bool Show( bool show = TRUE );
|
virtual bool Show( bool show = TRUE );
|
||||||
|
@@ -20,7 +20,8 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
|
|||||||
public:
|
public:
|
||||||
wxPopupWindow() { }
|
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)
|
bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
|
||||||
{
|
{
|
||||||
|
@@ -21,7 +21,8 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
|
|||||||
public:
|
public:
|
||||||
wxPopupWindow() { }
|
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)
|
bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
|
||||||
{
|
{
|
||||||
|
@@ -71,7 +71,7 @@ class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
|
|||||||
public:
|
public:
|
||||||
// ctors
|
// ctors
|
||||||
wxPopupTransientWindow() { Init(); }
|
wxPopupTransientWindow() { Init(); }
|
||||||
wxPopupTransientWindow(wxWindow *parent);
|
wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
|
||||||
|
|
||||||
virtual ~wxPopupTransientWindow();
|
virtual ~wxPopupTransientWindow();
|
||||||
|
|
||||||
|
@@ -147,11 +147,11 @@ void wxPopupTransientWindow::Init()
|
|||||||
m_focus = (wxWindow *)NULL;
|
m_focus = (wxWindow *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent)
|
wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
|
|
||||||
(void)Create(parent);
|
(void)Create(parent, style);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxPopupTransientWindow::~wxPopupTransientWindow()
|
wxPopupTransientWindow::~wxPopupTransientWindow()
|
||||||
|
Reference in New Issue
Block a user