From 4afcc1762c71b63499200943e3a00a13ddd1a3ee Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 21 Mar 2005 19:57:50 +0000 Subject: [PATCH] Fix order of output mode buttons... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4161 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/print_panel.cxx | 18 +++++++++--------- fluid/print_panel.fl | 11 +++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx index fcc9d5a49..fc3f281cf 100644 --- a/fluid/print_panel.cxx +++ b/fluid/print_panel.cxx @@ -465,15 +465,7 @@ Fl_Double_Window* make_print_panel() { o->selection_color(FL_FOREGROUND_COLOR); o->image(image_print_color); } - { Fl_Button* o = print_output_mode[1] = new Fl_Button(200, 45, 30, 40); - o->type(102); - o->box(FL_BORDER_BOX); - o->down_box(FL_BORDER_BOX); - o->color(FL_BACKGROUND2_COLOR); - o->selection_color(FL_FOREGROUND_COLOR); - o->image(image_print_gray); - } - { Fl_Button* o = print_output_mode[2] = new Fl_Button(150, 50, 40, 30); + { Fl_Button* o = print_output_mode[1] = new Fl_Button(150, 50, 40, 30); o->type(102); o->box(FL_BORDER_BOX); o->down_box(FL_BORDER_BOX); @@ -481,6 +473,14 @@ Fl_Double_Window* make_print_panel() { o->selection_color(FL_FOREGROUND_COLOR); o->image(image_print_color); } + { Fl_Button* o = print_output_mode[2] = new Fl_Button(200, 45, 30, 40); + o->type(102); + o->box(FL_BORDER_BOX); + o->down_box(FL_BORDER_BOX); + o->color(FL_BACKGROUND2_COLOR); + o->selection_color(FL_FOREGROUND_COLOR); + o->image(image_print_gray); + } { Fl_Button* o = print_output_mode[3] = new Fl_Button(240, 50, 40, 30); o->type(102); o->box(FL_BORDER_BOX); diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl index 1500d243f..7ce6b4856 100644 --- a/fluid/print_panel.fl +++ b/fluid/print_panel.fl @@ -235,17 +235,17 @@ print_update_status();} open } } Fl_Group {} { - label {Output Mode:} + label {Output Mode:} open xywh {110 45 170 40} labelfont 1 align 4 } { - Fl_Button {print_output_mode[0]} { + Fl_Button {print_output_mode[0]} {selected image {pixmaps/print_color.xpm} xywh {110 45 30 40} type Radio box BORDER_BOX down_box BORDER_BOX value 1 color 7 selection_color 0 } Fl_Button {print_output_mode[1]} { - image {pixmaps/print_gray.xpm} xywh {200 45 30 40} type Radio box BORDER_BOX down_box BORDER_BOX color 7 selection_color 0 + image {pixmaps/print_color.xpm} xywh {150 50 40 30} type Radio box BORDER_BOX down_box BORDER_BOX color 7 selection_color 0 } Fl_Button {print_output_mode[2]} { - image {pixmaps/print_color.xpm} xywh {150 50 40 30} type Radio box BORDER_BOX down_box BORDER_BOX color 7 selection_color 0 + image {pixmaps/print_gray.xpm} xywh {200 45 30 40} type Radio box BORDER_BOX down_box BORDER_BOX color 7 selection_color 0 } Fl_Button {print_output_mode[3]} { image {pixmaps/print_gray.xpm} xywh {240 50 40 30} type Radio box BORDER_BOX down_box BORDER_BOX color 7 selection_color 0 @@ -355,8 +355,7 @@ print_page_size->value(val); snprintf(name, sizeof(name), "%s/output_mode", printer); fluid_prefs.get(name, val, 0); -print_output_mode[val]->setonly();} {selected - } +print_output_mode[val]->setonly();} {} } comment {