From 47baece26c43403bf15c2bc19b61bd511d470237 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Sun, 8 Aug 1999 03:08:24 +0000 Subject: [PATCH] adding "default" window border type --- widget/src/mac/nsMacWindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/widget/src/mac/nsMacWindow.cpp b/widget/src/mac/nsMacWindow.cpp index ffb864780167..b80c959c134e 100644 --- a/widget/src/mac/nsMacWindow.cpp +++ b/widget/src/mac/nsMacWindow.cpp @@ -321,7 +321,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent, windowType = (mIsDialog ? eWindowType_dialog : eWindowType_toplevel); short wDefProcID; - Boolean goAwayFlag; + Boolean goAwayFlag; short hOffset; short vOffset; @@ -345,6 +345,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent, case eWindowType_dialog: if (aInitData && aInitData->mBorderStyle != eBorderStyle_all && + aInitData->mBorderStyle != eBorderStyle_default && (aInitData->mBorderStyle == eBorderStyle_none || !(aInitData->mBorderStyle & eBorderStyle_title))) { @@ -361,6 +362,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent, case eWindowType_toplevel: if (aInitData && aInitData->mBorderStyle != eBorderStyle_all && + aInitData->mBorderStyle != eBorderStyle_default && (aInitData->mBorderStyle == eBorderStyle_none || !(aInitData->mBorderStyle & eBorderStyle_resizeh))) wDefProcID = kWindowDocumentProc; @@ -384,6 +386,8 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent, if (aInitData && aInitData->mBorderStyle != eBorderStyle_all) { if (aInitData->mBorderStyle == eBorderStyle_none || + aInitData->mBorderStyle == eBorderStyle_default && + windowType == eWindowType_dialog || !(aInitData->mBorderStyle & eBorderStyle_close)) goAwayFlag = false; }