Compile fixes for the const patch

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

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 2e3b5dac7b300a6cfb1a902a1839a7c8052a3662..f73f67e9102c1c87be5712c9ceda682b44d94fd2 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -21,10 +21,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "wizardg.h"
-#endif
-

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


@@ -43,6 +39,7 @@
 
 #include "wx/statline.h"
 #include "wx/sizer.h"
 
 #include "wx/statline.h"
 #include "wx/sizer.h"

+#include "wx/settings.h"

 
 #include "wx/wizard.h"
 
 
 #include "wx/wizard.h"
 


@@ -266,6 +263,13 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
 // generic wxWizard implementation
 // ----------------------------------------------------------------------------
 
 // generic wxWizard implementation
 // ----------------------------------------------------------------------------
 

+#if wxCHECK_VERSION(2, 7, 0)
+    #error "Fix wxGTK vs. wxMSW difference other way"
+#else
+    WX_DEFINE_ARRAY_PTR(wxWizard *, wxModelessWizards);
+    wxModelessWizards modelessWizards;
+#endif
+

 void wxWizard::Init()
 {
     m_posWizard = wxDefaultPosition;
 void wxWizard::Init()
 {
     m_posWizard = wxDefaultPosition;


@@ -277,6 +281,7 @@ void wxWizard::Init()
     m_calledSetBorder = false;
     m_border = 0;
     m_started = false;
     m_calledSetBorder = false;
     m_border = 0;
     m_started = false;

+    modelessWizards.Add(this);

 }
 
 bool wxWizard::Create(wxWindow *parent,
 }
 
 bool wxWizard::Create(wxWindow *parent,


@@ -390,6 +395,9 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
     // key to TAB to the next entry field and page. This would not be possible, if the 'back' button
     // was created before the 'next' button.
 
     // key to TAB to the next entry field and page. This would not be possible, if the 'back' button
     // was created before the 'next' button.
 

+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+    int buttonStyle = isPda ? wxBU_EXACTFIT : 0;    
+

     wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL);
 #ifdef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
     wxBoxSizer *buttonRow = new wxBoxSizer(wxHORIZONTAL);
 #ifdef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)


@@ -411,16 +419,16 @@ void wxWizard::AddButtonRow(wxBoxSizer *mainColumn)
     wxButton *btnHelp=0;
 #ifdef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
     wxButton *btnHelp=0;
 #ifdef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)

-        btnHelp=new wxButton(this, wxID_HELP, _("&Help"));
+        btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle);

 #endif
 
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));
 #endif
 
     m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >"));

-    wxButton *btnCancel=new wxButton(this, wxID_CANCEL, _("&Cancel"));
+    wxButton *btnCancel=new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, buttonStyle);

 #ifndef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)
 #ifndef __WXMAC__
     if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON)

-        btnHelp=new wxButton(this, wxID_HELP, _("&Help"));
+        btnHelp=new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle);

 #endif
 #endif

