fltk
/
fltk
mirror of https://github.com/fltk/fltk.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Get rid of CR's in some files... 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1887 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
pull/168/head
Michael R Sweet 24 years ago
parent
128526fc28
commit
707972408b
8 changed files with 955 additions and 955 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Fl_Gl_Window.cxx
  2. 8
      test/CubeView.cxx
  3. 38
      test/browser.cxx
  4. 14
      test/demo.cxx
  5. 10
      test/forms.cxx
  6. 52
      test/keyboard.cxx
  7. 1404
      test/keyboard_ui.fl
  8. 378
      test/valuators.fl

6
src/Fl_Gl_Window.cxx
Unescape View File

@ -1,5 +1,5 @@
// //
// "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.6 2001/12/19 09:10:00 matthiaswm Exp $" // "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.7 2001/12/21 14:35:33 easysw Exp $"
// //
// OpenGL window code for the Fast Light Tool Kit (FLTK). // OpenGL window code for the Fast Light Tool Kit (FLTK).
// //
@ -151,7 +151,7 @@ void Fl_Gl_Window::swap_buffers() {
#ifdef WIN32 #ifdef WIN32
# if HAVE_GL_OVERLAY # if HAVE_GL_OVERLAY
// Do not swap the overlay, to match GLX: // Do not swap the overlay, to match GLX:
BOOL ret = wglSwapLayerBuffers(Fl_X::i(this)->private_dc, WGL_SWAP_MAIN_PLANE); BOOL ret = wglSwapLayerBuffers(Fl_X::i(this)->private_dc, WGL_SWAP_MAIN_PLANE);
DWORD err = GetLastError();; DWORD err = GetLastError();;
# else # else
SwapBuffers(Fl_X::i(this)->private_dc); SwapBuffers(Fl_X::i(this)->private_dc);
@ -368,5 +368,5 @@ void Fl_Gl_Window::draw_overlay() {}
#endif #endif
// //
// End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.6 2001/12/19 09:10:00 matthiaswm Exp $". // End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.22.2.7 2001/12/21 14:35:33 easysw Exp $".
// //

8
test/CubeView.cxx
Unescape View File

@ -1,5 +1,5 @@
// //
// "$Id: CubeView.cxx,v 1.4.2.4.2.1 2001/12/01 01:54:30 matthiaswm Exp $" // "$Id: CubeView.cxx,v 1.4.2.4.2.2 2001/12/21 14:35:33 easysw Exp $"
// //
// CubeView class implementation for the Fast Light Tool Kit (FLTK). // CubeView class implementation for the Fast Light Tool Kit (FLTK).
// //
@ -37,8 +37,8 @@ CubeView::CubeView(int x,int y,int w,int h,const char *l)
{ {
vAng = 0.0; vAng = 0.0;
hAng=0.0; hAng=0.0;
size=10.0; size=10.0;
xshift=0.0; xshift=0.0;
yshift=0.0; yshift=0.0;
/* The cube definition. These are the vertices of a unit cube /* The cube definition. These are the vertices of a unit cube
@ -167,5 +167,5 @@ void CubeView::draw() {
#endif /* HAVE_GL */ #endif /* HAVE_GL */
// //
// End of "$Id: CubeView.cxx,v 1.4.2.4.2.1 2001/12/01 01:54:30 matthiaswm Exp $". // End of "$Id: CubeView.cxx,v 1.4.2.4.2.2 2001/12/21 14:35:33 easysw Exp $".
// //

38
test/browser.cxx
Unescape View File

@ -1,5 +1,5 @@
// //
// "$Id: browser.cxx,v 1.5.2.6.2.2 2001/12/01 01:54:30 matthiaswm Exp $" // "$Id: browser.cxx,v 1.5.2.6.2.3 2001/12/21 14:35:33 easysw Exp $"
// //
// Browser test program for the Fast Light Tool Kit (FLTK). // Browser test program for the Fast Light Tool Kit (FLTK).
// //
@ -113,25 +113,25 @@ int main(int argc, char **argv) {
browser->callback(b_cb); browser->callback(b_cb);
// browser->scrollbar_right(); // browser->scrollbar_right();
//browser->has_scrollbar(Fl_Browser::BOTH_ALWAYS); //browser->has_scrollbar(Fl_Browser::BOTH_ALWAYS);
if (!browser->load(fname)) { if (!browser->load(fname)) {
#ifdef _MSC_VER #ifdef _MSC_VER
// if 'browser' was started from the VisualC environment in Win32, // if 'browser' was started from the VisualC environment in Win32,
// the current directory is set to the environment itself, // the current directory is set to the environment itself,
// so we need to correct the browser file path // so we need to correct the browser file path
int done = 1; int done = 1;
if ( i == argc ) if ( i == argc )
{ {
fname = "../test/browser.cxx"; fname = "../test/browser.cxx";
done = browser->load(fname); done = browser->load(fname);
} }
if ( !done ) if ( !done )
{ {
printf("Can't load %s, %s\n", fname, strerror(errno)); printf("Can't load %s, %s\n", fname, strerror(errno));
exit(1); exit(1);
} }
#else #else
printf("Can't load %s, %s\n", fname, strerror(errno)); printf("Can't load %s, %s\n", fname, strerror(errno));
exit(1); exit(1);
#endif #endif
} }
browser->position(0); browser->position(0);
@ -157,6 +157,6 @@ int main(int argc, char **argv) {
} }
// //
// End of "$Id: browser.cxx,v 1.5.2.6.2.2 2001/12/01 01:54:30 matthiaswm Exp $". // End of "$Id: browser.cxx,v 1.5.2.6.2.3 2001/12/21 14:35:33 easysw Exp $".
// //

14
test/demo.cxx
Unescape View File

@ -1,5 +1,5 @@
// //
// "$Id: demo.cxx,v 1.8.2.5.2.3 2001/12/01 01:54:30 matthiaswm Exp $" // "$Id: demo.cxx,v 1.8.2.5.2.4 2001/12/21 14:35:33 easysw Exp $"
// //
// Main demo program for the Fast Light Tool Kit (FLTK). // Main demo program for the Fast Light Tool Kit (FLTK).
// //
@ -316,11 +316,11 @@ int main(int argc, char **argv) {
putenv("FLTK_DOCDIR=../documentation"); putenv("FLTK_DOCDIR=../documentation");
create_the_forms(); create_the_forms();
char buf[256]; char buf[256];
strcpy(buf, argv[0]); strcpy(buf, argv[0]);
#if defined _MSC_VER && defined _DEBUG #if defined _MSC_VER && defined _DEBUG
// MS_VisualC appends a 'd' to debugging executables. remove it. // MS_VisualC appends a 'd' to debugging executables. remove it.
filename_setext( buf, "" ); filename_setext( buf, "" );
buf[ strlen(buf)-1 ] = 0; buf[ strlen(buf)-1 ] = 0;
#endif #endif
filename_setext(buf,".menu"); filename_setext(buf,".menu");
const char *fname = buf; const char *fname = buf;
@ -340,6 +340,6 @@ int main(int argc, char **argv) {
} }
// //
// End of "$Id: demo.cxx,v 1.8.2.5.2.3 2001/12/01 01:54:30 matthiaswm Exp $". // End of "$Id: demo.cxx,v 1.8.2.5.2.4 2001/12/21 14:35:33 easysw Exp $".
// //

10
test/forms.cxx
Unescape View File

@ -1,5 +1,5 @@
// //
// "$Id: forms.cxx,v 1.4.2.4.2.1 2001/12/01 01:54:30 matthiaswm Exp $" // "$Id: forms.cxx,v 1.4.2.4.2.2 2001/12/21 14:35:34 easysw Exp $"
// //
// Another forms demo for the Fast Light Tool Kit (FLTK). // Another forms demo for the Fast Light Tool Kit (FLTK).
// //
@ -60,9 +60,9 @@ static VN_struct btypes[]=
{FL_ROUNDED3D_UPBOX,"rounded3d upbox"}, {FL_ROUNDED3D_UPBOX,"rounded3d upbox"},
{FL_ROUNDED3D_DOWNBOX,"rounded3d downbox"}, {FL_ROUNDED3D_DOWNBOX,"rounded3d downbox"},
{FL_OVAL3D_UPBOX,"oval3d upbox"}, {FL_OVAL3D_UPBOX,"oval3d upbox"},
{FL_OVAL3D_DOWNBOX,"oval3d downbox"}, {FL_OVAL3D_DOWNBOX,"oval3d downbox"},
{FL_PLASTIC_UP_BOX,"plastic upbox"}, {FL_PLASTIC_UP_BOX,"plastic upbox"},
{FL_PLASTIC_DOWN_BOX,"plastic downbox"}, {FL_PLASTIC_DOWN_BOX,"plastic downbox"},
/* sentinel */ /* sentinel */
{-1} {-1}
}; };
@ -231,5 +231,5 @@ main (int argc, char *argv[])
} }
// //
// End of "$Id: forms.cxx,v 1.4.2.4.2.1 2001/12/01 01:54:30 matthiaswm Exp $". // End of "$Id: forms.cxx,v 1.4.2.4.2.2 2001/12/21 14:35:34 easysw Exp $".
// //

