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 63c17d793d944ea35a62de1b0a0ba34e12692323..d01ecdff0123e151006119806d884e53e9becce0 100644 (file)
--- 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 63c17d793d944ea35a62de1b0a0ba34e12692323..d01ecdff0123e151006119806d884e53e9becce0 100644 (file)
--- 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 bebd35d9fe26813ac7643c13ddc9dabec122a29b..fd56a9b5cb336f121df88f2faf4b1737a67a6f2a 100644 (file)
--- 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 616b22679df22b5e901962aaf029d7b39da95c2a..3586d958bb8a412762d2bbf7e24bd0584e60ed0d 100644 (file)
--- 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 7a666aaf7d6e6f834805581c3cadd2bdfcc0da9f..85ce6295e64d869479692f4204e7af92038702d5 100644 (file)
--- 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 ae9ab6392e7458f9c5786b0e34c95ba3dd65d93a..581d20333db581b96999402b68cfac055e46bbb3 100644 (file)
--- 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()