diff options
| -rw-r--r-- | FL/Fl_Gl_Window.H | 16 | ||||
| -rw-r--r-- | src/Fl_Gl_Overlay.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index d70094f9f..46cca40b6 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -127,11 +127,11 @@ public: */ void context_valid(char v) {if (v) valid_f_ |= 2; else valid_f_ &= 0xfd;} +/** Returns non-zero if the hardware supports the given or current OpenGL mode. */ static int can_do(int m) {return can_do(m,0);} +/** Returns non-zero if the hardware supports the given or current OpenGL mode. */ static int can_do(const int *m) {return can_do(0, m);} - /** - See static int Fl_Gl_Window::can_do(int) - */ + /** Returns non-zero if the hardware supports the given or current OpenGL mode. */ int can_do() {return can_do(mode_,alist);} /** Set or change the OpenGL capabilites of the window. The value can be @@ -162,8 +162,11 @@ public: window a child of another window if you wish to do this! */ Fl_Mode mode() const {return (Fl_Mode)mode_;} + /** See Fl_Mode mode() const */ int mode(int a) {return mode(a,0);} + /** See Fl_Mode mode() const */ int mode(const int *a) {return mode(0, a);} + /** void See void context(void* v, int destroy_flag) */ void* context() const {return context_;} void context(void*, int destroy_flag = 0); void make_current(); @@ -195,11 +198,16 @@ public: ~Fl_Gl_Window(); /** + Creates a new Fl_Gl_Window widget using the given size, and label string. + The default boxtype is FL_NO_BOX. The default mode is FL_RGB|FL_DOUBLE|FL_DEPTH. + */ + Fl_Gl_Window(int W, int H, const char *l=0) : Fl_Window(W,H,l) {init();} + /** Creates a new Fl_Gl_Window widget using the given position, size, and label string. The default boxtype is FL_NO_BOX. The default mode is FL_RGB|FL_DOUBLE|FL_DEPTH. */ - Fl_Gl_Window(int W, int H, const char *l=0) : Fl_Window(W,H,l) {init();} + Fl_Gl_Window(int X, int Y, int W, int H, const char *l=0) : Fl_Window(X,Y,W,H,l) {init();} diff --git a/src/Fl_Gl_Overlay.cxx b/src/Fl_Gl_Overlay.cxx index 9097bc3a7..f9a2c7bed 100644 --- a/src/Fl_Gl_Overlay.cxx +++ b/src/Fl_Gl_Overlay.cxx @@ -230,7 +230,7 @@ void Fl_Gl_Window::make_overlay_current() { glDrawBuffer(GL_FRONT); #endif } - +/** Hides the window if it is not this window, does nothing in WIN32*/ void Fl_Gl_Window::hide_overlay() { #if HAVE_GL_OVERLAY #ifdef WIN32 diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index c177819e6..3093dcd44 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -60,11 +60,7 @@ static char SWAP_TYPE = 0 ; // 0 = determine it from environment variable //////////////////////////////////////////////////////////////// -/** - Returns non-zero if the hardware supports the given or current OpenGL - mode. - -*/ +/** Returns non-zero if the hardware supports the given or current OpenGL mode. */ int Fl_Gl_Window::can_do(int a, const int *b) { return Fl_Gl_Choice::find(a,b) != 0; } |