Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed nsDeviceCOntextUnix header file and replaced it with nsIDeviceContext

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@9146 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
1998-09-02 20:01:41 +00:00
parent c918d7df77
commit 8aafdcac95
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/widget/src/motif/nsComboBox.cpp
View File

@@ -21,7 +21,7 @@
#include "nsGUIEvent.h"
#include "nsString.h"
#include "nsStringUtil.h"
#include "nsDeviceContextUnix.h"
#include "nsIDeviceContext.h"
#include <Xm/RowColumn.h>
#include <Xm/PushB.h>
@@ -31,7 +31,6 @@
#define INITIAL_MAX_ITEMS 128
#define ITEMS_GROWSIZE 128
//-------------------------------------------------------------------------
//
// nsComboBox constructor
@@ -67,7 +66,8 @@ nsComboBox::~nsComboBox()
void nsComboBox::SetForegroundColor(const nscolor &aColor)
{
nsWindow::SetForegroundColor(aColor);
PRUint32 pixel = ((nsDeviceContextUnix *)mContext)->ConvertPixel(aColor);
PRUint32 pixel;
mContext->ConvertPixel(aColor, pixel);
XtVaSetValues(mOptionMenu, XtNforeground, pixel, nsnull);
}
@@ -79,7 +79,8 @@ void nsComboBox::SetForegroundColor(const nscolor &aColor)
void nsComboBox::SetBackgroundColor(const nscolor &aColor)
{
nsWindow::SetForegroundColor(aColor);
PRUint32 pixel = ((nsDeviceContextUnix *)mContext)->ConvertPixel(aColor);
PRUint32 pixel;
mContext->ConvertPixel(aColor, pixel);
XtVaSetValues(mOptionMenu, XtNbackground, pixel, nsnull);
}

9
mozilla/widget/src/motif/nsWindow.cpp
View File

@@ -22,7 +22,6 @@
#include "nsGUIEvent.h"
#include "nsIRenderingContext.h"
#include "nsIDeviceContext.h"
#include "nsDeviceContextUnix.h"
#include "nsRect.h"
#include "nsTransform2D.h"
#include "nsGfxCIID.h"
@@ -45,7 +44,6 @@
#include "Xm/RowColumn.h"
#include "Xm/Form.h"
#define DBG 0
#define SET_VALUES 1
@@ -788,7 +786,9 @@ nscolor nsWindow::GetForegroundColor(void)
void nsWindow::SetForegroundColor(const nscolor &aColor)
{
mForeground = aColor;
PRUint32 pixel = ((nsDeviceContextUnix *)mContext)->ConvertPixel(aColor);
PRUint32 pixel;
mContext->ConvertPixel(aColor, pixel);
XtVaSetValues(mWidget, XtNforeground, pixel, nsnull);
}
@@ -812,7 +812,8 @@ nscolor nsWindow::GetBackgroundColor(void)
void nsWindow::SetBackgroundColor(const nscolor &aColor)
{
mBackground = aColor ;
PRUint32 pixel = ((nsDeviceContextUnix *)mContext)->ConvertPixel(aColor);
PRUint32 pixel;
mContext->ConvertPixel(aColor, pixel);
XtVaSetValues(mWidget, XtNbackground, pixel, nsnull);
}