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

Another merge of 2.6 changes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/include/wx/wxPython/printfw.h
View File

@@ -35,7 +35,7 @@ public:
void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
PYPRIVATE;
DECLARE_ABSTRACT_CLASS(wxPyPrintout);
DECLARE_ABSTRACT_CLASS(wxPyPrintout)
};
#endif

4
wxPython/include/wx/wxPython/pyclasses.h
View File

@@ -20,7 +20,7 @@
//---------------------------------------------------------------------------
class wxPySizer : public wxSizer {
DECLARE_DYNAMIC_CLASS(wxPySizer);
DECLARE_DYNAMIC_CLASS(wxPySizer)
public:
wxPySizer() : wxSizer() {};
@@ -33,7 +33,7 @@ public:
//---------------------------------------------------------------------------
class wxPyValidator : public wxValidator {
DECLARE_DYNAMIC_CLASS(wxPyValidator);
DECLARE_DYNAMIC_CLASS(wxPyValidator)
public:
wxPyValidator() {
}

4
wxPython/include/wx/wxPython/wxPython_int.h
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();