Added a wxDD_NEW_DIR_BUTTON style for wxDirDialog (currently,

works for the generic implementation only).
Renamed wxDIRCTRL_EDITABLE to wxDIRCTRL_EDIT_LABELS.
Removed reported memory leaks from dynload.cpp using wxModule --
this may cause problems if other modules want to use wxPluginLibrary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/dirctrl.tex b/docs/latex/wx/dirctrl.tex
index 42d6726c836ba2936d4fdae25cbe8ebf028513b4..7dafe1110505783e4eb4028bbcc0c1e255f7e933 100644 (file)
--- a/docs/latex/wx/dirctrl.tex
+++ b/docs/latex/wx/dirctrl.tex
@@ -24,7 +24,7 @@ hierarchy, and optionally, a \helpref{wxChoice}{wxchoice} window containing a li
 \twocolitem{\indexit{wxDIRCTRL\_3D\_INTERNAL}}{Use 3D borders for internal controls.}
 \twocolitem{\indexit{wxDIRCTRL\_SELECT\_FIRST}}{When setting the default path, select the first file in the directory.}
 \twocolitem{\indexit{wxDIRCTRL\_SHOW\_FILTERS}}{Show the drop-down filter list.}
 \twocolitem{\indexit{wxDIRCTRL\_3D\_INTERNAL}}{Use 3D borders for internal controls.}
 \twocolitem{\indexit{wxDIRCTRL\_SELECT\_FIRST}}{When setting the default path, select the first file in the directory.}
 \twocolitem{\indexit{wxDIRCTRL\_SHOW\_FILTERS}}{Show the drop-down filter list.}

-\twocolitem{\indexit{wxDIRCTRL\_EDITABLE}}{Allow the folder and file items to be editable.}
+\twocolitem{\indexit{wxDIRCTRL\_EDIT\_LABELS}}{Allow the folder and file labels to be editable.}

 \end{twocollist}
 
 See also \helpref{Generic window styles}{windowstyles}.
 \end{twocollist}
 
 See also \helpref{Generic window styles}{windowstyles}.

diff --git a/docs/latex/wx/dirdlg.tex b/docs/latex/wx/dirdlg.tex
index 975062f23e97e70b76afcc13099501d2da030bc2..366294269321d9d3d01598b93156f6a819c8391e 100644 (file)
--- a/docs/latex/wx/dirdlg.tex
+++ b/docs/latex/wx/dirdlg.tex
@@ -12,6 +12,19 @@ This class represents the directory chooser dialog.
 \wxheading{Include files}
 
 <wx/dirdlg.h>
 \wxheading{Include files}
 
 <wx/dirdlg.h>

+<wx/generic/dirdlgg.h>
+
+\wxheading{Window styles}
+
+\twocolwidtha{5cm}
+\begin{twocollist}
+\twocolitem{\indexit{wxDD\_NEW\_DIR\_BUTTON}}{Add "Create new directory" button and allow
+directory names to be editable. Available only on platforms that use the generic
+dialog chooser: GTK+, Motif, X11, MGL. For other platforms, use the wxGenericDirDialog
+implementation explicitly if you wish to use this style.}
+\end{twocollist}
+
+See also \helpref{Generic window styles}{windowstyles}.

 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index be319e0322a78a56b9dc270ff33680d7d1250f6f..e22378d3d68933c5d621060f8fed76e78c258b61 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1159,6 +1159,12 @@ enum wxBorder
 // be modal. No progress will then be made at all.
 #define wxPD_REMAINING_TIME     0x0040
 
 // be modal. No progress will then be made at all.
 #define wxPD_REMAINING_TIME     0x0040
 

+/*
+ * wxDirDialog styles
+ */
+
+#define wxDD_NEW_DIR_BUTTON     0x0080
+

 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 5b0dacfef85deb62c8a8256a83dad48d894c1042..bb9a22f36d16cea7141c936d94baccc76274b983 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -41,7 +41,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,

