mac paths updated

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

diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 5c5910cac0d3ab2fd87cbffdb8b99500b083ebf1..d347294f26706885465064dc97ffe20e7e7c67c4 100644 (file)
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -52,8 +52,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
 BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)

+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxGenericCollapsiblePane)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl)
+
+void wxGenericCollapsiblePane::Init()
+{
+    WX_INIT_CONTROL_CONTAINER();
+
+    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,24 +82,31 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     m_strLabel = label;
 
 
     m_strLabel = label;
 

+#ifdef __WXMAC__
+    // on Mac we use the disclosure triangle
+    // we need a light gray line above and below, lets approximate with the frame
+    m_pStaticLine = NULL;
+    m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel(), 
+                                         wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER );
+    m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) );
+    m_sz = new wxBoxSizer(wxHORIZONTAL);
+    // m_sz->Add(4,4); where shall we put it?
+    m_sz->Add( m_pButton, 1);
+#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_pStaticLine = new wxStaticLine(this, wxID_ANY);
     // 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_pStaticLine = new wxStaticLine(this, wxID_ANY);

-#ifdef __WXMAC__
-    // on Mac we put the static libe above the button
-    m_sz = new wxBoxSizer(wxVERTICAL);
-    m_sz->Add(m_pStaticLine, 0, wxALL|wxGROW, GetBorder());
-    m_sz->Add(m_pButton, 0, wxLEFT|wxRIGHT|wxBOTTOM, GetBorder());
-#else

     // on other platforms we put the static line and the button horizontally
     m_sz = new wxBoxSizer(wxHORIZONTAL);
     m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
 
     // on other platforms we put the static line and the button horizontally
     m_sz = new wxBoxSizer(wxHORIZONTAL);
     m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
 

-#ifdef __WXWINCE__
+    // 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
 
     SetBackgroundColour(parent->GetBackgroundColour());
 #endif
 


@@ -102,14 +122,14 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
 wxGenericCollapsiblePane::~wxGenericCollapsiblePane()
 {
 
 wxGenericCollapsiblePane::~wxGenericCollapsiblePane()
 {

-    if (m_pButton && m_pStaticLine && m_sz)
-    {
+    if (m_pButton)

         m_pButton->SetContainingSizer(NULL);
         m_pButton->SetContainingSizer(NULL);

+    
+    if (m_pStaticLine)

         m_pStaticLine->SetContainingSizer(NULL);
         m_pStaticLine->SetContainingSizer(NULL);

-
-        // our sizer is not deleted automatically since we didn't use SetSizer()!
-        wxDELETE(m_sz);
-    }
+    
+    // our sizer is not deleted automatically since we didn't use SetSizer()!
+    wxDELETE(m_sz);

 }
 
 wxSize wxGenericCollapsiblePane::DoGetBestSize() const
 }
 
 wxSize wxGenericCollapsiblePane::DoGetBestSize() const


@@ -129,7 +149,12 @@ wxSize wxGenericCollapsiblePane::DoGetBestSize() const
 
 wxString wxGenericCollapsiblePane::GetBtnLabel() const
 {
 
 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)
 }
 
 void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)


@@ -145,62 +170,21 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
     }
 
 
     }
 
 

-    //
-    // NB: the following block of code has been accurately designed to
-    //     as much flicker-free as possible; be careful when modifying it!
-    //
+    wxTopLevelWindow *top =
+        wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( !top )
+        return;

 
 

-    wxTopLevelWindow *
-        top = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    if ( top )
-    {
-        // NB: don't Layout() the 'top' window as its size has not been correctly
-        //     updated yet and we don't want to do an initial Layout() with the old
-        //     size immediately followed by a SetClientSize/Fit call for the new
-        //     size; that would provoke flickering!
-
-        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() )
-            {
-                // expanded -> collapsed transition
-                if (top->GetSizer())
-                {
-                    // we have just set the size hints...
-                    wxSize sz = top->GetSizer()->CalcMin();
-
-                    // 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
-                    top->Layout();
-            }
-            else
-            {
-                // collapsed -> expanded transition
-
-                // force our parent to "fit", i.e. expand so that it can honour
-                // our minimal size
-                top->Fit();
-            }
-        }
-    }
+    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)


@@ -213,8 +197,13 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     m_pPane->Show(!collapse);
 
     // update button label
     m_pPane->Show(!collapse);
 
     // update button label

+#ifdef __WXMAC__
+    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());
 }


@@ -222,16 +211,25 @@ 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->SetInitialSize();
     m_pButton->SetLabel(GetBtnLabel());
     m_pButton->SetInitialSize();

+#endif

 
     Layout();
 }
 
 bool wxGenericCollapsiblePane::Layout()
 {
 
     Layout();
 }
 
 bool wxGenericCollapsiblePane::Layout()
 {

+#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!
     if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz)
         return false;     // we need to complete the creation first!

+#endif

 
     wxSize oursz(GetSize());
 
 
     wxSize oursz(GetSize());
 


@@ -257,8 +255,6 @@ int wxGenericCollapsiblePane::GetBorder() const
 {
 #if defined( __WXMAC__ )
     return 6;
 {
 #if defined( __WXMAC__ )
     return 6;

-#elif defined(__WXGTK20__)
-    return 3;

 #elif defined(__WXMSW__)
     wxASSERT(m_pButton);
     return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x;
 #elif defined(__WXMSW__)
     wxASSERT(m_pButton);
     return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x;