Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index bbe29b3de56da2c09fb1524a4be8afe413068316..b6939581ee11ba7aecef29605d8a4c247eb0de3c 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -1,47 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dirdlg.h
+// Name:        wx/msw/dirdlg.h
 // Purpose:     wxDirDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DIRDLGH__
-#define __DIRDLGH__
+#ifndef _WX_DIRDLG_H_
+#define _WX_DIRDLG_H_
 
-#ifdef __GNUG__
-#pragma interface "dirdlg.h"
-#endif
-
-#include "wx/dialog.h"
-
-class WXDLLEXPORT wxDirDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
-DECLARE_DYNAMIC_CLASS(wxDirDialog)
 public:
-    wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultPath = "",
-        long style = 0, const wxPoint& pos = wxDefaultPosition);
+    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);
 
-    inline void SetMessage(const wxString& message) { m_message = message; }
-    inline void SetPath(const wxString& path) { m_path = path; }
-    inline void SetStyle(long style) { m_dialogStyle = style; }
+    void SetPath(const wxString& path);
 
-    inline wxString GetMessage(void) const { return m_message; }
-    inline wxString GetPath(void) const { return m_path; }
-    inline long GetStyle(void) const { return m_dialogStyle; }
+    virtual int ShowModal();
 
-    int ShowModal(void);
+private:
+    // The real implementations of ShowModal(), used for Windows versions
+    // before and since Vista.
+    int ShowSHBrowseForFolder(WXHWND owner);
+    int ShowIFileDialog(WXHWND owner);
 
-protected:
-    wxString    m_message;
-    long        m_dialogStyle;
-    wxWindow *  m_parent;
-    wxString    m_path;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)
 };
 
 #endif
-    // __DIRDLGH__
+    // _WX_DIRDLG_H_