no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index d044dee8731d76ca222b85f0c0074a23553c25d9..74a105dcd7cd5561429434605a6d020d0a26a1c9 100644 (file)
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dirdlg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dirdlg.h

-// Purpose:     wxDirDialogGTK
+// Purpose:     wxDirDialog

 // Author:      Francesco Montorsi
 // Id:          $Id$
 // Copyright:   (c) 2006 Francesco Montorsi
 // Author:      Francesco Montorsi
 // Id:          $Id$
 // Copyright:   (c) 2006 Francesco Montorsi


@@ -10,26 +10,24 @@
 #ifndef __GTKDIRDLGH__
 #define __GTKDIRDLGH__
 
 #ifndef __GTKDIRDLGH__
 #define __GTKDIRDLGH__
 

-#include "wx/generic/dirdlgg.h"
-

 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------

-// wxDirDialogGTK
+// wxDirDialog

 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxDirDialogGTK : public wxGenericDirDialog
+class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase

 {
 public:
 {
 public:

-    wxDirDialogGTK() { }
+    wxDirDialog() { }

 
 

-    wxDirDialogGTK(wxWindow *parent,
+    wxDirDialog(wxWindow *parent,

                 const wxString& message = wxDirSelectorPromptStr,
                 const wxString& message = wxDirSelectorPromptStr,

-                const wxString& defaultPath = _T(""),
+                const wxString& defaultPath = wxEmptyString,

                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 

-    virtual ~wxDirDialogGTK();
+    virtual ~wxDirDialog() { }

 
 
 public:     // overrides from wxGenericDirDialog
 
 
 public:     // overrides from wxGenericDirDialog


@@ -37,12 +35,6 @@ public:     // overrides from wxGenericDirDialog
     wxString GetPath() const;
     void SetPath(const wxString& path);
 
     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
 
 protected:
     // override this from wxTLW since the native


@@ -53,9 +45,10 @@ protected:
 
 
 private:
 
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDirDialogGTK)
-    DECLARE_EVENT_TABLE()

     void OnFakeOk( wxCommandEvent &event );
     void OnFakeOk( wxCommandEvent &event );

+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKDIRDLGH__
 };
 
 #endif // __GTKDIRDLGH__