[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 80f4852e38ffc62d86633cd6cf3967db903a17e0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 15 23:21:01 2002 +0000

        Alerts, useful for validating that js handlers work.
        Validated that onsubmit is working.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0842b36..d14309e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-05-15  Richard J. Williamson  <rjw at apple.com>
+    
+    Alerts, useful for validating that js handlers work.
+    Validated that onsubmit is working.
+    
+	* kwq/KWQKMessageBox.mm:
+	(KMessageBox::error):
+	(KMessageBox::warningYesNo):
+	(KMessageBox::questionYesNo):
+	(KMessageBox::sorry):
+
 2002-05-15  Darin Adler  <darin at apple.com>
 
 	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0842b36..d14309e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-05-15  Richard J. Williamson  <rjw at apple.com>
+    
+    Alerts, useful for validating that js handlers work.
+    Validated that onsubmit is working.
+    
+	* kwq/KWQKMessageBox.mm:
+	(KMessageBox::error):
+	(KMessageBox::warningYesNo):
+	(KMessageBox::questionYesNo):
+	(KMessageBox::sorry):
+
 2002-05-15  Darin Adler  <darin at apple.com>
 
 	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0842b36..d14309e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-05-15  Richard J. Williamson  <rjw at apple.com>
+    
+    Alerts, useful for validating that js handlers work.
+    Validated that onsubmit is working.
+    
+	* kwq/KWQKMessageBox.mm:
+	(KMessageBox::error):
+	(KMessageBox::warningYesNo):
+	(KMessageBox::questionYesNo):
+	(KMessageBox::sorry):
+
 2002-05-15  Darin Adler  <darin at apple.com>
 
 	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
diff --git a/WebCore/kwq/KWQKMessageBox.mm b/WebCore/kwq/KWQKMessageBox.mm
index 957610c..b18f258 100644
--- a/WebCore/kwq/KWQKMessageBox.mm
+++ b/WebCore/kwq/KWQKMessageBox.mm
@@ -22,37 +22,68 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
+#import <Cocoa/Cocoa.h>
 
 #include <kmessagebox.h>
 
-void KMessageBox::error(QWidget *, const QString &, 
+void KMessageBox::error(QWidget *, const QString &message, 
     const QString &caption=QString::null, bool notify=true)
 {
+    if (caption.isNull())
+        NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), nil, nil, nil);
+    else
+        NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), nil, nil, nil);
 }
 
 
-int KMessageBox::warningYesNo(QWidget *, const QString &, 
+int KMessageBox::warningYesNo(QWidget *, const QString &message, 
     const QString &caption=QString::null, 
     const QString &buttonYes=QString::null, 
     const QString &buttonNo=QString::null, 
     bool notify=true)
 {
-return 0;
+    NSString *yes = buttonYes.isNull() ? nil : @"OK";
+    NSString *no = buttonNo.isNull() ? nil : @"Cancel";
+    int result;
+    
+    if (caption.isNull())
+        result = NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), yes, no, nil);
+    else
+        result = NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), yes, no, nil);
+
+    if (result == NSAlertDefaultReturn)
+        return 1;
+    return 0;
 }
 
 
-int KMessageBox::questionYesNo(QWidget *, const QString &, 
+int KMessageBox::questionYesNo(QWidget *, const QString &message, 
     const QString &caption=QString::null, 
     const QString &buttonYes=QString::null, 
     const QString &buttonNo=QString::null, bool notify=true)
 {
-return 0;
+    NSString *yes = buttonYes.isNull() ? nil : @"OK";
+    NSString *no = buttonNo.isNull() ? nil : @"Cancel";
+    int result;
+    
+    if (caption.isNull())
+        result = NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), yes, no, nil);
+    else
+        result = NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), yes, no, nil);
+
+    if (result == NSAlertDefaultReturn)
+        return 1;
+    return 0;
 }
 
 
-void KMessageBox::sorry(QWidget *, const QString &, 
+void KMessageBox::sorry(QWidget *, const QString &message, 
     const QString &caption=QString::null, bool notify=true)
 {
+    if (caption.isNull())
+        NSRunAlertPanel (nil, QSTRING_TO_NSSTRING(message), nil, nil, nil);
+    else
+        NSRunAlertPanel (QSTRING_TO_NSSTRING(caption), QSTRING_TO_NSSTRING(message), nil, nil, nil);
 }
 
 

-- 
WebKit Debian packaging