Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted changes that set m_widget to NULL in native

Browse Source 
GTK+ dialogs for now. The problem persists, that
    when quitting the native file dialog with ESC, the
    dialog will be destroyed twice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-11-28 13:08:26 +00:00
parent 6120f2fcdb
commit a733492856
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/filedlg.cpp
View File

@@ -108,10 +108,10 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
{ {
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (response == GTK_RESPONSE_CANCEL) if (response == GTK_RESPONSE_ACCEPT)
gtk_filedialog_cancel_callback(w, dialog);
else
gtk_filedialog_ok_callback(w, dialog); gtk_filedialog_ok_callback(w, dialog);
else
gtk_filedialog_cancel_callback(w, dialog);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -182,7 +182,6 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
wxFileDialog::~wxFileDialog() wxFileDialog::~wxFileDialog()
{ {
m_widget = NULL;
} }
void wxFileDialog::GetFilenames(wxArrayString& files) const void wxFileDialog::GetFilenames(wxArrayString& files) const

1
src/gtk/msgdlg.cpp
View File

@@ -97,7 +97,6 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
wxMessageDialog::~wxMessageDialog() wxMessageDialog::~wxMessageDialog()
{ {
m_widget = NULL;
} }
int wxMessageDialog::ShowModal() int wxMessageDialog::ShowModal()

7
src/gtk1/filedlg.cpp
View File

@@ -108,10 +108,10 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
{ {
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (response == GTK_RESPONSE_CANCEL) if (response == GTK_RESPONSE_ACCEPT)
gtk_filedialog_cancel_callback(w, dialog);
else
gtk_filedialog_ok_callback(w, dialog); gtk_filedialog_ok_callback(w, dialog);
else
gtk_filedialog_cancel_callback(w, dialog);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -182,7 +182,6 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
wxFileDialog::~wxFileDialog() wxFileDialog::~wxFileDialog()
{ {
m_widget = NULL;
} }
void wxFileDialog::GetFilenames(wxArrayString& files) const void wxFileDialog::GetFilenames(wxArrayString& files) const

1
src/gtk1/msgdlg.cpp
View File

@@ -97,7 +97,6 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
wxMessageDialog::~wxMessageDialog() wxMessageDialog::~wxMessageDialog()
{ {
m_widget = NULL;
} }
int wxMessageDialog::ShowModal() int wxMessageDialog::ShowModal()