Disable typemap for wxImage constructors

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index c3bddea1d192ffdd3327c5a6fcac9772a54e631f..118c11e2c6f9b09fdba3075cd57ac42b85d54c59 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -60,10 +60,10 @@ public:
 
     wxSize GetMaxChildSize();
     int Border() const;
 
     wxSize GetMaxChildSize();
     int Border() const;

-    
+

 private:
     wxSize SiblingSize(wxSizerItem *child);
 private:
     wxSize SiblingSize(wxSizerItem *child);

-    
+

     wxWizard *m_owner;
     bool m_childSizeValid;
     wxSize m_childSize;
     wxWizard *m_owner;
     bool m_childSizeValid;
     wxSize m_childSize;


@@ -85,20 +85,20 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizard::OnHelp)
 
     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_FINISHED(-1, wxWizard::OnWizEvent)
-    EVT_WIZARD_HELP(-1, wxWizard::OnWizEvent)
+    EVT_WIZARD_PAGE_CHANGED(wxID_ANY, wxWizard::OnWizEvent)
+    EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxWizard::OnWizEvent)
+    EVT_WIZARD_CANCEL(wxID_ANY, wxWizard::OnWizEvent)
+    EVT_WIZARD_FINISHED(wxID_ANY, wxWizard::OnWizEvent)
+    EVT_WIZARD_HELP(wxID_ANY, wxWizard::OnWizEvent)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
 
 /*
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
 
 /*

-       TODO PROPERTIES :
-       wxWizard
-               extstyle
-               title
+    TODO PROPERTIES :
+    wxWizard
+        extstyle
+        title

 */
 
 IMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel)
 */
 
 IMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel)


@@ -129,8 +129,8 @@ bool wxWizardPage::Create(wxWizard *parent,
                           const wxBitmap& bitmap,
                           const wxChar *resource)
 {
                           const wxBitmap& bitmap,
                           const wxChar *resource)
 {

-    if ( !wxPanel::Create(parent, -1) )
-        return FALSE;
+    if ( !wxPanel::Create(parent, wxID_ANY) )
+        return false;

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


@@ -149,7 +149,7 @@ bool wxWizardPage::Create(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;
+    return true;

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


@@ -226,7 +226,7 @@ wxSize wxWizardSizer::GetMaxChildSize()
         m_childSizeValid = true;
         m_childSize = maxOfMin;
     }
         m_childSizeValid = true;
         m_childSize = maxOfMin;
     }

-    
+

     return maxOfMin;
 }
 
     return maxOfMin;
 }
 


@@ -241,7 +241,7 @@ int wxWizardSizer::Border() const
 wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
 {
     wxSize maxSibling;
 wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
 {
     wxSize maxSibling;

-    
+

     if ( child->IsWindow() )
     {
         wxWizardPage *page = wxDynamicCast(child->GetWindow(), wxWizardPage);
     if ( child->IsWindow() )
     {
         wxWizardPage *page = wxDynamicCast(child->GetWindow(), wxWizardPage);


@@ -258,7 +258,7 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
             }
         }
     }
             }
         }
     }

-    
+

     return maxSibling;
 }
 
     return maxSibling;
 }
 


@@ -287,12 +287,12 @@ bool wxWizard::Create(wxWindow *parent,
                       long style)
 {
     bool result = wxDialog::Create(parent,id,title,pos,wxDefaultSize,style);
                       long style)
 {
     bool result = wxDialog::Create(parent,id,title,pos,wxDefaultSize,style);

-    
+

     m_posWizard = pos;
     m_bitmap = bitmap ;
 
     DoCreateControls();
     m_posWizard = pos;
     m_bitmap = bitmap ;
 
     DoCreateControls();

-    
+

     return result;
 }
 
     return result;
 }
 


@@ -309,9 +309,10 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
         wxEXPAND // No border, (mostly useless) horizontal stretching
     );
 
         wxEXPAND // No border, (mostly useless) horizontal stretching
     );
 

