mirror of
https://github.com/fltk/fltk.git
synced 2026-06-06 08:32:07 +08:00
Fl_Value_Slider::draw_bg() didn't always apply the clipping
rectangle (STR #235) fl_filename_relative() returned the wrong string if the absolute pathname was equal to the current working directory (STR #224) Fl_Help_Dialog didn't correctly restore the scroll position when going forward/back in the link history if the file changed (STR #218) glutGetModifiers() did not mask off extra state bits, confusing some GLUT-based applications (STR #213) Fixed mouse capture problems on MacOS X (STR #209, STR #229) Fl_Sys_Menu_Bar is now built into the library for MacOS X (STR #229) Fl_Menu_ now provides item_pathname() methods to get the "pathname" of a menu item, e.g. "File/Quit" (STR #283) Fl_Text_Display now provides cursor_color() methods to get and set the cursor color (STR #271) Fl_Scroll didn't honor FL_NO_BOX (STR #305) FLUID declaration blocks didn't support public/private definitions (STR #301) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3231 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
// generated by Fast Light User Interface Designer (fluid) version 1.0104
|
||||
// generated by Fast Light User Interface Designer (fluid) version 1.0105
|
||||
|
||||
#ifndef Fl_Help_Dialog_H
|
||||
#define Fl_Help_Dialog_H
|
||||
|
||||
+3
-2
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Menu_.H,v 1.7.2.4.2.7 2003/06/15 04:47:28 easysw Exp $"
|
||||
// "$Id: Fl_Menu_.H,v 1.7.2.4.2.8 2004/03/11 05:17:10 easysw Exp $"
|
||||
//
|
||||
// Menu base class header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@@ -45,6 +45,7 @@ protected:
|
||||
unsigned textcolor_;
|
||||
|
||||
public:
|
||||
int item_pathname(char *name, int namelen, const Fl_Menu_Item *finditem=0) const;
|
||||
const Fl_Menu_Item* picked(const Fl_Menu_Item*);
|
||||
|
||||
Fl_Menu_(int,int,int,int,const char * =0);
|
||||
@@ -94,5 +95,5 @@ public:
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.7 2003/06/15 04:47:28 easysw Exp $".
|
||||
// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.8 2004/03/11 05:17:10 easysw Exp $".
|
||||
//
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Text_Display.H,v 1.4.2.13 2003/01/30 21:40:18 easysw Exp $"
|
||||
// "$Id: Fl_Text_Display.H,v 1.4.2.14 2004/03/11 05:17:11 easysw Exp $"
|
||||
//
|
||||
// Header file for Fl_Text_Display class.
|
||||
//
|
||||
@@ -98,6 +98,8 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group {
|
||||
void show_cursor(int b = 1);
|
||||
void hide_cursor() { show_cursor(0); }
|
||||
void cursor_style(int style);
|
||||
Fl_Color cursor_color() const {return mCursor_color;}
|
||||
void cursor_color(Fl_Color n) {mCursor_color = n;}
|
||||
int scrollbar_width() { return scrollbar_width_; }
|
||||
Fl_Align scrollbar_align() { return scrollbar_align_; }
|
||||
void scrollbar_width(int W) { scrollbar_width_ = W; }
|
||||
@@ -288,5 +290,5 @@ class FL_EXPORT Fl_Text_Display: public Fl_Group {
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Text_Display.H,v 1.4.2.13 2003/01/30 21:40:18 easysw Exp $".
|
||||
// End of "$Id: Fl_Text_Display.H,v 1.4.2.14 2004/03/11 05:17:11 easysw Exp $".
|
||||
//
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: glut.H,v 1.6.2.10.2.5 2003/01/30 21:40:50 easysw Exp $"
|
||||
// "$Id: glut.H,v 1.6.2.10.2.6 2004/03/11 05:17:11 easysw Exp $"
|
||||
//
|
||||
// GLUT emulation header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@@ -367,11 +367,11 @@ enum {
|
||||
//#define GLUT_NUM_DIALS 608
|
||||
//#define GLUT_NUM_TABLET_BUTTONS 609
|
||||
|
||||
inline int glutGetModifiers() {return Fl::event_state();}
|
||||
// WARNING: these values are different than GLUT uses:
|
||||
# define GLUT_ACTIVE_SHIFT FL_SHIFT
|
||||
# define GLUT_ACTIVE_CTRL FL_CTRL
|
||||
# define GLUT_ACTIVE_ALT FL_ALT
|
||||
inline int glutGetModifiers() {return Fl::event_state() & (GLUT_ACTIVE_SHIFT | GLUT_ACTIVE_CTRL | GLUT_ACTIVE_ALT);}
|
||||
|
||||
int glutLayerGet(GLenum);
|
||||
# define GLUT_OVERLAY_POSSIBLE 800
|
||||
@@ -470,5 +470,5 @@ extern void APIENTRY glutSolidIcosahedron();
|
||||
#endif /* !__glut_h__ */
|
||||
|
||||
//
|
||||
// End of "$Id: glut.H,v 1.6.2.10.2.5 2003/01/30 21:40:50 easysw Exp $".
|
||||
// End of "$Id: glut.H,v 1.6.2.10.2.6 2004/03/11 05:17:11 easysw Exp $".
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user