diff options
| author | Andrew Niefer | 2007-10-29 15:14:25 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2007-10-29 15:14:25 +0000 |
| commit | 2b75ae093566ffc38de588d3e378bfc67979bba2 (patch) | |
| tree | 84b2d3655846043e8068015cf9a4bf44229a3919 | |
| parent | a0cfbf3b2edbce6c38676eab9a42a9a74ad289c2 (diff) | |
| download | rt.equinox.framework-2b75ae093566ffc38de588d3e378bfc67979bba2.tar.gz rt.equinox.framework-2b75ae093566ffc38de588d3e378bfc67979bba2.tar.xz rt.equinox.framework-2b75ae093566ffc38de588d3e378bfc67979bba2.zip | |
bug 206897
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/eclipse.c | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/make_version.mak | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipse.c b/bundles/org.eclipse.equinox.executable/library/eclipse.c index 9c3736ba9..f416fa7ed 100644 --- a/bundles/org.eclipse.equinox.executable/library/eclipse.c +++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c @@ -364,6 +364,14 @@ JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[]) /* Initialize official program name */ officialName = name != NULL ? _tcsdup( name ) : getDefaultOfficialName(); +#ifdef MACOSX + /* Most platforms, we will initialize the window system later before trying to do any + * graphics. On Mac, we need it initialized to get the dock icon properly, so always do + * it now. + */ + initWindowSystem( &argc, argv, !noSplash ); +#endif + /* Find the directory where the Eclipse program is installed. */ programDir = getProgramDir(); if (programDir == NULL) diff --git a/bundles/org.eclipse.equinox.executable/library/make_version.mak b/bundles/org.eclipse.equinox.executable/library/make_version.mak index e71e87ef5..01e2a7769 100644 --- a/bundles/org.eclipse.equinox.executable/library/make_version.mak +++ b/bundles/org.eclipse.equinox.executable/library/make_version.mak @@ -10,5 +10,5 @@ #******************************************************************************* maj_ver=1 -min_ver=104 +min_ver=104b LIB_VERSION = $(maj_ver)$(min_ver) |