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 7a849a713a657bfe4ff02773131fdb560adaff6c..e8c7e441001099a45bcd4943b0f871da71d06806 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -40,6 +40,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 class WXDLLEXPORT wxDirDialogBase : public wxDialog
 {
 public:
 class WXDLLEXPORT wxDirDialogBase : public wxDialog
 {
 public:

+    wxDirDialogBase() {}

     wxDirDialogBase(wxWindow *parent,
                     const wxString& title = wxDirSelectorPromptStr,
                     const wxString& defaultPath = wxEmptyString,
     wxDirDialogBase(wxWindow *parent,
                     const wxString& title = wxDirSelectorPromptStr,
                     const wxString& defaultPath = wxEmptyString,


@@ -47,18 +48,34 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& sz = wxDefaultSize,
                     const wxString& name = wxDirDialogNameStr)
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& sz = wxDefaultSize,
                     const wxString& name = wxDirDialogNameStr)

-        : wxDialog(parent, wxID_ANY, title, pos, sz, style, name) {}
-    wxDirDialogBase() {}
+    {
+        Create(parent, title, defaultPath, style, pos, sz, name);
+    }

 
     virtual ~wxDirDialogBase() {}
 
 
     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 void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }

-    virtual void SetStyle(long style) { SetWindowStyle(style); }

 
     virtual wxString GetMessage() const { return m_message; }
     virtual wxString GetPath() const { return m_path; }
 
     virtual wxString GetMessage() const { return m_message; }
     virtual wxString GetPath() const { return m_path; }

-    virtual long GetStyle() const { return GetWindowStyle(); }

 
 protected:
     wxString m_message;
 
 protected:
     wxString m_message;


@@ -67,10 +84,14 @@ protected:
 
 
 // Universal and non-port related switches with need for generic implementation
 
 
 // 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
 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog


@@ -86,11 +107,16 @@ protected:
 
     #include "wx/msw/dirdlg.h"
 
 
     #include "wx/msw/dirdlg.h"
 

-// Native GTK
+// Native GTK for gtk2.x and generic for gtk1.x

 #elif defined(__WXGTK__)
 
 #elif defined(__WXGTK__)
 

+#if defined( __WXGTK20__ )

     #include "wx/gtk/dirdlg.h"
     #define wxDirDialog wxDirDialogGTK
     #include "wx/gtk/dirdlg.h"
     #define wxDirDialog wxDirDialogGTK

+#else
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+#endif

 
 // Native Mac
 #elif defined(__WXMAC__)
 
 // Native Mac
 #elif defined(__WXMAC__)