The check column needs more space

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 3e09742ebca41eba959672b875677d2deee1d485..540910d9dc035f9b00b5cb016fad385a4464b07b 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -1,291 +1,239 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/gtk1/dialog.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/dialog.h"
 
 #include "wx/dialog.h"

-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/gtk/win_gtk.h"

 
 

-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/cursor.h"
+#endif // WX_PRECOMP
+
+#include "wx/evtloop.h"

 
 

-extern wxList wxPendingDelete;
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "wx/gtk1/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// "delete_event"
+// global data

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{ 
-/*
-  printf( "OnDelete from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  win->Close();
-
-  return TRUE;
-}
+extern int g_openDialogs;

 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxDialog,wxPanel)
-  EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)
-  EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
-  EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
-  EVT_CLOSE   (wxDialog::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
+    EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)
+    EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
+    EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
+    EVT_CLOSE   (wxDialog::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)

 
 

-wxDialog::wxDialog(void)
+void wxDialog::Init()

 {
 {

-  m_title = "";
-  m_modalShowing = FALSE;
-  wxTopLevelWindows.Insert( this );
+    m_returnCode = 0;
+    m_sizeSet = false;
+    m_modalShowing = false;
+    m_themeEnabled = true;

 }
 
 }
 

-wxDialog::wxDialog( wxWindow *parent, 
-      wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
+wxDialog::wxDialog( wxWindow *parent,
+                    wxWindowID id, const wxString &title,
+                    const wxPoint &pos, const wxSize &size,
+                    long style, const wxString &name )

 {
 {

-  m_modalShowing = FALSE;
-  wxTopLevelWindows.Insert( this );
-  Create( parent, id, title, pos, size, style, name );
+    Init();
+
+    (void)Create( parent, id, title, pos, size, style, name );

 }
 
 bool wxDialog::Create( wxWindow *parent,
 }
 
 bool wxDialog::Create( wxWindow *parent,

-      wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
+                       wxWindowID id, const wxString &title,
+                       const wxPoint &pos, const wxSize &size,
+                       long style, const wxString &name )

 {
 {

-  m_needParent = FALSE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
- 
-  gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
-  
-  gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", 
-    GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
-    
-  m_wxwindow = gtk_myfixed_new();
-  gtk_widget_show( m_wxwindow );
-  GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-  
-  gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-  
-  SetTitle( title );
-  
-  if ((m_x != -1) || (m_y != -1))
-     gtk_widget_set_uposition( m_widget, m_x, m_y );
-     
-  gtk_widget_set_usize( m_widget, m_width, m_height );
-     
-  PostCreation();
-  
-  return TRUE;
-}
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-wxDialog::~wxDialog(void)
-{
-  wxTopLevelWindows.DeleteObject( this );
-  if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-}
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;

 
 

-void wxDialog::SetTitle(const wxString& title )
-{
-  m_title = title;
-  if (m_title.IsNull()) m_title = "";
-  gtk_window_set_title( GTK_WINDOW(m_widget), m_title );
-}
-
-wxString wxDialog::GetTitle(void) const
-{
-  return (wxString&)m_title;
+    return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);

 }
 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {

-  if (Validate()) TransferDataFromWindow();
+    if (Validate())
+        TransferDataFromWindow();

 }
 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 {

-  if (IsModal())
-  {
-    EndModal(wxID_CANCEL);
-  }
-  else
-  {
-    SetReturnCode(wxID_CANCEL);
-    this->Show(FALSE);
-  }
-}
-
-void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
-{
-  if ( Validate() && TransferDataFromWindow())
-  {
-    if (IsModal()) 
+    if (IsModal())

     {
     {

-      EndModal(wxID_OK);
+        EndModal(wxID_CANCEL);

     }
     else
     {
     }
     else
     {

-      SetReturnCode(wxID_OK);
-      this->Show(FALSE);
+        SetReturnCode(wxID_CANCEL);
+        Show(false);

     }
     }

-  }

 }
 
 }
 

-void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
+void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )

 {
 {

-  // yes
+    if (Validate() && TransferDataFromWindow())
+    {
+        if (IsModal())
+        {
+            EndModal(wxID_OK);
+        }
+        else
+        {
+            SetReturnCode(wxID_OK);
+            Show(false);
+        }
+    }

 }
 
 }
 

-bool wxDialog::OnClose(void)
+void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
 {

-  static wxList closing;
-
-  if (closing.Member(this)) return FALSE;   // no loops
-  
-  closing.Append(this);
-
-  wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-  cancelEvent.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(cancelEvent);
-  closing.DeleteObject(this);
-  
-  return FALSE;
+    // yes

 }
 
 }
 

-bool wxDialog::Destroy(void)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    // We'll send a Cancel message by default,
+    // which may close the dialog.
+    // Check for looping if the Cancel event handler calls Close().

 
 

-  return TRUE;
-}
+    // Note that if a cancel button and handler aren't present in the dialog,
+    // nothing will happen when you close the dialog via the window manager, or
+    // via Close().
+    // We wouldn't want to destroy the dialog by default, since the dialog may have been
+    // created on the stack.
+    // However, this does mean that calling dialog->Close() won't delete the dialog
+    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
+    // sure to destroy the dialog.
+    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.

 
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-  if (GetEventHandler()->OnClose() || event.GetForce())
-  {
-    this->Destroy();
-  }
-}
+    static wxList s_closing;

 
 

-void wxDialog::ImplementSetPosition(void)
-{
-  if ((m_x != -1) || (m_y != -1))
-     gtk_widget_set_uposition( m_widget, m_x, m_y );
-}
+    if (s_closing.Member(this))
+        return;   // no loops

 
 

-void wxDialog::Centre( int direction )
-{
-  if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
-  if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;
-  ImplementSetPosition();
+    s_closing.Append(this);
+
+    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    cancelEvent.SetEventObject( this );
+    HandleWindowEvent(cancelEvent);
+    s_closing.DeleteObject(this);

 }
 
 bool wxDialog::Show( bool show )
 {
 }
 
 bool wxDialog::Show( bool show )
 {

-  if (!show && IsModal())
-  {
-    EndModal( wxID_CANCEL );
-  }
-
-  wxWindow::Show( show );
-  
-  if (show) InitDialog();
-  
-  return TRUE;
+    if (!show && IsModal())
+    {
+        EndModal( wxID_CANCEL );
+    }
+
+    if (show && !m_sizeSet)
+    {
+        /* by calling GtkOnSize here, we don't have to call
+           either after showing the frame, which would entail
+           much ugly flicker nor from within the size_allocate
+           handler, because GTK 1.1.X forbids that. */
+
+        GtkOnSize( m_x, m_y, m_width, m_height );
+    }
+
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
+
+    bool ret = wxWindow::Show( show );
+
+    if (show) InitDialog();
+
+    return ret;

 }
 
 }
 

