Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

[wxWidgets.git] / include / wx / gtk / dirdlg.h

diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index ea078fd2ab480444d014541009e36bcf247aea18..e8f905c67e646cfe463ebd794577b0ec6d6be3a3 100644 (file)
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dirdlg.h
-// Purpose:     wxDirDialogGTK
+// Name:        wx/gtk/dirdlg.h
+// Purpose:     wxDirDialog
 // Author:      Francesco Montorsi
 // Id:          $Id$
 // Copyright:   (c) 2006 Francesco Montorsi
@@ -10,18 +10,16 @@
 #ifndef __GTKDIRDLGH__
 #define __GTKDIRDLGH__
 
-#include "wx/generic/dirdlgg.h"
-
 //-------------------------------------------------------------------------
-// wxDirDialogGTK
+// wxDirDialog
 //-------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDirDialogGTK : public wxGenericDirDialog
+class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
 public:
-    wxDirDialogGTK() { }
+    wxDirDialog() { }
 
-    wxDirDialogGTK(wxWindow *parent,
+    wxDirDialog(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
@@ -29,7 +27,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 
-    virtual ~wxDirDialogGTK();
+    virtual ~wxDirDialog() { }
 
 
 public:     // overrides from wxGenericDirDialog
@@ -37,12 +35,6 @@ public:     // overrides from wxGenericDirDialog
     wxString GetPath() const;
     void SetPath(const wxString& path);
 
-    virtual int ShowModal();
-    virtual bool Show( bool show = true );
-
-
-//private:      must be accessible by GTK callback
-    bool m_destroyed_by_delete;
 
 protected:
     // override this from wxTLW since the native
@@ -53,9 +45,10 @@ protected:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDirDialogGTK)
-    DECLARE_EVENT_TABLE()
     void OnFakeOk( wxCommandEvent &event );
+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKDIRDLGH__