2000-01-25 02:35:00 +00:00
|
|
|
--- src/bin/ibuild/ibmenu.c.org Wed Sep 9 07:34:15 1992
|
|
|
|
+++ src/bin/ibuild/ibmenu.c Sun Jan 23 20:18:28 2000
|
|
|
|
@@ -403,7 +403,7 @@
|
1999-12-29 07:47:39 +00:00
|
|
|
|
2000-01-25 02:35:00 +00:00
|
|
|
const char* proc = menuItem->GetTrackNameVar()->GetName();
|
|
|
|
const char* text = menuItem->GetMenuItemGraphic()->GetText();
|
1999-12-29 07:47:39 +00:00
|
|
|
- boolean export = icomp->GetMemberNameVar()->GetExport();
|
2000-01-25 02:35:00 +00:00
|
|
|
+ boolean exportval = icomp->GetMemberNameVar()->GetExport();
|
|
|
|
Shape* shape = icomp->GetShapeVar()->GetShape();
|
|
|
|
|
1999-12-29 07:47:39 +00:00
|
|
|
if (icomp->GetClassNameVar()->IsSubclass()) {
|
2000-01-25 02:35:00 +00:00
|
|
|
@@ -411,7 +411,7 @@
|
1999-12-29 07:47:39 +00:00
|
|
|
out << "(";
|
2000-01-25 02:35:00 +00:00
|
|
|
|
1999-12-29 07:47:39 +00:00
|
|
|
} else {
|
|
|
|
- if (export && !_emitMain) {
|
2000-01-25 02:35:00 +00:00
|
|
|
+ if (exportval && !_emitMain) {
|
|
|
|
out << " " << mname << " = ";
|
|
|
|
out << "new " << MenuClass;
|
1999-12-29 07:47:39 +00:00
|
|
|
} else {
|
2000-01-25 02:35:00 +00:00
|
|
|
@@ -431,7 +431,7 @@
|
|
|
|
EndInstantiate(out);
|
|
|
|
|
|
|
|
if (!_emitMain && proc != nil && *proc != '\0') {
|
|
|
|
- if (!export || icomp->GetClassNameVar()->IsSubclass()) {
|
|
|
|
+ if (!exportval || icomp->GetClassNameVar()->IsSubclass()) {
|
|
|
|
out << " " << mname << "->SetCoreClass(this);\n";
|
|
|
|
out <<" "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
|
|
|
|
out << "::" << proc << ");\n";
|