Skip to content

Commit

Permalink
- sorted fluid menu bar
Browse files Browse the repository at this point in the history 
- fixed some minor Valgrind memory checker complaints
- added conditional compile flag for OS X w/ MetroWerks compiler


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2967 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Matthias Melcher committed Apr 3, 2003
1 parent 14b142f commit 7903799
Show file tree
Hide file tree
Showing 9 changed files with 173 additions and 166 deletions.
4 changes: 4 additions & 0 deletions CHANGES
View file
@@ -1,5 +1,9 @@
CHANGES IN FLTK 1.1.4

- Sorted the icon menu bar in fluid.
- Fixed minor memory access complaints from Valgrind
- Compiling src/flstring.h on OS X with BSD header
would fail.
- Fl_Text_Editor didn't scroll the buffer when the user
pressed Ctrl+End or Ctrl+Home.
- Fl_Text_Editor didn't show its cursor when the mouse
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Expand Up @@ -188,7 +188,7 @@ COPYRIGHT
Gustavo Hime (hime@users.sourceforge.net)
Talbot Hughes
Robert Kesterson (robertk@users.sourceforge.net)
Matthias Melcher (matthias@users.sourceforge.net)
Matthias Melcher (matthiaswm@users.sourceforge.net)
James Dean Palmer (jamespalmer@users.sourceforge.net)
Vincent Penne (vincentp@users.sourceforge.net)
Michael Sweet (easysw@users.sourceforge.net)
Expand Down
122 changes: 61 additions & 61 deletions fluid/function_panel.cxx
View file
@@ -1,4 +1,4 @@
// generated by Fast Light User Interface Designer (fluid) version 1.0103
// generated by Fast Light User Interface Designer (fluid) version 1.0104

