bulk whitespace removal patch #1198588 by gigaclon

[inkscape.git] / src / widgets / desktop-widget.cpp

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index b7832658fddef7284ba656f0b0814dc65c631836..2cd6f13d399dccd0e59e2dcaaee27e5d851f0114 100644 (file)
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -166,9 +166,6 @@ sp_desktop_widget_init (SPDesktopWidget *dtw)
 
     widget = GTK_WIDGET (dtw);
 
-    Gtk::VPaned* pane = manage( new Gtk::VPaned() );
-    pane->show_all();
-
     dtw->window = 0;
     
     dtw->desktop = NULL;
@@ -177,11 +174,7 @@ sp_desktop_widget_init (SPDesktopWidget *dtw)
 
     /* 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);
@@ -190,9 +183,9 @@ sp_desktop_widget_init (SPDesktopWidget *dtw)
     {
         using Inkscape::UI::Dialogs::SwatchesPanel;
 
-        SwatchesPanel* swatches = manage( new SwatchesPanel() );
+        SwatchesPanel* swatches = new SwatchesPanel();
         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);
@@ -327,6 +320,9 @@ sp_desktop_widget_init (SPDesktopWidget *dtw)
 
     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