#include "wx/sizer.h"
#include "wx/panel.h"
+#include <gtk/gtk.h>
#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
// 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))
// 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());
m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTAB_TRAVERSAL|wxNO_BORDER, wxS("wxCollapsiblePanePane"));
- gtk_widget_show(m_widget);
m_parent->DoAddChild( this );
PostCreation(size);
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
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 );
+ windows.Add(gtk_widget_get_window(label));
+ windows.Add(gtk_widget_get_window(m_widget));
return NULL;
}