index b7832658fddef7284ba656f0b0814dc65c631836..ce7f683167cce23b1c92f35f2bcafa5bafdc1569 100644 (file)
{
GtkWidget *widget;
GtkWidget *tbl;
- GtkWidget *w;
GtkWidget *hbox;
GtkWidget *eventbox;
widget = GTK_WIDGET (dtw);
- Gtk::VPaned* pane = manage( new Gtk::VPaned() );
- pane->show_all();
-
dtw->window = 0;
dtw->desktop = NULL;
/* Main table */
dtw->vbox = gtk_vbox_new (FALSE, 0);
- gtk_container_add( GTK_CONTAINER(dtw), GTK_WIDGET(pane->gobj()) );
-
- Gtk::VBox* tmp = Glib::wrap( GTK_VBOX(dtw->vbox) );
- Gtk::VBox* boxWrap = manage( tmp );
- pane->pack1( *boxWrap, true, true );
+ gtk_container_add( GTK_CONTAINER(dtw), GTK_WIDGET(dtw->vbox) );
dtw->statusbar = gtk_hbox_new (FALSE, 0);
//gtk_widget_set_usize (dtw->statusbar, -1, BOTTOM_BAR_HEIGHT);
{
using Inkscape::UI::Dialogs::SwatchesPanel;
- SwatchesPanel* swatches = manage( new SwatchesPanel() );
+ SwatchesPanel* swatches = new SwatchesPanel();
+ swatches->setOrientation( Gtk::ANCHOR_SOUTH );
dtw->panels = GTK_WIDGET(swatches->gobj());
- pane->pack2( *swatches, false, true );
+ gtk_box_pack_end( GTK_BOX( dtw->vbox ), dtw->panels, FALSE, TRUE, 0 );
}
hbox = gtk_hbox_new (FALSE, 0);
gtk_table_attach (GTK_TABLE (tbl), dtw->vscrollbar_box, 2, 3, 0, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
/* Canvas */
- w = gtk_frame_new (NULL);
- gtk_table_attach (GTK_TABLE (tbl), w, 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
dtw->canvas = SP_CANVAS (sp_canvas_new_aa ());
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (dtw->canvas), GTK_CAN_FOCUS);
style = gtk_style_copy (GTK_WIDGET (dtw->canvas)->style);
gtk_widget_set_style (GTK_WIDGET (dtw->canvas), style);
gtk_widget_set_extension_events(GTK_WIDGET (dtw->canvas) , GDK_EXTENSION_EVENTS_ALL);
g_signal_connect (G_OBJECT (dtw->canvas), "event", G_CALLBACK (sp_desktop_widget_event), dtw);
- gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (dtw->canvas));
+ gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (dtw->canvas), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
dtw->selected_style = new Inkscape::UI::Widget::SelectedStyle(true);
GtkHBox *ss_ = dtw->selected_style->gobj();
dtw->select_status_eventbox = gtk_event_box_new ();
dtw->select_status = gtk_label_new (NULL);
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 6
+ gtk_label_set_ellipsize (GTK_LABEL(dtw->select_status), PANGO_ELLIPSIZE_END);
+#endif
gtk_misc_set_alignment (GTK_MISC (dtw->select_status), 0.0, 0.5);
gtk_widget_set_size_request (dtw->select_status, 1, -1);
// display the initial welcome message in the statusbar