diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 1646cc9853..5666277bd9 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -3495,7 +3495,8 @@ class PyPanel(Panel): def __init__(self, *args, **kwargs): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, - Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel + Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, + String name=PanelNameStr) -> PyPanel """ _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs)) self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel) @@ -3672,7 +3673,8 @@ class PyScrolledWindow(ScrolledWindow): def __init__(self, *args, **kwargs): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, - Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow + Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, + String name=PanelNameStr) -> PyScrolledWindow """ _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs)) self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow) diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index 426aa7f5bb..e191247001 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -3371,7 +3371,7 @@ public: wxPyPanel(wxWindow* parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPyPanelNameStr) : wxPanel(parent, id, pos, size, style, name) {} @@ -3462,7 +3462,7 @@ public: wxPyScrolledWindow(wxWindow* parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxHSCROLL | wxVSCROLL, const wxString& name = wxPyPanelNameStr) : wxScrolledWindow(parent, id, pos, size, style, name) {} @@ -22461,7 +22461,7 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxTAB_TRAVERSAL|wxNO_BORDER ; wxString const &arg6_defvalue = wxPyPanelNameStr ; wxString *arg6 = (wxString *) &arg6_defvalue ; wxPyPanel *result = 0 ; @@ -23146,7 +23146,7 @@ SWIGINTERN PyObject *_wrap_new_PyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxHSCROLL|wxVSCROLL ; wxString const &arg6_defvalue = wxPyPanelNameStr ; wxString *arg6 = (wxString *) &arg6_defvalue ; wxPyScrolledWindow *result = 0 ; diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 0a5731a5ec..bbc2367147 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -3475,7 +3475,8 @@ class PyPanel(Panel): def __init__(self, *args, **kwargs): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, - Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel + Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, + String name=PanelNameStr) -> PyPanel """ _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs)) self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel) @@ -3652,7 +3653,8 @@ class PyScrolledWindow(ScrolledWindow): def __init__(self, *args, **kwargs): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, - Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow + Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, + String name=PanelNameStr) -> PyScrolledWindow """ _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs)) self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow) diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index a63a0eedd2..ae6f55282f 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -3372,7 +3372,7 @@ public: wxPyPanel(wxWindow* parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPyPanelNameStr) : wxPanel(parent, id, pos, size, style, name) {} @@ -3463,7 +3463,7 @@ public: wxPyScrolledWindow(wxWindow* parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxHSCROLL | wxVSCROLL, const wxString& name = wxPyPanelNameStr) : wxScrolledWindow(parent, id, pos, size, style, name) {} @@ -22325,7 +22325,7 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxTAB_TRAVERSAL|wxNO_BORDER ; wxString const &arg6_defvalue = wxPyPanelNameStr ; wxString *arg6 = (wxString *) &arg6_defvalue ; wxPyPanel *result = 0 ; @@ -23010,7 +23010,7 @@ SWIGINTERN PyObject *_wrap_new_PyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxHSCROLL|wxVSCROLL ; wxString const &arg6_defvalue = wxPyPanelNameStr ; wxString *arg6 = (wxString *) &arg6_defvalue ; wxPyScrolledWindow *result = 0 ; diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 319bed1370..1bd84d980e 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -3511,7 +3511,8 @@ class PyPanel(Panel): def __init__(self, *args, **kwargs): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, - Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel + Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, + String name=PanelNameStr) -> PyPanel """ _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs)) self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel) @@ -3688,7 +3689,8 @@ class PyScrolledWindow(ScrolledWindow): def __init__(self, *args, **kwargs): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, - Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow + Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, + String name=PanelNameStr) -> PyScrolledWindow """ _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs)) self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow) diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 7de227bc30..d04c5e7aa3 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -3371,7 +3371,7 @@ public: wxPyPanel(wxWindow* parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPyPanelNameStr) : wxPanel(parent, id, pos, size, style, name) {} @@ -3462,7 +3462,7 @@ public: wxPyScrolledWindow(wxWindow* parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = 0, + long style = wxHSCROLL | wxVSCROLL, const wxString& name = wxPyPanelNameStr) : wxScrolledWindow(parent, id, pos, size, style, name) {} @@ -22593,7 +22593,7 @@ SWIGINTERN PyObject *_wrap_new_PyPanel(PyObject *SWIGUNUSEDPARM(self), PyObject wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxTAB_TRAVERSAL|wxNO_BORDER ; wxString const &arg6_defvalue = wxPyPanelNameStr ; wxString *arg6 = (wxString *) &arg6_defvalue ; wxPyPanel *result = 0 ; @@ -23278,7 +23278,7 @@ SWIGINTERN PyObject *_wrap_new_PyScrolledWindow(PyObject *SWIGUNUSEDPARM(self), wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxHSCROLL|wxVSCROLL ; wxString const &arg6_defvalue = wxPyPanelNameStr ; wxString *arg6 = (wxString *) &arg6_defvalue ; wxPyScrolledWindow *result = 0 ;