52
test/keyboard.cxx
Unescape View File

@ -1,5 +1,5 @@
// //
// "$Id: keyboard.cxx,v 1.5.2.3.2.1 2001/12/01 01:54:30 matthiaswm Exp $" // "$Id: keyboard.cxx,v 1.5.2.3.2.2 2001/12/21 14:35:34 easysw Exp $"
// //
// Keyboard/event test program for the Fast Light Tool Kit (FLTK). // Keyboard/event test program for the Fast Light Tool Kit (FLTK).
// //
@ -36,39 +36,39 @@
// //
// Please report all bugs and problems to "fltk-bugs@fltk.org". // Please report all bugs and problems to "fltk-bugs@fltk.org".
// //
#include <stdio.h> #include <stdio.h>
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/Fl_Window.H> #include <FL/Fl_Window.H>
class MyWindow : public Fl_Window { class MyWindow : public Fl_Window {
int handle(int); int handle(int);
public: public:
MyWindow(int w, int h, const char *t=0L) MyWindow(int w, int h, const char *t=0L)
: Fl_Window( w, h, t ) { } : Fl_Window( w, h, t ) { }
}; };
#include "keyboard_ui.cxx" #include "keyboard_ui.cxx"
// these are used to identify which buttons are which: // these are used to identify which buttons are which:
void key_cb(Fl_Button*, void*) {} void key_cb(Fl_Button*, void*) {}
void shift_cb(Fl_Button*, void*) {} void shift_cb(Fl_Button*, void*) {}
void wheel_cb(Fl_Button*, void*) {} void wheel_cb(Fl_Button*, void*) {}
// this is used to stop Esc from exiting the program: // this is used to stop Esc from exiting the program:
int handle(int e) { int handle(int e) {
return (e == FL_SHORTCUT); // eat all keystrokes return (e == FL_SHORTCUT); // eat all keystrokes
} }
int MyWindow::handle(int msg) { int MyWindow::handle(int msg) {
if (msg==FL_MOUSEWHEEL) if (msg==FL_MOUSEWHEEL)
{ {
roller->value( roller->value() + Fl::e_dy * roller->step() ); roller->value( roller->value() + Fl::e_dy * roller->step() );
return 1; return 1;
} }
return 0; return 0;
} }
struct {int n; const char* text;} table[] = { struct {int n; const char* text;} table[] = {
{FL_Escape, "FL_Escape"}, {FL_Escape, "FL_Escape"},
@ -142,11 +142,11 @@ int main(int argc, char** argv) {
} }
key_output->value(keyname); key_output->value(keyname);
text_output->value(Fl::event_text()); text_output->value(Fl::event_text());
} }
return 0; return 0;
} }
// //
// End of "$Id: keyboard.cxx,v 1.5.2.3.2.1 2001/12/01 01:54:30 matthiaswm Exp $". // End of "$Id: keyboard.cxx,v 1.5.2.3.2.2 2001/12/21 14:35:34 easysw Exp $".
// //

