Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index c6f4454aac5b13f4f6ce7fa672ef7c9441da4388..fc86e195279895440271ccde224a4ef097729b4f 100644 (file)
--- 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_
 
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 


@@ -9,77 +20,115 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
+
+#define wxDD_CHANGE_DIR         0x0100
+#define wxDD_DIR_MUST_EXIST     0x0200

 
 

-#define wxDD_DEFAULT_STYLE \
-    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+// deprecated, on by default now, use wxDD_DIR_MUST_EXIST to disable it
+#define wxDD_NEW_DIR_BUTTON     0
+
+#ifdef __WXWINCE__
+    #define wxDD_DEFAULT_STYLE      wxDEFAULT_DIALOG_STYLE
+#else
+    #define wxDD_DEFAULT_STYLE      (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+#endif

 
 

-/*
-    The interface (TODO: make the other classes really derive from it!) is
-    something like this:
+//-------------------------------------------------------------------------
+// wxDirDialogBase
+//-------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxDirDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog

 {
 public:
 {
 public:

+    wxDirDialogBase() {}

     wxDirDialogBase(wxWindow *parent,
     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& defaultPath = wxEmptyString,
                     long style = wxDD_DEFAULT_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& sz = wxDefaultSize,

-                    const wxString& name = _T("dirdialog"));
+                    const wxString& name = wxDirDialogNameStr)
+    {
+        Create(parent, title, defaultPath, style, pos, sz, name);
+    }

 
 

-    void SetMessage(const wxString& message);
-    void SetPath(const wxString& path);
-    void SetStyle(long style);
+    virtual ~wxDirDialogBase() {}

 
 

-    wxString GetMessage() const;
-    wxString GetPath() const;
-    long GetStyle() const;
-};

 
 

-*/
+    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;
+    }

 
 

-// Universal and non-port related switches with need for generic implementation
-#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
-                           defined(__WXWINCE__)     || \
-                           defined(__SALFORDC__)    || \
-                           !wxUSE_OLE               || \
-                           (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+#if WXWIN_COMPATIBILITY_2_6

 
 

-    #include "wx/generic/dirdlgg.h"
-    #define wxDirDialog wxGenericDirDialog
+    wxDEPRECATED( long GetStyle() const );
+    wxDEPRECATED( void SetStyle(long style) );

 
 

-// Native MSW
-#elif defined(__WXMSW__)
+#endif  // WXWIN_COMPATIBILITY_2_6

 
 

-    #include "wx/msw/dirdlg.h"
+    virtual void SetMessage(const wxString& message) { m_message = message; }
+    virtual void SetPath(const wxString& path) { m_path = path; }

 
 

-// Native Mac
-#elif defined(__WXMAC__)
+    virtual wxString GetMessage() const { return m_message; }
+    virtual wxString GetPath() const { return m_path; }
+
+protected:
+    wxString m_message;
+    wxString m_path;
+};

 
 

-    #include "wx/mac/dirdlg.h"

 
 

-// Other ports use generic implementation
+// Universal and non-port related switches with need for generic implementation
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+#elif defined(__WXMSW__) && (!wxUSE_OLE               || \
+                             (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
+    #include "wx/generic/dirdlgg.h"     // MS PocketPC or MS Smartphone
+    #define wxDirDialog wxGenericDirDialog
+#elif defined(__WXMSW__)
+    #include "wx/msw/dirdlg.h"  // Native MSW
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/dirdlg.h"  // Native GTK for gtk2.4
+#elif defined(__WXGTK__)
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+#elif defined(__WXMAC__)
+    #include "wx/osx/dirdlg.h"      // Native Mac
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/dirdlg.h"    // Native Cocoa

 #elif defined(__WXMOTIF__) || \
 #elif defined(__WXMOTIF__) || \

-      defined(__WXGTK__)   || \

       defined(__WXX11__)   || \
       defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \
       defined(__WXX11__)   || \
       defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \

+      defined(__WXPALMOS__) || \

       defined(__WXPM__)
       defined(__WXPM__)

-
-    #include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation

     #define wxDirDialog wxGenericDirDialog
     #define wxDirDialog wxGenericDirDialog

-

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

-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString

 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,