зеркало из https://github.com/mozilla/pjs.git
This patch set just makes sure that all functions that are
supposed to return values actually do so, to keep the Solaris native compiler happy. Thanks to Tim Rowley <tor@cs.brown.edu> for the fix.
This commit is contained in:
Родитель
558ca75430
Коммит
633be93e55
|
@ -456,6 +456,7 @@ gint nsGtkWidget_Scrollbar_Callback(GtkWidget *w, gpointer p)
|
||||||
sevent.message = NS_SCROLLBAR_POS;
|
sevent.message = NS_SCROLLBAR_POS;
|
||||||
sevent.widget = (nsWidget *) p;
|
sevent.widget = (nsWidget *) p;
|
||||||
widget->OnScroll(sevent, GTK_ADJUSTMENT(w)->value);
|
widget->OnScroll(sevent, GTK_ADJUSTMENT(w)->value);
|
||||||
|
return 0; /* XXX */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -478,6 +479,7 @@ gint nsGtkWidget_Expose_Callback(GtkWidget *w, gpointer p)
|
||||||
pevent.rect = (nsRect *)▭
|
pevent.rect = (nsRect *)▭
|
||||||
widgetWindow->OnPaint(pevent);
|
widgetWindow->OnPaint(pevent);
|
||||||
#endif
|
#endif
|
||||||
|
return 0; /* XXX */
|
||||||
}
|
}
|
||||||
|
|
||||||
//==============================================================
|
//==============================================================
|
||||||
|
@ -522,6 +524,7 @@ gint nsGtkWidget_Text_Callback(GtkWidget *w, GdkEvent* event, gpointer p)
|
||||||
for (len = 0; len < cbs->text->length; len++)
|
for (len = 0; len < cbs->text->length; len++)
|
||||||
cbs->text->ptr[len] = '*';
|
cbs->text->ptr[len] = '*';
|
||||||
#endif
|
#endif
|
||||||
|
return 0; /* XXX */
|
||||||
}
|
}
|
||||||
|
|
||||||
//==============================================================
|
//==============================================================
|
||||||
|
|
|
@ -265,6 +265,7 @@ int nsScrollbar::AdjustScrollBarPosition(int aPosition)
|
||||||
int cap = maxRange - sliderSize;
|
int cap = maxRange - sliderSize;
|
||||||
return aPosition > cap ? cap : aPosition;
|
return aPosition > cap ? cap : aPosition;
|
||||||
#endif
|
#endif
|
||||||
|
return 0; /* XXX */
|
||||||
}
|
}
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
|
@ -73,6 +73,7 @@ NS_METHOD nsWidget::ScreenToWidget(const nsRect& aOldRect, nsRect& aNewRect)
|
||||||
NS_IMETHODIMP nsWidget::Destroy(void)
|
NS_IMETHODIMP nsWidget::Destroy(void)
|
||||||
{
|
{
|
||||||
::gtk_widget_destroy(mWidget);
|
::gtk_widget_destroy(mWidget);
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
|
@ -120,7 +120,7 @@ class nsWidget : public nsBaseWidget
|
||||||
virtual void InitCallbacks(char * aName = nsnull);
|
virtual void InitCallbacks(char * aName = nsnull);
|
||||||
void CreateGC();
|
void CreateGC();
|
||||||
|
|
||||||
NS_IMETHOD CreateNative(GtkWidget *parentWindow) {};
|
NS_IMETHOD CreateNative(GtkWidget *parentWindow) { return NS_OK; }
|
||||||
|
|
||||||
nsresult StandardWindowCreate(nsIWidget *aParent,
|
nsresult StandardWindowCreate(nsIWidget *aParent,
|
||||||
const nsRect &aRect,
|
const nsRect &aRect,
|
||||||
|
|
|
@ -226,6 +226,7 @@ NS_METHOD nsWindow::CreateNative(GtkWidget *parentWidget)
|
||||||
gtk_widget_set_name(mWidget, "nsWindow");
|
gtk_widget_set_name(mWidget, "nsWindow");
|
||||||
mCursor = eCursor_select;
|
mCursor = eCursor_select;
|
||||||
SetCursor(eCursor_standard);
|
SetCursor(eCursor_standard);
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче