No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index d044dee8731d76ca222b85f0c0074a23553c25d9..8a05d55796565876b62916a698d30216a8d44cf8 100644 (file)
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.h
-// Purpose:     wxDirDialogGTK
+// Name:        wx/gtk/dirdlg.h
+// Purpose:     wxDirDialog

 // Author:      Francesco Montorsi
 // Author:      Francesco Montorsi

-// Id:          $Id$

 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,26 +9,30 @@
 #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();
+    bool Create(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);
+    virtual ~wxDirDialog() { }

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


@@ -37,12 +40,11 @@ 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 );

 
 

+    // Implementation only.

 
 

-//private:      must be accessible by GTK callback
-    bool m_destroyed_by_delete;
+    void GTKOnAccept();
+    void GTKOnCancel();

 
 protected:
     // override this from wxTLW since the native
 
 protected:
     // override this from wxTLW since the native


@@ -53,9 +55,9 @@ protected:
 
 
 private:
 
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDirDialogGTK)
-    DECLARE_EVENT_TABLE()
-    void OnFakeOk( wxCommandEvent &event );
+    wxString m_selectedDirectory;
+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)

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