check that we use bitmaps of correct size in the image list

[wxWidgets.git] / src / gtk1 / msgdlg.cpp

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 212f62da5ac387239835cf11ec33cd782b27d0bb..85ac15e5ebb37a3e1289a2636b13e0572385b52e 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlgg.cpp
-// Purpose:     wxGenericMessageDialog
-// Author:      Julian Smart, Robert Roebling
+// Name:        msgdlg.cpp
+// Purpose:     wxMessageDialog for GTK+2
+// Author:      Vaclav Slavik

 // Modified by:
 // Modified by:

-// Created:     04/01/98
+// Created:     2003/02/28

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart, Markus Holzem, Robert Roebling
-// Licence:           wxWindows license
+// Copyright:   (c) Vaclav Slavik, 2003
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "msgdlgg.h"
+#pragma implementation "msgdlg.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -20,178 +20,94 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/statbmp.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
-#include "wx/bitmap.h"
-#include "wx/app.h"
-#endif
+#if wxUSE_MSGDLG && defined(__WXGTK20__)

 
 

-#include <stdio.h>
-#include <string.h>
+#include "wx/gtk/private.h"
+#include <gtk/gtk.h>

 
 

-#include "wx/gtk/msgdlg.h"
-#include "wx/statline.h"
+#include "wx/msgdlg.h"
+#include "wx/intl.h"

 
 

-///////////////////////////////////////////////////////////////////
-// New dialog box implementations
+IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

 
 

-// Split message, using constraints to position controls
-wxSize wxSplitMessage2( const wxString &message, wxWindow *parent, int text_pos_x )
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+                                 const wxString& message,
+                                 const wxString& caption,
+                                 long style,
+                                 const wxPoint& WXUNUSED(pos))

 {
 {

-    int y = 15;
-    int w = 50;
-    wxString line( _T("") );
-    for (uint pos = 0; pos < message.Len(); pos++)
-    {
-        if (message[pos] == _T('\n'))
-        {
-            if (!line.IsEmpty())
-            {
-                wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(text_pos_x,y) );
-                wxSize size1( s1->GetSize() );
-                if (size1.x > w) w = size1.x;
-                line = _T("");
-            }
-            y += 18;
-        }
-        else
-        {
-            line += message[pos];
-        }
-    }
-    
-    if (!line.IsEmpty())
-    {
-        wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(text_pos_x,y) );
-        wxSize size2( s2->GetSize() );
-        if (size2.x > w) w = size2.x;
-    }
-        
-    y += 18;
-    
-    return wxSize(w+15+text_pos_x,y);
+    m_caption = caption;
+    m_message = message;
+    m_dialogStyle = style;
+    m_parent = parent;

 }
 
 }
 

