X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtpdm%2FPrinterBox.c;h=6c418c0932fca7c753363303562c42c9304c14f8;hb=2f634848ce5fd3ecd9971c2cb8d62c65c4d78d3e;hp=48ed2c6c7a0816ab736ce3dbd45bb88df372cfaa;hpb=c884521619ded86baea5e0a74c8d0d2234c232fe;p=oweals%2Fcde.git

diff --git a/cde/programs/dtpdm/PrinterBox.c b/cde/programs/dtpdm/PrinterBox.c
index 48ed2c6c..6c418c09 100644
--- a/cde/programs/dtpdm/PrinterBox.c
+++ b/cde/programs/dtpdm/PrinterBox.c
@@ -319,7 +319,7 @@ static void TrayCtlSelectCB(Widget w, XtPointer client_d, XtPointer call_d);
  */
 static SizeCtl* SizeCtlNew();
 static void SizeCtlDelete(SizeCtl* me);
-static int SizeCtlStrColl(void* e1, void* e2);
+static int SizeCtlStrColl(const void* e1, const void* e2);
 static void SizeCtlSetSizeLists(PdmOidList** oids,
 				XmStringTable* xmstrs,
 				PdmOidLinkedList* oids_ll);
@@ -530,7 +530,8 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp)
     PdmPrinterBoxData* data = (PdmPrinterBoxData*)me->subclass_data;
     const char* strval;
     PdmOidMediumSS* medium_ss_supported;
-    PdmOidTrayMediumList* input_trays_medium;
+    PdmOidTrayMediumList* input_trays_medium = NULL;
+#if 0 && defined(PRINTING_SUPPORTED)
     /*
      * printer model description
      */
@@ -542,19 +543,23 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp)
     strval = PdmXpGetStringValue(pdm_xp, XPDocAttr,
 				 pdmoid_att_document_format);
     data->document_format = PdmOidDocumentFormatParse(strval);
+#endif /* PRINTING_SUPPORTED */
     if((char*)NULL == data->document_format)
     {
 	/*
 	 * document format not specified, try to obtain
 	 * document-formats-supported, and obtain up the default from it
 	 */
+#if 0 && defined(PRINTING_SUPPORTED)
 	strval = PdmXpGetStringValue(pdm_xp, XPPrinterAttr,
 				     pdmoid_att_document_formats_supported);
 	data->document_format = PdmOidDocumentFormatDefault(strval);
+#endif /* PRINTING_SUPPORTED */
     }
     /*
      * document attributes supported
      */
+#if 0 && defined(PRINTING_SUPPORTED)
     strval = PdmXpGetStringValue(pdm_xp, XPPrinterAttr,
 				 pdmoid_att_document_attributes_supported);
     data->document_attrs_supported = PdmOidListNew(strval);
@@ -612,6 +617,7 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp)
      */
     PdmOidMediumSSDelete(medium_ss_supported);
     PdmOidTrayMediumListDelete(input_trays_medium);
+#endif /* PRINTING_SUPPORTED */
 }
 
 /*
@@ -630,6 +636,7 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp)
 static void
 PdmPrinterBoxSetAttr(PdmSetupBox* me, PdmXp* pdm_xp)
 {
+#if 0 && defined(PRINTING_SUPPORTED)
     PdmPrinterBoxData* data = (PdmPrinterBoxData*)me->subclass_data;
     /*
      * orientation
@@ -651,6 +658,7 @@ PdmPrinterBoxSetAttr(PdmSetupBox* me, PdmXp* pdm_xp)
      */
     PdmXpSetValue(pdm_xp, XPDocAttr, pdmoid_att_default_input_tray,
 		  TrayCtlGetTray(data->tray_ctl));
+#endif /* PRINTING_SUPPORTED */
 }
 
 /*
@@ -825,8 +833,8 @@ PdmPrinterBoxResizeCB(Widget w,
     PdmSetupBox* me = (PdmSetupBox*)client_data;
     PdmPrinterBoxData* data = (PdmPrinterBoxData*)me->subclass_data;
     typedef struct {
-	Position x, y;
-	Dimension width, height;
+	XtArgVal /* Position */ x, y;
+	XtArgVal /* Dimension */ width, height;
     } PdmRect;
     PdmRect rt, rs, ro, rp, c1, c2, r1, r2;
     /*
@@ -1121,9 +1129,9 @@ static void
 OrientCtlResizeCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     OrientCtl* me = (OrientCtl*)client_data;
-    Dimension height, width, margin_width, new_width;
-    Position menu_x, menu_y, icon_x, icon_y;
-    Dimension menu_h, menu_w, icon_h, icon_w;
+    XtArgVal /* Dimension */ height, width, margin_width, new_width;
+    XtArgVal /* Position */ menu_x, menu_y, icon_x, icon_y;
+    XtArgVal /* Dimension */ menu_h, menu_w, icon_h, icon_w;
     /*
      * get current layout info
      */
@@ -1212,7 +1220,7 @@ static void
 OrientCtlSelectCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     OrientCtl* me;
-    int selected_item = (int)client_data;
+    XtArgVal /* int */ selected_item = (XtArgVal)client_data;
 
     XtVaGetValues(w, XmNuserData, &me, NULL);
     OrientCtlSetSelectedItem(me, selected_item);
@@ -1574,9 +1582,9 @@ static void
 PlexCtlResizeCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     PlexCtl* me = (PlexCtl*)client_data;
