missing commit

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

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 8985914aa10b1c565799a776379d52ef93f3332e..b04b142f510aa23e228b283a96f3c0ae808f2b40 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -17,12 +17,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/defs.h"
+
+#if wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE
+

 #include "wx/collpane.h"
 
 #ifndef WX_PRECOMP
     #include "wx/toplevel.h"
     #include "wx/button.h"
     #include "wx/sizer.h"
 #include "wx/collpane.h"
 
 #ifndef WX_PRECOMP
     #include "wx/toplevel.h"
     #include "wx/button.h"
     #include "wx/sizer.h"

+    #include "wx/panel.h"

 #endif // !WX_PRECOMP
 
 #include "wx/statline.h"
 #endif // !WX_PRECOMP
 
 #include "wx/statline.h"


@@ -31,21 +40,17 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-// the number of pixels to leave between the button and the static line and
-// between the button and the pane
-#define wxCP_MARGIN         10
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-const wxChar wxGenericCollapsiblePaneNameStr[] = wxT("genericCollapsiblePane");
+const char wxCollapsiblePaneNameStr[] = "collapsiblePane";

 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)
+wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );

 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 


@@ -54,6 +59,13 @@ BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 

+void wxGenericCollapsiblePane::Init()
+{
+    m_pButton = NULL;
+    m_pPane = NULL;
+    m_pStaticLine = NULL;
+    m_sz = NULL;
+}

 
 bool wxGenericCollapsiblePane::Create(wxWindow *parent,
                                       wxWindowID id,
 
 bool wxGenericCollapsiblePane::Create(wxWindow *parent,
                                       wxWindowID id,


@@ -69,89 +81,107 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     m_strLabel = label;
 
 
     m_strLabel = label;
 

-    // create children; their size & position is set in OnSize()
+    // sizer containing the expand button and possibly a static line
+    m_sz = new wxBoxSizer(wxHORIZONTAL);
+
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+    // on Mac we use the special disclosure triangle button
+    m_pStaticLine = NULL;
+    m_pButton = new wxDisclosureTriangle(this, wxID_ANY, GetBtnLabel());
+    m_sz->Add(m_pButton);
+#else
+    // create children and lay them out using a wxBoxSizer
+    // (so that we automatically get RTL features)

     m_pButton = new wxButton(this, wxID_ANY, GetBtnLabel(), wxPoint(0, 0),
                              wxDefaultSize, wxBU_EXACTFIT);
     m_pButton = new wxButton(this, wxID_ANY, GetBtnLabel(), wxPoint(0, 0),
                              wxDefaultSize, wxBU_EXACTFIT);

-    m_pStatLine = new wxStaticLine(this, wxID_ANY);
-    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                           wxNO_BORDER);
+    m_pStaticLine = new wxStaticLine(this, wxID_ANY);
+
+    // on other platforms we put the static line and the button horizontally
+    m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
+    m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
+#endif
+
+    // FIXME: at least under wxCE and wxGTK1 the background is black if we don't do
+    //        this, no idea why...
+#if defined(__WXWINCE__) || defined(__WXGTK__)
+    SetBackgroundColour(parent->GetBackgroundColour());
+#endif
+
+    // do not set sz as our sizers since we handle the pane window without using sizers
+    m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                          wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") );

 
     // start as collapsed:
     m_pPane->Hide();
 
 
     // start as collapsed:
     m_pPane->Hide();
 

-    //CacheBestSize(GetBestSize());

     return true;
 }
 
     return true;
 }
 

