activating DrawRectangle optimization

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

diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index d62bcead0a706b748ce04f48cde94bc69bf64c9f..68dc907d0698dae79c6a69ae8439f82368e8decc 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
 // Author:      Francesco Montorsi
 // Id:          $Id$
 // Copyright:   (c) 2006 Francesco Montorsi


@@ -10,26 +10,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& defaultPath = wxEmptyString,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
                 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 ~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,9 +41,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.
+
+    void GTKOnAccept();
+    void GTKOnCancel();

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


@@ -50,9 +56,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__