-    Dimension height, width, margin_width, new_width;
-    Position menu_x, menu_y, icon_x, icon_y;
-    Dimension menu_h, menu_w, icon_h, icon_w;
+    XtArgVal /* Dimension */ height, width, margin_width, new_width;
+    XtArgVal /* Position  */ menu_x, menu_y, icon_x, icon_y;
+    XtArgVal /* Dimension */ menu_h, menu_w, icon_h, icon_w;
     /*
      * get current layout info
      */
@@ -1665,7 +1673,7 @@ static void
 PlexCtlSelectCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     PlexCtl* me;
-    int selected_item = (int)client_data;
+    XtArgVal /* int */ selected_item = (XtArgVal)client_data;
 
     XtVaGetValues(w, XmNuserData, &me, NULL);
     PlexCtlSetSelectedItem(me, selected_item);
@@ -2072,8 +2080,8 @@ static void
 TrayCtlResizeCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     TrayCtl* me = (TrayCtl*)client_data;
-    Dimension height, menu_h;
-    Position menu_y;
+    XtArgVal /* Dimension */ height, menu_h;
+    XtArgVal /* Position  */ menu_y;
     /*
      * get current layout info
      */
@@ -2217,7 +2225,7 @@ static void
 TrayCtlSelectCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     TrayCtl* me;
-    int selected_item = (int)client_data;
+    XtArgVal /* int */ selected_item = (XtArgVal)client_data;
 
     XtVaGetValues(w, XmNuserData, &me, NULL);
     TrayCtlSetSelectedItem(me, selected_item);
@@ -2289,9 +2297,9 @@ SizeCtlDelete(SizeCtl* me)
  *
  */
 static int
-SizeCtlStrColl(void* e1, void* e2)
+SizeCtlStrColl(const void* e1, const void* e2)
 {
-    SizeCtlSortRec *r1 = e1, *r2 = e2;
+    const SizeCtlSortRec *r1 = e1, *r2 = e2;
 
     return strcoll(r1->str, r2->str);
 }
@@ -2725,9 +2733,9 @@ static void
 SizeCtlResizeCB(Widget w, XtPointer client_data, XtPointer call_data)
 {
     SizeCtl* me = (SizeCtl*)client_data;
-    Dimension height, width, margin_width, new_width;
-    Position list_x, list_y, radio_x, radio_y;
-    Dimension list_h, list_w, radio_h, radio_w;
+    XtArgVal /* Dimension */ height, width, margin_width, new_width;
+    XtArgVal /* Position  */ list_x, list_y, radio_x, radio_y;
+    XtArgVal /* Dimension */ list_h, list_w, radio_h, radio_w;
     Widget scrolled_list = XtParent(me->list_box);
     /*
      * get current layout info
@@ -2969,7 +2977,7 @@ CreateOptionMenuPulldown(String pulldown_name,
 					 NULL);
 	if(activate_proc != (XtCallbackProc)NULL)
 	    XtAddCallback(button, XmNactivateCallback,
-			  activate_proc, (XtPointer)i);
+			  activate_proc, (XtPointer)(XtArgVal)i);
 	if(i == initial_item)
 	    initial_selected = button;
     }
@@ -3063,6 +3071,7 @@ IconMaxDimension(Widget icon_label,
 		 Dimension* max_width, Dimension* max_height)
 {
     Dimension width, height;
+    XtArgVal width0, height0;
     /*
      * set the pixmap in the label
      */
@@ -3073,9 +3082,11 @@ IconMaxDimension(Widget icon_label,
      * get the label dimensions
      */
     XtVaGetValues(icon_label,
-		  XmNwidth, &width,
-		  XmNheight, &height,
+		  XmNwidth, &width0,
+		  XmNheight, &height0,
 		  NULL);
+    width  = (Dimension)width0;
+    height = (Dimension)height0;
     /*
      * update the max dimensions
      */
@@ -3104,6 +3115,7 @@ PdmPixmapListNew(int count,
 		 Boolean stipple)
 {
     PdmPixmapList* me = (PdmPixmapList*)XtCalloc(1, sizeof(PdmPixmapList));
+    XtArgVal fg, bg;
 
     me->pixmap = (Pixmap*)XtCalloc(count, sizeof(Pixmap));
     me->image_name = (char**)XtCalloc(count, sizeof(char*));
@@ -3118,9 +3130,11 @@ PdmPixmapListNew(int count,
 	me->stipple = None;
     }
     XtVaGetValues(w,
-		  XmNforeground, &me->foreground,
-		  XmNbackground, &me->background,
+		  XmNforeground, &fg,
+		  XmNbackground, &bg,
 		  NULL);
+    me->foreground = (Pixel)fg;
+    me->background = (Pixel)bg;
 
     return me;
 }
@@ -3263,6 +3277,7 @@ PdmPixmapListGetPixmap(PdmPixmapList* me, int i)
 static void
 SetListBoxSelection(Widget list_box, int position)
 {
+    XtArgVal visible_item_count0, item_count0;
     int visible_item_count;
     int item_count;
     int middle_offset;
@@ -3273,9 +3288,11 @@ SetListBoxSelection(Widget list_box, int position)
      * it the initial selection.
      */
     XtVaGetValues(list_box,
-		  XmNitemCount, &item_count,
-		  XmNvisibleItemCount, &visible_item_count,
+		  XmNitemCount, &item_count0,
+		  XmNvisibleItemCount, &visible_item_count0,
 		  NULL);
+    item_count = (int)item_count0;
+    visible_item_count = (int)visible_item_count0;
 
     if(item_count > visible_item_count)
     {