From d5b23cc0b90db91a597631402b221ed6ba1a873e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 8 Jul 2003 21:36:56 +0000
Subject: [PATCH] just some warning fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/scrlwing.cpp    |  1 -
 src/motif/frame.cpp         |  5 ++++-
 src/motif/utils.cpp         | 10 ++--------
 src/motif/window.cpp        |  2 +-
 src/motif/xmcombo/xmcombo.c |  6 +++---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index f9965cfe15..b43a1067e8 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -347,7 +347,6 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
     int w = noUnitsX * pixelsPerUnitX;
     int h = noUnitsY * pixelsPerUnitY;
      
-    wxSize sz = m_targetWindow->GetClientSize();
     m_targetWindow->SetVirtualSizeHints( w, h );
 
     // The above should arguably be deprecated, this however we still need.
diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 2d07cc18c0..f8ba0a11d1 100644
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -243,7 +243,10 @@ bool wxFrame::Create(wxWindow *parent,
 
     wxLogTrace(wxTRACE_Messages,
                "Created frame (0x%08x) with work area 0x%08x and client "
-               "area 0x%08x", m_frameWidget, m_workArea, m_clientArea);
+               "area 0x%08x",
+               (unsigned)m_frameWidget,
+               (unsigned)m_workArea,
+               (unsigned)m_clientArea);
 
     XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE,
         wxUniversalRepaintProc, (XtPointer) this);
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 179a3a43d6..64c10cf9a5 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -69,10 +69,6 @@
 #pragma message enable nosimpint
 #endif
 
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
 // Yuck this is really BOTH site and platform dependent
 // so we should use some other strategy!
 #ifdef sun
@@ -81,8 +77,6 @@
     #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
 #endif
 
-static char *GetIniFile (char *dest, const char *filename);
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -226,6 +220,8 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 // ----------------------------------------------------------------------------
 
+#if wxUSE_RESOURCES
+
 // Read $HOME for what it says is home, if not
 // read $USER or $LOGNAME for user name else determine
 // the Real User, then determine the Real home dir.
@@ -256,8 +252,6 @@ static char * GetIniFile (char *dest, const char *filename)
     return dest;
 }
 
-#if wxUSE_RESOURCES
-
 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 {
     if (create && wxFileExists (name) ) {
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index e880d8ae24..3325d6cb13 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -1820,7 +1820,7 @@ bool wxAddWindowToTable(Widget w, wxWindow *win)
     wxWidgetHashTable->Put((long) w, win);
 
     wxLogTrace("widget", "Widget 0x%08x <-> window %p (%s)",
-               w, win, win->GetClassInfo()->GetClassName());
+               (unsigned)w, win, win->GetClassInfo()->GetClassName());
 
     return TRUE;
 }
diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index 6519996ac5..9467364f3d 100644
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -3187,12 +3187,12 @@ static int FindSortedItemPos(XmComboBoxWidget w, XmString item)
  */
 static Boolean CheckComboBox(Widget w, char *pFuncName)
 {
-    char buff[256];
-    char *pWName;
-
 #if (XmVersion >= 2000)
     return False; /* temporary workaround */
 #else    
+    char buff[256];
+    char *pWName;
+
     if ( XmIsComboBox(w) ) return False;
     pWName = XrmQuarkToString(w->core.xrm_name);
     sprintf(buff,