X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e961ff78126cdf0345340d48ba9de5b96eb682c6..dbcbe229628c7667da2b6257198467d4f09ab28d:/src/motif/xmcombo/xmcombo.c

diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index 189d72e321..dd806ccae9 100644
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -792,6 +792,7 @@ static int WidgetToScreen(Widget w)
 	if ( ScreenOfDisplay(display, i) == screen )
 	    return i;
     XtError("WidgetToScreen: data structures are destroyed.");
+    return 0; /* to avoid a compiler warning */
 } /* WidgetToScreen */
 
 /* --------------------------------------------------------------------
@@ -804,7 +805,6 @@ static void DoDropDownLayout(XmComboBoxWidget w)
     Position       abs_x, abs_y;
     Dimension      ArrowWidth, ListWidth, ListHeight;
     Dimension      ScreenHeight, LabelWidth;
-    Window         Decoration;
     XWindowChanges WindowChanges;
 
     /* 
@@ -1263,7 +1263,7 @@ static struct { String Resource; int Flag; }
 	   { XmNbackground,        BACKGROUND        }
        };
 
-static UpdateColors(XmComboBoxWidget w, int flags)
+static int UpdateColors(XmComboBoxWidget w, int flags)
 {
     Pixel  Color;
     int    i, size = XtNumber(ColorResources);
@@ -1419,7 +1419,7 @@ static Boolean SetValues(XmComboBoxWidget current, XmComboBoxWidget req,
  * dauerhaft dargestellt wird.
  */
     if ( newW->combobox.ScrollBarDisplayPolicy != 
-           current->combobox.ScrollBarDisplayPolicy )
+	 current->combobox.ScrollBarDisplayPolicy ) {
         if ( newW->combobox.StaticList )
             XtVaSetValues(newW->combobox.ListCtrl,
                           XmNscrollBarDisplayPolicy, newW->combobox.ScrollBarDisplayPolicy,
@@ -1427,7 +1427,8 @@ static Boolean SetValues(XmComboBoxWidget current, XmComboBoxWidget req,
         else
             XtWarning(
 "XmComboBox: ScrollBarDisplayPolicy can not be changed when StaticList == False."
-            );
+);
+    }
 /* Anzahl der in der Liste gleichzeitig darstellbaren Eintraege */
     if ( current->combobox.VisibleItemCount != 
            newW->combobox.VisibleItemCount ) {
@@ -1437,11 +1438,11 @@ static Boolean SetValues(XmComboBoxWidget current, XmComboBoxWidget req,
 	Update = True;
     }
     if ( current->combobox.AutomaticSelection != 
-           newW->combobox.AutomaticSelection )
+	 newW->combobox.AutomaticSelection ) {
 	XtVaSetValues(newW->combobox.ListCtrl, 
 	              XmNautomaticSelection, newW->combobox.AutomaticSelection, 
 		      NULL);
-					      
+    }
 /* 
  * benutzter Font: hier erhalten Liste und Eingabefeld jeweils die
  * gleiche Fontliste, wohingegen das Label getrennt behandelt wird.
@@ -2089,7 +2090,7 @@ static void EditVerifyCallback(Widget w, XtPointer pClientData,
 	XmStringTable  Items;
 	int            *SelectionList;
 	int            SelectionCount;
-	int            i, ItemCount, Start, End;
+	int            i, ItemCount, Start;
 	char           *pItem;
 	Boolean        Ignore;
 	
@@ -2321,9 +2322,8 @@ static Boolean FetchLabelTypeResource(Widget w,
                                 char *RscName, char *RscClass, 
 			        unsigned char *pUChar)
 {
-    XrmValue RscValue, RscDest;
+    XrmValue RscValue;
     String   RepresentationType;
-    int      AInt;
     
     if ( FetchResource(w, FullName, FullClass, 
                        RscName, RscClass, 
@@ -2570,7 +2570,6 @@ static void InitMirrorResources(XmComboBoxWidget w)
     XmStringTable AStringTable;
     Pixmap        APixmap;
     XmFontList    AFontList;
-    XrmValue      RscValue;
     String        AString;
     KeySym        AKeySym;
     int           i, size = XtNumber(ResourceMirror);
@@ -2718,8 +2717,6 @@ static void Initialize(Widget request, XmComboBoxWidget newW,
     Widget       w;
     Arg          args[10];
     int          n = 0;
-    XmString     xmstr;
-    Pixel        BackgroundColor;
     
 /* 
  * Da zu allem Ueberfluss die einzelnen Instanzen einer XmComboBox
@@ -3066,7 +3063,7 @@ Widget XmComboBoxGetLabelWidget(Widget w)
  *   Deleted	    Zeigt an, ob der Eintrag geloescht wurde (True)
  *		    oder sich nur veraenderte (False)
  */
-static UpdateComboBox(XmComboBoxWidget w, int Index, Boolean Deleted)
+static int UpdateComboBox(XmComboBoxWidget w, int Index, Boolean Deleted)
 {
     int OldIndex, ItemCount;