]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/dialog.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix the off-by-one a little differently, and correct a refresh problem
[wxWidgets.git] / src / gtk1 / dialog.cpp
diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 0c63e39f11f4eaf864dfa20286ef457d66a3eed8..644f2a89949e172f1ac781eba31d32363028a21b 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -2,211 +2,245 @@
 // Name:        dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        dialog.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dialog.h"
 #endif
 
 #pragma implementation "dialog.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
+#include "wx/cursor.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
-// delete
-
-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();
+// idle system
+//-----------------------------------------------------------------------------
 
 
-  return TRUE;
-};
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDialog,wxWindow)
-  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,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 
-wxDialog::wxDialog(void)
+void wxDialog::Init()
 {
 {
-  m_title = "";
-  m_modalShowing = TRUE;
-  wxTopLevelWindows.Insert( this );
-};
-
-wxDialog::wxDialog( wxWindow *parent, 
-      wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size, 
-      const long style, const wxString &name )
+    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 )
 {
 {
-  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, 
-      const 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_modalShowing = ((m_windowStyle & wxDIALOG_MODAL) == wxDIALOG_MODAL);
-  
-  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 );
-  
-  PostCreation();
-  
-  return TRUE;
-};
-
-wxDialog::~wxDialog(void)
-{
-  wxTopLevelWindows.DeleteObject( this );
-  if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-};
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
 
-void wxDialog::SetTitle(const wxString& title )
-{
-  m_title = title;
-  gtk_window_set_title( GTK_WINDOW(m_widget), m_title );
-};
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;
 
 
-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);
-  };
-};
+    if (IsModal())
+    {
+        EndModal(wxID_CANCEL);
+    }
+    else
+    {
+        SetReturnCode(wxID_CANCEL);
+        Show(FALSE);
+    }
+}
 
 
-void wxDialog::OnOk( wxCommandEvent &WXUNUSED(event) )
+void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
 {
-  if ( Validate() && TransferDataFromWindow())
-  {
-    if (IsModal()) 
-      EndModal(wxID_OK);
-    else
+    if (Validate() && TransferDataFromWindow())
     {
     {
-      SetReturnCode(wxID_OK);
-      this->Show(FALSE);
-    };
-  };
-  EndModal( wxID_OK );
-};
+        if (IsModal())
+        {
+            EndModal(wxID_OK);
+        }
+        else
+        {
+            SetReturnCode(wxID_OK);
+            Show(FALSE);
+        }
+    }
+}
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
-  // yes
-};
+    // yes
+}
+
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+    // We'll send a Cancel message by default,
+    // which may close the dialog.
+    // Check for looping if the Cancel event handler calls Close().
+
+    // 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.
+
+    static wxList s_closing;
+
+    if (s_closing.Member(this))
+        return;   // no loops
 
 
-bool wxDialog::OnClose(void)
+    s_closing.Append(this);
+
+    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    cancelEvent.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(cancelEvent);
+    s_closing.DeleteObject(this);
+}
+
+bool wxDialog::Show( bool show )
 {
 {
-  static wxList closing;
+    if (!show && IsModal())
+    {
+        EndModal( wxID_CANCEL );
+    }
 
 
-  if (closing.Member(this)) return FALSE;   // no loops
+    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 );
+    }
 
 
-  closing.Append(this);
+    bool ret = wxWindow::Show( show );
 
 
-  wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-  cancelEvent.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(cancelEvent);
-  closing.DeleteObject(this);
-  
-  return FALSE;
+    if (show) InitDialog();
+
+    return ret;
 }
 
 }
 
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+bool wxDialog::IsModal() const
 {
 {
-  if (GetEventHandler()->OnClose() || event.GetForce())
-  {
-    this->Destroy();
-  };
-};
+    return m_modalShowing;
+}
 
 
-bool wxDialog::Show( const bool show )
+void wxDialog::SetModal( bool WXUNUSED(flag) )
 {
 {
-  if (!show && m_modalShowing)
-  {
-    EndModal( wxID_CANCEL );
-  };
-
-  wxWindow::Show( show );
-  
-  if (show) InitDialog();
-  
-  if (show && m_modalShowing)
-  {
+/*
+  if (flag)
+    m_windowStyle |= wxDIALOG_MODAL;
+  else
+    if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
+*/
+    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
+}
+
+int wxDialog::ShowModal()
+{
+    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 *parent = wxTheApp->GetTopWindow();
+        if ( parent &&
+                parent != this &&
+                    parent->IsBeingDeleted() &&
+                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+        {
+            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 );
+
+    SetFocus();
+
+    m_modalShowing = TRUE;
+
+    g_openDialogs++;
+
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
-  };
-  
-  return TRUE;
-};
 
 
-int wxDialog::ShowModal(void)
-{
-  Show( TRUE );
-  return GetReturnCode();
-};
+    g_openDialogs--;
+
+    return GetReturnCode();
+}
 
 void wxDialog::EndModal( int retCode )
 {
 
 void wxDialog::EndModal( int retCode )
 {
-  gtk_main_quit();
-  SetReturnCode( retCode );
-};
+    SetReturnCode( retCode );
 
 
-void wxDialog::InitDialog(void)
-{
-  wxWindow::InitDialog();
-};
+    if (!IsModal())
+    {
+        wxFAIL_MSG( wxT("wxDialog:EndModal called twice") );
+        return;
+    }
 
 
+    m_modalShowing = FALSE;
+
+    gtk_main_quit();
+
+    Show( FALSE );
+}
wxWidgets (Impactor)