Slider Updates

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index ec746149a314899bd70db5301e2ce5056afab5e1..c57773d6ce26d5f4268381ebc5c1636b5282c4d8 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -21,7 +21,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation ".h"
+    #pragma implementation "wizardg.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -64,6 +64,11 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)
     EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)

+
+    EVT_WIZARD_PAGE_CHANGED(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_PAGE_CHANGING(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_CANCEL(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_HELP(-1, wxWizard::OnWizEvent)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)


@@ -79,11 +84,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent)
 // wxWizardPage
 // ----------------------------------------------------------------------------
 
 // wxWizardPage
 // ----------------------------------------------------------------------------
 

+void wxWizardPage::Init()
+{
+    m_bitmap = wxNullBitmap;
+}
+

 wxWizardPage::wxWizardPage(wxWizard *parent,
                            const wxBitmap& bitmap,
                            const wxChar *resource)
 wxWizardPage::wxWizardPage(wxWizard *parent,
                            const wxBitmap& bitmap,
                            const wxChar *resource)

-            : wxPanel(parent)

 {
 {

+    Create(parent, bitmap, resource);
+}
+
+bool wxWizardPage::Create(wxWizard *parent,
+                          const wxBitmap& bitmap,
+                          const wxChar *resource)
+{
+    if ( !wxPanel::Create(parent, -1) )
+        return FALSE;
+

     if ( resource != NULL )
     {
 #if wxUSE_WX_RESOURCES
     if ( resource != NULL )
     {
 #if wxUSE_WX_RESOURCES


@@ -98,6 +117,8 @@ wxWizardPage::wxWizardPage(wxWizard *parent,
 
     // 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();

+
+    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -259,6 +280,32 @@ void wxWizard::SetPageSize(const wxSize& size)
     m_sizePage = size;
 }
 
     m_sizePage = size;
 }
 

+void wxWizard::FitToPage(const wxWizardPage *page)
+{
+    // otherwise it will have no effect now as it's too late...
+    wxASSERT_MSG( !WasCreated(), _T("should be called before RunWizard()!") );
+
+    wxSize sizeMax;
+    while ( page )
+    {
+        wxSize size = page->GetBestSize();
+
+        if ( size.x > sizeMax.x )
+            sizeMax.x = size.x;
+
+        if ( size.y > sizeMax.y )
+            sizeMax.y = size.y;
+
+        page = page->GetNext();
+    }
+
+    if ( sizeMax.x > m_sizePage.x )
+        m_sizePage.x = sizeMax.x;
+
+    if ( sizeMax.y > m_sizePage.y )
+        m_sizePage.y = sizeMax.y;
+}
+

 bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 {
     wxASSERT_MSG( page != m_page, wxT("this is useless") );
 bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 {
     wxASSERT_MSG( page != m_page, wxT("this is useless") );


@@ -276,8 +323,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
     // use these labels to determine if we need to change the bitmap
     // for this page
 
     // use these labels to determine if we need to change the bitmap
     // for this page

-    wxBitmap   PreviousBitmap = wxNullBitmap;
-    wxBitmap   ThisBitmap = wxNullBitmap;
+    wxBitmap bmpPrev, bmpCur;

 
     // check for previous page
     if ( m_page )
 
     // check for previous page
     if ( m_page )


@@ -296,9 +342,9 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
 
         // Get the bitmap of the previous page (if it exists)
         btnLabelWasNext = m_page->GetNext() != (wxWizardPage *)NULL;
 
         // Get the bitmap of the previous page (if it exists)

-        if(m_page->GetBitmap().Ok())
-    {
-            PreviousBitmap = m_page->GetBitmap();
+        if ( m_page->GetBitmap().Ok() )
+        {
+            bmpPrev = m_page->GetBitmap();

         }
     }
 
         }
     }
 


@@ -313,20 +359,15 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         return TRUE;
     }
 
         return TRUE;
     }
 

-    // send the change event to the new page now
-    wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward);
-    (void)m_page->GetEventHandler()->ProcessEvent(event);
-

     // position and show the new page
     (void)m_page->TransferDataToWindow();
     m_page->SetSize(m_x, m_y, m_width, m_height);
     // position and show the new page
     (void)m_page->TransferDataToWindow();
     m_page->SetSize(m_x, m_y, m_width, m_height);

-    m_page->Show();

 
     // check if bitmap needs to be updated
     // update default flag as well
 
     // check if bitmap needs to be updated
     // update default flag as well

-    if(m_page->GetBitmap().Ok())
+    if ( m_page->GetBitmap().Ok() )

     {
     {

-        ThisBitmap = m_page->GetBitmap();
+        bmpCur = m_page->GetBitmap();

         bmpIsDefault = FALSE;
     }
 
         bmpIsDefault = FALSE;
     }
 


@@ -334,7 +375,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
     // 3) this bitmap is not the previous bitmap
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
     // 3) this bitmap is not the previous bitmap

-    if( m_statbmp && (ThisBitmap != PreviousBitmap) )
+    if ( m_statbmp && (bmpCur != bmpPrev) )

     {
         wxBitmap bmp;
         if ( bmpIsDefault )
     {
         wxBitmap bmp;
         if ( bmpIsDefault )


@@ -358,6 +399,14 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     }
     // nothing to do: the label was already correct
 
     }
     // nothing to do: the label was already correct
 

+    // send the change event to the new page now
+    wxWizardEvent event(wxEVT_WIZARD_PAGE_CHANGED, GetId(), goingForward);
+    (void)m_page->GetEventHandler()->ProcessEvent(event);
+
+    // and finally show it
+    m_page->Show();
+    m_page->SetFocus();
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -449,6 +498,23 @@ void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void wxWizard::OnWizEvent(wxWizardEvent& event)
+{
+    // the dialogs have wxWS_EX_BLOCK_EVENTS style on by default but we want to
+    // propagate wxEVT_WIZARD_XXX to the parent (if any), so do it manually
+    if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
+    {
+        // the event will be propagated anyhow
+        return;
+    }
+
+    wxWindow *parent = GetParent();
+
+    if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) )
+    {
+        event.Skip();
+    }
+}

 
 // ----------------------------------------------------------------------------
 // our public interface
 
 // ----------------------------------------------------------------------------
 // our public interface