+#if wxUSE_STATBMP

     if ( m_bitmap.Ok() )
     {
     if ( m_bitmap.Ok() )
     {

-        m_statbmp = new wxStaticBitmap(this, -1, m_bitmap);
+        m_statbmp = new wxStaticBitmap(this, wxID_ANY, m_bitmap);

         m_sizerBmpAndPage->Add(
             m_statbmp,
             0, // No horizontal stretching
         m_sizerBmpAndPage->Add(
             m_statbmp,
             0, // No horizontal stretching


@@ -324,6 +325,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
             wxEXPAND // No border, (mostly useless) vertical stretching
         );
     }
             wxEXPAND // No border, (mostly useless) vertical stretching
         );
     }

+#endif

 
     // Added to m_sizerBmpAndPage in FinishLayout
     m_sizerPage = new wxWizardSizer(this);
 
     // Added to m_sizerBmpAndPage in FinishLayout
     m_sizerPage = new wxWizardSizer(this);


@@ -333,7 +335,7 @@ void wxWizard::AddStaticLine(wxBoxSizer *mainColumn)
 {
 #if wxUSE_STATLINE
     mainColumn->Add(
 {
 #if wxUSE_STATLINE
     mainColumn->Add(

-        new wxStaticLine(this, -1),
+        new wxStaticLine(this, wxID_ANY),

         0, // Vertically unstretchable
         wxEXPAND | wxALL, // Border all around, horizontally stretchable
         5 // Border width
         0, // Vertically unstretchable
         wxEXPAND | wxALL, // Border all around, horizontally stretchable
         5 // Border width


@@ -349,7 +351,10 @@ void wxWizard::AddStaticLine(wxBoxSizer *mainColumn)
 
 void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
 {
 
 void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
 {

-    wxASSERT_MSG(m_btnNext!=0 && m_btnPrev!=0, "You must create the buttons first before calling wxWizard::AddBackNextPair");
+    wxASSERT_MSG( m_btnNext && m_btnPrev,
+                  _T("You must create the buttons before calling ")
+                  _T("wxWizard::AddBackNextPair") );
+

     // margin between Back and Next buttons
 #ifdef __WXMAC__
     static const int BACKNEXT_MARGIN = 10;
     // margin between Back and Next buttons
 #ifdef __WXMAC__
     static const int BACKNEXT_MARGIN = 10;


@@ -364,7 +369,7 @@ void wxWizard::AddBackNextPair(wxBoxSizer *buttonRow)
         wxALL, // Border all around
         5 // Border width
     );
         wxALL, // Border all around
         5 // Border width
     );

-    
+

     backNextPair->Add(m_btnPrev);
     backNextPair->Add(BACKNEXT_MARGIN,0,
         0, // No horizontal stretching
     backNextPair->Add(m_btnPrev);
     backNextPair->Add(BACKNEXT_MARGIN,0,
         0, // No horizontal stretching


@@ -386,6 +391,15 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
     // was created before the 'next' button.
 
     wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL);
     // was created before the 'next' button.
 
     wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL);

+#ifdef __WXMAC__
+    if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
+        mainColumn->Add(
+            buttonRow,
+            0, // Vertically unstretchable
+            wxGROW|wxALIGN_CENTRE
+            );
+    else
+#endif

     mainColumn->Add(
         buttonRow,
         0, // Vertically unstretchable
     mainColumn->Add(
         buttonRow,
         0, // Vertically unstretchable


@@ -394,23 +408,36 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
 
     // Desired TAB order is 'next', 'cancel', 'help', 'back'. This makes the 'back' button the last control on the page.
     // Create the buttons in the right order...
 
     // Desired TAB order is 'next', 'cancel', 'help', 'back'. This makes the 'back' button the last control on the page.
     // Create the buttons in the right order...

+    wxButton *btnHelp=0;
+#ifdef __WXMAC__
+    if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
+        btnHelp=new wxButton(this, wxID_HELP, _("&Help"));
+#endif
+

     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));
     wxButton *btnCancel=new wxButton(this, wxID_CANCEL, _("&Cancel"));
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));
     wxButton *btnCancel=new wxButton(this, wxID_CANCEL, _("&Cancel"));

-    wxButton *btnHelp=0;
+#ifndef __WXMAC__

     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
         btnHelp=new wxButton(this, wxID_HELP, _("&Help"));
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
         btnHelp=new wxButton(this, wxID_HELP, _("&Help"));

+#endif

     m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"));
 
     if (btnHelp)
     m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"));
 
     if (btnHelp)

+    {

         buttonRow->Add(
             btnHelp,
             0, // Horizontally unstretchable
             wxALL, // Border all around, top aligned
             5 // Border width
         buttonRow->Add(
             btnHelp,
             0, // Horizontally unstretchable
             wxALL, // Border all around, top aligned
             5 // Border width

-        );
+            );
+#ifdef __WXMAC__
+        // Put stretchable space between help button and others
+        buttonRow->Add(0, 0, 1, wxALIGN_CENTRE, 0);
+#endif
+    }

 
     AddBackNextPair(buttonRow);
 
     AddBackNextPair(buttonRow);

-    
+

     buttonRow->Add(
         btnCancel,
         0, // Horizontally unstretchable
     buttonRow->Add(
         btnCancel,
         0, // Horizontally unstretchable


@@ -424,10 +451,10 @@ void wxWizard::DoCreateControls()
     // do nothing if the controls were already created
     if ( WasCreated() )
         return;
     // do nothing if the controls were already created
     if ( WasCreated() )
         return;

-    
+

     // wxWindow::SetSizer will be called at end
     wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);
     // wxWindow::SetSizer will be called at end
     wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);

-    
+

     wxBoxSizer *mainColumn = new wxBoxSizer(wxVERTICAL);
     windowSizer->Add(
         mainColumn,
     wxBoxSizer *mainColumn = new wxBoxSizer(wxVERTICAL);
     windowSizer->Add(
         mainColumn,


@@ -435,11 +462,11 @@ void wxWizard::DoCreateControls()
         wxALL | wxEXPAND, // Border all around, horizontal stretching
         5 // Border width
     );
         wxALL | wxEXPAND, // Border all around, horizontal stretching
         5 // Border width
     );

-    
+

     AddBitmapRow(mainColumn);
     AddStaticLine(mainColumn);
     AddButtonRow(mainColumn);
     AddBitmapRow(mainColumn);
     AddStaticLine(mainColumn);
     AddButtonRow(mainColumn);

-    
+

     // wxWindow::SetSizer should be followed by wxWindow::Fit, but
     // this is done in FinishLayout anyway so why duplicate it
     SetSizer(windowSizer);
     // wxWindow::SetSizer should be followed by wxWindow::Fit, but
     // this is done in FinishLayout anyway so why duplicate it
     SetSizer(windowSizer);


@@ -459,7 +486,7 @@ void wxWizard::FinishLayout()
         wxEXPAND | wxALL, // Vertically stretchable
         m_sizerPage->Border()
     );
         wxEXPAND | wxALL, // Vertically stretchable
         m_sizerPage->Border()
     );

