Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index cedb296539123b723e8ded90873f309169ec778f..467786df1b9ed50c9c107cb8e08f5f7d7ae814da 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -3,17 +3,50 @@
 
 #if wxUSE_DIRDLG
 
 
 #if wxUSE_DIRDLG
 

+#include "wx/dialog.h"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;

+WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;

 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 

+#define wxDD_DEFAULT_STYLE \
+    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+
+/*
+    The interface (TODO: make the other classes really derive from it!) is
+    something like this:
+
+class WXDLLEXPORT wxDirDialogBase : public wxDialog
+{
+public:
+    wxDirDialogBase(wxWindow *parent,
+                    const wxString& title = wxFileSelectorPromptStr,
+                    const wxString& defaultPath = wxEmptyString,
+                    long style = wxDD_DEFAULT_STYLE,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& sz = wxDefaultSize,
+                    const wxString& name = _T("dirdialog"));
+
+    void SetMessage(const wxString& message);
+    void SetPath(const wxString& path);
+    void SetStyle(long style);
+
+    wxString GetMessage() const;
+    wxString GetPath() const;
+    long GetStyle() const;
+};
+
+*/
+

 #if defined(__WXMSW__)
     #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"
 #if defined(__WXMSW__)
     #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"

+        #define wxDirDialog wxGenericDirDialog

     #else
         #include "wx/msw/dirdlg.h"
     #endif
     #else
         #include "wx/msw/dirdlg.h"
     #endif


@@ -21,6 +54,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"

+#elif defined(__WXX11__)
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)


@@ -29,16 +64,18 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #include "wx/generic/dirdlgg.h"
 #endif
 
     #include "wx/generic/dirdlgg.h"
 #endif
 

+#if !defined(__WXMSW__) && !defined(__WXMAC__)
+    #define wxDirDialog wxGenericDirDialog
+#endif
+

 // ----------------------------------------------------------------------------
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
-

 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,

-              long style = 0,
+              long style = wxDD_DEFAULT_STYLE,

               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);
 
               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);