Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pro4 namespace stuff.

Browse Source
This commit is contained in:
pinkerton%netscape.com 1998-09-29 17:29:34 +00:00
parent 1f53b20032
commit bd7bb73f4a
11 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/macfe/Composer/CFontMenuAttachment.cp
View File

@ -249,7 +249,7 @@ void CFontMenuAttachment::InstallMenus()
LMenuBar *currentMenuBar = LMenuBar::GetCurrentMenuBar();
if (currentMenuBar)
{
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
currentMenuBar->InstallMenu(sMenu, hierMenu);
ResIDT resID;

2
cmd/macfe/Composer/CRecentEditMenuAttachment.cp
View File

@ -192,7 +192,7 @@ void CRecentEditMenuAttachment::InstallMenus()
LMenuBar *currentMenuBar = LMenuBar::GetCurrentMenuBar();
if (currentMenuBar)
{
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
currentMenuBar->InstallMenu(sMenu, hierMenu);
ResIDT resID;

4
cmd/macfe/Composer/CToolsAttachment.cp
View File

@ -327,11 +327,11 @@ void CToolsAttachment::InstallMenus()
if (menu)
{
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
currentMenuBar->InstallMenu(menu, hierMenu);
}
}
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
currentMenuBar->InstallMenu(sMenu, InstallMenu_AtEnd);
}
}

12
cmd/macfe/applevnt/mplugin.cp
View File

@ -397,10 +397,10 @@ OSErr CPluginHandler::InitCodeResource(NPNetscapeFuncs* funcs, _np_handle* handl
OSErr err = noErr;
#ifdef DEBUG
EDebugAction oldThrow = gDebugThrow;
EDebugAction oldSignal = gDebugSignal;
gDebugThrow = debugAction_Nothing;
gDebugSignal = debugAction_Nothing;
EDebugAction oldThrow = UDebugging::gDebugThrow;
EDebugAction oldSignal = UDebugging::gDebugSignal;
UDebugging::gDebugThrow = debugAction_Nothing;
UDebugging::gDebugSignal = debugAction_Nothing;
#endif
Try_
{
@ -474,8 +474,8 @@ OSErr CPluginHandler::InitCodeResource(NPNetscapeFuncs* funcs, _np_handle* handl
EndCatch_
CPrefs::UseApplicationResFile(); // Revert the resource chain
#ifdef DEBUG
gDebugThrow = oldThrow;
gDebugSignal = oldSignal;
UDebugging::gDebugThrow = oldThrow;
UDebugging::gDebugSignal = oldSignal;
#endif
return err;
}

4
cmd/macfe/central/CBookmarksAttachment.cp
View File

@ -377,11 +377,11 @@ void CBookmarksAttachment::InstallMenus()
if (menu)
{
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
currentMenuBar->InstallMenu(menu, hierMenu);
}
}
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
currentMenuBar->InstallMenu(sMenu, InstallMenu_AtEnd);
#if 0
// no more Guide menu. Leave this here in case mktg wants to replace it with something (pinkerton).

2
cmd/macfe/central/InternetConfig.cp
View File

@ -274,7 +274,7 @@ fInstance(NULL)
ICError err;
// Detect IC, if present
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
err = ::ICStart(&fInstance, emSignature);
//ThrowIfOSErr_(err);
if (!err)

13
cmd/macfe/gui/CBrowserWindow.cp
View File

@ -2325,7 +2325,7 @@ void CBrowserWindow::HandleGetURLEvent(const AppleEvent &inAppleEvent,
char * winName = NULL;
#ifdef DEBUG
StValueChanger<EDebugAction> changeDebugThrow(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> changeDebugThrow(UDebugging::gDebugThrow, debugAction_Nothing);
#endif
MoreExtractFromAEDesc::GetCString(inAppleEvent, keyDirectObject, url);
@ -2447,20 +2447,15 @@ void CBrowserWindow::HandleOpenURLEvent(const AppleEvent &inAppleEvent,
AEDesc &/*outResult*/,
CBrowserWindow *inBrowserWindow)
{
// The use of "volatile" in the following lines
// (a) generated compiler warnings, because they are passed to routines that
// are not declared with correspondingly volatile parameters.
// (b) do not appear to need to be volatile in the sense given (If they were
// declared as volatile char*, that would be another thing...
char * /*volatile*/ formData = NULL; // Do not free this
char * /*volatile*/ formHeader = NULL; // form headers (MIME type)
char * formData = NULL; // Do not free this
char * formHeader = NULL; // form headers (MIME type)
ProcessSerialNumber psn;
FSSpec fileSpec;
Boolean hasFileSpec = FALSE;
Boolean hasFormData = FALSE;
Boolean hasPSN = FALSE;
Boolean forceReload = FALSE;
OSErr volatile err;
OSErr err;
Size actualSize;
DescType realType;

2
cmd/macfe/gui/CDateView.cp
View File

@ -441,7 +441,7 @@ void CDateView::ShowHideArrows(Boolean inShow) {
Filter for incoming data characters.
======================================================================================*/
EKeyStatus CDateView::DateFieldFilter(TEHandle inMacTEH, Char16 theKey, Char16& theChar, SInt16 inModifiers) {
EKeyStatus CDateView::DateFieldFilter(TEHandle inMacTEH, Char16 theKey, Char16& theChar, UInt16 inModifiers) {
EKeyStatus theKeyStatus = keyStatus_PassUp;
//Char16 theKey = inKeyEvent.message;

2
lib/mac/UserInterface/CButton.cp
View File

@ -135,7 +135,7 @@ void CButton::Draw(RgnHandle inSuperDrawRgnH)
StColorPenState::Normalize();
// Fail safe offscreen drawing
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
try
{
LGWorld theOffWorld(theFrame, 0, useTempMem);

2
lib/mac/UserInterface/COffscreenCaption.cp
View File

@ -108,7 +108,7 @@ void COffscreenCaption::Draw(RgnHandle inSuperDrawRgnH)
StColorPenState::Normalize();
// Fail safe offscreen drawing
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
try
{
LGWorld theOffWorld(theFrame, 0, useTempMem);

2
lib/mac/UserInterface/CTabControl.cp
View File

@ -188,7 +188,7 @@ void CTabControl::Draw(RgnHandle inSuperDrawRgnH)
StColorPenState::Normalize();
// Fail safe offscreen drawing
StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
StValueChanger<EDebugAction> okayToFail(UDebugging::gDebugThrow, debugAction_Nothing);
try
{
LGWorld theOffWorld(theFrame, 0, useTempMem);