-    
+

     GetSizer()->SetSizeHints(this);
     if ( m_posWizard == wxDefaultPosition )
         CentreOnScreen();
     GetSizer()->SetSizeHints(this);
     if ( m_posWizard == wxDefaultPosition )
         CentreOnScreen();


@@ -468,7 +495,7 @@ void wxWizard::FinishLayout()
 void wxWizard::FitToPage(const wxWizardPage *page)
 {
     wxCHECK_RET(!m_started,wxT("wxWizard::FitToPage after RunWizard"));
 void wxWizard::FitToPage(const wxWizardPage *page)
 {
     wxCHECK_RET(!m_started,wxT("wxWizard::FitToPage after RunWizard"));

-    
+

     while ( page )
     {
         wxSize size = page->GetBestSize();
     while ( page )
     {
         wxSize size = page->GetBestSize();


@@ -485,14 +512,14 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
 
     // we'll use this to decide whether we have to change the label of this
     // button or not (initially the label is "Next")
 
     // 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;
+    bool btnLabelWasNext = true;

 
     // Modified 10-20-2001 Robert Cavanaugh.
     // Fixed bug for displaying a new bitmap
     // in each *consecutive* page
 
     // flag to indicate if this page uses a new bitmap
 
     // Modified 10-20-2001 Robert Cavanaugh.
     // Fixed bug for displaying a new bitmap
     // in each *consecutive* page
 
     // flag to indicate if this page uses a new bitmap

-    bool bmpIsDefault = TRUE;
+    bool bmpIsDefault = true;

 
     // 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


@@ -507,7 +534,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
              !event.IsAllowed() )
         {
             // vetoed by the page
              !event.IsAllowed() )
         {
             // vetoed by the page

-            return FALSE;
+            return false;

         }
 
         m_page->Hide();
         }
 
         m_page->Hide();


@@ -529,17 +556,18 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     {
         // terminate successfully
         EndModal(wxID_OK);
     {
         // terminate successfully
         EndModal(wxID_OK);

-        if ( !IsModal() )
-         {
-           wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(),FALSE, 0);
-           (void)GetEventHandler()->ProcessEvent(event);
-         }
-        return TRUE;
+
+        // and notify the user code (this is especially useful for modeless
+        // wizards)
+        wxWizardEvent event(wxEVT_WIZARD_FINISHED, GetId(), false, 0);
+        (void)GetEventHandler()->ProcessEvent(event);
+
+        return true;

     }
 
     // position and show the new page
     (void)m_page->TransferDataToWindow();
     }
 
     // position and show the new page
     (void)m_page->TransferDataToWindow();

-    
+

     // wxWizardSizer::RecalcSizes wants to be called when m_page changes
     m_sizerPage->RecalcSizes();
 
     // wxWizardSizer::RecalcSizes wants to be called when m_page changes
     m_sizerPage->RecalcSizes();
 


@@ -548,9 +576,10 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     if ( m_page->GetBitmap().Ok() )
     {
         bmpCur = m_page->GetBitmap();
     if ( m_page->GetBitmap().Ok() )
     {
         bmpCur = m_page->GetBitmap();

-        bmpIsDefault = FALSE;
+        bmpIsDefault = false;

     }
 
     }
 

+#if wxUSE_STATBMP

     // change the bitmap if:
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap
     // change the bitmap if:
     // 1) a default bitmap was selected in constructor
     // 2) this page was constructed with a bitmap


@@ -564,6 +593,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
             bmp = m_page->GetBitmap();
         m_statbmp->SetBitmap(bmp);
     }
             bmp = m_page->GetBitmap();
         m_statbmp->SetBitmap(bmp);
     }

