mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Renamed GLFW_WINDOW to GLFW_WINDOWED.
This commit is contained in:
parent
059b2b55c0
commit
484a2714fc
@ -576,7 +576,7 @@ int main( void )
|
|||||||
|
|
||||||
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
||||||
|
|
||||||
GLFWwindow window = glfwOpenWindow( 400, 400, GLFW_WINDOW );
|
GLFWwindow window = glfwOpenWindow( 400, 400, GLFW_WINDOWED );
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
fprintf( stderr, "Failed to open GLFW window\n" );
|
fprintf( stderr, "Failed to open GLFW window\n" );
|
||||||
|
@ -331,7 +331,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
||||||
|
|
||||||
window = glfwOpenWindow( 300, 300, GLFW_WINDOW );
|
window = glfwOpenWindow( 300, 300, GLFW_WINDOWED );
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
fprintf( stderr, "Failed to open GLFW window\n" );
|
fprintf( stderr, "Failed to open GLFW window\n" );
|
||||||
|
@ -460,7 +460,7 @@ int main( void )
|
|||||||
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
||||||
|
|
||||||
// Open OpenGL window
|
// Open OpenGL window
|
||||||
window = glfwOpenWindow( 500, 500, GLFW_WINDOW );
|
window = glfwOpenWindow( 500, 500, GLFW_WINDOWED );
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
fprintf( stderr, "Failed to open GLFW window\n" );
|
fprintf( stderr, "Failed to open GLFW window\n" );
|
||||||
|
@ -23,7 +23,7 @@ int main( void )
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Open a window and create its OpenGL context
|
// Open a window and create its OpenGL context
|
||||||
window = glfwOpenWindow( 640, 480, GLFW_WINDOW );
|
window = glfwOpenWindow( 640, 480, GLFW_WINDOWED );
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
fprintf( stderr, "Failed to open GLFW window\n" );
|
fprintf( stderr, "Failed to open GLFW window\n" );
|
||||||
|
@ -332,7 +332,7 @@ int main(int argc, char* argv[])
|
|||||||
/* Desired window properties */
|
/* Desired window properties */
|
||||||
width = 640;
|
width = 640;
|
||||||
height = 480;
|
height = 480;
|
||||||
mode = GLFW_WINDOW;
|
mode = GLFW_WINDOWED;
|
||||||
|
|
||||||
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
glfwOpenWindowHint(GLFW_DEPTH_BITS, 16);
|
||||||
|
|
||||||
|
@ -302,7 +302,7 @@ extern "C" {
|
|||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
/* glfwOpenWindow modes */
|
/* glfwOpenWindow modes */
|
||||||
#define GLFW_WINDOW 0x00010001
|
#define GLFW_WINDOWED 0x00010001
|
||||||
#define GLFW_FULLSCREEN 0x00010002
|
#define GLFW_FULLSCREEN 0x00010002
|
||||||
|
|
||||||
/* glfwGetWindowParam tokens */
|
/* glfwGetWindowParam tokens */
|
||||||
|
@ -270,6 +270,7 @@ version of GLFW.</p>
|
|||||||
<li>Changed buffer bit depth parameters of <code>glfwOpenWindow</code> to window hints</li>
|
<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>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.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>Replaced ad hoc build system with CMake</li>
|
||||||
<li>Updated all included test and example programs to use the new API</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>
|
<li>Made Unicode character input unaffected by <code>GLFW_KEY_REPEAT</code></li>
|
||||||
|
@ -464,7 +464,7 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode)
|
|||||||
return GL_FALSE;
|
return GL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mode != GLFW_WINDOW && mode != GLFW_FULLSCREEN)
|
if (mode != GLFW_WINDOWED && mode != GLFW_FULLSCREEN)
|
||||||
{
|
{
|
||||||
// Invalid window mode
|
// Invalid window mode
|
||||||
glfwCloseWindow(window);
|
glfwCloseWindow(window);
|
||||||
|
@ -746,7 +746,7 @@ static GLboolean createWindow(_GLFWwindow* window,
|
|||||||
PointerMotionMask | ButtonPressMask | ButtonReleaseMask |
|
PointerMotionMask | ButtonPressMask | ButtonReleaseMask |
|
||||||
ExposureMask | FocusChangeMask | VisibilityChangeMask;
|
ExposureMask | FocusChangeMask | VisibilityChangeMask;
|
||||||
|
|
||||||
if (wndconfig->mode == GLFW_WINDOW)
|
if (wndconfig->mode == GLFW_WINDOWED)
|
||||||
{
|
{
|
||||||
// The /only/ reason we are setting the background pixel here is
|
// The /only/ reason we are setting the background pixel here is
|
||||||
// that otherwise our window wont get any decorations on systems
|
// that otherwise our window wont get any decorations on systems
|
||||||
|
@ -65,7 +65,7 @@ int main(void)
|
|||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
window = glfwOpenWindow(window_width, window_height, GLFW_WINDOW);
|
window = glfwOpenWindow(window_width, window_height, GLFW_WINDOWED);
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
|
@ -75,7 +75,7 @@ int main(void)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
window = glfwOpenWindow(0, 0, GLFW_WINDOW);
|
window = glfwOpenWindow(0, 0, GLFW_WINDOWED);
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
|
@ -274,7 +274,7 @@ int main(void)
|
|||||||
|
|
||||||
printf("Library initialized\n");
|
printf("Library initialized\n");
|
||||||
|
|
||||||
window = glfwOpenWindow(0, 0, GLFW_WINDOW);
|
window = glfwOpenWindow(0, 0, GLFW_WINDOWED);
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
|
@ -55,7 +55,7 @@ int main(void)
|
|||||||
|
|
||||||
glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
|
glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
|
||||||
|
|
||||||
window = glfwOpenWindow(400, 400, GLFW_WINDOW);
|
window = glfwOpenWindow(400, 400, GLFW_WINDOWED);
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
|
@ -89,7 +89,7 @@ static GLboolean open_window(void)
|
|||||||
{
|
{
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
window_handle = glfwOpenWindow(0, 0, GLFW_WINDOW);
|
window_handle = glfwOpenWindow(0, 0, GLFW_WINDOWED);
|
||||||
if (!window_handle)
|
if (!window_handle)
|
||||||
return GL_FALSE;
|
return GL_FALSE;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ static const char* get_mode_name(int mode)
|
|||||||
{
|
{
|
||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case GLFW_WINDOW:
|
case GLFW_WINDOWED:
|
||||||
return "windowed";
|
return "windowed";
|
||||||
case GLFW_FULLSCREEN:
|
case GLFW_FULLSCREEN:
|
||||||
return "fullscreen";
|
return "fullscreen";
|
||||||
@ -128,7 +128,7 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
if (!open_window(640, 480, (count & 1) ? GLFW_FULLSCREEN : GLFW_WINDOW))
|
if (!open_window(640, 480, (count & 1) ? GLFW_FULLSCREEN : GLFW_WINDOWED))
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -50,7 +50,7 @@ int main(void)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
window = glfwOpenWindow(0, 0, GLFW_WINDOW);
|
window = glfwOpenWindow(0, 0, GLFW_WINDOWED);
|
||||||
if (!window)
|
if (!window)
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
|
@ -183,7 +183,7 @@ int main(int argc, char** argv)
|
|||||||
// We assume here that we stand a better chance of success by leaving all
|
// We assume here that we stand a better chance of success by leaving all
|
||||||
// possible details of pixel format selection to GLFW
|
// possible details of pixel format selection to GLFW
|
||||||
|
|
||||||
if (!glfwOpenWindow(0, 0, GLFW_WINDOW))
|
if (!glfwOpenWindow(0, 0, GLFW_WINDOWED))
|
||||||
{
|
{
|
||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ static const char* titles[] =
|
|||||||
|
|
||||||
static GLFWwindow open_window(int width, int height, const char* title)
|
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)
|
if (!window)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Failed to open GLFW default window\n");
|
fprintf(stderr, "Failed to open GLFW default window\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user