diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-01-28 02:21:46 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-01-28 02:21:46 +0000 |
| commit | 084bf8fc6790974922561fabf23d2330711f501c (patch) | |
| tree | bf6be45caf0e20f58eae1a453c8ebe290412e9fa /src/widgets/desktop-widget.cpp | |
| parent | remove second label from ToleranceSlider, fixes #1407428 (diff) | |
| download | inkscape-084bf8fc6790974922561fabf23d2330711f501c.tar.gz inkscape-084bf8fc6790974922561fabf23d2330711f501c.zip | |
Reverted Gtk::VPaned to avoid taking up F6 and F8
(bzr r40)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 311f93a1c..2cd6f13d3 100644 --- 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); |