compile fixes. Vadim ows me a pizza.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index b8f0a09f592c610b5324857053fed8195095917b..eaf4cc717722e17f9c705deb64fe8b5b04fd879a 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -82,7 +82,7 @@ private:
       Finished             // finished, waiting to be removed from screen
    } m_state;
    /// the abort button (or NULL if none)
       Finished             // finished, waiting to be removed from screen
    } m_state;
    /// the abort button (or NULL if none)

-   wxButton *m_btnAbort;
+   class wxButton *m_btnAbort;

    /// the maximum value
    int m_maximum;
 
    /// the maximum value
    int m_maximum;
 

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index 56f95f30678d649e2d853cc3eadbad747ecdf66e..e9b819b6fc44b49b62529c94a9b226f72e9b5a22 100644 (file)
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -176,9 +176,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
        printout->GetTitle(),
        _("Printing..."),
        totalPages,
        printout->GetTitle(),
        _("Printing..."),
        totalPages,

-       parent,
-       /* disable parent only */ true,
-       /* show abort button */ true);
+       parent );

     
     printout->OnBeginPrinting();
 
     
     printout->OnBeginPrinting();