1404
test/keyboard_ui.fl
View File

File diff suppressed because it is too large Load Diff

378
test/valuators.fl
Unescape View File

@ -1,189 +1,189 @@
# data file for the Fltk User Interface Designer (fluid) # data file for the Fltk User Interface Designer (fluid)
version 1.0100 version 1.0100
header_name {.h} header_name {.h}
code_name {.cxx} code_name {.cxx}
gridx 5 gridx 5
gridy 5 gridy 5
snap 3 snap 3
Function {callback(Fl_Widget* o, void*)} {open private return_type void Function {callback(Fl_Widget* o, void*)} {open private return_type void
} { } {
code {printf("%g \\r", ((Fl_Valuator*)o)->value()); code {printf("%g \\r", ((Fl_Valuator*)o)->value());
fflush(stdout);} {} fflush(stdout);} {}
} }
Function {} {open Function {} {open
} { } {
Fl_Window {} { Fl_Window {} {
label {Valuator classes, showing values for type()} open label {Valuator classes, showing values for type()} open
xywh {382 441 567 506} color 43 selection_color 43 xywh {382 441 567 506} color 43 selection_color 43
code0 {\#include <stdio.h>} visible code0 {\#include <stdio.h>} visible
} { } {
Fl_Box {} { Fl_Box {} {
label Fl_Slider label Fl_Slider
xywh {10 10 280 210} box ENGRAVED_BOX labelfont 1 align 17 xywh {10 10 280 210} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Slider {} { Fl_Slider {} {
label 0 label 0
callback callback callback callback
xywh {30 45 20 145} selection_color 1 labelsize 8 align 1 xywh {30 45 20 145} selection_color 1 labelsize 8 align 1
} }
Fl_Slider {} { Fl_Slider {} {
label FL_VERT_FILL_SLIDER label FL_VERT_FILL_SLIDER
callback callback callback callback
xywh {70 55 20 145} type {Vert Fill} selection_color 1 labelsize 8 xywh {70 55 20 145} type {Vert Fill} selection_color 1 labelsize 8
} }
Fl_Slider {} { Fl_Slider {} {
label FL_VERT_NICE_SLIDER label FL_VERT_NICE_SLIDER
callback callback callback callback
xywh {105 45 20 145} type {Vert Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8 align 1 xywh {105 45 20 145} type {Vert Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8 align 1
} }
Fl_Box {} { Fl_Box {} {
label Fl_Value_Slider label Fl_Value_Slider
xywh {10 230 280 205} box ENGRAVED_BOX labelfont 1 align 17 xywh {10 230 280 205} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Value_Slider {} { Fl_Value_Slider {} {
label 0 label 0
callback callback callback callback
xywh {30 260 30 145} selection_color 1 labelsize 8 align 1 xywh {30 260 30 145} selection_color 1 labelsize 8 align 1
} }
Fl_Value_Slider {} { Fl_Value_Slider {} {
label FL_VERT_FILL_SLIDER label FL_VERT_FILL_SLIDER
callback callback callback callback
xywh {70 275 30 140} type {Vert Fill} selection_color 1 labelsize 8 xywh {70 275 30 140} type {Vert Fill} selection_color 1 labelsize 8
} }
Fl_Value_Slider {} { Fl_Value_Slider {} {
label FL_VERT_NICE_SLIDER label FL_VERT_NICE_SLIDER
callback callback callback callback
xywh {110 260 20 145} type {Vert Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8 align 1 xywh {110 260 20 145} type {Vert Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8 align 1
} }
Fl_Slider {} { Fl_Slider {} {
label FL_HORIZONTAL label FL_HORIZONTAL
callback callback callback callback
xywh {140 80 130 20} type Horizontal selection_color 1 labelsize 8 xywh {140 80 130 20} type Horizontal selection_color 1 labelsize 8
} }
Fl_Slider {} { Fl_Slider {} {
label FL_HOR_FILL_SLIDER label FL_HOR_FILL_SLIDER
callback callback callback callback
xywh {140 120 130 20} type {Horz Fill} selection_color 1 labelsize 8 xywh {140 120 130 20} type {Horz Fill} selection_color 1 labelsize 8
} }
Fl_Slider {} { Fl_Slider {} {
label FL_HOR_NICE_SLIDER label FL_HOR_NICE_SLIDER
callback callback callback callback
xywh {140 160 130 20} type {Horz Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8 xywh {140 160 130 20} type {Horz Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8
} }
Fl_Value_Slider {} { Fl_Value_Slider {} {
label FL_HOR_SLIDER label FL_HOR_SLIDER
callback callback callback callback
xywh {140 290 130 20} type Horizontal selection_color 1 labelsize 8 xywh {140 290 130 20} type Horizontal selection_color 1 labelsize 8
} }
Fl_Value_Slider {} { Fl_Value_Slider {} {
label FL_HOR_FILL_SLIDER label FL_HOR_FILL_SLIDER
callback callback callback callback
xywh {140 330 130 20} type {Horz Fill} selection_color 1 labelsize 8 xywh {140 330 130 20} type {Horz Fill} selection_color 1 labelsize 8
} }
Fl_Box {} { Fl_Box {} {
label Fl_Adjuster label Fl_Adjuster
xywh {430 10 125 120} box ENGRAVED_BOX labelfont 1 align 17 xywh {430 10 125 120} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Value_Slider {} { Fl_Value_Slider {} {
label FL_HOR_NICE_SLIDER label FL_HOR_NICE_SLIDER
callback callback selected callback callback selected
xywh {140 370 130 20} type {Horz Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8 xywh {140 370 130 20} type {Horz Knob} box FLAT_BOX color 10 selection_color 1 labelsize 8
} }
Fl_Adjuster {} { Fl_Adjuster {} {
label {w()>h()} label {w()>h()}
callback callback callback callback
xywh {440 60 75 25} labelsize 8 xywh {440 60 75 25} labelsize 8
} }
Fl_Adjuster {} { Fl_Adjuster {} {
label {w()<h()} label {w()<h()}
callback callback callback callback
xywh {520 35 25 75} labelsize 8 xywh {520 35 25 75} labelsize 8
} }
Fl_Box {} { Fl_Box {} {
label Fl_Counter label Fl_Counter
xywh {345 135 210 115} box ENGRAVED_BOX labelfont 1 align 17 xywh {345 135 210 115} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Counter {} { Fl_Counter {} {
label 0 label 0
callback callback callback callback
xywh {360 160 180 30} labelsize 8 xywh {360 160 180 30} labelsize 8
} }
Fl_Counter {} { Fl_Counter {} {
label FL_SIMPLE_COUNTER label FL_SIMPLE_COUNTER
callback callback callback callback
xywh {360 205 180 30} type Simple labelsize 8 xywh {360 205 180 30} type Simple labelsize 8
} }
Fl_Box {} { Fl_Box {} {
label Fl_Dial label Fl_Dial
xywh {300 260 255 105} box ENGRAVED_BOX labelfont 1 align 17 xywh {300 260 255 105} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Dial {} { Fl_Dial {} {
label 0 label 0
callback callback callback callback
xywh {315 280 65 65} color 10 selection_color 1 labelsize 8 value 0.5 xywh {315 280 65 65} color 10 selection_color 1 labelsize 8 value 0.5
code0 {o->angles(0,315);} code0 {o->angles(0,315);}
} }
Fl_Dial {} { Fl_Dial {} {
label FL_LINE_DIAL label FL_LINE_DIAL
callback callback callback callback
xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8 value 0.5 xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8 value 0.5
} }
Fl_Dial {} { Fl_Dial {} {
label FL_FILL_DIAL label FL_FILL_DIAL
callback callback callback callback
xywh {475 280 65 65} type Fill color 10 selection_color 1 labelsize 8 value 1 xywh {475 280 65 65} type Fill color 10 selection_color 1 labelsize 8 value 1
code0 {o->angles(0,360);} code0 {o->angles(0,360);}
} }
Fl_Box {} { Fl_Box {} {
label Fl_Roller label Fl_Roller
xywh {300 375 145 120} box ENGRAVED_BOX labelfont 1 align 17 xywh {300 375 145 120} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Roller {} { Fl_Roller {} {
label 0 label 0
callback callback callback callback
xywh {315 390 20 95} labelsize 8 xywh {315 390 20 95} labelsize 8
} }
Fl_Roller {} { Fl_Roller {} {
label FL_HORIZONTAL label FL_HORIZONTAL
callback callback callback callback
xywh {340 430 90 20} type Horizontal labelsize 8 xywh {340 430 90 20} type Horizontal labelsize 8
} }
Fl_Box {} { Fl_Box {} {
label Fl_Value_Input label Fl_Value_Input
xywh {10 445 140 50} box ENGRAVED_BOX labelfont 1 align 17 xywh {10 445 140 50} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Box {} { Fl_Box {} {
label {Some widgets have color(FL_GREEN) and color2(FL_RED) to show the areas these effect.} label {Some widgets have color(FL_GREEN) and color2(FL_RED) to show the areas these effect.}
xywh {455 375 100 120} box BORDER_FRAME color 0 selection_color 0 labelsize 10 align 128 xywh {455 375 100 120} box BORDER_FRAME color 0 selection_color 0 labelsize 10 align 128
} }
Fl_Box {} { Fl_Box {} {
label Fl_Value_Output label Fl_Value_Output
xywh {155 445 135 50} box ENGRAVED_BOX labelfont 1 align 17 xywh {155 445 135 50} box ENGRAVED_BOX labelfont 1 align 17
} }
Fl_Value_Input {} { Fl_Value_Input {} {
label 0 label 0
callback callback callback callback
xywh {30 460 110 30} labelsize 8 maximum 100 step 0.1 xywh {30 460 110 30} labelsize 8 maximum 100 step 0.1
} }
Fl_Value_Output {} { Fl_Value_Output {} {
label 0 label 0
callback callback callback callback
xywh {170 460 110 30} labelsize 8 maximum 100 step 0.1 xywh {170 460 110 30} labelsize 8 maximum 100 step 0.1
} }
Fl_Box {} { Fl_Box {} {
label { Fl_Scrollbar} label { Fl_Scrollbar}
xywh {295 10 130 120} box ENGRAVED_BOX labelfont 1 align 21 xywh {295 10 130 120} box ENGRAVED_BOX labelfont 1 align 21
} }
Fl_Scrollbar {} { Fl_Scrollbar {} {
label 0 label 0
callback callback callback callback
xywh {395 20 20 105} labelsize 8 align 1 maximum 100 slider_size 0.3 xywh {395 20 20 105} labelsize 8 align 1 maximum 100 slider_size 0.3
} }
Fl_Scrollbar {} { Fl_Scrollbar {} {
label FL_HORIZONTAL label FL_HORIZONTAL
callback callback callback callback
xywh {300 65 95 20} type Horizontal labelsize 8 maximum 100 slider_size 0.3 xywh {300 65 95 20} type Horizontal labelsize 8 maximum 100 slider_size 0.3
} }
} }
} }

Write Preview
Loading…
Cancel
Save