Make callback names consistent

[wxWidgets.git] / src / generic / progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index b1bb1c6e3e27bba6e52a0b122478bd656f19a6f3..fb454b79530c3ec0458705cb2d5696b2ccc641a3 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -114,6 +114,11 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style)
 
     m_skip = false;
 
+#if !defined(__SMARTPHONE__)
+    m_btnAbort =
+    m_btnSkip = NULL;
+#endif
+
     m_display_estimated =
     m_last_timeupdate =
     m_ctdelay = 0;
@@ -256,7 +261,7 @@ void wxGenericProgressDialog::Create( const wxString& title,
 
     // Windows dialogs usually have buttons in the lower right corner
     const int sizerFlags =
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXOSX__)
                            wxALIGN_RIGHT | wxALL
 #else // !MSW
                            wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP