From: Václav Slavík Date: Wed, 19 Jan 2000 23:06:11 +0000 (+0000) Subject: split mimetype.h/.cpp into platform specific code X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ecf23aa6269c155f66f5a37d00bb8b11ad01f383 split mimetype.h/.cpp into platform specific code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index ca17706d16..0626bba4d4 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -12,6 +12,11 @@ #ifndef _MIMETYPE_H #define _MIMETYPE_H +#ifdef __GNUG__ +#pragma interface "mimetypebase.h" +#endif + + // fwd decls class wxIcon; class wxFileTypeImpl; @@ -23,6 +28,7 @@ class wxMimeTypesManagerImpl; // the things we really need #include "wx/string.h" +#include "wx/dynarray.h" // This class holds information about a given "file type". File type is the // same as MIME type under Unix, but under Windows it corresponds more to an @@ -148,6 +154,9 @@ private: wxArrayString m_exts; // the extensions which are mapped on this filetype }; +WX_DECLARE_EXPORTED_OBJARRAY(wxFileTypeInfo, wxArrayFileTypeInfo); + + // This class accesses the information about all known MIME types and allows // the application to retrieve information (including how to handle data of // given type) about them. @@ -215,8 +224,19 @@ private: wxMimeTypesManager& operator=(const wxMimeTypesManager&); wxMimeTypesManagerImpl *m_impl; + + // if m_impl is NULL, create one + void EnsureImpl(); }; + +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +// the default mime manager for wxWindows programs +WXDLLEXPORT_DATA(extern wxMimeTypesManager *) wxTheMimeTypesManager; + #endif // wxUSE_FILE diff --git a/src/wxvc.dsp b/src/wxvc.dsp index 8d2309bbad..2e647b95fc 100644 --- a/src/wxvc.dsp +++ b/src/wxvc.dsp @@ -320,7 +320,7 @@ SOURCE=.\common\menucmn.cpp # End Source File # Begin Source File -SOURCE=.\common\mimetype.cpp +SOURCE=.\common\mimecmn.cpp # End Source File # Begin Source File @@ -902,6 +902,10 @@ SOURCE=.\msw\metafile.cpp # End Source File # Begin Source File +SOURCE=.\msw\mimetype.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\minifram.cpp # End Source File # Begin Source File diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index 075a64cf14..0450bbdfba 100644 --- a/src/wxvc_dll.dsp +++ b/src/wxvc_dll.dsp @@ -327,7 +327,7 @@ SOURCE=.\common\menucmn.cpp # End Source File # Begin Source File -SOURCE=.\common\mimetype.cpp +SOURCE=.\common\mimecmn.cpp # End Source File # Begin Source File @@ -900,6 +900,10 @@ SOURCE=.\msw\metafile.cpp # End Source File # Begin Source File +SOURCE=.\msw\mimetype.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\minifram.cpp # End Source File # Begin Source File