X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48013bb0986730359e35f93bbc73e0932816a04c..e16514bf08d65e85cc5886108a7b038c7bddd952:/include/wx/dirdlg.h

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 467786df1b..e8c7e44100 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/dirdlg.h
+// Purpose:     wxDirDialog base class
+// Author:      Robert Roebling
+// Modified by:
+// Created:
+// Copyright:   (c) Robert Roebling
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
@@ -9,63 +20,124 @@
 // 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;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+
 
-#define wxDD_DEFAULT_STYLE \
-    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+#ifdef __WXWINCE__
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+#else
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+#endif
 
-/*
-    The interface (TODO: make the other classes really derive from it!) is
-    something like this:
+//-------------------------------------------------------------------------
+// wxDirDialogBase
+//-------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDirDialogBase : public wxDialog
 {
 public:
+    wxDirDialogBase() {}
     wxDirDialogBase(wxWindow *parent,
-                    const wxString& title = wxFileSelectorPromptStr,
+                    const wxString& title = wxDirSelectorPromptStr,
                     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;
+                    const wxString& name = wxDirDialogNameStr)
+    {
+        Create(parent, title, defaultPath, style, pos, sz, name);
+    }
+
+    virtual ~wxDirDialogBase() {}
+
+
+    bool Create(wxWindow *parent,
+                const wxString& title = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& sz = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr)
+    {
+        if (!wxDialog::Create(parent, wxID_ANY, title, pos, sz, style, name))
+            return false;
+        m_path = defaultPath;
+        m_message = title;
+        return true;
+    }
+
+
+    virtual void SetMessage(const wxString& message) { m_message = message; }
+    virtual void SetPath(const wxString& path) { m_path = path; }
+
+    virtual wxString GetMessage() const { return m_message; }
+    virtual wxString GetPath() const { return m_path; }
+
+protected:
+    wxString m_message;
+    wxString m_path;
 };
 
-*/
 
-#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
-#elif defined(__WXMOTIF__)
+// Universal and non-port related switches with need for generic implementation
+#if defined(__WXUNIVERSAL__)
+
     #include "wx/generic/dirdlgg.h"
-#elif defined(__WXGTK__)
+    #define wxDirDialog wxGenericDirDialog
+
+#elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
+                             !wxUSE_OLE               || \
+                             (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+
     #include "wx/generic/dirdlgg.h"
-#elif defined(__WXX11__)
+    #define wxDirDialog wxGenericDirDialog
+
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
+
     #include "wx/generic/dirdlgg.h"
-#elif defined(__WXMGL__)
+    #define wxDirDialog wxGenericDirDialog
+
+// Native MSW
+#elif defined(__WXMSW__)
+
+    #include "wx/msw/dirdlg.h"
+
+// Native GTK for gtk2.x and generic for gtk1.x
+#elif defined(__WXGTK__)
+
+#if defined( __WXGTK20__ )
+    #include "wx/gtk/dirdlg.h"
+    #define wxDirDialog wxDirDialogGTK
+#else
     #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+#endif
+
+// Native Mac
 #elif defined(__WXMAC__)
+
     #include "wx/mac/dirdlg.h"
-#elif defined(__WXPM__)
-    #include "wx/generic/dirdlgg.h"
-#endif
 
-#if !defined(__WXMSW__) && !defined(__WXMAC__)
+// Native Cocoa
+#elif defined(__WXCOCOA__)
+
+    #include "wx/cocoa/dirdlg.h"
+
+// Other ports use generic implementation
+#elif defined(__WXMOTIF__) || \
+      defined(__WXX11__)   || \
+      defined(__WXMGL__)   || \
+      defined(__WXCOCOA__) || \
+      defined(__WXPM__)
+
+    #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
+
 #endif
 
 // ----------------------------------------------------------------------------