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

Bye bye gtk1 and xlib (part 1 of 2). b=326152 r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@225306 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net
2007-04-30 23:52:44 +00:00
parent 5988367130
commit 5162274ddd
71 changed files with 97 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
mozilla/xpfe/bootstrap/showOSAlert.cpp
View File

@@ -46,8 +46,6 @@
#elif defined (XP_MAC)
#include <Dialogs.h>
#include <TextUtils.h>
#elif defined (MOZ_WIDGET_GTK)
#include <gtk/gtk.h>
#elif defined (XP_OS2)
#define INCL_DOS
#define INCL_WIN
@@ -56,128 +54,6 @@
extern "C" void ShowOSAlert(const char* aMessage);
#if defined (MOZ_WIDGET_GTK)
static int sbAlertDone = 0;
/**
* ns_gtk_alert_OK_callback
*
* Private callback function for the OK button on the alert.
*
* @param aWidget the button widget
* @param aData the alert dialog passed in for destruction
*/
void
ns_gtk_alert_OK_callback(GtkWidget *aWidget, gpointer aData)
{
GtkWidget *alertDlg = (GtkWidget *) aData;
if (!alertDlg)
return;
gtk_widget_destroy(alertDlg);
sbAlertDone = 1;
}
/**
* NS_gtk_alert
*
* Displays an alert with a message and an OK button in a modal
* dialog that is centered on the screen. Assumes gtk_main has
* been called or explicit event queue flushing is being performed.
*
* @param aMessage [required] the message to display in the alert
* @param aTitle [optional] the alert dialog title;
* passing NULL defaults the title to ""
* @param aOKBtnText [optional] the text on the OK button;
* parametrized for i18n purposes;
* passing NULL defaults the button text to "OK"
* @return int error code returns 0 for SUCCESS;
* returns -1 for param error;
* returns -2 for widget creation error
*/
int
NS_gtk_alert(const char *aMessage, const char *aTitle, const char *aOKBtnText)
{
#ifdef DEBUG_dbragg
printf ("\n*** Now inside NS_gtk_alert *** \n");
#endif
GtkWidget *alertDlg = NULL;
GtkWidget *okBtn = NULL;
GtkWidget *msgLabel = NULL;
GtkWidget *packerLbl = NULL;
GtkWidget *packerBtn = NULL;
const char *okBtnText = aOKBtnText;
const char *title = aTitle;
if (!aMessage)
return -1;
if (!aOKBtnText)
okBtnText = "OK";
if (!aTitle)
title = " ";
#ifdef DEBUG_dbragg
printf("title is: %s\n", title);
#endif
alertDlg = gtk_dialog_new();
msgLabel = gtk_label_new(aMessage);
if (msgLabel)
gtk_label_set_line_wrap(GTK_LABEL(msgLabel), TRUE);
okBtn = gtk_button_new_with_label(okBtnText);
packerLbl = gtk_packer_new();
packerBtn = gtk_packer_new();
sbAlertDone = 0;
if (alertDlg && msgLabel && okBtn && packerBtn && packerLbl)
{
// pack widgets in dialog
gtk_packer_set_default_border_width(GTK_PACKER(packerLbl), 20);
gtk_packer_add_defaults(GTK_PACKER(packerLbl), msgLabel,
GTK_SIDE_BOTTOM, GTK_ANCHOR_CENTER, GTK_FILL_X);
gtk_packer_set_default_border_width(GTK_PACKER(packerBtn), 0);
gtk_packer_add_defaults(GTK_PACKER(packerBtn), okBtn,
GTK_SIDE_BOTTOM, GTK_ANCHOR_CENTER, GTK_FILL_Y);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(alertDlg)->vbox),
packerLbl);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(alertDlg)->action_area),
packerBtn);
gtk_window_set_modal(GTK_WINDOW(alertDlg), TRUE);
gtk_window_set_title(GTK_WINDOW(alertDlg), title);
gtk_window_set_position(GTK_WINDOW(alertDlg), GTK_WIN_POS_CENTER);
// register callback for OK button
gtk_signal_connect(GTK_OBJECT(okBtn), "clicked",
GTK_SIGNAL_FUNC(ns_gtk_alert_OK_callback), alertDlg);
GTK_WIDGET_SET_FLAGS(okBtn, GTK_CAN_DEFAULT);
gtk_widget_grab_default(okBtn);
// show dialog
gtk_widget_show(msgLabel);
gtk_widget_show(packerLbl);
gtk_widget_show(okBtn);
gtk_widget_show(packerBtn);
gtk_widget_show(alertDlg);
}
else
{
return -2;
}
while (!sbAlertDone)
{
while (gtk_events_pending())
gtk_main_iteration();
}
return 0;
}
#endif //MOZ_WIDGET_GTK
// The maximum allowed length of aMessage is 255 characters!
void ShowOSAlert(const char* aMessage)
@@ -198,8 +74,6 @@ printf("\n****Inside ShowOSAlert ***\n");
#elif (XP_MAC)
short buttonClicked;
StandardAlert(kAlertStopAlert, c2pstr(message_copy), nil, nil, &buttonClicked);
#elif defined (MOZ_WIDGET_GTK)
NS_gtk_alert(message_copy, NULL, "OK");
#elif defined (XP_OS2)
/* Set our app to be a PM app before attempting Win calls */
PPIB ppib;