Combine two wxImage-to-pixmap creation functions into one.

[wxWidgets.git] / src / msdos / mimetype.cpp

diff --git a/src/msdos/mimetype.cpp b/src/msdos/mimetype.cpp
index 0665e79ab91982cd06027f4396c3b76fe37dd657..0be46cd73d1d46477af6be5014176a7bb5af41e5 100644 (file)
--- a/src/msdos/mimetype.cpp
+++ b/src/msdos/mimetype.cpp
@@ -13,30 +13,26 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
+#if wxUSE_MIMETYPE
+
+#include "wx/msdos/mimetype.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-  #include "wx/string.h"
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #if wxUSE_GUI
+        #include "wx/icon.h"
+    #endif

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#if wxUSE_MIMETYPE
-
-#include "wx/log.h"

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

-#include "wx/intl.h"
-#include "wx/dynarray.h"

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

-#include "wx/msdos/mimetype.h"
-

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


@@ -69,7 +65,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& WXUNUSED(extensions))
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 {
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 {

-    if ( m_strFileType.Length() > 0 )
+    if ( !m_strFileType.empty() )

     {
         *mimeType = m_strFileType ;
         return true ;
     {
         *mimeType = m_strFileType ;
         return true ;