-wxSize wxGenericCollapsiblePane::DoGetBestSize() const
+wxGenericCollapsiblePane::~wxGenericCollapsiblePane()

 {
 {

-    wxSize sz = m_pButton->GetBestSize();
+    if (m_pButton)
+        m_pButton->SetContainingSizer(NULL);

 
 

-    // set width
-    sz.SetWidth(sz.x + wxCP_MARGIN + m_pStatLine->GetBestSize().x);
-    const wxCoord paneWidth = m_pPane->GetBestSize().x;
-    if ( sz.x < paneWidth )
-        sz.x = paneWidth;
+    if (m_pStaticLine)
+        m_pStaticLine->SetContainingSizer(NULL);
+
+    // our sizer is not deleted automatically since we didn't use SetSizer()!
+    wxDELETE(m_sz);
+}
+
+wxSize wxGenericCollapsiblePane::DoGetBestSize() const
+{
+    // NB: do not use GetSize() but rather GetMinSize()
+    wxSize sz = m_sz->GetMinSize();

 
     // when expanded, we need more vertical space
     if ( IsExpanded() )
 
     // when expanded, we need more vertical space
     if ( IsExpanded() )

-        sz.SetHeight(sz.y + wxCP_MARGIN + m_pPane->GetBestSize().y);
+    {
+        sz.SetWidth(wxMax( sz.GetWidth(), m_pPane->GetBestSize().x ));
+        sz.SetHeight(sz.y + GetBorder() + m_pPane->GetBestSize().y);
+    }

 
     return sz;
 }
 
 wxString wxGenericCollapsiblePane::GetBtnLabel() const
 {
 
     return sz;
 }
 
 wxString wxGenericCollapsiblePane::GetBtnLabel() const
 {

+    // on mac the triangle indicates the state, no string change
+#ifdef __WXMAC__
+    return m_strLabel;
+#else

     return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<"));
     return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<"));

+#endif

 }
 
 void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 {
     // minimal size has priority over the best size so set here our min size
 }
 
 void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 {
     // minimal size has priority over the best size so set here our min size

-    SetMinSize(sz);
+//    SetMinSize(sz);

     SetSize(sz);
 
     SetSize(sz);
 

-    wxTopLevelWindow *
-        top = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    if ( top )
+    if (this->HasFlag(wxCP_NO_TLW_RESIZE))

     {
     {

-        // we've changed our size, thus our top level parent needs to relayout
-        // itself
-        top->Layout();
-
-        // FIXME: this makes wxGenericCollapsiblePane behave as the user expect
-        //        but maybe there are cases where this is unwanted!
-        if (top->GetSizer())
-#ifdef __WXGTK__
-        // FIXME: the SetSizeHints() call would be required also for GTK+ for
-        //        the expanded->collapsed transition. Unfortunately if we
-        //        enable this line, then the GTK+ top window won't always be
-        //        resized by the SetClientSize() call below! As a side effect
-        //        of this dirty fix, the minimal size for the pane window is
-        //        not set in GTK+ and the user can hide it shrinking the "top"
-        //        window...
-        if (IsCollapsed())
-#endif
-            top->GetSizer()->SetSizeHints(top);
-
-
-        // we shouldn't attempt to resize a maximized window, whatever happens
-        if ( !top->IsMaximized() )
-        {
-            if ( IsCollapsed() )
-            {
-                // use SetClientSize() and not SetSize() otherwise the size for
-                // e.g. a wxFrame with a menubar wouldn't be correctly set
-                top->SetClientSize(sz);
-            }
-            else
-            {
-                // force our parent to "fit", i.e. expand so that it can honour
-                // our minimal size
-                top->Fit();
-            }
-        }
+        // the user asked to explicitly handle the resizing itself...
+        return;

     }
     }

+
+
+    wxTopLevelWindow *top =
+        wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( !top )
+        return;
+
+    wxSizer *sizer = top->GetSizer();
+    if ( !sizer )
+        return;
+
+    const wxSize newBestSize = sizer->ComputeFittingClientSize(top);
+    top->SetMinClientSize(newBestSize);
+
+    // we shouldn't attempt to resize a maximized window, whatever happens
+    if ( !top->IsMaximized() )
+        top->SetClientSize(newBestSize);

 }
 
 void wxGenericCollapsiblePane::Collapse(bool collapse)
 }
 
 void wxGenericCollapsiblePane::Collapse(bool collapse)


