Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-01-19 21:11:48 +0000
committerAndrew Niefer2007-01-19 21:11:48 +0000
commit1a0ef36ae9f69561b240c5191040b1411e9e2777 (patch)
tree813d2c4f6e9c615dae34118c41a8af651821e358 /bundles/org.eclipse.equinox.executable/library/motif
parent435198d2fb3fea69d034957ce8595a7284d5301d (diff)
downloadrt.equinox.framework-1a0ef36ae9f69561b240c5191040b1411e9e2777.tar.gz
rt.equinox.framework-1a0ef36ae9f69561b240c5191040b1411e9e2777.tar.xz
rt.equinox.framework-1a0ef36ae9f69561b240c5191040b1411e9e2777.zip
changes for 168775
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c14
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c4
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak1
3 files changed, 11 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
index 83b694e92..53a4cc151 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
+++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
@@ -127,10 +127,10 @@ int showSplash( const char* featureImage )
/* Note that XtSetArg is a macro, and the 1st argument will be evaluated twice
* so increment nArgs on its own */
XtSetArg(args[nArgs], XmNmwmDecorations, 0); nArgs++;
- XtSetArg(args[nArgs], XmNtitle, officialName); nArgs++;
+ XtSetArg(args[nArgs], XmNtitle, getOfficialName()); nArgs++;
XtSetArg(args[nArgs], XmNwidth, width); nArgs++;
XtSetArg(args[nArgs], XmNheight, height); nArgs++;
- shellHandle = XtAppCreateShell(officialName, "", applicationShellWidgetClass, xDisplay, args, nArgs);
+ shellHandle = XtAppCreateShell(getOfficialName(), "", applicationShellWidgetClass, xDisplay, args, nArgs);
nArgs = 0;
XtSetArg(args[nArgs++], XmNancestorSensitive, 1);
@@ -214,10 +214,12 @@ long getSplashHandle() {
void dispatchMessages() {
XtInputMask mask;
- /* Process any outstanding messages */
- while ((mask = XtAppPending(appContext)) != 0) {
- XtAppProcessEvent(appContext, mask);
- }
+ if (appContext != NULL) {
+ /* Process any outstanding messages */
+ while ((mask = XtAppPending(appContext)) != 0) {
+ XtAppProcessEvent(appContext, mask);
+ }
+ }
}
void takeDownSplash()
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c
index 3442ac985..791f9d0af 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c
+++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotifCommon.c
@@ -76,7 +76,7 @@ void displayMessage( char* title, char* message )
XtSetArg( arg[ nArgs ], XmNdialogType, XmDIALOG_MESSAGE ); nArgs++;
XtSetArg( arg[ nArgs ], XmNtitle, title ); nArgs++;
XtSetArg( arg[ nArgs ], XmNmessageString, msg ); nArgs++;
- msgBox = XmCreateMessageDialog( topWindow, officialName, arg, nArgs );
+ msgBox = XmCreateMessageDialog( topWindow, getOfficialName(), arg, nArgs );
XtUnmanageChild( XmMessageBoxGetChild( msgBox, XmDIALOG_CANCEL_BUTTON ) );
XtUnmanageChild( XmMessageBoxGetChild( msgBox, XmDIALOG_HELP_BUTTON ) );
XtManageChild( msgBox );
@@ -112,7 +112,7 @@ void initWindowSystem( int* pArgc, char* argv[], int showSplash )
/* Create the top level shell that will not be used other than
to initialize the application. */
XtSetLanguageProc (NULL, NULL, NULL);
- topWindow = XtAppInitialize( &appContext, officialName, NULL, 0,
+ topWindow = XtAppInitialize( &appContext, getOfficialName(), NULL, 0,
pArgc, argv, NULL, NULL, 0 );
XtSetArg( arg[ 0 ], XmNmappedWhenManaged, False );
XtSetValues( topWindow, arg, 1 );
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
index deedc371b..0eb97fbe2 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
@@ -42,6 +42,7 @@ CFLAGS = -O -s \
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
-DDEFAULT_WS="\"$(DEFAULT_WS)\"" \
+ -DDEFAULT_JAVA_EXEC \
-DAIX \
-I./ \
-I../ \

Back to the top