test that wxUSE_DATAVIEWCTRL is defined

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 0752c5e97224c0061bc47fe7f908f075f234ed4a..e8c7e441001099a45bcd4943b0f871da71d06806 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -20,9 +20,10 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+
 
 #ifdef __WXWINCE__
     #define wxDD_DEFAULT_STYLE \
@@ -32,37 +33,65 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
         (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;
 };
 
-*/
 
 // Universal and non-port related switches with need for generic implementation
-#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
-                           defined(__SALFORDC__)    || \
-                           !wxUSE_OLE               || \
-                           (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+#if defined(__WXUNIVERSAL__)
+
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+
+#elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
+                             !wxUSE_OLE               || \
+                             (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
@@ -78,14 +107,29 @@ public:
 
     #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"
 
+// Native Cocoa
+#elif defined(__WXCOCOA__)
+
+    #include "wx/cocoa/dirdlg.h"
+
 // Other ports use generic implementation
 #elif defined(__WXMOTIF__) || \
-      defined(__WXGTK__)   || \
       defined(__WXX11__)   || \
       defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \