diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 6234348501..20bc8b0558 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -108,10 +108,10 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 {
     wxapp_install_idle_handler();
     
-    if (response == GTK_RESPONSE_CANCEL)
-        gtk_filedialog_cancel_callback(w, dialog);
-    else
+    if (response == GTK_RESPONSE_ACCEPT)
         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()
 {
-    m_widget = NULL;
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 66a4b47b66..6ca4915481 100644
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -97,7 +97,6 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
  
 wxMessageDialog::~wxMessageDialog()
 {
-    m_widget = NULL;
 }
 
 int wxMessageDialog::ShowModal()
diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 6234348501..20bc8b0558 100644
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -108,10 +108,10 @@ static void gtk_filedialog_response_callback(GtkWidget *w,
 {
     wxapp_install_idle_handler();
     
-    if (response == GTK_RESPONSE_CANCEL)
-        gtk_filedialog_cancel_callback(w, dialog);
-    else
+    if (response == GTK_RESPONSE_ACCEPT)
         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()
 {
-    m_widget = NULL;
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 66a4b47b66..6ca4915481 100644
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -97,7 +97,6 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
  
 wxMessageDialog::~wxMessageDialog()
 {
-    m_widget = NULL;
 }
 
 int wxMessageDialog::ShowModal()