back out previous changes

This commit is contained in:
pavlov%netscape.com 1999-07-31 02:28:56 +00:00
parent f3e7ecf26f
commit f69d3461a8
14 changed files with 18 additions and 145 deletions

View File

@ -292,24 +292,6 @@ class nsIWidget : public nsISupports {
*/
NS_IMETHOD Show(PRBool aState) = 0;
/**
* Minimize or iconify the window. Not for child windows.
*
*/
NS_IMETHOD Minimize(void) = 0;
/**
* Maximize the window. Not for child windows.
*
*/
NS_IMETHOD Maximize(void) = 0;
/**
* Undo maximize or minimize. Not for child windows.
*
*/
NS_IMETHOD Restore(void) = 0;
/**
* Make the window modal
*

View File

@ -731,28 +731,6 @@ NS_METHOD nsWindow::IsVisible(PRBool & bState)
return NS_OK;
}
NS_METHOD nsWindow::Minimize(void)
{
mView->Window()->Minimize(true);
return NS_OK;
}
NS_METHOD nsWindow::Maximize(void)
{
// IMPLIMENT ME! :)
return NS_OK;
}
NS_METHOD nsWindow::Restore(void)
{
mView->Window()->Minimize(false);
return NS_OK;
}
//-------------------------------------------------------------------------
//
// Move this component

View File

@ -93,10 +93,6 @@ public:
NS_IMETHOD Show(PRBool bState);
NS_IMETHOD IsVisible(PRBool & aState);
NS_IMETHOD Minimize(void);
NS_IMETHOD Maximize(void);
NS_IMETHOD Restore(void);
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
NS_IMETHOD Resize(PRInt32 aWidth,
PRInt32 aHeight,

View File

@ -87,10 +87,6 @@ class nsWidget : public nsBaseWidget
NS_IMETHOD Show(PRBool state);
NS_IMETHOD IsVisible(PRBool &aState);
NS_IMETHOD Minimize(void) {return NS_OK; }
NS_IMETHOD Maximize(void) {return NS_OK; }
NS_IMETHOD Restore(void) {return NS_OK; }
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
NS_IMETHOD Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
NS_IMETHOD Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth,

View File

@ -694,28 +694,6 @@ NS_METHOD nsWindow::ShowMenuBar(PRBool aShow)
return NS_OK;
}
NS_METHOD nsWindow::Minimize(void)
{
int status;
if (mIsToplevel && mShell)
{
// ret val 0 == successful
status = XIconifyWindow(GDK_DISPLAY(), GDK_WINDOW_XWINDOW(mShell), 0);
return status ? NS_ERROR_FAILURE : NS_OK;
}
return NS_ERROR_FAILURE;
}
NS_METHOD nsWindow::Maximize(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Restore(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Move(PRInt32 aX, PRInt32 aY)
{
// not implimented for toplevel windows

View File

@ -62,11 +62,6 @@ public:
NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar);
NS_IMETHOD Show(PRBool aShow);
NS_IMETHOD ShowMenuBar(PRBool aShow);
NS_IMETHOD Minimize(void);
NS_IMETHOD Maximize(void);
NS_IMETHOD Restore(void);
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
NS_IMETHOD Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);

View File

@ -512,6 +512,24 @@ NS_IMETHODIMP nsMacWindow::Show(PRBool bState)
return NS_OK;
}
NS_METHOD nsWindow::Minimize(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Maximize(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Restore(void)
{
return NS_OK;
}
//-------------------------------------------------------------------------
//
// Move this window

View File

@ -72,8 +72,6 @@ public:
nsNativeWidget aNativeParent = nsnull);
NS_IMETHOD Show(PRBool aState);
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
NS_IMETHOD Resize(PRInt32 aWidth,PRInt32 aHeight, PRBool aRepaint);
virtual PRBool OnPaint(nsPaintEvent &event);

View File

@ -341,23 +341,6 @@ NS_IMETHODIMP nsWindow::Show(PRBool bState)
return NS_OK;
}
NS_METHOD nsWindow::Minimize(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Maximize(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Restore(void)
{
return NS_OK;
}
//-------------------------------------------------------------------------
//

View File

@ -82,11 +82,6 @@ public:
virtual nsIWidget* GetParent(void);
NS_IMETHOD Show(PRBool aState);
NS_IMETHOD Minimize(void);
NS_IMETHOD Maximize(void);
NS_IMETHOD Restore(void);
NS_IMETHOD IsVisible(PRBool & aState);
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);

View File

@ -885,25 +885,6 @@ NS_METHOD nsWindow::IsVisible(PRBool & bState)
return NS_OK;
}
NS_METHOD nsWindow::Minimize(void)
{
::ShowWindow(mWnd, SW_MINIMIZE);
return NS_OK;
}
NS_METHOD nsWindow::Maximize(void)
{
::ShowWindow(mWnd, SW_MAXIMIZE);
return NS_OK;
}
NS_METHOD nsWindow::Restore(void)
{
::ShowWindow(mWnd, SW_RESTORE);
return NS_OK;
}
//-------------------------------------------------------------------------
//
// Move this component

View File

@ -84,12 +84,6 @@ public:
virtual nsIWidget* GetParent(void);
NS_IMETHOD Show(PRBool bState);
NS_IMETHOD IsVisible(PRBool & aState);
NS_IMETHOD Minimize(void);
NS_IMETHOD Maximize(void);
NS_IMETHOD Restore(void);
HWND mBorderlessParent;
NS_IMETHOD CaptureMouse(PRBool aCapture);

View File

@ -417,23 +417,6 @@ NS_IMETHODIMP nsWidget::IsVisible(PRBool &aState)
return NS_OK;
}
NS_METHOD nsWindow::Minimize(void)
{
status = XIconifyWindow(mDisplay, mBaseWindow, 0);
return status ? NS_ERROR_FAULRE : NS_OK;
}
NS_METHOD nsWindow::Maximize(void)
{
return NS_OK;
}
NS_METHOD nsWindow::Restore(void)
{
return NS_OK;
}
NS_IMETHODIMP nsWidget::SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight)
{
return NS_OK;

View File

@ -66,10 +66,6 @@ public:
NS_IMETHOD Show(PRBool bState);
NS_IMETHOD IsVisible(PRBool &aState);
NS_IMETHOD Minimize(void);
NS_IMETHOD Maximize(void);
NS_IMETHOD Restore(void);
NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
NS_IMETHOD Resize(PRInt32 aWidth,
PRInt32 aHeight,