From bbb8f29b4ad757acb73f74552d0761dced69a03e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 22 Nov 2001 12:58:44 +0000 Subject: [PATCH 1/1] Applied patch #484508 (mostly sample warnings). I've no idea why CVS thinks that the .mcp files have been changed - they haven't. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/html/test/test.cpp | 4 +- samples/opengl/penguin/lw.cpp | 6 +-- samples/opengl/penguin/trackball.c | 66 +++++++++++++++--------------- samples/proplist/proplist.cpp | 5 +++ 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index 2b7fe2a9ed..4dbabea04b 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -22,6 +22,7 @@ #endif #include "wx/image.h" +#include "wx/sysopt.h" #include "wx/html/htmlwin.h" #include "wx/html/htmlproc.h" #include "wx/fs_inet.h" @@ -131,7 +132,8 @@ class BoldProcessor : public wxHtmlProcessor bool MyApp::OnInit() { wxLog::AddTraceMask(wxT("strconv")); - + wxSystemOptions::SetOption(wxT("no-maskblt"), 1); + wxInitAllImageHandlers(); #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS wxFileSystem::AddHandler(new wxInternetFSHandler); diff --git a/samples/opengl/penguin/lw.cpp b/samples/opengl/penguin/lw.cpp index aaa1d889c2..487359bbba 100644 --- a/samples/opengl/penguin/lw.cpp +++ b/samples/opengl/penguin/lw.cpp @@ -128,9 +128,9 @@ static void read_srfs(FILE *f, int nbytes, lwObject *lwo) nbytes -= read_string(f,material->name); /* defaults */ - material->r = 0.7; - material->g = 0.7; - material->b = 0.7; + material->r = 0.7f; + material->g = 0.7f; + material->b = 0.7f; } lwo->material = (lwMaterial*) realloc(lwo->material, sizeof(lwMaterial)*lwo->material_cnt); } diff --git a/samples/opengl/penguin/trackball.c b/samples/opengl/penguin/trackball.c index f23d3db30b..3821e1d930 100644 --- a/samples/opengl/penguin/trackball.c +++ b/samples/opengl/penguin/trackball.c @@ -59,7 +59,7 @@ * simple example, though, so that is left as an Exercise for the * Programmer. */ -#define TRACKBALLSIZE (0.8) +#define TRACKBALLSIZE (0.8f) /* * Local function prototypes (not defined in trackball.h) @@ -113,7 +113,7 @@ vcross(const float *v1, const float *v2, float *cross) float vlength(const float *v) { - return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); + return (float) sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]); } void @@ -127,7 +127,7 @@ vscale(float *v, float div) void vnormal(float *v) { - vscale(v,1.0/vlength(v)); + vscale(v, 1.0f/vlength(v)); } float @@ -175,8 +175,8 @@ trackball(float q[4], float p1x, float p1y, float p2x, float p2y) * First, figure out z-coordinates for projection of P1 and P2 to * deformed sphere */ - vset(p1,p1x,p1y,tb_project_to_sphere(TRACKBALLSIZE,p1x,p1y)); - vset(p2,p2x,p2y,tb_project_to_sphere(TRACKBALLSIZE,p2x,p2y)); + vset(p1, p1x, p1y, tb_project_to_sphere(TRACKBALLSIZE, p1x, p1y)); + vset(p2, p2x, p2y, tb_project_to_sphere(TRACKBALLSIZE, p2x, p2y)); /* * Now, we want the cross product of P1 and P2 @@ -186,15 +186,15 @@ trackball(float q[4], float p1x, float p1y, float p2x, float p2y) /* * Figure out how much to rotate around that axis. */ - vsub(p1,p2,d); - t = vlength(d) / (2.0*TRACKBALLSIZE); + vsub(p1, p2, d); + t = vlength(d) / (2.0f*TRACKBALLSIZE); /* * Avoid problems with out-of-control values... */ if (t > 1.0) t = 1.0; if (t < -1.0) t = -1.0; - phi = 2.0 * asin(t); + phi = 2.0f * (float) asin(t); axis_to_quat(a,phi,q); } @@ -206,9 +206,9 @@ void axis_to_quat(float a[3], float phi, float q[4]) { vnormal(a); - vcopy(a,q); - vscale(q,sin(phi/2.0)); - q[3] = cos(phi/2.0); + vcopy(a, q); + vscale(q, (float) sin(phi/2.0)); + q[3] = (float) cos(phi/2.0); } /* @@ -220,11 +220,11 @@ tb_project_to_sphere(float r, float x, float y) { float d, t, z; - d = sqrt(x*x + y*y); + d = (float) sqrt(x*x + y*y); if (d < r * 0.70710678118654752440) { /* Inside sphere */ - z = sqrt(r*r - d*d); + z = (float) sqrt(r*r - d*d); } else { /* On hyperbola */ - t = r / 1.41421356237309504880; + t = r / 1.41421356237309504880f; z = t*t / d; } return z; @@ -301,24 +301,24 @@ normalize_quat(float q[4]) void build_rotmatrix(float m[4][4], float q[4]) { - m[0][0] = 1.0 - 2.0 * (q[1] * q[1] + q[2] * q[2]); - m[0][1] = 2.0 * (q[0] * q[1] - q[2] * q[3]); - m[0][2] = 2.0 * (q[2] * q[0] + q[1] * q[3]); - m[0][3] = 0.0; - - m[1][0] = 2.0 * (q[0] * q[1] + q[2] * q[3]); - m[1][1]= 1.0 - 2.0 * (q[2] * q[2] + q[0] * q[0]); - m[1][2] = 2.0 * (q[1] * q[2] - q[0] * q[3]); - m[1][3] = 0.0; - - m[2][0] = 2.0 * (q[2] * q[0] - q[1] * q[3]); - m[2][1] = 2.0 * (q[1] * q[2] + q[0] * q[3]); - m[2][2] = 1.0 - 2.0 * (q[1] * q[1] + q[0] * q[0]); - m[2][3] = 0.0; - - m[3][0] = 0.0; - m[3][1] = 0.0; - m[3][2] = 0.0; - m[3][3] = 1.0; + m[0][0] = 1.0f - 2.0f * (q[1] * q[1] + q[2] * q[2]); + m[0][1] = 2.0f * (q[0] * q[1] - q[2] * q[3]); + m[0][2] = 2.0f * (q[2] * q[0] + q[1] * q[3]); + m[0][3] = 0.0f; + + m[1][0] = 2.0f * (q[0] * q[1] + q[2] * q[3]); + m[1][1]= 1.0f - 2.0f * (q[2] * q[2] + q[0] * q[0]); + m[1][2] = 2.0f * (q[1] * q[2] - q[0] * q[3]); + m[1][3] = 0.0f; + + m[2][0] = 2.0f * (q[2] * q[0] - q[1] * q[3]); + m[2][1] = 2.0f * (q[1] * q[2] + q[0] * q[3]); + m[2][2] = 1.0f - 2.0f * (q[1] * q[1] + q[0] * q[0]); + m[2][3] = 0.0f; + + m[3][0] = 0.0f; + m[3][1] = 0.0f; + m[3][2] = 0.0f; + m[3][3] = 1.0f; } diff --git a/samples/proplist/proplist.cpp b/samples/proplist/proplist.cpp index 92a762c866..ab4dffc53b 100644 --- a/samples/proplist/proplist.cpp +++ b/samples/proplist/proplist.cpp @@ -24,6 +24,11 @@ #include "wx/wx.h" #endif + +#if !wxUSE_PROPSHEET +#error Please set wxUSE_PROPSHEET to 1 in include/wx/msw/setup.h and recompile. +#endif + #include "proplist.h" IMPLEMENT_APP(MyApp) -- 2.47.2