+#endif

 
     // and update the buttons state
     m_btnPrev->Enable(HasPrevPage(m_page));
 
     // and update the buttons state
     m_btnPrev->Enable(HasPrevPage(m_page));


@@ -577,6 +607,7 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         else
             m_btnNext->SetLabel(_("&Next >"));
     }
         else
             m_btnNext->SetLabel(_("&Next >"));
     }

+    m_btnNext->SetDefault();

     // nothing to do: the label was already correct
 
     // send the change event to the new page now
     // nothing to do: the label was already correct
 
     // send the change event to the new page now


@@ -587,22 +618,22 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     m_page->Show();
     m_page->SetFocus();
 
     m_page->Show();
     m_page->SetFocus();
 

-    return TRUE;
+    return true;

 }
 
 bool wxWizard::RunWizard(wxWizardPage *firstPage)
 {
 }
 
 bool wxWizard::RunWizard(wxWizardPage *firstPage)
 {

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

     // Set before FinishLayout to enable wxWizardSizer::GetMaxChildSize
     m_started = true;
     // Set before FinishLayout to enable wxWizardSizer::GetMaxChildSize
     m_started = true;

-    
+

     // This cannot be done sooner, because user can change layout options
     // up to this moment
     FinishLayout();
     // This cannot be done sooner, because user can change layout options
     // up to this moment
     FinishLayout();

-    
-    // 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 */);

 
     return ShowModal() == wxID_OK;
 }
 
     return ShowModal() == wxID_OK;
 }


