Bug fix.

[wxWidgets.git] / src / gtk / collpane.cpp

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index 263306affc0439c80057e482834f06c79b9980db..cd744aa00c62bf9b30ff1bdb0c55a4ea66700de8 100644 (file)
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -20,35 +20,16 @@
 #ifdef __WXGTK24__
 
 #include "wx/collpane.h"
 #ifdef __WXGTK24__
 
 #include "wx/collpane.h"

+#include "wx/gtk/private.h"
+

 #include <gtk/gtkexpander.h>
 #include <gtk/gtkexpander.h>

-#include <gtk/gtk.h>
+
+const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane");

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

-
-/* DEBUG TIMER */
-class myTimer : public wxTimer
-{
-    wxCollapsiblePane *p;
-
-public:
-    myTimer(wxCollapsiblePane *pp) {p=pp;}
-
-    void Notify()
-    {
-        //wxLogDebug(wxT("%d"), p->IsCollapsed());
-
-        wxSize sz = p->GetBestSize();
-        wxLogDebug(wxT("our best size is now: %d-%d"), sz.GetWidth(), sz.GetHeight());
-    }
-};
-
-
-
-const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane");
-

 //-----------------------------------------------------------------------------
 // "notify::expanded" signal
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "notify::expanded" signal
 //-----------------------------------------------------------------------------


@@ -59,80 +40,41 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
                                                     GParamSpec *param_spec,
                                                     wxCollapsiblePane *p)
 {
                                                     GParamSpec *param_spec,
                                                     wxCollapsiblePane *p)
 {

-    // NB: unlike for the "activate" signal, when this callback is called, if we try to
-    //     query the "collapsed" status through p->IsCollapsed(), we get the right value.
-    //     I.e. here p->IsCollapsed() will return false if this callback has been called
-    //     at the end of a collapsed->expanded transition and viceversa.
-    //     Inside the "activate" signal callback p->IsCollapsed() would return the wrong value!
-
-    wxLogDebug("gtk_collapsiblepane_expanded_callback - IsCollapsed says %d", p->IsCollapsed());
+    // NB: unlike for the "activate" signal, when this callback is called, if
+    //     we try to query the "collapsed" status through p->IsCollapsed(), we
+    //     get the right value. I.e. here p->IsCollapsed() will return false if
+    //     this callback has been called at the end of a collapsed->expanded
+    //     transition and viceversa. Inside the "activate" signal callback
+    //     p->IsCollapsed() would return the wrong value!

 
     wxSize sz;
 
     wxSize sz;

-    if (!p->IsCollapsed())
+    if ( p->IsExpanded() )

     {
     {

-        // unfortunately there's no clean way to retrieve the minimal size of the expanded pane
-        // in this handler or in other handlers for the signals generated by user clicks on the
-        // GtkExpander button: p->GetBestSize() or p->GetMinSize() would still return the size for
-        // the collapsed expander even if the collapsed->expanded transition has already been
-        // completed (this because GTK+ queues some resize calls which still must be processed).
-        // So, the only solution to correctly set the size hints for this window is to calculate
-        // the expanded size ourselves, without relying on p->Get[Best|Min]Size:
+        // unfortunately there's no clean way to retrieve the minimal size of
+        // the expanded pane in this handler or in other handlers for the
+        // signals generated by user clicks on the GtkExpander button:
+        // p->GetBestSize() or p->GetMinSize() would still return the size for
+        // the collapsed expander even if the collapsed->expanded transition
+        // has already been completed (this because GTK+ queues some resize
+        // calls which still must be processed). So, the only solution to
+        // correctly set the size hints for this window is to calculate the
+        // expanded size ourselves, without relying on p->Get[Best|Min]Size:

         sz = p->GetMinSize();
         sz = p->GetMinSize();

-        sz.SetWidth( wxMax(sz.GetWidth(), p->GetPane()->GetMinSize().GetWidth()) );
-        sz.SetHeight( sz.GetHeight() + p->GetPane()->GetMinSize().GetHeight() + 10 );
+        sz.SetWidth(wxMax(sz.x, p->GetPane()->GetMinSize().x));
+        sz.SetHeight(sz.y + p->GetPane()->GetMinSize().y + 10);

     }
     }

-    else
+    else // collapsed

     {
     {

-        // same problem described above: using p->Get[Best|Min]Size() here we would get the size
-        // of the control when it is expanded even if the expanded->collapsed transition should be
-        // complete now...
+        // same problem described above: using p->Get[Best|Min]Size() here we
+        // would get the size of the control when it is expanded even if the
+        // expanded->collapsed transition should be complete now...

         // So, we use the size cached at control-creation time...
         sz = p->m_szCollapsed;
     }
 
         // So, we use the size cached at control-creation time...
         sz = p->m_szCollapsed;
     }
 

-    wxLogDebug(wxT("gtk_collapsiblepane_expanded_callback - my min size is now: %d-%d"),
-               sz.GetWidth(), sz.GetHeight());
+    p->OnStateChange(sz);

 
 

-    // minimal size has priority over the best size so set here our min size
-    p->SetMinSize(sz);
-    p->SetSize(sz);
-
-    wxWindow *top = p->GetTopLevelParent();
-    if (top)
-    {
-        // 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 (p->IsCollapsed())
-#endif
-            top->GetSizer()->SetSizeHints(top);
-
-        if (p->IsCollapsed())
-        {
-            // NB: we need to use SetClientSize() and not SetSize() otherwise the size for
-            //     windows like e.g. wxFrames with wxMenubars won'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();
-        }
-    }
-
-    if (p->m_bIgnoreNextChange)
+    if ( p->m_bIgnoreNextChange )

     {
         // change generated programmatically - do not send an event!
         p->m_bIgnoreNextChange = false;
     {
         // change generated programmatically - do not send an event!
         p->m_bIgnoreNextChange = false;


@@ -145,17 +87,17 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
 }
 }
 
 }
 }
 