-bool wxDialog::IsModal(void) const
+bool wxDialog::IsModal() const

 {
 {

-  return m_modalShowing;
+    return m_modalShowing;

 }
 
 void wxDialog::SetModal( bool WXUNUSED(flag) )
 {
 }
 
 void wxDialog::SetModal( bool WXUNUSED(flag) )
 {

-/*
-  if (flag)
-    m_windowStyle |= wxDIALOG_MODAL;
-  else
-    if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
-*/
-  wxFAIL_MSG( "wxDialog:SetModal obsolete now" );
+    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );

 }
 
 }
 

-int wxDialog::ShowModal(void)
+int wxDialog::ShowModal()

 {
 {

-  if (IsModal())
-  {
-    wxFAIL_MSG( "wxDialog:ShowModal called twice" );
+    if (IsModal())
+    {
+       wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );
+       return GetReturnCode();
+    }
+
+    // use the apps top level window as parent if none given unless explicitly
+    // forbidden
+    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    {
+        wxWindow * const parent = GetParentForModalDialog();
+        if ( parent )
+        {
+            m_parent = parent;
+            gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
+        }
+    }
+
+    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+
+    Show( true );
+
+    m_modalShowing = true;
+
+    g_openDialogs++;
+
+    gtk_grab_add( m_widget );
+
+    wxEventLoop().Run();
+
+    gtk_grab_remove( m_widget );
+
+    g_openDialogs--;
+

     return GetReturnCode();
     return GetReturnCode();

-  }
-
-  Show( TRUE );
-  
-  m_modalShowing = TRUE;
-  
-  gtk_grab_add( m_widget );
-  gtk_main();
-  gtk_grab_remove( m_widget );
-  
-  return GetReturnCode();

 }
 
 void wxDialog::EndModal( int retCode )
 {
 }
 
 void wxDialog::EndModal( int retCode )
 {

-  SetReturnCode( retCode );
-  
-  if (!IsModal())
-  {
-     wxFAIL_MSG( "wxDialog:EndModal called twice" );
-     return;
-  }
-  
-  m_modalShowing = FALSE;
-  
-  gtk_main_quit();
-  
-  Show( FALSE );
-}
+    SetReturnCode( retCode );

 
 

-void wxDialog::InitDialog(void)
-{
-  wxWindow::InitDialog();
-}
+    if (!IsModal())
+    {
+        wxFAIL_MSG( wxT("wxDialog:EndModal called twice") );
+        return;
+    }

 
 

-void wxDialog::SetIcon( const wxIcon &icon )
-{
-  m_icon = icon;
-  if (!icon.Ok()) return;
-  
-  wxMask *mask = icon.GetMask();
-  GdkBitmap *bm = (GdkBitmap *) NULL;
-  if (mask) bm = mask->GetBitmap();
-  
-  gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
-}
+    m_modalShowing = false;

 
 

+    gtk_main_quit();

 
 

+    Show( false );
+}