make sure we catch invalid control refs better

[wxWidgets.git] / src / mac / carbon / mimetmac.cpp

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index e53d77111fdc8d34443b977f4d91b703244c3965..4ee87964e6955090e3852b880905bdceff64f3e9 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -27,26 +27,27 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_MIMETYPE
 
 #endif
 
 #if wxUSE_MIMETYPE
 

-#ifndef WX_PRECOMP
-  #include "wx/string.h"
+#include "wx/mac/mimetype.h"

 
 

-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+#ifndef WX_PRECOMP
+    #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
 
 #endif
 

-#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/mac/mimetype.h"

 #include "wx/mac/private.h"
 
 // other standard headers
 #include "wx/mac/private.h"
 
 // other standard headers


@@ -629,7 +630,7 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, const wxString& extra
     if (status != noErr)
     {
         wxLogDebug(wxT("Could not initialize wxMimeTypesManager!"));
     if (status != noErr)
     {
         wxLogDebug(wxT("Could not initialize wxMimeTypesManager!"));

-        wxASSERT( false );
+        wxFAIL;

         m_hIC = NULL;
 
         return;
         m_hIC = NULL;
 
         return;


@@ -818,7 +819,6 @@ pascal  OSStatus  MoreProcGetProcessTypeSignature(
 //
 
 #include "wx/mac/corefoundation/cfstring.h"
 //
 
 #include "wx/mac/corefoundation/cfstring.h"

-#include "wx/intl.h" //wxLocale for wxCFString

 
 #define wxCF_RELEASE true
 #define wxCF_RETAIN  false
 
 #define wxCF_RELEASE true
 #define wxCF_RETAIN  false