X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..c71830c3b63568566cf5f006165e51ffaee0c704:/src/motif/utils.cpp diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 10d2f165b3..082d3285be 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -123,7 +123,7 @@ bool wxCheckForInterrupt(wxWindow *wnd) // wxExecute stuff // ---------------------------------------------------------------------------- -static void xt_notify_end_process(XtPointer data, int *fid, +static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid), XtInputId *id) { wxEndProcessData *proc_data = (wxEndProcessData *)data; @@ -194,7 +194,7 @@ static char * GetIniFile (char *dest, const char *filename) strcat (dest, "/"); if (filename == NULL) { - if ((filename = getenv ("XENVIRONMENT(")) == NULL) + if ((filename = getenv ("XENVIRONMENT")) == NULL) filename = ".Xdefaults"; } else if (*filename != '.') @@ -405,7 +405,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c { // Handle True, False here // True, Yes, Enables, Set or Activated - if (*s == 'T(' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A') + if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A') *value = TRUE; // False, No, Disabled, Reset, Cleared, Deactivated else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C') @@ -457,7 +457,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display) * and merge into existing database */ - if ((environment = getenv ("XENVIRONMENT(")) == NULL) + if ((environment = getenv ("XENVIRONMENT")) == NULL) { size_t len; environment = GetIniFile (filename, NULL); @@ -1048,7 +1048,7 @@ void wxHSVToXColor(wxHSV *hsv,XColor *rgb) int h = hsv->h; int s = hsv->s; int v = hsv->v; - int r, g, b; + int r = 0, g = 0, b = 0; int i, f; int p, q, t; s = (s * wxMAX_RGB) / wxMAX_SV; @@ -1081,14 +1081,14 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb) int b = rgb->blue >> 8; int maxv = wxMax3(r, g, b); int minv = wxMin3(r, g, b); - int h, s, v; + int h = 0, s, v; v = maxv; if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv; else s = 0; if (s == 0) h = 0; else { - int rc, gc, bc, hex; + int rc, gc, bc, hex = 0; rc = (maxv - r) * wxMAX_RGB / (maxv - minv); gc = (maxv - g) * wxMAX_RGB / (maxv - minv); bc = (maxv - b) * wxMAX_RGB / (maxv - minv); @@ -1117,7 +1117,7 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc) wxHSV hsv_defs, hsv; wxXColorToHSV(&hsv,xc); - int diff, min_diff, pixel = 0; + int diff, min_diff = 0, pixel = 0; for(llp = 0;llp < num_colors;llp++) {