Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes to correct compilation warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-21 05:19:25 +00:00
parent 5fe143dfdf
commit 4b6480c8eb
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/motif/xmcombo/xmcombo.c
View File

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