-static void gtk_collapsiblepane_insert_callback( wxWindowGTK* parent, wxWindowGTK* child )
+static void
+gtk_collapsiblepane_insert_callback(wxWindowGTK* parent, wxWindowGTK* child)

 {
 {

-    // this callback should be used only once to insert the "pane" into
-    // the GtkExpander widget. wxGenericCollapsiblePane::DoAddChild() will check
-    // if it has been called only once (and in any case we would get a warning
-    // from the following call as GtkExpander is a GtkBin and can contain only a
-    // single child!).
+    // this callback should be used only once to insert the "pane" into the
+    // GtkExpander widget. wxGenericCollapsiblePane::DoAddChild() will check if
+    // it has been called only once (and in any case we would get a warning
+    // from the following call as GtkExpander is a GtkBin and can contain only
+    // a single child!).

     gtk_container_add (GTK_CONTAINER (parent->m_widget), child->m_widget);
 }
 
     gtk_container_add (GTK_CONTAINER (parent->m_widget), child->m_widget);
 }
 

-

 //-----------------------------------------------------------------------------
 // wxCollapsiblePane
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCollapsiblePane
 //-----------------------------------------------------------------------------


@@ -166,55 +108,55 @@ BEGIN_EVENT_TABLE(wxCollapsiblePane, wxGenericCollapsiblePane)
     EVT_SIZE(wxCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 

-bool wxCollapsiblePane::Create( wxWindow *parent, wxWindowID id,
-                                 const wxString& label,
-                                const wxPoint& pos,
-                                const wxSize& size,
-                                long style,
-                                const wxValidator& val,
-                                const wxString& name)
+bool wxCollapsiblePane::Create(wxWindow *parent,
+                               wxWindowID id,
+                               const wxString& label,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxValidator& val,
+                               const wxString& name)

 {
 {

-    if (gtk_check_version(2,4,0)) {wxASSERT(0);
-        return wxGenericCollapsiblePane::Create(parent, id, label, pos, size, style, val, name);}
+    if (gtk_check_version(2,4,0))
+        return wxGenericCollapsiblePane::Create(parent, id, label,
+                                                pos, size, style, val, name);

 
     m_needParent = true;
     m_acceptsFocus = true;
     m_bIgnoreNextChange = false;
 
 
     m_needParent = true;
     m_acceptsFocus = true;
     m_bIgnoreNextChange = false;
 

-    if (!PreCreation( parent, pos, size ) ||
-         !wxControl::CreateBase(parent, id, pos, size, style, val, name))
+    if ( !PreCreation( parent, pos, size ) ||
+          !wxControl::CreateBase(parent, id, pos, size, style, val, name) )

     {
         wxFAIL_MSG( wxT("wxCollapsiblePane creation failed") );
         return false;
     }
 
     {
         wxFAIL_MSG( wxT("wxCollapsiblePane creation failed") );
         return false;
     }
 

-    m_widget = gtk_expander_new(label.c_str());
+    m_widget =
+        gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label)));

 
 

