diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-07-29 00:40:35 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-07-29 00:40:35 +0000 |
| commit | 71eb560c323df9e78e1381eff41002f1df9cb44b (patch) | |
| tree | 56ef83d88e352b5219d691d2db87f349e31ce79f | |
| parent | a5c5bd828d0a89ab979ad122c40073e8985e5e6e (diff) | |
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=938 - Updaterel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1lg3d-eventlg3d-dev-0-6-latestlg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1lg3dCOMPOSITEWRAP
XawPrintShell per feedback and review comments.
| -rw-r--r-- | printdialog.c | 15 | ||||
| -rw-r--r-- | printdialog.h | 24 |
2 files changed, 19 insertions, 20 deletions
diff --git a/printdialog.c b/printdialog.c index 615734f..97cf4c9 100644 --- a/printdialog.c +++ b/printdialog.c @@ -40,6 +40,10 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xaw/AsciiText.h> #include <X11/Xaw/Dialog.h> +#ifdef XKB +#include <X11/extensions/XKBbells.h> +#endif /* XKB */ + #include "printdialog.h" #include "printdialogprivates.h" #include "print.h" @@ -95,6 +99,11 @@ static void do_beep(PrintDialogWidget pdw) { Log(("*** Beep!\n")); +#ifdef XKB + XkbStdBell(XtDisplay((Widget)pdw), XtWindow((Widget)pdw), 0, XkbBI_MinorError); +#else + XBell(XtDisplay((Widget)pdw), 0); +#endif /* XKB */ } /* Center popup (on parent, not on screen - which would be a bad idea @@ -972,6 +981,12 @@ createprintdialogchildren(Widget w) has_default_printer = True; } } + else + { + XtAppWarning(XtWidgetToApplicationContext(w), + "No Xprint servers could be found. " + "Check whether the XPSERVERLIST environment variable contains any valid Xprint server(s)."); + } n = 0; XtSetArg(args[n], XtNborderWidth, 0); n++; diff --git a/printdialog.h b/printdialog.h index a549a1e..e963847 100644 --- a/printdialog.h +++ b/printdialog.h @@ -37,30 +37,14 @@ in this Software without prior written authorization from The Open Group. #include <X11/XprintUtil/xprintutil.h> /* Resources: - - Name Class RepType Default Value - ---- ----- ------- ------------- - background Background Pixel XtDefaultBackground - borderColor BorderColor Pixel XtDefaultForeground - borderWidth BorderWidth Dimension 1 - destroyCallback Callback Pointer NULL - height Height Dimension computed at create - icon Icon Pixmap 0 - label Label String NULL - mappedWhenManaged MappedWhenManaged Boolean True - sensitive Sensitive Boolean True - value Value String NULL - width Width Dimension computed at create - x Position Position 0 - y Position Position 0 - + NOT WRITTEN YET */ #define XtCIcon "Icon" #define XtNicon "icon" -#define XawNOkCallback "XawNOkCallback" -#define XawNCancelCallback "XawNCancelCallback" +#define XawNOkCallback "okCallback" +#define XawNCancelCallback "cancelCallback" typedef struct { @@ -82,4 +66,4 @@ void XawPrintDialogClosePrinterConnection(Widget w, Bool closeDisplay); _XFUNCPROTOEND -#endif /* _XawDialog_h */ +#endif /* !XMORE_PRINTDIALOG_H */ |