fix the broken code in strftime()

[wxWidgets.git] / src / common / mimecmn.cpp

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 326eefa0af26ce3b81554f1d63d094b400926e79..db1cf082f363404ac8d1dc6f1a8e92e3621d0261 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -27,20 +27,20 @@
 
 #if wxUSE_MIMETYPE
 
 
 #if wxUSE_MIMETYPE
 

+#include "wx/mimetype.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/string.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/module.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/module.h"
-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/iconloc.h"
 #include "wx/file.h"
 #include "wx/iconloc.h"

-#include "wx/intl.h"

 #include "wx/confbase.h"
 
 #include "wx/confbase.h"
 

-#include "wx/mimetype.h"
-

 // other standard headers
 #include <ctype.h>
 
 // other standard headers
 #include <ctype.h>
 


@@ -453,28 +453,27 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 #endif
 }
 
 #endif
 }
 

-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxMimeTypesManagerFactory
 // wxMimeTypesManagerFactory

-//----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
 
 /* static */
 
 wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
 
 /* static */

-void wxMimeTypesManagerFactory::SetFactory( wxMimeTypesManagerFactory *factory )
+void wxMimeTypesManagerFactory::Set(wxMimeTypesManagerFactory *factory)

 {
 {

-    if (wxMimeTypesManagerFactory::m_factory)
-        delete wxMimeTypesManagerFactory::m_factory;
+    delete m_factory;

 
 

-    wxMimeTypesManagerFactory::m_factory = factory;
+    m_factory = factory;

 }
 
 /* static */
 }
 
 /* static */

-wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::GetFactory()
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::Get()

 {
 {

-    if (!wxMimeTypesManagerFactory::m_factory)
-        wxMimeTypesManagerFactory::m_factory = new wxMimeTypesManagerFactory;
+    if ( !m_factory )
+        m_factory = new wxMimeTypesManagerFactory;

 
 

-    return wxMimeTypesManagerFactory::m_factory;
+    return m_factory;

 }
 
 wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
 }
 
 wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()


@@ -489,7 +488,7 @@ wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
 void wxMimeTypesManager::EnsureImpl()
 {
     if ( !m_impl )
 void wxMimeTypesManager::EnsureImpl()
 {
     if ( !m_impl )

-        m_impl = wxMimeTypesManagerFactory::GetFactory()->CreateMimeTypesManagerImpl();
+        m_impl = wxMimeTypesManagerFactory::Get()->CreateMimeTypesManagerImpl();

 }
 
 bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
 }
 
 bool wxMimeTypesManager::IsOfType(const wxString& mimeType,


@@ -528,6 +527,8 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {

+    EnsureImpl();
+

 #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     return m_impl->Unassociate(ft);
 #else
 #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     return m_impl->Unassociate(ft);
 #else


@@ -673,10 +674,12 @@ class wxMimeTypeCmnModule: public wxModule
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }

+

     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {

-        // this avoids false memory leak allerts:
+        wxMimeTypesManagerFactory::Set(NULL);
+

         if ( gs_mimeTypesManager.m_impl != NULL )
         {
             delete gs_mimeTypesManager.m_impl;
         if ( gs_mimeTypesManager.m_impl != NULL )
         {
             delete gs_mimeTypesManager.m_impl;