Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/dirdlg.h b/interface/wx/dirdlg.h
index cf6364f31b2250185fac18a7a9c866f44228fca4..e04898229157418163efa74051cbe0161a8cf4a4 100644 (file)
--- a/interface/wx/dirdlg.h
+++ b/interface/wx/dirdlg.h
@@ -2,10 +2,30 @@
 // Name:        dirdlg.h
 // Purpose:     interface of wxDirDialog
 // Author:      wxWidgets team
 // Name:        dirdlg.h
 // Purpose:     interface of wxDirDialog
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#define wxDD_CHANGE_DIR         0x0100
+#define wxDD_DIR_MUST_EXIST     0x0200
+#define wxDD_NEW_DIR_BUTTON     0 // deprecated, on by default now,
+
+#define wxDD_DEFAULT_STYLE      (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+
+/**
+    Initial folder for generic directory dialog.
+*/
+const char wxDirDialogDefaultFolderStr[] = "/";
+
+/**
+    Default message for directory selector dialog.
+*/
+const char wxDirSelectorPromptStr[] = "Select a directory";
+
+/**
+    Default name for directory selector dialog.
+*/
+const char wxDirDialogNameStr[] = "wxDirCtrl";
+

 /**
     @class wxDirDialog
 
 /**
     @class wxDirDialog
 


@@ -67,12 +87,12 @@ public:
             The dialog name, not used.
     */
     wxDirDialog(wxWindow* parent,
             The dialog name, not used.
     */
     wxDirDialog(wxWindow* parent,

-                const wxString& message = "Choose a directory",
-                const wxString& defaultPath = "",
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,

                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                const wxString& name = "wxDirCtrl");
+                const wxString& name = wxDirDialogNameStr);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -112,7 +132,7 @@ public:
 // Global functions/macros
 // ============================================================================
 
 // Global functions/macros
 // ============================================================================
 

-/** @ingroup group_funcmacro_dialog */
+/** @addtogroup group_funcmacro_dialog */

 //@{
 
 /**
 //@{
 
 /**


@@ -134,7 +154,7 @@ public:
     @header{wx/dirdlg.h}
 */
 wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
     @header{wx/dirdlg.h}
 */
 wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr,

-                       const wxString& default_path = "",
+                       const wxString& default_path = wxEmptyString,

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