Bring over combined fix [r12041/12042] from 1.3 current to the porting branch.

Added line numbers to Edit -> Show Source Code viewer (source + header tabs)
Fixes Aditya Siram's observation today on fltk.coredev.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12043 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 10 insertions, 2 deletions

diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index 6de712c96..c2412c370 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -1088,7 +1088,7 @@ Fl_Double_Window* make_sourceview() {
       sv_tab->callback((Fl_Callback*)update_sourceview_position_cb);
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Source");
         o->labelsize(13);
-        { sv_source = new CodeViewer(20, 50, 480, 390);
+        { CodeViewer* o = sv_source = new CodeViewer(20, 50, 480, 390);
           sv_source->box(FL_DOWN_FRAME);
           sv_source->color(FL_BACKGROUND2_COLOR);
           sv_source->selection_color(FL_SELECTION_COLOR);
@@ -1101,6 +1101,8 @@ Fl_Double_Window* make_sourceview() {
           sv_source->align(Fl_Align(FL_ALIGN_TOP));
           sv_source->when(FL_WHEN_RELEASE);
           Fl_Group::current()->resizable(sv_source);
+          o->linenumber_width(60);
+          o->linenumber_size(o->Fl_Text_Display::textsize());
         } // CodeViewer* sv_source
         o->end();
         Fl_Group::current()->resizable(o);
@@ -1108,7 +1110,7 @@ Fl_Double_Window* make_sourceview() {
       { Fl_Group* o = new Fl_Group(10, 35, 500, 415, "Header");
         o->labelsize(13);
         o->hide();
-        { sv_header = new CodeViewer(20, 50, 480, 390);
+        { CodeViewer* o = sv_header = new CodeViewer(20, 50, 480, 390);
           sv_header->box(FL_DOWN_FRAME);
           sv_header->color(FL_BACKGROUND2_COLOR);
           sv_header->selection_color(FL_SELECTION_COLOR);
@@ -1121,6 +1123,8 @@ Fl_Double_Window* make_sourceview() {
           sv_header->align(Fl_Align(FL_ALIGN_TOP));
           sv_header->when(FL_WHEN_RELEASE);
           Fl_Group::current()->resizable(sv_header);
+          o->linenumber_width(60);
+          o->linenumber_size(o->Fl_Text_Display::textsize());
         } // CodeViewer* sv_header
         o->end();
       } // Fl_Group* o
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index aaf97b8b1..0cd9609f7 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -905,6 +905,8 @@ Function {make_sourceview()} {} {
         Fl_Text_Editor sv_source {
           xywh {20 50 480 390} textfont 4 textsize 11 resizable
           code0 {\#include "CodeEditor.h"}
+          code1 {o->linenumber_width(60);}
+          code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
           class CodeViewer
         }
       }
@@ -915,6 +917,8 @@ Function {make_sourceview()} {} {
         Fl_Text_Editor sv_header {
           xywh {20 50 480 390} textfont 4 textsize 11 resizable
           code0 {\#include "CodeEditor.h"}
+          code1 {o->linenumber_width(60);}
+          code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
           class CodeViewer
         }
       }