Moved gsockunx.h from src/unix to include/wx/unix

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 6fec89ad790d2a8944dfc2e1e6e4b27d8ecfeb63..2131e993d3dabd013d7fa2ebe84c09d0dab8e40c 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -31,6 +31,7 @@
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/intl.h"

+    #include "wx/statbmp.h"

 #endif //WX_PRECOMP
 
 #include "wx/statline.h"
 #endif //WX_PRECOMP
 
 #include "wx/statline.h"


@@ -111,8 +112,8 @@ private:
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxWizardGeneric, wxDialog)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxWizardGeneric, wxDialog)

-    EVT_BUTTON(wxID_CANCEL, OnCancel)
-    EVT_BUTTON(-1, OnBackOrNext)
+    EVT_BUTTON(wxID_CANCEL, wxWizardGeneric::OnCancel)
+    EVT_BUTTON(-1, wxWizardGeneric::OnBackOrNext)

 END_EVENT_TABLE()
 
 IMPLEMENT_ABSTRACT_CLASS(wxWizard, wxDialog)
 END_EVENT_TABLE()
 
 IMPLEMENT_ABSTRACT_CLASS(wxWizard, wxDialog)


@@ -190,9 +191,12 @@ wxWizardGeneric::wxWizardGeneric(wxWindow *parent,
 
     int x = X_MARGIN;
     int y = m_y + m_height + BITMAP_Y_MARGIN;
 
     int x = X_MARGIN;
     int y = m_y + m_height + BITMAP_Y_MARGIN;

+    
+#if wxUSE_STATLINE    

     (void)new wxStaticLine(this, -1, wxPoint(x, y),
                            wxSize(m_x + m_width - x, 2));
     (void)new wxStaticLine(this, -1, wxPoint(x, y),
                            wxSize(m_x + m_width - x, 2));

-
+#endif
+    

     x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN;
     y += SEPARATOR_LINE_MARGIN;
     m_btnPrev = new wxButton(this, -1, _("< &Back"), wxPoint(x, y), sizeBtn);
     x = m_x + m_width - 3*sizeBtn.x - BUTTON_MARGIN;
     y += SEPARATOR_LINE_MARGIN;
     m_btnPrev = new wxButton(this, -1, _("< &Back"), wxPoint(x, y), sizeBtn);