-              long style = 0,
+              long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,

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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index a2d2763defe8bc7ef41b49122e48486399657a18..4cfd2b5de87ff2c3a1510d76dc3d36050a51bc2a 100644 (file)
--- a/include/wx/dynload.h
+++ b/include/wx/dynload.h
@@ -184,7 +184,7 @@ class WXDLLEXPORT wxPluginLibrary : public wxDynamicLibrary
 {
 public:
 
 {
 public:
 

-    static wxDLImports ms_classes;  // Static hash of all imported classes.
+    static wxDLImports* ms_classes;  // Static hash of all imported classes.

 
     wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT );
     ~wxPluginLibrary();
 
     wxPluginLibrary( const wxString &libname, int flags = wxDL_DEFAULT );
     ~wxPluginLibrary();


@@ -269,10 +269,13 @@ public:
         return m_entry->GetSymbol( symbol, success );
     }
 
         return m_entry->GetSymbol( symbol, success );
     }
 

+    static void CreateManifest() { ms_manifest = new wxDLManifest(wxKEY_STRING); }
+    static void ClearManifest() { delete ms_manifest; ms_manifest = NULL; }
+

 private:
 
 private:
 

-    static wxDLManifest  ms_manifest;  // Static hash of loaded libs.
-    wxPluginLibrary     *m_entry;      // Cache our entry in the manifest.
+    static wxDLManifest* ms_manifest;  // Static hash of loaded libs.
+    wxPluginLibrary*     m_entry;      // Cache our entry in the manifest.

 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.
 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 23ca798c5aae50c392d431d0a6c8b85acb83b77c..ec2b098c2967f0303ab889e62f2e827e2b179293 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -47,7 +47,7 @@ enum
     // Use 3D borders on internal controls
     wxDIRCTRL_3D_INTERNAL    = 0x0080,
     // Editable labels
     // Use 3D borders on internal controls
     wxDIRCTRL_3D_INTERNAL    = 0x0080,
     // Editable labels

-    wxDIRCTRL_EDITABLE       = 0x0100
+    wxDIRCTRL_EDIT_LABELS    = 0x0100

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index d0b21b34f717393e0dc41949ddd3510078d75ef8..4996965dd36030cbbbf7ecccfaed95ca19ab32d2 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -38,7 +38,7 @@ public:
     wxGenericDirDialog(): wxDialog() {}
     wxGenericDirDialog(wxWindow* parent, const wxString& title,
                        const wxString& defaultPath = wxEmptyString,
     wxGenericDirDialog(): wxDialog() {}
     wxGenericDirDialog(wxWindow* parent, const wxString& title,
                        const wxString& defaultPath = wxEmptyString,

-                       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER,
+                       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,

                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxSize(450, 550),
                        const wxString& name = _T("dialog"));
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxSize(450, 550),
                        const wxString& name = _T("dialog"));

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index b127ecf5d2985daa86a860feb902ac9382655a54..4d94741e294d2117dc47ba93bf3874e32129db57 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -38,6 +38,7 @@
 #include "wx/filename.h"        // for SplitPath()
 
 #include "wx/dynload.h"
 #include "wx/filename.h"        // for SplitPath()
 
 #include "wx/dynload.h"

