couple of minor bug fixes/enhancements (interface unchanged)

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 0c63e39f11f4eaf864dfa20286ef457d66a3eed8..6411ba19302f836e7a5db86312cefe0263ad1c1c 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -17,6 +17,10 @@
 #include "wx/app.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/app.h"
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+
+extern wxList wxPendingDelete;
+

 //-----------------------------------------------------------------------------
 // delete
 
 //-----------------------------------------------------------------------------
 // delete
 


@@ -50,15 +54,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxWindow)
 wxDialog::wxDialog(void)
 {
   m_title = "";
 wxDialog::wxDialog(void)
 {
   m_title = "";

-  m_modalShowing = TRUE;
+  m_modalShowing = FALSE;

   wxTopLevelWindows.Insert( this );
 };
 
 wxDialog::wxDialog( wxWindow *parent, 
       wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size, 
   wxTopLevelWindows.Insert( this );
 };
 
 wxDialog::wxDialog( wxWindow *parent, 
       wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size, 

-      const long style, const wxString &name )
+      long style, const wxString &name )

 {
 {

+  m_modalShowing = FALSE;

   wxTopLevelWindows.Insert( this );
   Create( parent, id, title, pos, size, style, name );
 };
   wxTopLevelWindows.Insert( this );
   Create( parent, id, title, pos, size, style, name );
 };


@@ -66,14 +71,12 @@ wxDialog::wxDialog( wxWindow *parent,
 bool wxDialog::Create( wxWindow *parent,
       wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size, 
 bool wxDialog::Create( wxWindow *parent,
       wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size, 

-      const long style, const wxString &name )
+      long style, const wxString &name )

 {
   m_needParent = FALSE;
   
   PreCreation( parent, id, pos, size, style, 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 );
  
   m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
   GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
  


@@ -120,7 +123,9 @@ void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 {
   if (IsModal())
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 {
   if (IsModal())

+  {

     EndModal(wxID_CANCEL);
     EndModal(wxID_CANCEL);

+  }

   else
   {
     SetReturnCode(wxID_CANCEL);
   else
   {
     SetReturnCode(wxID_CANCEL);


@@ -133,14 +138,15 @@ void wxDialog::OnOk( wxCommandEvent &WXUNUSED(event) )
   if ( Validate() && TransferDataFromWindow())
   {
     if (IsModal()) 
   if ( Validate() && TransferDataFromWindow())
   {
     if (IsModal()) 

+    {

       EndModal(wxID_OK);
       EndModal(wxID_OK);

+    }

     else
     {
       SetReturnCode(wxID_OK);
       this->Show(FALSE);
     };
   };
     else
     {
       SetReturnCode(wxID_OK);
       this->Show(FALSE);
     };
   };

-  EndModal( wxID_OK );

 };
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 };
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )


@@ -153,7 +159,7 @@ bool wxDialog::OnClose(void)
   static wxList closing;
 
   if (closing.Member(this)) return FALSE;   // no loops
   static wxList closing;
 
   if (closing.Member(this)) return FALSE;   // no loops

-
+  

   closing.Append(this);
 
   wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
   closing.Append(this);
 
   wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);


@@ -164,6 +170,14 @@ bool wxDialog::OnClose(void)
   return FALSE;
 }
 
   return FALSE;
 }
 

+bool wxDialog::Destroy(void)
+{
+  if (!wxPendingDelete.Member(this))
+    wxPendingDelete.Append(this);
+
+  return TRUE;
+}
+

 void wxDialog::OnCloseWindow(wxCloseEvent& event)
 {
   if (GetEventHandler()->OnClose() || event.GetForce())
 void wxDialog::OnCloseWindow(wxCloseEvent& event)
 {
   if (GetEventHandler()->OnClose() || event.GetForce())


@@ -172,9 +186,9 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
   };
 };
 
   };
 };
 

-bool wxDialog::Show( const bool show )
+bool wxDialog::Show( bool show )

 {
 {

-  if (!show && m_modalShowing)
+  if (!show && IsModal() && m_modalShowing)

   {
     EndModal( wxID_CANCEL );
   };
   {
     EndModal( wxID_CANCEL );
   };


@@ -183,26 +197,32 @@ bool wxDialog::Show( const bool show )
   
   if (show) InitDialog();
   
   
   if (show) InitDialog();
   

-  if (show && m_modalShowing)
-  {
-    gtk_grab_add( m_widget );
-    gtk_main();
-    gtk_grab_remove( m_widget );
-  };
-  

   return TRUE;
 };
 
 int wxDialog::ShowModal(void)
 {
   return TRUE;
 };
 
 int wxDialog::ShowModal(void)
 {

+  if (m_modalShowing) return GetReturnCode();
+

   Show( TRUE );
   Show( TRUE );

+  
+  m_modalShowing = TRUE;
+  
+  gtk_grab_add( m_widget );
+  gtk_main();
+  gtk_grab_remove( m_widget );
+  

   return GetReturnCode();
 };
 
 void wxDialog::EndModal( int retCode )
 {
   return GetReturnCode();
 };
 
 void wxDialog::EndModal( int retCode )
 {

-  gtk_main_quit();

   SetReturnCode( retCode );
   SetReturnCode( retCode );

+  
+  if (!m_modalShowing) return;
+  m_modalShowing = FALSE;
+  
+  gtk_main_quit();

 };
 
 void wxDialog::InitDialog(void)
 };
 
 void wxDialog::InitDialog(void)