Corrections to bitmap handling

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index dcada774504faa7d25a7af29202af4d0fc4f22e0..74c26780b8c9c1862e9ea489ea999bb0aa8c2fdf 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -682,13 +682,13 @@ bool wxWizard::ShowPage(wxWizardPage *page, bool goingForward)
         DoWizardLayout();
     }
 
         DoWizardLayout();
     }
 

-    if (GetBitmapPlacement())
+    if (GetBitmapPlacement() && m_statbmp)

     {
         ResizeBitmap(bmp);
     {
         ResizeBitmap(bmp);

-    
+

         if ( !bmp.IsSameAs(bmpPrev) )
             m_statbmp->SetBitmap(bmp);
         if ( !bmp.IsSameAs(bmpPrev) )
             m_statbmp->SetBitmap(bmp);

-    
+

         if (m_usingSizer)
             m_sizerPage->RecalcSizes();
     }
         if (m_usingSizer)
             m_sizerPage->RecalcSizes();
     }


@@ -924,16 +924,16 @@ bool wxWizard::DoLayoutAdaptation()
                         // Create a scrolled window and reparent
                         wxScrolledWindow* scrolledWindow = new wxScrolledWindow(page, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL|wxHSCROLL|wxBORDER_NONE);
                         wxSizer* oldSizer = page->GetSizer();
                         // Create a scrolled window and reparent
                         wxScrolledWindow* scrolledWindow = new wxScrolledWindow(page, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL|wxHSCROLL|wxBORDER_NONE);
                         wxSizer* oldSizer = page->GetSizer();

-                        
+

                         wxSizer* newSizer = new wxBoxSizer(wxVERTICAL);
                         newSizer->Add(scrolledWindow,1, wxEXPAND, 0);
                         wxSizer* newSizer = new wxBoxSizer(wxVERTICAL);
                         newSizer->Add(scrolledWindow,1, wxEXPAND, 0);

-                        
+

                         page->SetSizer(newSizer, false /* don't delete the old sizer */);
                         page->SetSizer(newSizer, false /* don't delete the old sizer */);

-                        
+

                         scrolledWindow->SetSizer(oldSizer);
                         scrolledWindow->SetSizer(oldSizer);

-                        
+

                         wxStandardDialogLayoutAdapter::DoReparentControls(page, scrolledWindow);
                         wxStandardDialogLayoutAdapter::DoReparentControls(page, scrolledWindow);

-                        
+

                         pages.Append(page);
                         windows.Append(scrolledWindow);
                     }
                         pages.Append(page);
                         windows.Append(scrolledWindow);
                     }


@@ -961,7 +961,7 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp)
         int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth());
         int bitmapHeight = pageSize.y;
 
         int bitmapWidth = wxMax(bmp.GetWidth(), GetMinimumBitmapWidth());
         int bitmapHeight = pageSize.y;
 

-        if (bmp.GetHeight() != bitmapHeight)
+        if (!m_statbmp->GetBitmap().Ok() || m_statbmp->GetBitmap().GetHeight() != bitmapHeight)

         {
             wxBitmap bitmap(bitmapWidth, bitmapHeight);
             {
         {
             wxBitmap bitmap(bitmapWidth, bitmapHeight);
             {


@@ -981,16 +981,16 @@ bool wxWizard::ResizeBitmap(wxBitmap& bmp)
                     if (GetBitmapPlacement() & wxWIZARD_HALIGN_LEFT)
                         x = 0;
                     else if (GetBitmapPlacement() & wxWIZARD_HALIGN_RIGHT)
                     if (GetBitmapPlacement() & wxWIZARD_HALIGN_LEFT)
                         x = 0;
                     else if (GetBitmapPlacement() & wxWIZARD_HALIGN_RIGHT)

-                        x = bitmapWidth - GetBitmap().GetWidth();
+                        x = bitmapWidth - bmp.GetWidth();

                     else
                     else

-                        x = (bitmapWidth - GetBitmap().GetWidth())/2;
+                        x = (bitmapWidth - bmp.GetWidth())/2;

 
                     if (GetBitmapPlacement() & wxWIZARD_VALIGN_TOP)
                         y = 0;
                     else if (GetBitmapPlacement() & wxWIZARD_VALIGN_BOTTOM)
 
                     if (GetBitmapPlacement() & wxWIZARD_VALIGN_TOP)
                         y = 0;
                     else if (GetBitmapPlacement() & wxWIZARD_VALIGN_BOTTOM)

-                        y = bitmapHeight - GetBitmap().GetHeight();
+                        y = bitmapHeight - bmp.GetHeight();

                     else
                     else

-                        y = (bitmapHeight - GetBitmap().GetHeight())/2;
+                        y = (bitmapHeight - bmp.GetHeight())/2;

 
                     dc.DrawBitmap(bmp, x, y, true);
                     dc.SelectObject(wxNullBitmap);
 
                     dc.DrawBitmap(bmp, x, y, true);
                     dc.SelectObject(wxNullBitmap);