Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index a09f08bef73a5c28d960938d18772e2b2b0b7c28..34ef1e74952d6915c3b9cdca9364721e45155376 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -66,7 +66,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent)
 // wxWizardPage
 // ----------------------------------------------------------------------------
 
 // wxWizardPage
 // ----------------------------------------------------------------------------
 

-wxWizardPage::wxWizardPage(wxWizard *parent) : wxPanel(parent)
+wxWizardPage::wxWizardPage(wxWizard *parent, const wxBitmap& bitmap)
+            : wxPanel(parent), m_bitmap(bitmap)

 {
     // initially the page is hidden, it's shown only when it becomes current
     Hide();
 {
     // initially the page is hidden, it's shown only when it becomes current
     Hide();


@@ -95,6 +96,7 @@ wxWizard::wxWizard(wxWindow *parent,
                    const wxBitmap& bitmap,
                    const wxPoint& pos,
                    const wxSize& size)
                    const wxBitmap& bitmap,
                    const wxPoint& pos,
                    const wxSize& size)

+        : m_bitmap(bitmap)

 {
     // constants defining the dialog layout
     // ------------------------------------
 {
     // constants defining the dialog layout
     // ------------------------------------


@@ -139,13 +141,15 @@ wxWizard::wxWizard(wxWindow *parent,
     m_y = Y_MARGIN;
     if ( bitmap.Ok() )
     {
     m_y = Y_MARGIN;
     if ( bitmap.Ok() )
     {

-        (void)new wxStaticBitmap(this, -1, bitmap, wxPoint(m_x, m_y));
+        m_statbmp = new wxStaticBitmap(this, -1, bitmap, wxPoint(m_x, m_y));

 
         m_x += bitmap.GetWidth() + BITMAP_X_MARGIN;
         m_height = bitmap.GetHeight();
     }
     else
     {
 
         m_x += bitmap.GetWidth() + BITMAP_X_MARGIN;
         m_height = bitmap.GetHeight();
     }
     else
     {

+        m_statbmp = (wxStaticBitmap *)NULL;
+

         m_height = DEFAULT_PAGE_HEIGHT;
     }
 
         m_height = DEFAULT_PAGE_HEIGHT;
     }
 


@@ -187,12 +191,15 @@ wxWizard::wxWizard(wxWindow *parent,
 
 bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 {
 
 bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 {

-    wxASSERT_MSG( page != m_page, T("this is useless") );
+    wxASSERT_MSG( page != m_page, wxT("this is useless") );

 
     // we'll use this to decide whether we have to change the label of this
     // button or not (initially the label is "Next")
     bool btnLabelWasNext = TRUE;
 
 
     // we'll use this to decide whether we have to change the label of this
     // button or not (initially the label is "Next")
     bool btnLabelWasNext = TRUE;
 

+    // and this tells us whether we already had the default bitmap before
+    bool bmpWasDefault = TRUE;
+

     if ( m_page )
     {
         // ask the current page first
     if ( m_page )
     {
         // ask the current page first


@@ -214,6 +221,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         m_page->Hide();
 
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
         m_page->Hide();
 
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;

+        bmpWasDefault = !m_page->GetBitmap().Ok();

     }
 
     // set the new one
     }
 
     // set the new one


@@ -237,13 +245,29 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     m_page->SetSize(m_x, m_y, m_width, m_height);
     m_page->Show();
 
     m_page->SetSize(m_x, m_y, m_width, m_height);
     m_page->Show();
 

+    // change the bitmap if necessary (and if we have it at all)
+    bool bmpIsDefault = !m_page->GetBitmap().Ok();
+    if ( m_statbmp && (bmpIsDefault != bmpWasDefault) )
+    {
+        wxBitmap bmp;
+        if ( bmpIsDefault )
+            bmp = m_bitmap;
+        else
+            bmp = m_page->GetBitmap();
+        m_statbmp->SetBitmap(bmp);
+    }
+

     // and update the buttons state
     m_btnPrev->Enable(m_page->GetPrev() != (wxWizardPage *)NULL);
 
     // and update the buttons state
     m_btnPrev->Enable(m_page->GetPrev() != (wxWizardPage *)NULL);
 

-    if ( btnLabelWasNext != (m_page->GetNext() != (wxWizardPage *)NULL) )
+    bool hasNext = m_page->GetNext() != (wxWizardPage *)NULL;
+    if ( btnLabelWasNext != hasNext )

     {
         // need to update
     {
         // need to update

-        m_btnNext->SetLabel(btnLabelWasNext ? _("&Finish") : _("&Next >"));
+        if (btnLabelWasNext)
+            m_btnNext->SetLabel(_("&Finish"));
+        else
+            m_btnNext->SetLabel(_("&Next >"));

     }
     // nothing to do: the label was already correct
 
     }
     // nothing to do: the label was already correct
 


@@ -252,7 +276,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
 bool wxWizard::RunWizard(wxWizardPage *firstPage)
 {
 
 bool wxWizard::RunWizard(wxWizardPage *firstPage)
 {

-    wxCHECK_MSG( firstPage, FALSE, T("can't run empty wizard") );
+    wxCHECK_MSG( firstPage, FALSE, wxT("can't run empty wizard") );

 
     // can't return FALSE here because there is no old page
     (void)ShowPage(firstPage, TRUE /* forward */);
 
     // can't return FALSE here because there is no old page
     (void)ShowPage(firstPage, TRUE /* forward */);


@@ -265,6 +289,11 @@ wxWizardPage *wxWizard::GetCurrentPage() const
     return m_page;
 }
 
     return m_page;
 }
 

+wxSize wxWizard::GetPageSize() const
+{
+    return wxSize(m_width, m_height);
+}
+

 void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     // this function probably can never be called when we don't have an active
 void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     // this function probably can never be called when we don't have an active


@@ -284,7 +313,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
 {
     wxASSERT_MSG( (event.GetEventObject() == m_btnNext) ||
                   (event.GetEventObject() == m_btnPrev),
 {
     wxASSERT_MSG( (event.GetEventObject() == m_btnNext) ||
                   (event.GetEventObject() == m_btnPrev),

-                  T("unknown button") );
+                  wxT("unknown button") );

 
     bool forward = event.GetEventObject() == m_btnNext;
 
 
     bool forward = event.GetEventObject() == m_btnNext;
 


@@ -297,7 +326,7 @@ void wxWizard::OnBackOrNext(wxCommandEvent& event)
     {
         page = m_page->GetPrev();
 
     {
         page = m_page->GetPrev();
 

-        wxASSERT_MSG( page, T("\"<Back\" button should have been disabled") );
+        wxASSERT_MSG( page, wxT("\"<Back\" button should have been disabled") );

     }
 
     // just pass to the new page (or may be not - but we don't care here)
     }
 
     // just pass to the new page (or may be not - but we don't care here)