diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
| commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
| tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/src/XawInit.c | |
| parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
| parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
| download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'libXaw/src/XawInit.c')
| -rw-r--r-- | libXaw/src/XawInit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libXaw/src/XawInit.c b/libXaw/src/XawInit.c index c10a9b64b..5ca1ef88a 100644 --- a/libXaw/src/XawInit.c +++ b/libXaw/src/XawInit.c @@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - * - * - * XawInitializeWidgetSet - * + * + * + * XawInitializeWidgetSet + * * This routine forces a reference to vendor shell so that the one in this * widget is installed. Any other cross-widget set initialization should be * done here as well. All Athena widgets should include "XawInit.h" and @@ -76,7 +76,7 @@ Widget XawOpenApplication(XtAppContext *app_context_return, *app_context_return = XtCreateApplicationContext(); if( *app_context_return == NULL ) return NULL; - + XtDisplayInitialize(*app_context_return, dpy, application_name, application_class, NULL, 0, @@ -86,7 +86,7 @@ Widget XawOpenApplication(XtAppContext *app_context_return, if (screen) { XtSetArg(args[n], XtNscreen, screen); n++; } - toplevel = XtAppCreateShell(application_name, + toplevel = XtAppCreateShell(application_name, application_class, widget_class, dpy, |