-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
-        EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
-        EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
-        EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
-END_EVENT_TABLE()
-
-IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
-#endif
-
-wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, 
-   const wxString& caption, long style, const wxPoint& pos) :
-  wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
+int wxMessageDialog::ShowModal()

 {
 {

-    m_dialogStyle = style;
-
-    int text_pos_x = 15;
-    
-    if (m_dialogStyle & wxICON_MASK)
-        text_pos_x += 80;
-
-    wxSize message_size( wxSplitMessage2( message, this, text_pos_x ) );
-
-    if (m_dialogStyle & wxICON_MASK)
-    {
-       if (message_size.y < 50) message_size.y = 50;
-        (void) new wxStaticBitmap( this, -1,
-                                   wxTheApp->GetStdIcon(m_dialogStyle
-                                                        & wxICON_MASK),
-                                   wxPoint(15,message_size.y/2-16) ); 
-    }
-
-    wxButton *ok = (wxButton *) NULL;
-    wxButton *cancel = (wxButton *) NULL;
-    wxButton *yes = (wxButton *) NULL;
-    wxButton *no = (wxButton *) NULL;
-    
-    int y = message_size.y + 30;
+    GtkWidget *dlg;
+    GtkMessageType type;
+    GtkButtonsType buttons = GTK_BUTTONS_OK;

     
     

-    if (style & wxYES_NO) 
+    if (m_dialogStyle & wxYES_NO)

     {
     {

-        yes = new wxButton( this, wxID_YES, _("Yes"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( yes );
-        no = new wxButton( this, wxID_NO, _("No"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( no );
+        buttons = GTK_BUTTONS_YES_NO;

     }
 
     }
 

-    if (style & wxOK) 
+    if (m_dialogStyle & wxOK)

     {
     {

-        ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( ok );
-    }
-
-    if (style & wxCANCEL) 
-    {
-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( cancel );
-    }
-
-    if (ok)
-    {
-        ok->SetDefault();
-        ok->SetFocus();
-    }
-    else if (yes)
-    {
-        yes->SetDefault();
-        yes->SetFocus();
+        if (m_dialogStyle & wxCANCEL)
+            buttons = GTK_BUTTONS_OK_CANCEL;
+        else
+            buttons = GTK_BUTTONS_OK;

     }
     
     }
     

-    int w = m_buttons.GetCount() * 100;
-    if (message_size.x > w) w = message_size.x;
-    int space = w / (m_buttons.GetCount()*2);
-    
-    int n = 0;
-    wxNode *node = m_buttons.First();
-    while (node)
+    if (m_dialogStyle & wxICON_EXCLAMATION)
+        type = GTK_MESSAGE_WARNING;
+    else if (m_dialogStyle & wxICON_ERROR)
+        type = GTK_MESSAGE_ERROR;
+    else if (m_dialogStyle & wxICON_INFORMATION)
+        type = GTK_MESSAGE_INFO;
+    else if (m_dialogStyle & wxICON_QUESTION)
+        type = GTK_MESSAGE_QUESTION;
+
+    dlg = gtk_message_dialog_new(m_parent ?
+                                    GTK_WINDOW(m_parent->m_widget) : NULL,
+                                 GTK_DIALOG_MODAL,
+                                 type, buttons,
+                                 "%s", (const char*)wxGTK_CONV(m_message));
+    if (m_caption != wxMessageBoxCaptionStr)
+        gtk_window_set_title(GTK_WINDOW(dlg), wxGTK_CONV(m_caption));
+
+    if (m_dialogStyle & wxYES_NO)

     {
     {

-        wxWindow *win = (wxWindow*)node->Data();
-        int x = (n*2+1)*space - 40 + 15;
-        win->Move( x, -1 );
-        node = node->Next();
-        n++;
+        if (m_dialogStyle & wxCANCEL)
+            gtk_dialog_add_button(GTK_DIALOG(dlg), GTK_STOCK_CANCEL,
+                                  GTK_RESPONSE_CANCEL);
+        if (m_dialogStyle & wxNO_DEFAULT)
+            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_NO);
+        else
+            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES);

     }
     
     }
     

-#ifdef __WXGTK__
-    int edge_margin = 7;
-    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
-#endif
-    
-    SetSize( w+30, y+40 );
-
-    Centre( wxBOTH );
-}
+    gint result = gtk_dialog_run(GTK_DIALOG(dlg));
+    gtk_widget_destroy(dlg);

 
 

-void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
-{
-    EndModal( wxID_YES );
-}
-
-void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
-{
-    EndModal( wxID_NO );
-}
-
-void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    /* Allow cancellation via ESC/Close button except if
-       only YES and NO are specified. */
-    if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
+    switch (result)

     {
     {

-        EndModal( wxID_CANCEL );
+        default:
+            wxFAIL_MSG(_T("unexpected GtkMessageDialog return code"));
+            // fall through
+
+        case GTK_RESPONSE_CANCEL: 
+            return wxID_CANCEL;
+        case GTK_RESPONSE_OK:
+            return wxID_OK;
+        case GTK_RESPONSE_YES:
+            return wxID_YES;
+        case GTK_RESPONSE_NO:
+            return wxID_NO;

     }
 }
 
     }
 }
 

+#endif // wxUSE_MSGDLG && defined(__WXGTK20__)