Allow using wxDEFAULT as font size in wxOSX.

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

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index dc81929bcb366dc586429e1f1a83d70644bf5315..d8fbd9bc7b7a932cc3ec231337dbaa0f5b1d600b 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -6,46 +6,34 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 

-#ifdef __GNUG__
-#pragma interface "dirdlg.h"
-#endif
-
-#include "wx/dialog.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
-
-class WXDLLEXPORT wxDirDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase

 {
 public:
     wxDirDialog(wxWindow *parent,
 {
 public:
     wxDirDialog(wxWindow *parent,

-                const wxString& message = wxFileSelectorPromptStr,
+                const wxString& message = wxDirSelectorPromptStr,

                 const wxString& defaultPath = wxEmptyString,
                 const wxString& defaultPath = wxEmptyString,

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

 
 

-    void SetMessage(const wxString& message) { m_message = message; }

     void SetPath(const wxString& path);
     void SetPath(const wxString& path);

-    void SetStyle(long style) { m_dialogStyle = style; }
-
-    wxString GetMessage() const { return m_message; }
-    wxString GetPath() const { return m_path; }
-    long GetStyle() const { return m_dialogStyle; }

 
     virtual int ShowModal();
 
 
     virtual int ShowModal();
 

-protected:
-    wxString    m_message;
-    long        m_dialogStyle;
-    wxString    m_path;
-

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    // The real implementations of ShowModal(), used for Windows versions
+    // before and since Vista.
+    int ShowSHBrowseForFolder(WXHWND owner);
+    int ShowIFileDialog(WXHWND owner);
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)

 };
 
 #endif
 };
 
 #endif