Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 11:35:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed GLFW_WINDOW to GLFW_WINDOWED.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-10 13:24:19 +02:00
parent 059b2b55c0
commit 484a2714fc
18 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/boing.c
View File

@ -576,7 +576,7 @@ int main( void )
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
GLFWwindow window = glfwOpenWindow( 400, 400, GLFW_WINDOW );
GLFWwindow window = glfwOpenWindow( 400, 400, GLFW_WINDOWED );
if (!window)
{
fprintf( stderr, "Failed to open GLFW window\n" );

2
examples/gears.c
View File

@ -331,7 +331,7 @@ int main(int argc, char *argv[])
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
window = glfwOpenWindow( 300, 300, GLFW_WINDOW );
window = glfwOpenWindow( 300, 300, GLFW_WINDOWED );
if (!window)
{
fprintf( stderr, "Failed to open GLFW window\n" );

2
examples/splitview.c
View File

@ -460,7 +460,7 @@ int main( void )
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
// Open OpenGL window
window = glfwOpenWindow( 500, 500, GLFW_WINDOW );
window = glfwOpenWindow( 500, 500, GLFW_WINDOWED );
if (!window)
{
fprintf( stderr, "Failed to open GLFW window\n" );

2
examples/triangle.c
View File

@ -23,7 +23,7 @@ int main( void )
}
// Open a window and create its OpenGL context
window = glfwOpenWindow( 640, 480, GLFW_WINDOW );
window = glfwOpenWindow( 640, 480, GLFW_WINDOWED );
if (!window)
{
fprintf( stderr, "Failed to open GLFW window\n" );

2
examples/wave.c
View File

@ -332,7 +332,7 @@ int main(int argc, char* argv[])
/* Desired window properties */
width = 640;
height = 480;
mode = GLFW_WINDOW;
mode = GLFW_WINDOWED;
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);

2
include/GL/glfw3.h
View File

@ -302,7 +302,7 @@ extern "C" {
*************************************************************************/
/* glfwOpenWindow modes */
#define GLFW_WINDOW 0x00010001
#define GLFW_WINDOWED 0x00010001
#define GLFW_FULLSCREEN 0x00010002
/* glfwGetWindowParam tokens */

1
readme.html
View File

@ -270,6 +270,7 @@ version of GLFW.</p>
<li>Changed buffer bit depth parameters of <code>glfwOpenWindow</code> to window hints</li>
<li>Renamed <code>lib</code> source code directory to <code>src</code></li>
<li>Renamed <code>glfw.h</code> to <code>glfw3.h</code> to avoid conflicts with 2.x series</li>
<li>Renamed <code>GLFW_WINDOW</code> token to <code>GLFW_WINDOWED</code></li>
<li>Replaced ad hoc build system with CMake</li>
<li>Updated all included test and example programs to use the new API</li>
<li>Made Unicode character input unaffected by <code>GLFW_KEY_REPEAT</code></li>

2
src/window.c
View File

@ -464,7 +464,7 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode)
return GL_FALSE;
}
if (mode != GLFW_WINDOW && mode != GLFW_FULLSCREEN)
if (mode != GLFW_WINDOWED && mode != GLFW_FULLSCREEN)
{
// Invalid window mode
glfwCloseWindow(window);

2
src/x11/x11_window.c
View File

@ -746,7 +746,7 @@ static GLboolean createWindow(_GLFWwindow* window,
PointerMotionMask | ButtonPressMask | ButtonReleaseMask |
ExposureMask | FocusChangeMask | VisibilityChangeMask;
if (wndconfig->mode == GLFW_WINDOW)
if (wndconfig->mode == GLFW_WINDOWED)
{
// The /only/ reason we are setting the background pixel here is
// that otherwise our window wont get any decorations on systems

2
tests/accuracy.c
View File

@ -65,7 +65,7 @@ int main(void)
exit(EXIT_FAILURE);
}
window = glfwOpenWindow(window_width, window_height, GLFW_WINDOW);
window = glfwOpenWindow(window_width, window_height, GLFW_WINDOWED);
if (!window)
{
glfwTerminate();

2
tests/defaults.c
View File

@ -75,7 +75,7 @@ int main(void)
exit(1);
}
window = glfwOpenWindow(0, 0, GLFW_WINDOW);
window = glfwOpenWindow(0, 0, GLFW_WINDOWED);
if (!window)
{
glfwTerminate();

2
tests/events.c
View File

@ -274,7 +274,7 @@ int main(void)
printf("Library initialized\n");
window = glfwOpenWindow(0, 0, GLFW_WINDOW);
window = glfwOpenWindow(0, 0, GLFW_WINDOWED);
if (!window)
{
glfwTerminate();

2
tests/fsaa.c
View File

@ -55,7 +55,7 @@ int main(void)
glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
window = glfwOpenWindow(400, 400, GLFW_WINDOW);
window = glfwOpenWindow(400, 400, GLFW_WINDOWED);
if (!window)
{
glfwTerminate();

2
tests/peter.c
View File

@ -89,7 +89,7 @@ static GLboolean open_window(void)
{
int x, y;
window_handle = glfwOpenWindow(0, 0, GLFW_WINDOW);
window_handle = glfwOpenWindow(0, 0, GLFW_WINDOWED);
if (!window_handle)
return GL_FALSE;

4
tests/reopen.c
View File

@ -45,7 +45,7 @@ static const char* get_mode_name(int mode)
{
switch (mode)
{
case GLFW_WINDOW:
case GLFW_WINDOWED:
return "windowed";
case GLFW_FULLSCREEN:
return "fullscreen";
@ -128,7 +128,7 @@ int main(int argc, char** argv)
for (;;)
{
if (!open_window(640, 480, (count & 1) ? GLFW_FULLSCREEN : GLFW_WINDOW))
if (!open_window(640, 480, (count & 1) ? GLFW_FULLSCREEN : GLFW_WINDOWED))
{
glfwTerminate();
exit(1);

2
tests/tearing.c
View File

@ -50,7 +50,7 @@ int main(void)
exit(1);
}
window = glfwOpenWindow(0, 0, GLFW_WINDOW);
window = glfwOpenWindow(0, 0, GLFW_WINDOWED);
if (!window)
{
glfwTerminate();

2
tests/version.c
View File

@ -183,7 +183,7 @@ int main(int argc, char** argv)
// We assume here that we stand a better chance of success by leaving all
// possible details of pixel format selection to GLFW
if (!glfwOpenWindow(0, 0, GLFW_WINDOW))
if (!glfwOpenWindow(0, 0, GLFW_WINDOWED))
{
glfwTerminate();

2
tests/windows.c
View File

@ -42,7 +42,7 @@ static const char* titles[] =
static GLFWwindow open_window(int width, int height, const char* title)
{
GLFWwindow window = glfwOpenWindow(width, height, GLFW_WINDOW);
GLFWwindow window = glfwOpenWindow(width, height, GLFW_WINDOWED);
if (!window)
{
fprintf(stderr, "Failed to open GLFW default window\n");