From 892fafec038878c0e5e4dca0d90be10f7216a94f Mon Sep 17 00:00:00 2001 From: dcnieho Date: Fri, 5 Apr 2013 03:52:59 +0000 Subject: [PATCH] docs: glutPauseFunc/glutResumeFunc -> glutAppStatusFunc git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1594 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/web-src/docs/android.php | 2 +- freeglut/web-src/docs/api.php | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/freeglut/web-src/docs/android.php b/freeglut/web-src/docs/android.php index bd1f154..3f71055 100644 --- a/freeglut/web-src/docs/android.php +++ b/freeglut/web-src/docs/android.php @@ -170,7 +170,7 @@ Done:
  • GLES1 and GLES2 support for geometry
  • Pause/resume application support
  • Callback to reload OpenGL resources lost during a pause
    • -
  • Callback for pause/resume notifications
    • +
  • Callback for application status (pause/resume) notifications
    • TODO: diff --git a/freeglut/web-src/docs/api.php b/freeglut/web-src/docs/api.php index 56e6747..1a0cfcb 100644 --- a/freeglut/web-src/docs/api.php +++ b/freeglut/web-src/docs/api.php @@ -225,8 +225,7 @@ contained herein.
  • Android functions
    1. glutInitContextFunc ← void
      2. -
    2. glutPauseFunc ← void
      3. -
    3. glutResumeFunc ← void
      4. +
    4. glutAppStatusFunc ← event
  • Miscellaneous Functions @@ -613,14 +612,14 @@ By means of the glutSetWindowTitle function you can set the titles for your top-level FreeGLUT windows. If you just want one title for the window over the window's entire life, you should set it when you open the window with glutCreateWindow().
    -glutSetIconTitle set the title to be displayed for the window +glutSetIconTitle sets the title to be displayed for the window when it is in iconified (minimized) state.

    Changes From GLUT

    -

    glutSetIconTitle does nothing in GLUT on Windows, Windows is -supported by FreeGLUT.

    +

    glutSetIconTitle does nothing in GLUT on Windows, but is +emulated on Windows by FreeGLUT.

    6.6 glutReshapeWindow

    @@ -2451,10 +2450,13 @@ whether/how to implement it.