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:
		@@ -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();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
    {
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
    {
 | 
			
		||||
 
 | 
			
		||||
@@ -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();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user