Allow passing multi-line strings to wxDC::DrawText(), even under MSW.

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

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index ccc51e049dc7eef7a7f5000fab24275d63b09301..5687ef5c09e6654abfa6794cba6533d05e227245 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -48,10 +48,9 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
 
-const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
-const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
+wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
     EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)
@@ -112,49 +111,6 @@ wxChoicebook::Create(wxWindow *parent,
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxChoicebook geometry management
-// ----------------------------------------------------------------------------
-
-wxSize wxChoicebook::GetControllerSize() const
-{
-    const wxSize sizeClient = GetClientSize(),
-                 sizeChoice = m_controlSizer->CalcMin();
-
-    wxSize size;
-    if ( IsVertical() )
-    {
-        size.x = sizeClient.x;
-        size.y = sizeChoice.y;
-    }
-    else // left/right aligned
-    {
-        size.x = sizeChoice.x;
-        size.y = sizeClient.y;
-    }
-
-    return size;
-}
-
-wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const
-{
-    // we need to add the size of the choice control and the border between
-    const wxSize sizeChoice = GetControllerSize();
-
-    wxSize size = sizePage;
-    if ( IsVertical() )
-    {
-        size.y += sizeChoice.y + GetInternalBorder();
-    }
-    else // left/right aligned
-    {
-        size.x += sizeChoice.x + GetInternalBorder();
-    }
-
-    return size;
-}
-
-
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
@@ -173,22 +129,31 @@ wxString wxChoicebook::GetPageText(size_t n) const
 
 int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
 {
-    wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
-
     return wxNOT_FOUND;
 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
 {
-    wxFAIL_MSG( _T("wxChoicebook::SetPageImage() not implemented") );
+    // fail silently, the code may be written to use one of several book
+    // classes and call SetPageImage() unconditionally, it's better to just
+    // ignore it (which is the best we can do short of rewriting this class to
+    // use wxBitmapComboBox anyhow) than complain loudly about a rather
+    // harmless problem
 
     return false;
 }
 
 // ----------------------------------------------------------------------------
-// image list stuff
+// miscellaneous other stuff
 // ----------------------------------------------------------------------------
 
+void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant)
+{
+    wxBookCtrlBase::DoSetWindowVariant(variant);
+    if (m_bookctrl)
+        m_bookctrl->SetWindowVariant(variant);
+}
+
 void wxChoicebook::SetImageList(wxImageList *imageList)
 {
     // TODO: can be implemented in form of static bitmap near choice control
@@ -205,12 +170,12 @@ int wxChoicebook::GetSelection() const
     return m_selection;
 }
 
-wxBookCtrlBaseEvent* wxChoicebook::CreatePageChangingEvent() const
+wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const
 {
-    return new wxChoicebookEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+    return new wxBookCtrlEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
 }
 
-void wxChoicebook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
+void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event)
 {
     event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
 }