@@ -636,17 +667,21 @@ wxSize wxWizard::GetManualPageSize() const
 {
     // default width and height of the page
     static const int DEFAULT_PAGE_WIDTH = 270;
 {
     // default width and height of the page
     static const int DEFAULT_PAGE_WIDTH = 270;

-    static const int DEFAULT_PAGE_HEIGHT = 290;
+    //static const int DEFAULT_PAGE_HEIGHT = 290;
+    // For compatibility with 2.4: there's too much
+    // space under the bitmap, probably due to differences in
+    // the sizer implementation. This makes it reasonable again.
+    static const int DEFAULT_PAGE_HEIGHT = 270;

 
     wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);
 
     wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);

-    
+

     totalPageSize.IncTo(m_sizePage);
     totalPageSize.IncTo(m_sizePage);

-    
+

     if ( m_statbmp )
     {
         totalPageSize.IncTo(wxSize(0, m_bitmap.GetHeight()));
     }
     if ( m_statbmp )
     {
         totalPageSize.IncTo(wxSize(0, m_bitmap.GetHeight()));
     }

-    
+

     return totalPageSize;
 }
 
     return totalPageSize;
 }
 


@@ -656,7 +691,7 @@ void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(eventUnused))
     // page, but a small extra check won't hurt
     wxWindow *win = m_page ? (wxWindow *)m_page : (wxWindow *)this;
 
     // page, but a small extra check won't hurt
     wxWindow *win = m_page ? (wxWindow *)m_page : (wxWindow *)this;
 

-    wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), FALSE, m_page);
+    wxWizardEvent event(wxEVT_WIZARD_CANCEL, GetId(), false, m_page);

     if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
     {
         // no objections - close the dialog
     if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
     {
         // no objections - close the dialog


@@ -707,7 +742,7 @@ void wxWizard::OnHelp(wxCommandEvent& WXUNUSED(event))
         // Create and send the help event to the specific page handler
         // event data contains the active page so that context-sensitive
         // help is possible
         // Create and send the help event to the specific page handler
         // event data contains the active page so that context-sensitive
         // help is possible

-        wxWizardEvent eventHelp(wxEVT_WIZARD_HELP, GetId(), TRUE, m_page);
+        wxWizardEvent eventHelp(wxEVT_WIZARD_HELP, GetId(), true, m_page);

         (void)m_page->GetEventHandler()->ProcessEvent(eventHelp);
     }
 }
         (void)m_page->GetEventHandler()->ProcessEvent(eventHelp);
     }
 }


@@ -719,6 +754,7 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
     if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
     {
         // the event will be propagated anyhow
     if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
     {
         // the event will be propagated anyhow

+        event.Skip();

         return;
     }
 
         return;
     }
 


@@ -734,7 +770,7 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
 // our public interface
 // ----------------------------------------------------------------------------
 
 // our public interface
 // ----------------------------------------------------------------------------
 

-#ifdef WXWIN_COMPATIBILITY_2_2
+#if WXWIN_COMPATIBILITY_2_2

 
 /* static */
 wxWizard *wxWizardBase::Create(wxWindow *parent,
 
 /* static */
 wxWizard *wxWizardBase::Create(wxWindow *parent,