X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e10110af0bf913550b6d336773fa5825e48fb12..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/collpane.cpp?ds=sidebyside diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index d312306ca3..cfda20564c 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -24,14 +24,16 @@ #include "wx/sizer.h" #include "wx/panel.h" +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.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 wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane"); +const char wxCollapsiblePaneNameStr[] = "collapsiblePane"; -DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED) +wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent ); IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) @@ -95,7 +97,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), // 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 + // (redraw/relayout/resize) so that it's flicker-free p->SetMinSize(sz); if (p->HasFlag(wxCP_NO_TLW_RESIZE)) @@ -104,7 +106,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); p->HandleWindowEvent(ev); - // the user asked to explicitely handle the resizing itself... + // the user asked to explicitly handle the resizing itself... return; } @@ -123,7 +125,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), // 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 + // dialog of GTK+>=2.4 is not resizable when the expander is // collapsed!) gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); @@ -148,15 +150,14 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), } } -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); } //----------------------------------------------------------------------------- @@ -189,6 +190,7 @@ bool wxCollapsiblePane::Create(wxWindow *parent, 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 @@ -196,19 +198,19 @@ bool wxCollapsiblePane::Create(wxWindow *parent, 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 - 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, wxS("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(); @@ -220,10 +222,12 @@ wxSize wxCollapsiblePane::DoGetBestSize() const wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); +#ifdef __WXGTK3__ + gtk_widget_get_preferred_width(m_widget, NULL, &req.width); + gtk_widget_get_preferred_height_for_width(m_widget, req.width, NULL, &req.height); +#else + GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req); +#endif // notice that we do not cache our best size here as it changes // all times the user expands/hide our pane @@ -248,7 +252,8 @@ bool wxCollapsiblePane::IsCollapsed() const void wxCollapsiblePane::SetLabel(const wxString &str) { - gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str)); + gtk_expander_set_label(GTK_EXPANDER(m_widget), + wxGTK_CONV(GTKConvertMnemonics(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! @@ -267,13 +272,23 @@ 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(); } + +GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const +{ + GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) ); + windows.Add(gtk_widget_get_window(label)); + windows.Add(gtk_widget_get_window(m_widget)); + + return NULL; +} + #endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)