Fl_File_Chooser did not implement the user_data() methods (STR
#970) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4473 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
b8dcdf4c64
commit
c9f9b4faa0
2
CHANGES
2
CHANGES
@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7
|
|||||||
|
|
||||||
- Documentation fixes (STR #648, STR #692, STR #730, STR
|
- Documentation fixes (STR #648, STR #692, STR #730, STR
|
||||||
#744, STR #745, STR #942, STR #931)
|
#744, STR #745, STR #942, STR #931)
|
||||||
|
- Fl_File_Chooser did not implement the user_data()
|
||||||
|
methods (STR #970)
|
||||||
- Compilation could fail if a previous installation of
|
- Compilation could fail if a previous installation of
|
||||||
FLTK was in the same (non-standard) directory as an
|
FLTK was in the same (non-standard) directory as an
|
||||||
image library (STR #926)
|
image library (STR #926)
|
||||||
|
@ -155,6 +155,8 @@ public:
|
|||||||
uchar textsize();
|
uchar textsize();
|
||||||
void type(int t);
|
void type(int t);
|
||||||
int type();
|
int type();
|
||||||
|
void * user_data() const;
|
||||||
|
void user_data(void *d);
|
||||||
const char *value(int f = 1);
|
const char *value(int f = 1);
|
||||||
void value(const char *filename);
|
void value(const char *filename);
|
||||||
int visible();
|
int visible();
|
||||||
|
@ -426,6 +426,14 @@ int Fl_File_Chooser::type() {
|
|||||||
return (type_);
|
return (type_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void * Fl_File_Chooser::user_data() const {
|
||||||
|
return (data_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Fl_File_Chooser::user_data(void *d) {
|
||||||
|
data_ = d;
|
||||||
|
}
|
||||||
|
|
||||||
int Fl_File_Chooser::visible() {
|
int Fl_File_Chooser::visible() {
|
||||||
return window->visible();
|
return window->visible();
|
||||||
}
|
}
|
||||||
|
@ -31,8 +31,7 @@ comment {//
|
|||||||
} {in_source in_header
|
} {in_source in_header
|
||||||
}
|
}
|
||||||
|
|
||||||
decl {\#include <FL/fl_draw.H>} {selected
|
decl {\#include <FL/fl_draw.H>} {}
|
||||||
}
|
|
||||||
|
|
||||||
class FL_EXPORT Fl_File_Chooser {open
|
class FL_EXPORT Fl_File_Chooser {open
|
||||||
} {
|
} {
|
||||||
@ -160,8 +159,8 @@ window->hide();}
|
|||||||
}
|
}
|
||||||
Fl_Window favWindow {
|
Fl_Window favWindow {
|
||||||
label {Manage Favorites}
|
label {Manage Favorites}
|
||||||
private xywh {580 50 355 150} type Double resizable
|
private xywh {580 50 355 150} type Double hide resizable
|
||||||
code0 {favWindow->label(manage_favorites_label);} modal visible
|
code0 {favWindow->label(manage_favorites_label);} modal
|
||||||
} {
|
} {
|
||||||
Fl_File_Browser favList {
|
Fl_File_Browser favList {
|
||||||
callback {favoritesCB(favList);}
|
callback {favoritesCB(favList);}
|
||||||
@ -356,6 +355,15 @@ else
|
|||||||
} {
|
} {
|
||||||
code {return (type_);} {}
|
code {return (type_);} {}
|
||||||
}
|
}
|
||||||
|
Function {user_data() const} {selected return_type {void *}
|
||||||
|
} {
|
||||||
|
code {return (data_);} {selected
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Function {user_data(void *d)} {selected return_type void
|
||||||
|
} {
|
||||||
|
code {data_ = d;} {}
|
||||||
|
}
|
||||||
decl {const char *value(int f = 1);} {public
|
decl {const char *value(int f = 1);} {public
|
||||||
}
|
}
|
||||||
decl {void value(const char *filename);} {public
|
decl {void value(const char *filename);} {public
|
||||||
|
Loading…
Reference in New Issue
Block a user