-    m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"));
+    m_btnPrev = new wxButton(this, wxID_BACKWARD, _("< &Back"), wxDefaultPosition, wxDefaultSize, buttonStyle);

 
     if (btnHelp)
     {
 
     if (btnHelp)
     {


@@ -452,6 +460,11 @@ void wxWizard::DoCreateControls()
     if ( WasCreated() )
         return;
 
     if ( WasCreated() )
         return;
 

+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+    
+    // Horizontal stretching, and if not PDA, border all around
+    int mainColumnSizerFlags = isPda ? wxEXPAND : wxALL|wxEXPAND ;
+    

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


@@ -459,12 +472,15 @@ void wxWizard::DoCreateControls()
     windowSizer->Add(
         mainColumn,
         1, // Vertical stretching
     windowSizer->Add(
         mainColumn,
         1, // Vertical stretching

-        wxALL | wxEXPAND, // Border all around, horizontal stretching
+        mainColumnSizerFlags,

         5 // Border width
     );
 
     AddBitmapRow(mainColumn);
         5 // Border width
     );
 
     AddBitmapRow(mainColumn);

-    AddStaticLine(mainColumn);
+    
+    if (!isPda)
+        AddStaticLine(mainColumn);
+    

     AddButtonRow(mainColumn);
 
     // wxWindow::SetSizer should be followed by wxWindow::Fit, but
     AddButtonRow(mainColumn);
 
     // wxWindow::SetSizer should be followed by wxWindow::Fit, but


@@ -480,6 +496,11 @@ void wxWizard::SetPageSize(const wxSize& size)
 
 void wxWizard::FinishLayout()
 {
 
 void wxWizard::FinishLayout()
 {

+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+    
+    // Set to enable wxWizardSizer::GetMaxChildSize
+    m_started = true;
+

     m_sizerBmpAndPage->Add(
         m_sizerPage,
         1, // Horizontal stretching
     m_sizerBmpAndPage->Add(
         m_sizerPage,
         1, // Horizontal stretching


@@ -487,9 +508,12 @@ void wxWizard::FinishLayout()
         m_sizerPage->Border()
     );
 
         m_sizerPage->Border()
     );
 

-    GetSizer()->SetSizeHints(this);
-    if ( m_posWizard == wxDefaultPosition )
-        CentreOnScreen();
+    if (!isPda)
+    {
+        GetSizer()->SetSizeHints(this);
+        if ( m_posWizard == wxDefaultPosition )
+            CentreOnScreen();
+    }

 }
 
 void wxWizard::FitToPage(const wxWizardPage *page)
 }
 
 void wxWizard::FitToPage(const wxWizardPage *page)


@@ -555,7 +579,15 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
     if ( !m_page )
     {
         // terminate successfully
     if ( !m_page )
     {
         // terminate successfully

-        EndModal(wxID_OK);
+        if(IsModal())
+        {
+            EndModal(wxID_OK);
+        }
+        else
+        {
+            SetReturnCode(wxID_OK);
+            Hide();
+        }

 
         // and notify the user code (this is especially useful for modeless
         // wizards)
 
         // and notify the user code (this is especially useful for modeless
         // wizards)


@@ -625,9 +657,6 @@ 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;
-

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


@@ -635,6 +664,8 @@ bool wxWizard::RunWizard(wxWizardPage *firstPage)
     // 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 */);
 

+    modelessWizards.Remove(this);
+

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


@@ -666,9 +697,16 @@ void wxWizard::SetBorder(int border)
 wxSize wxWizard::GetManualPageSize() const
 {
     // default width and height of the page
 wxSize wxWizard::GetManualPageSize() const
 {
     // default width and height of the page

-    static const int DEFAULT_PAGE_WIDTH = 270;
-    static const int DEFAULT_PAGE_HEIGHT = 290;
-
+    int DEFAULT_PAGE_WIDTH = 270;
+    int DEFAULT_PAGE_HEIGHT = 270;
+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+    if (isPda)
+    {
+        // Make the default page size small enough to fit on screen
+        DEFAULT_PAGE_WIDTH = wxSystemSettings::GetMetric(wxSYS_SCREEN_X) / 2;
+        DEFAULT_PAGE_HEIGHT = wxSystemSettings::GetMetric(wxSYS_SCREEN_Y) / 2;
+    }
+    

     wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);
 
     totalPageSize.IncTo(m_sizePage);
     wxSize totalPageSize(DEFAULT_PAGE_WIDTH,DEFAULT_PAGE_HEIGHT);
 
     totalPageSize.IncTo(m_sizePage);


@@ -691,7 +729,15 @@ void wxWizard::OnCancel(wxCommandEvent& WXUNUSED(eventUnused))
     if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
     {
         // no objections - close the dialog
     if ( !win->GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
     {
         // no objections - close the dialog

-        EndModal(wxID_CANCEL);
+        if(IsModal())
+        {
+            EndModal(wxID_CANCEL);
+        }
+        else
+        {
+            SetReturnCode(wxID_CANCEL);
+            Hide();
+        }

     }
     //else: request to Cancel ignored
 }
     }
     //else: request to Cancel ignored
 }


@@ -751,14 +797,26 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
     {
         // the event will be propagated anyhow
         event.Skip();
     {
         // the event will be propagated anyhow
         event.Skip();

-        return;

     }
     }

+    else
+    {
+        wxWindow *parent = GetParent();

 
 

-    wxWindow *parent = GetParent();
+        if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) )
+        {
+            event.Skip();
+        }
+    }

 
 

-    if ( !parent || !parent->GetEventHandler()->ProcessEvent(event) )
+    if ( ( modelessWizards.Index(this) != wxNOT_FOUND ) &&
+         event.IsAllowed() &&
+         ( event.GetEventType() == wxEVT_WIZARD_FINISHED ||
+           event.GetEventType() == wxEVT_WIZARD_CANCEL
+         )
+       )

     {
     {

-        event.Skip();
+        modelessWizards.Remove(this);
+        Destroy();

     }
 }
 
     }
 }