Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Added style parameter to wxPopupWindow ctors so they match the Create method.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-12 18:11:46 +00:00
parent 337a001037
commit 758bce950b
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/popupwin.h
View File

@@ -30,17 +30,18 @@ public:
#ifdef __DARWIN__ #ifdef __DARWIN__
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 );
// implementation // implementation
// -------------- // --------------
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void OnInternalIdle(); virtual void OnInternalIdle();

9
include/wx/gtk1/popupwin.h
View File

@@ -30,17 +30,18 @@ public:
#ifdef __DARWIN__ #ifdef __DARWIN__
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 );
// implementation // implementation
// -------------- // --------------
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void OnInternalIdle(); virtual void OnInternalIdle();

3
include/wx/mgl/popupwin.h
View File

@@ -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)
{ {

3
include/wx/msw/popupwin.h
View File

@@ -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)
{ {

2
include/wx/popupwin.h
View File

@@ -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();

4
src/common/popupcmn.cpp
View File

@@ -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()