#include "function_panel.h"
#include <FL/Fl_Pixmap.H>
Expand Down Expand Up @@ -334,42 +334,42 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Window"));
o->image(pixmap[1]);
}
{ Fl_Button* o = new Fl_Button(56, 28, 24, 24);
o->tooltip("Tabs");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tabs"));
o->image(pixmap[13]);
}
{ Fl_Button* o = new Fl_Button(56, 52, 24, 24);
o->tooltip("Tile");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tile"));
o->image(pixmap[20]);
}
{ Fl_Button* o = new Fl_Button(80, 4, 24, 24);
o->tooltip("Group");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Group"));
o->image(pixmap[6]);
}
{ Fl_Button* o = new Fl_Button(104, 4, 24, 24);
o->tooltip("Pack");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Pack"));
o->image(pixmap[22]);
}
{ Fl_Button* o = new Fl_Button(56, 28, 24, 24);
o->tooltip("Tabs");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tabs"));
o->image(pixmap[13]);
}
{ Fl_Button* o = new Fl_Button(80, 28, 24, 24);
o->tooltip("Scroll");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scroll"));
o->image(pixmap[19]);
}
{ Fl_Button* o = new Fl_Button(56, 52, 24, 24);
o->tooltip("Tile");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tile"));
o->image(pixmap[20]);
}
{ Fl_Button* o = new Fl_Button(80, 52, 24, 24);
o->tooltip("Wizard");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Wizard"));
o->image(pixmap[21]);
}
{ Fl_Button* o = new Fl_Button(104, 4, 24, 24);
o->tooltip("Pack");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Pack"));
o->image(pixmap[22]);
}
o->end();
}
{ Fl_Group* o = new Fl_Group(131, 3, 50, 74);
Expand Down Expand Up @@ -426,6 +426,12 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scrollbar"));
o->image(pixmap[38]);
}
{ Fl_Button* o = new Fl_Button(232, 4, 24, 24);
o->tooltip("Value Slider");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Slider"));
o->image(pixmap[39]);
}
{ Fl_Button* o = new Fl_Button(184, 28, 24, 24);
o->tooltip("Adjuster");
o->box(FL_THIN_UP_BOX);
Expand All @@ -438,6 +444,12 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Counter"));
o->image(pixmap[41]);
}
{ Fl_Button* o = new Fl_Button(232, 28, 24, 24);
o->tooltip("Dial");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Dial"));
o->image(pixmap[42]);
}
{ Fl_Button* o = new Fl_Button(184, 52, 24, 24);
o->tooltip("Roller");
o->box(FL_THIN_UP_BOX);
Expand All @@ -450,18 +462,6 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Input"));
o->image(pixmap[44]);
}
{ Fl_Button* o = new Fl_Button(232, 4, 24, 24);
o->tooltip("Value Slider");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Slider"));
o->image(pixmap[39]);
}
{ Fl_Button* o = new Fl_Button(232, 28, 24, 24);
o->tooltip("Dial");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Dial"));
o->image(pixmap[42]);
}
{ Fl_Button* o = new Fl_Button(232, 52, 24, 24);
o->tooltip("Value Output");
o->box(FL_THIN_UP_BOX);
Expand All @@ -478,30 +478,30 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input"));
o->image(pixmap[14]);
}
{ Fl_Button* o = new Fl_Button(260, 28, 24, 24);
o->tooltip("Text Edit");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Editor"));
o->image(pixmap[29]);
}
{ Fl_Button* o = new Fl_Button(260, 52, 24, 24);
o->tooltip("File Input");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Input"));
o->image(pixmap[30]);
}
{ Fl_Button* o = new Fl_Button(284, 4, 24, 24);
o->tooltip("Output");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Output"));
o->image(pixmap[27]);
}
{ Fl_Button* o = new Fl_Button(260, 28, 24, 24);
o->tooltip("Text Edit");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Editor"));
o->image(pixmap[29]);
}
{ Fl_Button* o = new Fl_Button(284, 28, 24, 24);
o->tooltip("Text Display");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Display"));
o->image(pixmap[28]);
}
{ Fl_Button* o = new Fl_Button(260, 52, 24, 24);
o->tooltip("File Input");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Input"));
o->image(pixmap[30]);
}
o->end();
}
{ Fl_Group* o = new Fl_Group(311, 3, 50, 74);
Expand All @@ -512,30 +512,30 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Bar"));
o->image(pixmap[17]);
}
{ Fl_Button* o = new Fl_Button(312, 28, 24, 24);
o->tooltip("Menu Button");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Button"));
o->image(pixmap[26]);
}
{ Fl_Button* o = new Fl_Button(312, 52, 24, 24);
o->tooltip("Choice");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Choice"));
o->image(pixmap[15]);
}
{ Fl_Button* o = new Fl_Button(336, 4, 24, 24);
o->tooltip("Menu Item");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("menuitem"));
o->image(pixmap[16]);
}
{ Fl_Button* o = new Fl_Button(312, 28, 24, 24);
o->tooltip("Menu Button");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Button"));
o->image(pixmap[26]);
}
{ Fl_Button* o = new Fl_Button(336, 28, 24, 24);
o->tooltip("Sub Menu");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("submenu"));
o->image(pixmap[18]);
}
{ Fl_Button* o = new Fl_Button(312, 52, 24, 24);
o->tooltip("Choice");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Choice"));
o->image(pixmap[15]);
}
o->end();
}
{ Fl_Group* o = new Fl_Group(363, 3, 26, 74);
Expand Down Expand Up @@ -568,6 +568,12 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Box"));
o->image(pixmap[5]);
}
{ Fl_Button* o = new Fl_Button(416, 4, 24, 24);
o->tooltip("Clock");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock"));
o->image(pixmap[34]);
}
{ Fl_Button* o = new Fl_Button(392, 28, 24, 24);
o->tooltip("Help Browser");
o->box(FL_THIN_UP_BOX);
Expand All @@ -580,12 +586,6 @@ Fl_Double_Window* make_widgetbin() {
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Progress"));
o->image(pixmap[36]);
}
{ Fl_Button* o = new Fl_Button(416, 4, 24, 24);
o->tooltip("Clock");
o->box(FL_THIN_UP_BOX);
o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock"));
o->image(pixmap[34]);
}
o->end();
}
o->size(o->w(),80);
Expand Down

0 comments on commit 7903799

Please sign in to comment.