Index: /wxWidgets/trunk/src/gtk/dirdlg.cpp
===================================================================
--- /wxWidgets/trunk/src/gtk/dirdlg.cpp (revision 72605)
+++ /wxWidgets/trunk/src/gtk/dirdlg.cpp (revision 72779)
@@ -36,47 +36,13 @@
 #endif
 
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
 extern "C" {
-static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
-{
-    // change to the directory where the user went if asked
-    if (dialog->HasFlag(wxDD_CHANGE_DIR))
-    {
-        wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
-        chdir(filename);
-    }
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    event.SetEventObject(dialog);
-    dialog->HandleWindowEvent(event);
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
-                                           wxDirDialog *dialog)
-{
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    event.SetEventObject(dialog);
-    dialog->HandleWindowEvent(event);
-}
-}
-
-extern "C" {
-static void gtk_dirdialog_response_callback(GtkWidget *w,
+static void gtk_dirdialog_response_callback(GtkWidget * WXUNUSED(w),
                                              gint response,
                                              wxDirDialog *dialog)
 {
     if (response == GTK_RESPONSE_ACCEPT)
-        gtk_dirdialog_ok_callback(w, dialog);
+        dialog->GTKOnAccept();
     else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
-        gtk_dirdialog_cancel_callback(w, dialog);
+        dialog->GTKOnCancel();
 }
 }
@@ -87,8 +53,4 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(wxDirDialog, wxDirDialogBase)
-    EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)
-END_EVENT_TABLE()
 
 wxDirDialog::wxDirDialog(wxWindow* parent,
@@ -157,13 +119,26 @@
 
     if ( !defaultPath.empty() )
-        gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
-                                             wxGTK_CONV_FN(defaultPath) );
+        SetPath(defaultPath);
 
     return true;
 }
 
-void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+void wxDirDialog::GTKOnAccept()
 {
+    wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+    m_selectedDirectory = wxString::FromUTF8(str);
+
+    // change to the directory where the user went if asked
+    if (HasFlag(wxDD_CHANGE_DIR))
+    {
+        chdir(m_selectedDirectory);
+    }
+
     EndDialog(wxID_OK);
+}
+
+void wxDirDialog::GTKOnCancel()
+{
+    EndDialog(wxID_CANCEL);
 }
 
@@ -187,6 +162,5 @@
 wxString wxDirDialog::GetPath() const
 {
-    wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
-    return wxString::FromUTF8(str);
+    return m_selectedDirectory;
 }
 
Index: /wxWidgets/trunk/include/wx/gtk/dirdlg.h
===================================================================
--- /wxWidgets/trunk/include/wx/gtk/dirdlg.h (revision 70898)
+++ /wxWidgets/trunk/include/wx/gtk/dirdlg.h (revision 72779)
@@ -43,4 +43,9 @@
 
 
+    // Implementation only.
+
+    void GTKOnAccept();
+    void GTKOnCancel();
+
 protected:
     // override this from wxTLW since the native
@@ -52,8 +57,7 @@
 
 private:
-    void OnFakeOk( wxCommandEvent &event );
+    wxString m_selectedDirectory;
 
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
-    DECLARE_EVENT_TABLE()
 };