Another merge of 2.6 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-17 05:42:30 +00:00
parent f3ebbc0ac8
commit 4617be085f
21 changed files with 241 additions and 43 deletions

View File

@@ -286,7 +286,7 @@ PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
#ifndef wxPyUSE_EXPORTED_API
class wxPyCallback : public wxObject {
DECLARE_ABSTRACT_CLASS(wxPyCallback);
DECLARE_ABSTRACT_CLASS(wxPyCallback)
public:
wxPyCallback(PyObject* func);
wxPyCallback(const wxPyCallback& other);
@@ -606,7 +606,7 @@ enum {
class wxPyApp: public wxApp
{
DECLARE_ABSTRACT_CLASS(wxPyApp);
DECLARE_ABSTRACT_CLASS(wxPyApp)
public:
wxPyApp();