Change usage of jint to PRint32. One of he fixes from the net.
git-svn-id: svn://10.0.0.236/trunk@7417 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -130,8 +130,8 @@ extern "C" {
|
||||
URL_Struct *fe_GetBrowserStartupUrlStruct();
|
||||
|
||||
void displayImage(MWContext * context, IL_Pixmap * image,
|
||||
IL_Pixmap * mask, long int x, long int y,
|
||||
jint x_offset, jint y_offset, jint width, jint height);
|
||||
IL_Pixmap * mask,PRInt32 x,PRInt32 y,
|
||||
PRInt32 x_offset, PRInt32 y_offset, PRInt32 width, PRInt32 height);
|
||||
};
|
||||
|
||||
extern MWContext *last_documented_xref_context;
|
||||
@@ -4966,7 +4966,7 @@ XFE_Frame::zaxis_BelowEH(Widget shell,
|
||||
extern "C"
|
||||
{
|
||||
void
|
||||
DisplayPixmap(MWContext * context, IL_Pixmap * image, IL_Pixmap * mask, long int x, long int y, jint x_offset, jint y_offset, jint width, jint height)
|
||||
DisplayPixmap(MWContext * context, IL_Pixmap * image, IL_Pixmap * mask, PRInt32 x, PRInt32 y, PRInt32 x_offset, PRInt32 y_offset, PRInt32 width, PRInt32 height)
|
||||
{
|
||||
|
||||
XFE_Frame * frameHandle=(XFE_Frame *)NULL;
|
||||
@@ -5078,8 +5078,8 @@ ImageComplete(MWContext * context, IL_Pixmap * image)
|
||||
|
||||
void
|
||||
displayImage(MWContext * context, IL_Pixmap * image,
|
||||
IL_Pixmap * mask, long int x, long int y,
|
||||
jint x_offset, jint y_offset, jint width, jint height)
|
||||
IL_Pixmap * mask, PRInt32 x, PRInt32 y,
|
||||
PRInt32 x_offset, PRInt32 y_offset, PRInt32 width,PRInt32 height)
|
||||
{
|
||||
|
||||
int32 img_x_offset, img_y_offset; /* Offset of image in drawable. */
|
||||
|
||||
@@ -248,8 +248,8 @@ public:
|
||||
// Handles image display in the new setup
|
||||
/*
|
||||
void displayImage(MWContext * context, IL_Pixmap * image,
|
||||
IL_Pixmap * mask, long int x, long int y,
|
||||
jint x_offset, jint y_offset, jint width, jint height);
|
||||
IL_Pixmap * mask, PRInt32 x, PRInt32 y,
|
||||
PRInt32 x_offset, PRInt32 y_offset,PRInt32 width, PRInt32 height);
|
||||
*/
|
||||
|
||||
protected:
|
||||
|
||||
@@ -158,7 +158,7 @@ XFE_NavCenterView::XFE_NavCenterView(XFE_Component *toplevel_component,
|
||||
ns->data = this;
|
||||
|
||||
m_pane = HT_NewPane(ns);
|
||||
HT_SetPaneFEData(m_pane, this);
|
||||
HT_SetPaneFEData(m_pane, context);
|
||||
|
||||
// add our subviews to the list of subviews for command dispatching and
|
||||
// deletion.
|
||||
@@ -392,7 +392,7 @@ XFE_NavCenterView::getSelector(void)
|
||||
}
|
||||
|
||||
void
|
||||
XFE_NavCenterView::handleDisplayPixmap(Widget w, IL_Pixmap * image, IL_Pixmap * mask, jint width, jint height)
|
||||
XFE_NavCenterView::handleDisplayPixmap(Widget w, IL_Pixmap * image, IL_Pixmap * mask, PRInt32 width, PRInt32 height)
|
||||
{
|
||||
XFE_RDFImage * rdfImage;
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
static void selector_destroy_cb(Widget,XtPointer,XtPointer);
|
||||
|
||||
|
||||
virtual void handleDisplayPixmap(Widget, IL_Pixmap *, IL_Pixmap *, jint width, jint height);
|
||||
virtual void handleDisplayPixmap(Widget, IL_Pixmap *, IL_Pixmap *, PRInt32 width, PRInt32 height);
|
||||
virtual void handleNewPixmap(Widget, IL_Pixmap *, Boolean mask);
|
||||
virtual void handleImageComplete(Widget, IL_Pixmap *);
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
void DisplayPixmap(MWContext *, IL_Pixmap *, IL_Pixmap * , jint , jint , jint , jint , jint , jint) ;
|
||||
void DisplayPixmap(MWContext *, IL_Pixmap *, IL_Pixmap * , PRInt32, PRInt32, PRInt32, PRInt32, PRInt32, PRInt32);
|
||||
void NewPixmap(MWContext *, IL_Pixmap * image, Boolean mask);
|
||||
void ImageComplete(MWContext *, IL_Pixmap * image);
|
||||
void fe_load_default_font(MWContext *context);
|
||||
@@ -207,7 +207,7 @@ XFE_RDFImage::setCompleteCallback(completeCallbackPtr callback, void * client_d
|
||||
|
||||
|
||||
void
|
||||
XFE_RDFImage::RDFDisplayPixmap(IL_Pixmap * image, IL_Pixmap * mask, jint width, jint height)
|
||||
XFE_RDFImage::RDFDisplayPixmap(IL_Pixmap * image, IL_Pixmap * mask, PRInt32 width, PRInt32 height)
|
||||
{
|
||||
m_image = image;
|
||||
m_mask = mask;
|
||||
|
||||
@@ -36,8 +36,8 @@ typedef struct _callbackClientData {
|
||||
Widget widget;
|
||||
Pixmap image;
|
||||
Pixmap mask;
|
||||
jint width;
|
||||
jint height;
|
||||
PRInt32 width;
|
||||
PRInt32 height;
|
||||
}callbackClientData;
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
Boolean isImageLoaded();
|
||||
void setCompleteCallback(completeCallbackPtr callback, void * callbackData);
|
||||
|
||||
void XFE_RDFImage::RDFDisplayPixmap(IL_Pixmap * image, IL_Pixmap * mask, long int width, long int height);
|
||||
void XFE_RDFImage::RDFDisplayPixmap(IL_Pixmap * image, IL_Pixmap * mask, PRInt32 width, PRInt32 height);
|
||||
void XFE_RDFImage::RDFNewPixmap(IL_Pixmap * image, Boolean isMask);
|
||||
void XFE_RDFImage::RDFImageComplete(IL_Pixmap * image);
|
||||
|
||||
|
||||
@@ -112,8 +112,10 @@ public:
|
||||
static XFE_View * getNavCenterView(XFE_View * parent);
|
||||
static XFE_View * getViewOfType(XFE_View * parent, EViewType);
|
||||
|
||||
virtual void handleDisplayPixmap(Widget, IL_Pixmap *, IL_Pixmap *, long int, long int) { return;}
|
||||
virtual void handleNewPixmap(Widget, IL_Pixmap *, Boolean) { return; }
|
||||
|
||||
virtual void handleDisplayPixmap(Widget, IL_Pixmap *, IL_Pixmap *, PRInt32, PRInt32) { return;}
|
||||
virtual void handleNewPixmap(Widget, IL_Pixmap *, Boolean mask) { return; }
|
||||
|
||||
virtual void handleImageComplete(Widget, IL_Pixmap *) {return; }
|
||||
|
||||
protected:
|
||||
|
||||
Reference in New Issue
Block a user