summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1998-11-08 15:05:48 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1998-11-08 15:05:48 +0000
commita90ca2d60a0cdf699410be34fde62a03558715b4 (patch)
tree8764d77661768fa2bb1f4ccd60656cd41f0678f1 /src
parent4c68a1ca547f15de9b7b53173974cd1683b1535b (diff)
Patches from Bill:
- Box type problems with 2-pixel boxes (wrong colors) - Fl_Pixmap fix (uchar instead of char) - Style demo fixes for Windows. - HPUX comparison function prototype wrong. - Spelling errors... git-svn-id: file:///fltk/svn/fltk/trunk@70 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Browser_.cxx6
-rw-r--r--src/filename_list.cxx6
-rw-r--r--src/fl_boxtype.cxx6
-rw-r--r--src/fl_file_chooser.cxx12
4 files changed, 15 insertions, 15 deletions
diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx
index 0342b2d63..c8238984d 100644
--- a/src/Fl_Browser_.cxx
+++ b/src/Fl_Browser_.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Browser_.cxx,v 1.4 1998/10/21 14:19:57 mike Exp $"
+// "$Id: Fl_Browser_.cxx,v 1.5 1998/11/08 15:05:45 mike Exp $"
//
// Base Browser widget class for the Fast Light Tool Kit (FLTK).
//
@@ -326,7 +326,7 @@ J1:
else update_child(hscrollbar);
}
- // draw that little square between the scrolbars:
+ // draw that little square between the scrollbars:
if (drawsquare && scrollbar.visible() && hscrollbar.visible()) {
fl_color(parent()->color());
fl_rectf(scrollbar.x(), hscrollbar.y(), scrollbar_width_,scrollbar_width_);
@@ -627,5 +627,5 @@ void Fl_Browser_::item_select(void*, int) {}
int Fl_Browser_::item_selected(void* l) const {return l==selection_;}
//
-// End of "$Id: Fl_Browser_.cxx,v 1.4 1998/10/21 14:19:57 mike Exp $".
+// End of "$Id: Fl_Browser_.cxx,v 1.5 1998/11/08 15:05:45 mike Exp $".
//
diff --git a/src/filename_list.cxx b/src/filename_list.cxx
index b46e279d9..aa8fd91af 100644
--- a/src/filename_list.cxx
+++ b/src/filename_list.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: filename_list.cxx,v 1.5 1998/10/21 14:20:41 mike Exp $"
+// "$Id: filename_list.cxx,v 1.6 1998/11/08 15:05:45 mike Exp $"
//
// Filename list routines for the Fast Light Tool Kit (FLTK).
//
@@ -40,7 +40,7 @@ extern "C" {
}
int filename_list(const char *d, dirent ***list) {
-#if defined(_AIX) || defined(CRAY)
+#if defined(_AIX) || defined(CRAY) || defined(HPUX)
// on some systems you may need to do this, due to a rather common
// error in the prototype for the sorting function, where a level
// of pointer indirection is missing:
@@ -51,5 +51,5 @@ int filename_list(const char *d, dirent ***list) {
}
//
-// End of "$Id: filename_list.cxx,v 1.5 1998/10/21 14:20:41 mike Exp $".
+// End of "$Id: filename_list.cxx,v 1.6 1998/11/08 15:05:45 mike Exp $".
//
diff --git a/src/fl_boxtype.cxx b/src/fl_boxtype.cxx
index f18a83754..6666e53c9 100644
--- a/src/fl_boxtype.cxx
+++ b/src/fl_boxtype.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_boxtype.cxx,v 1.4 1998/10/21 14:20:44 mike Exp $"
+// "$Id: fl_boxtype.cxx,v 1.5 1998/11/08 15:05:46 mike Exp $"
//
// Box drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -120,7 +120,7 @@ void fl_up_frame(int x, int y, int w, int h, Fl_Color) {
fl_frame2("HHWW",x,y,w,h);
#else
#if BORDER_WIDTH == 2
- fl_frame2("AAPPMMWU",x,y,w,h);
+ fl_frame2("AAUWMMSS",x,y,w,h);
#else
fl_frame("AAAAWUJJUSNN",x,y,w,h);
#endif
@@ -282,5 +282,5 @@ const {
}
//
-// End of "$Id: fl_boxtype.cxx,v 1.4 1998/10/21 14:20:44 mike Exp $".
+// End of "$Id: fl_boxtype.cxx,v 1.5 1998/11/08 15:05:46 mike Exp $".
//
diff --git a/src/fl_file_chooser.cxx b/src/fl_file_chooser.cxx
index 8f947f986..de97bcdd9 100644
--- a/src/fl_file_chooser.cxx
+++ b/src/fl_file_chooser.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_file_chooser.cxx,v 1.5 1998/11/06 16:00:45 mike Exp $"
+// "$Id: fl_file_chooser.cxx,v 1.6 1998/11/08 15:05:46 mike Exp $"
//
// File chooser widget for the Fast Light Tool Kit (FLTK).
//
@@ -341,11 +341,11 @@ void FCB::draw() {
if (full_height() > 0) return;
message = "No matching files";
}
- Fl_Boxtype b = box(); if (!b) b = Fl_Input_::default_box();
- draw_box(b,color());
- fl_color(FL_INACTIVE_COLOR);
+ Fl_Boxtype b = box(); if (!b) b = Fl_Input_::default_box();
+ draw_box(b,color());
+ fl_color(FL_INACTIVE_COLOR);
fl_font(textfont(), textsize(), default_font(), default_size());
- fl_draw(message, x()+7, y()+3, w(), h()-3, FL_ALIGN_TOP_LEFT);
+ fl_draw(message, x()+7, y()+3, w(), h()-3, FL_ALIGN_TOP_LEFT);
}
void FCB::clear_prev() {
@@ -611,5 +611,5 @@ char* fl_file_chooser(const char* message, const char* pat, const char* fname)
}
//
-// End of "$Id: fl_file_chooser.cxx,v 1.5 1998/11/06 16:00:45 mike Exp $".
+// End of "$Id: fl_file_chooser.cxx,v 1.6 1998/11/08 15:05:46 mike Exp $".
//