@@ -160,12 +190,19 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     if ( IsCollapsed() == collapse )
         return;
 
     if ( IsCollapsed() == collapse )
         return;
 

+    InvalidateBestSize();
+

     // update our state
     m_pPane->Show(!collapse);
 
     // update button label
     // update our state
     m_pPane->Show(!collapse);
 
     // update button label

+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+    m_pButton->SetOpen( !collapse );
+#else

     // NB: this must be done after updating our "state"
     m_pButton->SetLabel(GetBtnLabel());
     // NB: this must be done after updating our "state"
     m_pButton->SetLabel(GetBtnLabel());

+#endif
+

 
     OnStateChange(GetBestSize());
 }
 
     OnStateChange(GetBestSize());
 }


@@ -173,26 +210,56 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
 void wxGenericCollapsiblePane::SetLabel(const wxString &label)
 {
     m_strLabel = label;
 void wxGenericCollapsiblePane::SetLabel(const wxString &label)
 {
     m_strLabel = label;

+#ifdef __WXMAC__
+    m_pButton->SetLabel(GetBtnLabel());
+#else

     m_pButton->SetLabel(GetBtnLabel());
     m_pButton->SetLabel(GetBtnLabel());

-    m_pButton->SetBestFittingSize();
+    m_pButton->SetInitialSize();
+#endif

 
 

-    LayoutChildren();
+    Layout();

 }
 
 }
 

-void wxGenericCollapsiblePane::LayoutChildren()
+bool wxGenericCollapsiblePane::Layout()

 {
 {

-    wxSize btnSz = m_pButton->GetSize();
+#ifdef __WXMAC__
+    if (!m_pButton || !m_pPane || !m_sz)
+        return false;     // we need to complete the creation first!
+#else
+    if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz)
+        return false;     // we need to complete the creation first!
+#endif

 
 

-    // the button position & size are always ok...
+    wxSize oursz(GetSize());

 
 

-    // move & resize the static line
-    m_pStatLine->SetSize(btnSz.x + wxCP_MARGIN, btnSz.y/2,
-                         GetSize().x - btnSz.x - wxCP_MARGIN, -1,
-                         wxSIZE_USE_EXISTING);
+    // move & resize the button and the static line
+    m_sz->SetDimension(0, 0, oursz.GetWidth(), m_sz->GetMinSize().GetHeight());
+    m_sz->Layout();

 
 

-    // move & resize the container window
-    m_pPane->SetSize(0, btnSz.y + wxCP_MARGIN,
-                     GetSize().x, GetSize().y - btnSz.y - wxCP_MARGIN);
+    if ( IsExpanded() )
+    {
+        // move & resize the container window
+        int yoffset = m_sz->GetSize().GetHeight() + GetBorder();
+        m_pPane->SetSize(0, yoffset,
+                        oursz.x, oursz.y - yoffset);
+
+        // this is very important to make the pane window layout show correctly
+        m_pPane->Layout();
+    }
+
+    return true;
+}
+
+int wxGenericCollapsiblePane::GetBorder() const
+{
+#if defined( __WXMAC__ )
+    return 6;
+#elif defined(__WXMSW__)
+    wxASSERT(m_pButton);
+    return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x;
+#else
+    return 5;
+#endif

 }
 
 
 }
 
 


@@ -227,12 +294,7 @@ void wxGenericCollapsiblePane::OnSize(wxSizeEvent& WXUNUSED(event))
     dc.DrawRectangle(wxPoint(0,0), GetBestSize());
 #endif
 
     dc.DrawRectangle(wxPoint(0,0), GetBestSize());
 #endif
 

-
-    if (!m_pButton || !m_pStatLine || !m_pPane)
-        return;     // we need to complete the creation first!
-
-    LayoutChildren();
-
-    // this is very important to make the pane window layout show correctly
-    m_pPane->Layout();
+    Layout();

 }
 }

+
+#endif // wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE