mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fl_Gl_Window's on WIN32 now prefer accelerated pixel formats

Browse Source 
over generic formats (STR #382)

Fl_Window::resize() did not work on some systems if the window
was not shown (STR #373)

FLUID did not write the user_data type if the user_data field
was empty (STR #374)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3416 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2004-05-13 21:02:41 +00:00
parent 4aa09c6c6a
commit e643c17eea
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -1,6 +1,12 @@
CHANGES IN FLTK 1.1.5rc2
- Documentation updates (STR #365)
- Fl_Gl_Window's on WIN32 now prefer accelerated pixel
formats over generic formats (STR #382)
- Fl_Window::resize() did not work on some systems if
the window was not shown (STR #373)
- FLUID did not write the user_data type if the
user_data field was empty (STR #374)
- The value(const Fl_Menu_Item*) method was not
implemented for Fl_Choice (STR #366)
- Fl_Pack didn't draw child widget labels the same way

12
fluid/Fl_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Type.cxx,v 1.6.2.6.2.18 2004/04/11 04:38:55 easysw Exp $"
// "$Id: Fl_Type.cxx,v 1.6.2.6.2.19 2004/05/13 21:02:39 easysw Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@ -757,10 +757,10 @@ void Fl_Type::write_properties() {
write_indent(level+1);
write_word("user_data");
write_word(user_data());
if (user_data_type()) {
write_word("user_data_type");
write_word(user_data_type());
}
}
if (user_data_type()) {
write_word("user_data_type");
write_word(user_data_type());
}
if (callback()) {
write_indent(level+1);
@ -791,5 +791,5 @@ void Fl_Type::read_property(const char *c) {
int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
//
// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.18 2004/04/11 04:38:55 easysw Exp $".
// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.19 2004/05/13 21:02:39 easysw Exp $".
//

9
src/Fl_Gl_Choice.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.17 2004/04/11 04:38:57 easysw Exp $"
// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.18 2004/05/13 21:02:40 easysw Exp $"
//
// OpenGL visual selection code for the Fast Light Tool Kit (FLTK).
//
@ -178,8 +178,11 @@ Fl_Gl_Choice *Fl_Gl_Choice::find(int m, const int *alistp) {
if ((m & FL_STENCIL) && !pfd.cStencilBits) continue;
// see if better than the one we have already:
if (pixelformat) {
// offering non-generic rendering is better (read: hardware accelleration)
if (!(chosen_pfd.dwFlags & PFD_GENERIC_FORMAT) &&
(pfd.dwFlags & PFD_GENERIC_FORMAT)) continue;
// offering overlay is better:
if (!(chosen_pfd.bReserved & 15) && (pfd.bReserved & 15)) {}
else if (!(chosen_pfd.bReserved & 15) && (pfd.bReserved & 15)) {}
// otherwise more bit planes is better:
else if (chosen_pfd.cColorBits > pfd.cColorBits) continue;
else if (chosen_pfd.cDepthBits > pfd.cDepthBits) continue;
@ -347,5 +350,5 @@ void fl_delete_gl_context(GLContext context) {
//
// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.17 2004/04/11 04:38:57 easysw Exp $".
// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7.2.18 2004/05/13 21:02:40 easysw Exp $".
//

9
src/Fl_x.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_x.cxx,v 1.24.2.24.2.33 2004/04/11 04:38:59 easysw Exp $"
// "$Id: Fl_x.cxx,v 1.24.2.24.2.34 2004/05/13 21:02:41 easysw Exp $"
//
// X specific code for the Fast Light Tool Kit (FLTK).
//
@ -932,6 +932,11 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
} else {
x(X); y(Y);
}
if (resize_from_program && is_a_resize && !resizable()) {
size_range(w(), h(), w(), h());
}
if (resize_from_program && shown()) {
if (is_a_resize) {
if (!resizable()) size_range(w(),h(),w(),h());
@ -1270,5 +1275,5 @@ void Fl_Window::make_current() {
#endif
//
// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.33 2004/04/11 04:38:59 easysw Exp $".
// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.34 2004/05/13 21:02:41 easysw Exp $".
//