No real changes, just add wxSizerItem::AddBorderToSize() helper.

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

diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index 35d6085c211fa32334954002cf2353c85aad683a..fe457b7755aa1bdf1778102062ddbac0bbf9a591 100644 (file)
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.h
+// Name:        wx/gtk/dirdlg.h

 // Purpose:     wxDirDialog
 // Author:      Francesco Montorsi
 // Id:          $Id$
 // Purpose:     wxDirDialog
 // Author:      Francesco Montorsi
 // Id:          $Id$


@@ -10,13 +10,11 @@
 #ifndef __GTKDIRDLGH__
 #define __GTKDIRDLGH__
 
 #ifndef __GTKDIRDLGH__
 #define __GTKDIRDLGH__
 

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

 //-------------------------------------------------------------------------
 // wxDirDialog
 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 // wxDirDialog
 //-------------------------------------------------------------------------
 

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

 {
 public:
     wxDirDialog() { }
 {
 public:
     wxDirDialog() { }


@@ -28,7 +26,13 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);

-
+    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() { }
 
 
     virtual ~wxDirDialog() { }
 
 


@@ -37,9 +41,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 );
-

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


@@ -50,9 +51,10 @@ protected:
 
 
 private:
 
 
 private:

+    void OnFakeOk( wxCommandEvent &event );
+

     DECLARE_DYNAMIC_CLASS(wxDirDialog)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
     DECLARE_EVENT_TABLE()

-    void OnFakeOk( wxCommandEvent &event );

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