+#include "wx/module.h"

 
 #if defined(__DARWIN__)
 /* Porting notes:
 
 #if defined(__DARWIN__)
 /* Porting notes:


@@ -280,7 +281,22 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 
 

-wxDLImports  wxPluginLibrary::ms_classes(wxKEY_STRING);
+wxDLImports*  wxPluginLibrary::ms_classes = NULL;
+
+class wxPluginLibraryModule : public wxModule
+{
+public:
+    wxPluginLibraryModule() {}
+    bool OnInit() { wxPluginLibrary::ms_classes = new wxDLImports(wxKEY_STRING); return TRUE; }
+    void OnExit() { delete wxPluginLibrary::ms_classes; wxPluginLibrary::ms_classes = NULL;
+                    wxPluginManager::ClearManifest(); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPluginLibraryModule )
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule)
+

 
 wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
         : m_linkcount(1)
 
 wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
         : m_linkcount(1)


@@ -347,8 +363,8 @@ void wxPluginLibrary::UpdateClassInfo()
             // Hash all the class names into a local table too so
             // we can quickly find the entry they correspond to.
 
             // Hash all the class names into a local table too so
             // we can quickly find the entry they correspond to.
 

-            if( ms_classes.Get(info->m_className) == 0 )
-                ms_classes.Put(info->m_className, (wxObject *) this);
+            if( ms_classes->Get(info->m_className) == 0 )
+                ms_classes->Put(info->m_className, (wxObject *) this);

         }
     }
 
         }
     }
 


@@ -368,7 +384,7 @@ void wxPluginLibrary::RestoreClassInfo()
     for(info = m_after; info != m_before; info = info->m_next)
     {
         wxClassInfo::sm_classTable->Delete(info->m_className);
     for(info = m_after; info != m_before; info = info->m_next)
     {
         wxClassInfo::sm_classTable->Delete(info->m_className);

-        ms_classes.Delete(info->m_className);
+        ms_classes->Delete(info->m_className);

     }
 
     if( wxClassInfo::sm_first == m_after )
     }
 
     if( wxClassInfo::sm_first == m_after )


@@ -457,7 +473,7 @@ void wxPluginLibrary::UnregisterModules()
 // wxPluginLibrary
 // ---------------------------------------------------------------------------
 
 // wxPluginLibrary
 // ---------------------------------------------------------------------------
 

-wxDLManifest   wxPluginManager::ms_manifest(wxKEY_STRING);
+wxDLManifest*   wxPluginManager::ms_manifest = NULL;

 
 // ------------------------
 // Static accessors
 
 // ------------------------
 // Static accessors


@@ -470,7 +486,7 @@ wxPluginLibrary *wxPluginManager::LoadLibrary(const wxString &libname, int flags
     if( !(flags & wxDL_VERBATIM) )
         realname += wxDynamicLibrary::GetDllExt();
 
     if( !(flags & wxDL_VERBATIM) )
         realname += wxDynamicLibrary::GetDllExt();
 

-    wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest.Get(realname);
+    wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest->Get(realname);

 
     if( entry != 0 )
     {
 
     if( entry != 0 )
     {


@@ -482,7 +498,7 @@ wxPluginLibrary *wxPluginManager::LoadLibrary(const wxString &libname, int flags
 
         if( entry->IsLoaded() )
         {
 
         if( entry->IsLoaded() )
         {

-            ms_manifest.Put(realname, (wxObject*) entry);
+            ms_manifest->Put(realname, (wxObject*) entry);

         }
         else
         {
         }
         else
         {


@@ -496,10 +512,10 @@ wxPluginLibrary *wxPluginManager::LoadLibrary(const wxString &libname, int flags
 
 bool wxPluginManager::UnloadLibrary(const wxString &libname)
 {
 
 bool wxPluginManager::UnloadLibrary(const wxString &libname)
 {

-    wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest.Get(libname);
+    wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest->Get(libname);

 
     if( !entry )
 
     if( !entry )

-        entry = (wxPluginLibrary*) ms_manifest.Get(libname + wxDynamicLibrary::GetDllExt());
+        entry = (wxPluginLibrary*) ms_manifest->Get(libname + wxDynamicLibrary::GetDllExt());

 
     if( entry )
         return entry->UnrefLib();
 
     if( entry )
         return entry->UnrefLib();


@@ -512,9 +528,9 @@ bool wxPluginManager::UnloadLibrary(const wxString &libname)
 wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
 {
     wxNode  *node;
 wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
 {
     wxNode  *node;

-    ms_manifest.BeginFind();
+    ms_manifest->BeginFind();

 
 

-    for(node = ms_manifest.Next(); node; node = ms_manifest.Next())
+    for(node = ms_manifest->Next(); node; node = ms_manifest->Next())

         if( ((wxPluginLibrary*)node->GetData())->GetLibHandle() == handle )
             return (wxPluginLibrary*)node->GetData();
 
         if( ((wxPluginLibrary*)node->GetData())->GetLibHandle() == handle )
             return (wxPluginLibrary*)node->GetData();
 


@@ -535,11 +551,11 @@ bool wxPluginManager::Load(const wxString &libname, int flags)
 void wxPluginManager::Unload()
 {
     wxNode  *node;
 void wxPluginManager::Unload()
 {
     wxNode  *node;

-    ms_manifest.BeginFind();
+    ms_manifest->BeginFind();

 
     // It's either this or store the name of the lib just to do this.
 
 
     // It's either this or store the name of the lib just to do this.
 

-    for(node = ms_manifest.Next(); node; node = ms_manifest.Next())
+    for(node = ms_manifest->Next(); node; node = ms_manifest->Next())

         if( (wxPluginLibrary*)node->GetData() == m_entry )
             break;
 
         if( (wxPluginLibrary*)node->GetData() == m_entry )
             break;
 

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 94e2f41024734d796bd7e7e188dc815ae3c25dcb..38c948fc2c045878e3a20fd931e7de68f7ee31dd 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -504,10 +504,8 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
 
 
     long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
 

-#ifdef __WXMSW__
-    if (style & wxDIRCTRL_EDITABLE)
+    if (style & wxDIRCTRL_EDIT_LABELS)

         treeStyle |= wxTR_EDIT_LABELS;
         treeStyle |= wxTR_EDIT_LABELS;

-#endif

 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 94349e3c35b1f089bc9caf11e3e61c4d0f6a4567..d74c7aadc07595ddae6e05b36f3298b1bbb42e90 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -93,14 +93,19 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     
     // I'm not convinced we need a New button, and we tend to get annoying
     // accidental-editing with label editing enabled.
     
     // I'm not convinced we need a New button, and we tend to get annoying
     // accidental-editing with label editing enabled.

-    wxBitmapButton* newButton = 
-        new wxBitmapButton(this, ID_NEW,
-                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
-    buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        wxBitmapButton* newButton = 
+            new wxBitmapButton(this, ID_NEW,
+                            wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+        buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
+#if wxUSE_TOOLTIPS
+        newButton->SetToolTip(_("Create new directory"));
+#endif    
+    }

 
 #if wxUSE_TOOLTIPS
     homeButton->SetToolTip(_("Go to home directory"));
 
 #if wxUSE_TOOLTIPS
     homeButton->SetToolTip(_("Go to home directory"));

-    newButton->SetToolTip(_("Create new directory"));

 #endif
 
     topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
 #endif
 
     topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );


@@ -108,10 +113,21 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     // 1) dir ctrl
     m_dirCtrl = NULL; // this is neccessary, event handler called from 
                       // wxGenericDirCtrl would crash otherwise!
     // 1) dir ctrl
     m_dirCtrl = NULL; // this is neccessary, event handler called from 
                       // wxGenericDirCtrl would crash otherwise!

+    long dirStyle = wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER;
+    
+#ifdef __WXMSW__
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
+        // before we can call EditLabel (required for "New directory")
+        dirStyle |= wxDIRCTRL_EDIT_LABELS;
+    }
+#endif    
+

     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
                                      m_path, wxPoint(5, 5),
                                      wxSize(300, 200), 
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
                                      m_path, wxPoint(5, 5),
                                      wxSize(300, 200), 

-                                     wxDIRCTRL_DIR_ONLY|wxDIRCTRL_EDITABLE|wxSUNKEN_BORDER);
+                                     dirStyle);

 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
 
 
     topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );