mirror of
https://github.com/python/cpython.git
synced 2025-08-02 08:02:56 +00:00
Removed (within an #ifdef) Carbon-incompatabilities:
- Don't call all the toolbox init routines. - No balloon help, so removed help code from the initial dialog.
This commit is contained in:
parent
bb6d83a8c4
commit
ee6eeb1876
1 changed files with 6 additions and 0 deletions
|
@ -48,6 +48,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include <profiler.h>
|
#include <profiler.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#ifdef THINK_C
|
#ifdef THINK_C
|
||||||
#include <console.h>
|
#include <console.h>
|
||||||
|
@ -91,6 +92,8 @@ init_mac_world()
|
||||||
#ifdef THINK_C
|
#ifdef THINK_C
|
||||||
printf("\n");
|
printf("\n");
|
||||||
#else
|
#else
|
||||||
|
#ifndef TARGET_API_MAC_CARBON
|
||||||
|
/* These aren't needed for carbon */
|
||||||
MaxApplZone();
|
MaxApplZone();
|
||||||
InitGraf(&qd.thePort);
|
InitGraf(&qd.thePort);
|
||||||
InitFonts();
|
InitFonts();
|
||||||
|
@ -98,6 +101,7 @@ init_mac_world()
|
||||||
TEInit();
|
TEInit();
|
||||||
InitDialogs((long)0);
|
InitDialogs((long)0);
|
||||||
InitMenus();
|
InitMenus();
|
||||||
|
#endif
|
||||||
InitCursor();
|
InitCursor();
|
||||||
init_appearance();
|
init_appearance();
|
||||||
#endif
|
#endif
|
||||||
|
@ -165,9 +169,11 @@ PyMac_InteractiveOptions(PyMac_PrefRecord *p, int *argcp, char ***argvp)
|
||||||
DisposeDialog(dialog);
|
DisposeDialog(dialog);
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
#ifndef TARGET_API_MAC_CARBON
|
||||||
if ( item == OPT_HELP ) {
|
if ( item == OPT_HELP ) {
|
||||||
HMSetBalloons(!HMGetBalloons());
|
HMSetBalloons(!HMGetBalloons());
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if ( item == OPT_CMDLINE ) {
|
if ( item == OPT_CMDLINE ) {
|
||||||
int new_argc, newer_argc;
|
int new_argc, newer_argc;
|
||||||
char **new_argv, **newer_argv;
|
char **new_argv, **newer_argv;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue