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

@@ -721,7 +721,7 @@ public:
%{
class wxPyPreviewFrame : public wxPreviewFrame
{
DECLARE_CLASS(wxPyPreviewFrame);
DECLARE_CLASS(wxPyPreviewFrame)
public:
wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
const wxString& title,
@@ -780,7 +780,7 @@ public:
%{
class wxPyPreviewControlBar : public wxPreviewControlBar
{
DECLARE_CLASS(wxPyPreviewControlBar);
DECLARE_CLASS(wxPyPreviewControlBar)
public:
wxPyPreviewControlBar(wxPrintPreview *preview,
long buttons,