-    // see the gtk_collapsiblepane_expanded_callback comments to understand why we connect
-    // to the "notify::expanded" signal instead of the more common "activate" one
+    // see the gtk_collapsiblepane_expanded_callback comments to understand why
+    // we connect to the "notify::expanded" signal instead of the more common
+    // "activate" one

     g_signal_connect(m_widget, "notify::expanded",
                      G_CALLBACK(gtk_collapsiblepane_expanded_callback), this);
 
     g_signal_connect(m_widget, "notify::expanded",
                      G_CALLBACK(gtk_collapsiblepane_expanded_callback), this);
 

-    // before creating m_pPane, we need to makesure our own insert callback will be used
+    // before creating m_pPane, we need to makesure our own insert callback
+    // will be used

     m_insertCallback = gtk_collapsiblepane_insert_callback;
 
     // this the real "pane"
     m_insertCallback = gtk_collapsiblepane_insert_callback;
 
     // this the real "pane"

-    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
+    m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                           wxNO_BORDER);

 
     gtk_widget_show( GTK_WIDGET(m_widget) );
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     gtk_widget_show( GTK_WIDGET(m_widget) );
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    //SetBestSize(size);

 
     // remember the size of this control when it's collapsed
     m_szCollapsed = GetBestSize();
 
 
     // remember the size of this control when it's collapsed
     m_szCollapsed = GetBestSize();
 

-    /*
-    myTimer *t = new myTimer(this);
-    t->Start(2000);
-    */
-

     return true;
 }
 
     return true;
 }
 


@@ -222,8 +164,6 @@ wxSize wxCollapsiblePane::DoGetBestSize() const
 {
     if (!gtk_check_version(2,4,0))
     {
 {
     if (!gtk_check_version(2,4,0))
     {

-        //return wxControl::DoGetBestSize();        // need not to cache the best size!
-

         wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
         GtkRequisition req;
         wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
         GtkRequisition req;


@@ -232,9 +172,8 @@ wxSize wxCollapsiblePane::DoGetBestSize() const
         (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
                 (m_widget, &req );
 
         (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
                 (m_widget, &req );
 

-        wxSize best(req.width, req.height);
-        //CacheBestSize(best);
-        return best;
+        // notice that we do not cache our best size here as it changes
+        return wxSize(req.width, req.height);

     }
 
     return wxGenericCollapsiblePane::DoGetBestSize();
     }
 
     return wxGenericCollapsiblePane::DoGetBestSize();


@@ -267,7 +206,7 @@ bool wxCollapsiblePane::IsCollapsed() const
 void wxCollapsiblePane::SetLabel(const wxString &str)
 {
     if (!gtk_check_version(2,4,0))
 void wxCollapsiblePane::SetLabel(const wxString &str)
 {
     if (!gtk_check_version(2,4,0))

-        gtk_expander_set_label(GTK_EXPANDER(m_widget), str.c_str());
+        gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str));

     else
         wxGenericCollapsiblePane::SetLabel(str);
 }
     else
         wxGenericCollapsiblePane::SetLabel(str);
 }


@@ -283,8 +222,6 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
     dc.DrawRectangle(wxPoint(0,0), GetBestSize());
 #endif
 
     dc.DrawRectangle(wxPoint(0,0), GetBestSize());
 #endif
 

-    //wxLogDebug(wxT("wxCollapsiblePane::OnSize"));
-

     // here we need to resize the pane window otherwise, even if the GtkExpander container
     // is expanded or shrinked, the pane window won't be updated!
     m_pPane->SetSize(ev.GetSize());
     // here we need to resize the pane window otherwise, even if the GtkExpander container
     // is expanded or shrinked, the pane window won't be updated!
     m_pPane->SetSize(ev.GetSize());


@@ -294,5 +231,5 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
     m_pPane->Layout();
 }
 
     m_pPane->Layout();
 }
 

-#endif      //  __WXGTK24__
+#endif //  __WXGTK24__