Added SetBitmap, GetBitmap to wxWizard

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

docs/changes.txt

@@ -93,38 +93,48 @@ Major new features in 2.8 release
 
 All (GUI):
 
-- Added colour normalization to PNM image handler (Ray Johnston)
+- Added colour normalization to PNM image handler (Ray Johnston).
-- Fixed selecting part of word from right to left in wxHTML (Michael Hieke)
+- Fixed selecting part of word from right to left in wxHTML (Michael Hieke).
 - Selecting text in wxHTML with character precision was made easier, it's
-  enough to select half of a character (Michael Hieke)
+  enough to select half of a character (Michael Hieke).
 - Significantly improved startup times of XRC-based applications using
-  embedded resources on Unix (requires resources recompilation)
+  embedded resources on Unix (requires resources recompilation).
-- Fixed freeing of "static" alpha data in wxImage (Axel Gembe)
+- Fixed freeing of "static" alpha data in wxImage (Axel Gembe).
-- Added tab mouse click events to wxAuiNotebook (Ben Williams)
+- Added tab mouse click events to wxAuiNotebook (Ben Williams).
-- Option for middle-click tab close in wxAuiNotebook (Ben Williams)
+- Option for middle-click tab close in wxAuiNotebook (Ben Williams).
+- Added wxAuiNotebook::SetFont, GetTabCtrlHeight, GetHeightForPageHeight.
+- Added SetBitmap/GetBitmap to wxWizard, to allow e.g. on-the-fly creation
+  of bitmap to fit page height.
 
 wxMSW:
 
-- Fix crash when destroying a default button (Tim Kosse)
+- Fix crash when destroying a default button (Tim Kosse).
-- Correct problem with page setup dialog when using landscape mode
+- Correct problem with page setup dialog when using landscape mode.
-- Added msw.font.no-proof-quality system option, see manual for description
+- Added msw.font.no-proof-quality system option, see manual for description.
-- Fix appearance of notebook with non-top tabs under Windows Vista
+- Fix appearance of notebook with non-top tabs under Windows Vista.
-- Fixed bug with symbol resolving in wxStackWalker (Axel Gembe)
+- Fixed bug with symbol resolving in wxStackWalker (Axel Gembe).
 
 wxGTK:
 
-- Fixed missing key events in wxGTK1 build
+- Fixed missing key events in wxGTK1 build.
-- Setting foreground colour of single line wxTextCtrl now works
+- Setting foreground colour of single line wxTextCtrl now works.
 - More work on setting defaults in GNOME print dialogs.
 - Also made landscape printing work as per wxMSW.
 - Add support for (rectangular) clipping in GNOME print backend.
-- Speed up wxBitmap::Rescale()
+- Speed up wxBitmap::Rescale().
-- Add right button event for wxToolbar's tools (Tim Kosse)
+- Add right button event for wxToolbar's tools (Tim Kosse).
 - Made wxWindow::SetScrollPos and wxScrollbar::SetThumbPos
-  not emit any event
+  not emit any event.
-- Correct hyperactive mouse wheel support
+- Correct hyperactive mouse wheel support.
-- Correct grid line mode in wxListCtrl
+- Correct grid line mode in wxListCtrl.
-- Don't unconditionally add wxCAPTION style to wxMiniFrame
+- Don't unconditionally add wxCAPTION style to wxMiniFrame.
+- Fixed crash in file and dir pickers for GTK+ < 2.6 if compiled
+  with GTK+ >= 2.6.
+
+wxMac:
+
+- Fixed ability of non-native/installed toolbars to have controls,
+  in native toolbar compilation mode.
 
 
 2.8.4
@@ -132,66 +142,66 @@ wxGTK:
 
 All:
 
-- Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem)
+- Fix bug in wxFileConfig when recreating a group (Steven Van Ingelgem).
 - Fix wxStringOutputStream::Write() in Unicode build when the argument
-  overlaps UTF-8 characters boundary
+  overlaps UTF-8 characters boundary.
-- Account for lines without newline at the end in wxExecute()
+- Account for lines without newline at the end in wxExecute().
 - Added wxString::char_str(), wchar_str(), From8BitData(), To8BitData(),
   FromUTF8(), ToUTF8() and utf8_str() methods for forward compatiblity
-  with wxWidgets 3
+  with wxWidgets 3.
 
 All (Unix):
 
-- Handle socket shutdown by the peer correctly in wxSocket (Tim Kosse)
+- Handle socket shutdown by the peer correctly in wxSocket (Tim Kosse).
 
 All (GUI):
 
-- Allow status bar children in XRC (Edmunt Pienkowski)
+- Allow status bar children in XRC (Edmunt Pienkowski).
-- Fix memory leak in wxWizard when not using sizers for the page layout
+- Fix memory leak in wxWizard when not using sizers for the page layout.
-- Added wxListCtrl::SetItemPtrData()
+- Added wxListCtrl::SetItemPtrData().
-- wxHTML: Apply table background colour between the cells too (Michael Hieke)
+- wxHTML: Apply table background colour between the cells too (Michael Hieke).
 
 wxMSW:
 
 - Corrected wxStaticBox label appearance when its foreground colour was set:
-  it didn't respect font size nor background colour then (Juan Antonio Ortega)
+  it didn't respect font size nor background colour then (Juan Antonio Ortega).
-- Don't lose combobox text when it's opened and closed (Kolya Kosenko)
+- Don't lose combobox text when it's opened and closed (Kolya Kosenko).
-- Corrected GetChecked() for events from checkable menu items (smanders)
+- Corrected GetChecked() for events from checkable menu items (smanders).
-- Fixed popup menus under Windows NT 4
+- Fixed popup menus under Windows NT 4.
-- Fixed bug in wxThread::Wait() in console applications introduced in 2.8.3
+- Fixed bug in wxThread::Wait() in console applications introduced in 2.8.3.
-- Support right-aligned/centered owner drawn items in wxListCtrl (troelsk)
+- Support right-aligned/centered owner drawn items in wxListCtrl (troelsk).
-- Compilation fixed with WXWIN_COMPATIBILITY_2_6==0
+- Compilation fixed with WXWIN_COMPATIBILITY_2_6==0.
-- Fix wxComboCtrl colours under Windows Vista (Kolya Kosenko)
+- Fix wxComboCtrl colours under Windows Vista (Kolya Kosenko).
 
 wxGTK:
 
-- Fix infinite loop when adding a wxStaticText control to a toolbar
+- Fix infinite loop when adding a wxStaticText control to a toolbar.
-- Fix wxNO_BORDER style for wxRadioBox (David Hart)
+- Fix wxNO_BORDER style for wxRadioBox (David Hart).
-- wxComboBox::SetValue() doesn't emit EVT_TEXT anymore
+- wxComboBox::SetValue() doesn't emit EVT_TEXT anymore.
-- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
+- Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr).
-- Fix support for wxFD_FILE_MUST_EXIST in wxFileDialog
+- Fix support for wxFD_FILE_MUST_EXIST in wxFileDialog.
 - Fix support for setting orientation, paper size and collate
-  in GNOME print backend
+  in GNOME print backend.
 - Support wxTEXT_ALIGNMENT_JUSTIFIED in wxTextCtrl if GTK+ version is at
-  least 2.11 (Mart Raudsepp).
+  least 2.11 (Mart Raudsepp)..
 
 wxMac:
 
-- Fix wxComboBox::SetSelection(wxNOT_FOUND) (Adrian Secord)
+- Fix wxComboBox::SetSelection(wxNOT_FOUND) (Adrian Secord).
 
 wxUniv:
 
-- Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen)
+- Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen).
-- Fix wxComboBox::SetSelection(wxNOT_FOUND)
+- Fix wxComboBox::SetSelection(wxNOT_FOUND).
-- Fix setting background colour for controls with transparent background
+- Fix setting background colour for controls with transparent background.
 
 2.8.3
 -----
 
 All:
 
-- Shut down the sockets gracefully (Sergio Aguayo)
+- Shut down the sockets gracefully (Sergio Aguayo).
-- Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal)
+- Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal).
 
 wxMac
 
@@ -205,7 +215,7 @@ wxMSW:
 
 wxGTK:
 
-- Fixed handling of accelerators using PageUp/Down keys
+- Fixed handling of accelerators using PageUp/Down keys.
 
 
 2.8.2
@@ -226,9 +236,9 @@ All:
 - Fixed tab-related drawing and hit-testing bugs in wxRichTextCtrl.
 - Implemented background colour in wxRichTextCtrl.
 - Fixed crashes in helpview when opening a file.
-- Fixed detection of number of processors under Linux 2.6
+- Fixed detection of number of processors under Linux 2.6.
-- Fixed Base64 computation in wxHTTP (p_michalczyk)
+- Fixed Base64 computation in wxHTTP (p_michalczyk).
-- Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk)
+- Fix handling of wxSOCKET_REUSEADDR in wxDatagramSocket (troelsk).
 
 Unix Ports:
 

docs/latex/wx/wizard.tex

@@ -157,6 +157,11 @@ This is useful if the decision about which pages to show is taken during
 run-time, as in this case, the wizard won't be able to get to all pages starting
 from a single one and you should call {\it Fit} separately for the others.
 
+\membersection{wxWizard::GetBitmap}\label{wxwizardgetbitmap}
+
+\constfunc{const wxBitmap\&}{GetBitmap}{\void}
+
+Returns the bitmap used for the wizard.
 
 \membersection{wxWizard::GetCurrentPage}\label{wxwizardgetcurrentpage}
 
@@ -241,6 +246,11 @@ Executes the wizard starting from the given page, returning {\tt true} if it was
 successfully finished or {\tt false} if user cancelled it. The {\it firstPage} 
 can not be {\tt NULL}.
 
+\membersection{wxWizard::SetBitmap}\label{wxwizardsetbitmap}
+
+\func{void}{SetBitmap}{\param{const wxBitmap\& }{bitmap}}
+
+Sets the bitmap used for the wizard.
 
 \membersection{wxWizard::SetPageSize}\label{wxwizardsetpagesize}
 

include/wx/generic/wizard.h

@@ -58,6 +58,12 @@ public:
     virtual wxSizer *GetPageAreaSizer() const;
     virtual void SetBorder(int border);
 
+    /// set/get bitmap
+#if wxABI_VERSION >= 20805
+    const wxBitmap& GetBitmap() const { return m_bitmap; }
+    void SetBitmap(const wxBitmap& bitmap);
+#endif
+
     // implementation only from now on
     // -------------------------------
 

src/generic/wizard.cpp

@@ -854,6 +854,13 @@ void wxWizard::OnWizEvent(wxWizardEvent& event)
     }
 }
 
+void wxWizard::SetBitmap(const wxBitmap& bitmap)
+{
+    m_bitmap = bitmap;
+    if (m_statbmp)
+        m_statbmp->SetBitmap(m_bitmap);
+}
+
 // ----------------------------------------------------------------------------
 // wxWizardEvent
 // ----------------------------------------------------------------------------

version-script.in

@@ -37,6 +37,8 @@
         *wxLogChain*DetachOldLog*;
         *wxMemoryFSHandler*AddFileWithMimeType*;
         *wxMetafileDC*DoGetTextExtent*;
+        *wxWizard*GetBitmap*;
+        *wxWizard*SetBitmap*;
 };
 
 # public symbols added in 2.8.4 (please keep in alphabetical order):