// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#if wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)
#include "wx/collpane.h"
#include "wx/toplevel.h"
#include "wx/gtk/private.h"
+// the lines below duplicate the same definitions in collpaneg.cpp, if we have
+// another implementation of this class we should extract them to a common file
+
+const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
+
+wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+
+IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
+
// ============================================================================
// implementation
// ============================================================================
GParamSpec * WXUNUSED(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!
-
- wxSize sz;
- if ( p->IsExpanded() )
- {
- // NB: we cannot use the p->GetBestSize() or p->GetMinSize() functions
- // here as they would return the size for the collapsed expander
- // even if the collapsed->expanded transition has already been
- // completed; we solve this problem doing:
-
- sz = p->m_szCollapsed;
-
- wxSize panesz = p->GetPane()->GetBestSize();
- sz.x = wxMax(sz.x, panesz.x);
- sz.y += gtk_expander_get_spacing(GTK_EXPANDER(p->m_widget)) + panesz.y;
- }
- else // collapsed
+ if (!p->IsCollapsed())
{
- // 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;
+ if (p->GetPane()->GetSizer())
+ p->GetPane()->GetSizer()->Fit( p->GetPane() );
}
+}
+}
- // VERY IMPORTANT:
- // just calling
- // p->OnStateChange(sz);
- // here would work work BUT:
- // 1) in the expanded->collapsed transition it provokes a lot of flickering
- // 2) in the collapsed->expanded transition using the "Change status" wxButton
- // in samples/collpane application some strange warnings would be generated
- // by the "clearlooks" theme, if that's your theme.
- //
- // So we prefer to use some GTK+ native optimized calls, which prevent too many resize
- // calculations to happen. Note that the following code has been very carefully designed
- // and tested - be VERY careful when changing it!
-
- // 1) need to update our size hints
- // NB: this function call won't actually do any long operation
- // (redraw/relayouting/resizing) so that it's flicker-free
- p->SetMinSize(sz);
-
+extern "C" {
+static void
+gtk_collpane_map_unmap_callback( GtkWidget *WXUNUSED(pane), GdkEvent *WXUNUSED(event), wxCollapsiblePane* p )
+{
if (p->HasFlag(wxCP_NO_TLW_RESIZE))
{
// fire an event
wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
- p->GetEventHandler()->ProcessEvent(ev);
+ p->HandleWindowEvent(ev);
- // the user asked to explicitely handle the resizing itself...
+ // the user asked to explicitly handle the resizing itself...
return;
}
if ( top && top->GetSizer() )
{
// 2) recalculate minimal size of the top window
- sz = top->GetSizer()->CalcMin();
+ wxSize sz = top->GetSizer()->CalcMin();
if (top->m_mainWidget)
{
- // 3) MAGIC HACK: if you ever used GtkExpander in a GTK+ program you know
- // that this magic call is required to make it possible to shrink the
- // top level window in the expanded->collapsed transition.
- // This may be sometimes undesired but *is* necessary and if you look
- // carefully, all GTK+ programs using GtkExpander perform this trick
- // (e.g. the standard "open file" dialog of GTK+>=2.4 is not resizeable
- // when the expander is collapsed!)
+ // 3) MAGIC HACK: if you ever used GtkExpander in a GTK+ program
+ // you know that this magic call is required to make it possible
+ // to shrink the top level window in the expanded->collapsed
+ // transition. This may be sometimes undesired but *is*
+ // necessary and if you look carefully, all GTK+ programs using
+ // GtkExpander perform this trick (e.g. the standard "open file"
+ // dialog of GTK+>=2.4 is not resizeable when the expander is
+ // collapsed!)
gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded());
// 4) set size hints
- top->SetSizeHints(sz.x, sz.y);
+ top->SetMinClientSize(sz);
// 5) set size
top->SetClientSize(sz);
// fire an event
wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
- p->GetEventHandler()->ProcessEvent(ev);
+ p->HandleWindowEvent(ev);
}
}
-static void
-gtk_collapsiblepane_insert_callback(wxWindowGTK* parent, wxWindowGTK* child)
+
+void wxCollapsiblePane::AddChildGTK(wxWindowGTK* child)
{
- // this callback should be used only once to insert the "pane" into the
+ // 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(m_widget), child->m_widget);
}
//-----------------------------------------------------------------------------
// wxCollapsiblePane
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxGenericCollapsiblePane)
+IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl)
-BEGIN_EVENT_TABLE(wxCollapsiblePane, wxGenericCollapsiblePane)
+BEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase)
EVT_SIZE(wxCollapsiblePane::OnSize)
END_EVENT_TABLE()
const wxValidator& val,
const wxString& name)
{
- if (gtk_check_version(2,4,0))
- return wxGenericCollapsiblePane::Create(parent, id, label,
- pos, size, style, val, name);
-
m_bIgnoreNextChange = false;
if ( !PreCreation( parent, pos, size ) ||
m_widget =
gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label)));
+ g_object_ref(m_widget);
- // 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_signal_connect_after(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
- m_insertCallback = gtk_collapsiblepane_insert_callback;
-
// this the real "pane"
m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
- wxTAB_TRAVERSAL|wxNO_BORDER);
+ wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") );
gtk_widget_show(m_widget);
m_parent->DoAddChild( this );
PostCreation(size);
+ // we should blend into our parent background
+ const wxColour bg = parent->GetBackgroundColour();
+ SetBackgroundColour(bg);
+ m_pPane->SetBackgroundColour(bg);
+
// remember the size of this control when it's collapsed
- m_szCollapsed = GetBestSize();
+ GtkRequisition req;
+ req.width = 2;
+ req.height = 2;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+ (m_widget, &req );
+
+ m_szCollapsed = wxSize( req.width, req.height );
+
+ g_signal_connect (m_pPane->m_widget, "map_event",
+ G_CALLBACK (gtk_collpane_map_unmap_callback), this);
+ g_signal_connect (m_pPane->m_widget, "unmap_event",
+ G_CALLBACK (gtk_collpane_map_unmap_callback), this);
+
return true;
}
wxSize wxCollapsiblePane::DoGetBestSize() const
{
- if (!gtk_check_version(2,4,0))
+ wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
+
+ wxSize sz = m_szCollapsed;
+ if ( IsExpanded() )
{
- wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
+ wxSize panesz = GetPane()->GetBestSize();
+ sz.x = wxMax(sz.x, panesz.x);
+ sz.y += gtk_expander_get_spacing(GTK_EXPANDER(m_widget)) + panesz.y;
+ }
- GtkRequisition req;
- req.width = 2;
- req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
- (m_widget, &req );
+ return sz;
+}
- // notice that we do not cache our best size here as it changes
- // all times the user expands/hide our pane
- return wxSize(req.width, req.height);
- }
+GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const
+{
+ GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) );
+ windows.Add( label->window );
+ windows.Add( m_widget->window );
- return wxGenericCollapsiblePane::DoGetBestSize();
+ return NULL;
}
void wxCollapsiblePane::Collapse(bool collapse)
{
- if (!gtk_check_version(2,4,0))
- {
- // optimization
- if (IsCollapsed() == collapse)
- return;
+ // optimization
+ if (IsCollapsed() == collapse)
+ return;
- // do not send event in next signal handler call
- m_bIgnoreNextChange = true;
- gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse);
- }
- else
- wxGenericCollapsiblePane::Collapse(collapse);
+ // do not send event in next signal handler call
+ m_bIgnoreNextChange = true;
+ gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse);
}
bool wxCollapsiblePane::IsCollapsed() const
{
- if (!gtk_check_version(2,4,0))
- return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget));
-
- return wxGenericCollapsiblePane::IsCollapsed();
+ return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget));
}
void wxCollapsiblePane::SetLabel(const wxString &str)
{
- if (!gtk_check_version(2,4,0))
- {
- gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str));
+ gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str));
- // FIXME: we need to update our collapsed width in some way but using GetBestSize()
- // we may get the size of the control with the pane size summed up if we are expanded!
- //m_szCollapsed.x = GetBestSize().x;
- }
- else
- wxGenericCollapsiblePane::SetLabel(str);
+ // FIXME: we need to update our collapsed width in some way but using GetBestSize()
+ // we may get the size of the control with the pane size summed up if we are expanded!
+ //m_szCollapsed.x = GetBestSize().x;
}
void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
#endif
// 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!
+ // is expanded or shrunk, the pane window won't be updated!
m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y);
- // we need to explicitely call m_pPane->Layout() or else it won't correctly relayout
+ // we need to explicitly call m_pPane->Layout() or else it won't correctly relayout
// (even if SetAutoLayout(true) has been called on it!)
m_pPane->Layout();
}
-#endif // wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)
projects / wxWidgets.git / blobdiff