// Show
-// TODO: Virtualize ShouldInheritColours
-
//---------------------------------------------------------------------------
-
%{ // C++ version of Python aware wxWindow
class wxPyWindow : public wxWindow
{
const wxString& name = wxPyPanelNameStr)
: wxWindow(parent, id, pos, size, style, name) {}
-
+ void SetBestSize(const wxSize& size) { wxWindow::SetBestSize(size); }
+
+ bool DoEraseBackground(wxDC* dc) {
+#ifdef __WXMSW__
+ return wxWindow::DoEraseBackground(dc->GetHDC());
+#else
+ dc->SetBackground(wxBrush(GetBackgroundColour()));
+ dc->Clear();
+ return true;
+#endif
+ }
+
DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
DEC_PYCALLBACK_VOID_INT5(DoSetSize);
DEC_PYCALLBACK_VOID_INTINT(DoSetClientSize);
DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
- DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
- DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
+ DEC_PYCALLBACK_BOOL_const(ShouldInheritColours);
+ DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
+ DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+
PYPRIVATE;
};
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, AddChild);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, RemoveChild);
-IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, ShouldInheritColours);
-IMP_PYCALLBACK__COLOUR(wxPyWindow, wxWindow, ApplyParentThemeBackground);
-
+IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, ShouldInheritColours);
+IMP_PYCALLBACK_VIZATTR_(wxPyWindow, wxWindow, GetDefaultAttributes);
+
+IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, HasTransparentBackground);
%}
// And now the one for SWIG to see
+MustHaveApp(wxPyWindow);
class wxPyWindow : public wxWindow
{
public:
%pythonAppend wxPyWindow "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
%pythonAppend wxPyWindow() ""
- wxPyWindow(wxWindow* parent, const wxWindowID id,
+ wxPyWindow(wxWindow* parent, const wxWindowID id=-1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPyPanelNameStr);
- %name(PrePyWindow) wxPyWindow();
+ %RenameCtor(PrePyWindow, wxPyWindow());
void _setCallbackInfo(PyObject* self, PyObject* _class);
-
+ void SetBestSize(const wxSize& size);
+ bool DoEraseBackground(wxDC* dc);
+
void base_DoMoveWindow(int x, int y, int width, int height);
void base_DoSetSize(int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO);
void base_AddChild(wxWindow* child);
void base_RemoveChild(wxWindow* child);
- bool base_ShouldInheritColours();
- void base_ApplyParentThemeBackground(const wxColour& c);
+ bool base_ShouldInheritColours() const;
+ wxVisualAttributes base_GetDefaultAttributes();
};
//---------------------------------------------------------------------------
const wxString& name = wxPyPanelNameStr)
: wxPanel(parent, id, pos, size, style, name) {}
+ void SetBestSize(const wxSize& size) { wxPanel::SetBestSize(size); }
+ bool DoEraseBackground(wxDC* dc) {
+#ifdef __WXMSW__
+ return wxWindow::DoEraseBackground(dc->GetHDC());
+#else
+ dc->SetBackground(wxBrush(GetBackgroundColour()));
+ dc->Clear();
+ return true;
+#endif
+ }
+
DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
DEC_PYCALLBACK_VOID_INT5(DoSetSize);
DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
- DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
- DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
+ DEC_PYCALLBACK_BOOL_const(ShouldInheritColours);
+ DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
+ DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+
PYPRIVATE;
};
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, AddChild);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
-IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, ShouldInheritColours);
-IMP_PYCALLBACK__COLOUR(wxPyPanel, wxPanel, ApplyParentThemeBackground);
+IMP_PYCALLBACK_BOOL_const(wxPyPanel, wxPanel, ShouldInheritColours);
+IMP_PYCALLBACK_VIZATTR_(wxPyPanel, wxPanel, GetDefaultAttributes);
+
+IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, HasTransparentBackground);
%}
// And now the one for SWIG to see
+MustHaveApp(wxPyPanel);
class wxPyPanel : public wxPanel
{
public:
%pythonAppend wxPyPanel "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
%pythonAppend wxPyPanel() ""
- wxPyPanel(wxWindow* parent, const wxWindowID id,
+ wxPyPanel(wxWindow* parent, const wxWindowID id=-1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPyPanelNameStr);
- %name(PrePyPanel) wxPyPanel();
+ %RenameCtor(PrePyPanel, wxPyPanel());
void _setCallbackInfo(PyObject* self, PyObject* _class);
-
+ void SetBestSize(const wxSize& size);
+ bool DoEraseBackground(wxDC* dc);
+
void base_DoMoveWindow(int x, int y, int width, int height);
void base_DoSetSize(int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO);
void base_AddChild(wxWindow* child);
void base_RemoveChild(wxWindow* child);
- bool base_ShouldInheritColours();
- void base_ApplyParentThemeBackground(const wxColour& c);
+ bool base_ShouldInheritColours() const ;
+ wxVisualAttributes base_GetDefaultAttributes();
};
//---------------------------------------------------------------------------
const wxString& name = wxPyPanelNameStr)
: wxScrolledWindow(parent, id, pos, size, style, name) {}
+ void SetBestSize(const wxSize& size) { wxScrolledWindow::SetBestSize(size); }
+ bool DoEraseBackground(wxDC* dc) {
+#ifdef __WXMSW__
+ return wxWindow::DoEraseBackground(dc->GetHDC());
+#else
+ dc->SetBackground(wxBrush(GetBackgroundColour()));
+ dc->Clear();
+ return true;
+#endif
+ }
DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
DEC_PYCALLBACK_VOID_INT5(DoSetSize);
DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
- DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
- DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
+ DEC_PYCALLBACK_BOOL_const(ShouldInheritColours);
+ DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
+ DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+
PYPRIVATE;
};
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyScrolledWindow, wxScrolledWindow, AddChild);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyScrolledWindow, wxScrolledWindow, RemoveChild);
-IMP_PYCALLBACK_BOOL_(wxPyScrolledWindow, wxScrolledWindow, ShouldInheritColours);
-IMP_PYCALLBACK__COLOUR(wxPyScrolledWindow, wxScrolledWindow, ApplyParentThemeBackground);
+IMP_PYCALLBACK_BOOL_const(wxPyScrolledWindow, wxScrolledWindow, ShouldInheritColours);
+IMP_PYCALLBACK_VIZATTR_(wxPyScrolledWindow, wxScrolledWindow, GetDefaultAttributes);
+
+IMP_PYCALLBACK_BOOL_(wxPyScrolledWindow, wxScrolledWindow, HasTransparentBackground);
%}
// And now the one for SWIG to see
+MustHaveApp(wxPyScrolledWindow);
class wxPyScrolledWindow : public wxScrolledWindow
{
public:
- %pythonAppend wxPyScrolledWindow "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
+ %pythonAppend wxPyScrolledWindow "self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)"
%pythonAppend wxPyScrolledWindow() ""
- wxPyScrolledWindow(wxWindow* parent, const wxWindowID id,
+ wxPyScrolledWindow(wxWindow* parent, const wxWindowID id=-1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPyPanelNameStr);
- %name(PrePyScrolledWindow) wxPyScrolledWindow();
+ %RenameCtor(PrePyScrolledWindow, wxPyScrolledWindow());
void _setCallbackInfo(PyObject* self, PyObject* _class);
-
+ void SetBestSize(const wxSize& size);
+ bool DoEraseBackground(wxDC* dc);
+
void base_DoMoveWindow(int x, int y, int width, int height);
void base_DoSetSize(int x, int y, int width, int height,
int sizeFlags = wxSIZE_AUTO);
void base_AddChild(wxWindow* child);
void base_RemoveChild(wxWindow* child);
- bool base_ShouldInheritColours();
- void base_ApplyParentThemeBackground(const wxColour& c);
+ bool base_ShouldInheritColours() const;
+ wxVisualAttributes base_GetDefaultAttributes();
};