X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..3b69b47ca6e1a595bd357f849d46b10d98444fce:/src/motif/utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index fee2d0fb03..d4322fe7cc 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utils.cpp
+// Name:        src/motif/utils.cpp
 // Purpose:     Various utilities
 // Author:      Julian Smart
 // Modified by:
@@ -24,7 +24,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/apptrait.h"
 #include "wx/app.h"
@@ -180,7 +179,7 @@ static char * GetIniFile (char *dest, const char *filename)
     {
         strcpy(dest, filename);
     }
-    else if ((home = wxGetUserHome("")) != NULL)
+    else if ((home = wxGetUserHome()) != NULL)
     {
         strcpy(dest, home);
         if (dest[strlen(dest) - 1] != '/')
@@ -314,7 +313,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
     XrmDatabase database;
 
-    if (file != "")
+    if (!file.empty())
     {
         char buffer[500];
 
@@ -454,7 +453,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);
         wxString hostname = wxGetHostName();
-        if ( !!hostname )
+        if ( !hostname.empty() )
             strncat(environment, hostname, 1024 - len);
     }
     homeDB = XrmGetFileDatabase (environment);
@@ -529,7 +528,7 @@ void wxGetMousePosition( int* x, int* y )
     *x = xev.x_root;
     *y = xev.y_root;
 #endif
-};
+}
 
 // Return true if we have a colour display
 bool wxColourDisplay()
@@ -667,9 +666,9 @@ void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
     case 4: r = t, g = p, b = v; break;
     case 5: r = v, g = p, b = q; break;
     }
-    rgb->red = r << 8;
-    rgb->green = g << 8;
-    rgb->blue = b << 8;
+    rgb->red = (unsigned short)(r << 8);
+    rgb->green = (unsigned short)(g << 8);
+    rgb->blue = (unsigned short)(b << 8);
 }
 
 void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
@@ -811,6 +810,7 @@ char wxFindMnemonic (const char *s)
 char* wxFindAccelerator( const char *s )
 {
 #if 1
+    wxUnusedVar(s);
     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;
@@ -878,6 +878,7 @@ char* wxFindAccelerator( const char *s )
 XmString wxFindAcceleratorText (const char *s)
 {
 #if 1
+    wxUnusedVar(s);
     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;
@@ -934,6 +935,9 @@ extern void wxDoChangeFont(WXWidget widget, const wxFont& font)
     XtVaSetValues( w,
                    wxFont::GetFontTag(), font.GetFontTypeC( XtDisplay(w) ),
                    NULL );
+#else
+    wxUnusedVar(widget);
+    wxUnusedVar(font);
 #endif
 
 }