From e17206f71b41034cadb28419af637f0d7ca682f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 13 Aug 2007 22:06:26 +0000 Subject: [PATCH] wxMac compilation fixes for visibility (missing DLL export macros) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/macnotfy.h | 18 ++++++++-------- include/wx/mac/carbon/notebook.h | 2 +- include/wx/mac/carbon/private.h | 26 ++++++++++++------------ include/wx/mac/carbon/uma.h | 4 ++-- include/wx/mac/corefoundation/cfstring.h | 19 +++++++++-------- include/wx/mac/corefoundation/hid.h | 4 ++-- src/mac/carbon/uma.cpp | 4 ++-- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/include/wx/mac/carbon/macnotfy.h b/include/wx/mac/carbon/macnotfy.h index a9f3f70c03..5e412bcfc0 100644 --- a/include/wx/mac/carbon/macnotfy.h +++ b/include/wx/mac/carbon/macnotfy.h @@ -9,7 +9,9 @@ #ifndef MAC_NOTIFYERS #define MAC_NOTIFYERS - + +#include "wx/dlimpexp.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -17,13 +19,13 @@ extern "C" { typedef void (*wxMacNotificationProcPtr)(unsigned long event , void* data ) ; typedef void *wxMacNotifierTableRef ; -void wxMacCreateNotifierTable() ; -void wxMacDestroyNotifierTable() ; -wxMacNotifierTableRef wxMacGetNotifierTable() ; -void wxMacAddEvent( wxMacNotifierTableRef table , wxMacNotificationProcPtr handler , unsigned long event , void* data , short wakeUp ) ; -void wxMacProcessNotifierEvents() ; -void wxMacProcessNotifierAndPendingEvents() ; -void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) ; +WXDLLIMPEXP_BASE void wxMacCreateNotifierTable() ; +WXDLLIMPEXP_BASE void wxMacDestroyNotifierTable() ; +WXDLLIMPEXP_BASE wxMacNotifierTableRef wxMacGetNotifierTable() ; +WXDLLIMPEXP_BASE void wxMacAddEvent( wxMacNotifierTableRef table , wxMacNotificationProcPtr handler , unsigned long event , void* data , short wakeUp ) ; +WXDLLIMPEXP_BASE void wxMacProcessNotifierEvents() ; +WXDLLIMPEXP_BASE void wxMacProcessNotifierAndPendingEvents() ; +WXDLLIMPEXP_BASE void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) ; #ifdef __cplusplus } diff --git a/include/wx/mac/carbon/notebook.h b/include/wx/mac/carbon/notebook.h index 8d37796db6..48e13feb3a 100644 --- a/include/wx/mac/carbon/notebook.h +++ b/include/wx/mac/carbon/notebook.h @@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; // wxNotebook // ---------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index 6fc913dd2c..7e0736ac85 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -202,16 +202,16 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec); #endif // wxUSE_GUI // filefn.h -WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ); -WXDLLEXPORT void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec ); +WXDLLIMPEXP_BASE wxString wxMacFSSpec2MacFilename( const FSSpec *spec ); +WXDLLIMPEXP_BASE void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec ); // utils.h -WXDLLEXPORT wxString wxMacFindFolderNoSeparator(short vRefNum, - OSType folderType, - Boolean createFolder); -WXDLLEXPORT wxString wxMacFindFolder(short vRefNum, - OSType folderType, - Boolean createFolder); +WXDLLIMPEXP_BASE wxString wxMacFindFolderNoSeparator(short vRefNum, + OSType folderType, + Boolean createFolder); +WXDLLIMPEXP_BASE wxString wxMacFindFolder(short vRefNum, + OSType folderType, + Boolean createFolder); template EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; } template<> inline EventParamType wxMacGetEventParamType() { return typeQDRgnHandle; } @@ -1313,14 +1313,14 @@ UPP Get##x() \ void wxMacSetupConverters(); void wxMacCleanupConverters(); -void wxMacStringToPascal( const wxString&from , StringPtr to ); -wxString wxMacMakeStringFromPascal( ConstStringPtr from ); +WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to ); +WXDLLIMPEXP_BASE wxString wxMacMakeStringFromPascal( ConstStringPtr from ); // filefn.cpp -wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ); -OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); -wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); +WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ); +WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); +WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); #if wxUSE_GUI diff --git a/include/wx/mac/carbon/uma.h b/include/wx/mac/carbon/uma.h index 3d12a552cd..748f016acc 100644 --- a/include/wx/mac/carbon/uma.h +++ b/include/wx/mac/carbon/uma.h @@ -18,8 +18,8 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ; void UMACleanupToolbox() ; long UMAGetSystemVersion() ; -bool UMASystemIsInitialized() ; -void UMASetSystemIsInitialized(bool val); +WXDLLIMPEXP_BASE bool UMASystemIsInitialized(); +WXDLLIMPEXP_BASE void UMASetSystemIsInitialized(bool val); // process manager diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h index 38d6a9f47e..16a95cf2ff 100644 --- a/include/wx/mac/corefoundation/cfstring.h +++ b/include/wx/mac/corefoundation/cfstring.h @@ -18,21 +18,22 @@ #include #endif +#include "wx/dlimpexp.h" #include "wx/fontenc.h" class WXDLLIMPEXP_FWD_BASE wxString; -void wxMacConvertNewlines13To10( wxString *data ) ; -void wxMacConvertNewlines10To13( wxString *data ) ; +WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ; +WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( wxString *data ) ; -void wxMacConvertNewlines13To10( char * data ) ; -void wxMacConvertNewlines10To13( char * data ) ; +WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( char * data ) ; +WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( char * data ) ; -wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ; -wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ; -void wxMacWakeUp() ; +WXDLLIMPEXP_BASE wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ; +WXDLLIMPEXP_BASE wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ; +WXDLLIMPEXP_BASE void wxMacWakeUp() ; -class wxMacCFStringHolder +class WXDLLIMPEXP_BASE wxMacCFStringHolder { public: wxMacCFStringHolder() @@ -88,7 +89,7 @@ private: // corresponding class for holding UniChars (native unicode characters) -class wxMacUniCharBuffer +class WXDLLIMPEXP_BASE wxMacUniCharBuffer { public : wxMacUniCharBuffer( const wxString &str ) ; diff --git a/include/wx/mac/corefoundation/hid.h b/include/wx/mac/corefoundation/hid.h index ec7c09cf08..e6df5cb45f 100644 --- a/include/wx/mac/corefoundation/hid.h +++ b/include/wx/mac/corefoundation/hid.h @@ -54,7 +54,7 @@ extern "C" { // Quite good, as is the sample program associated with it // (Depite the author's protests!). // --------------------------------------------------------------------------- -class wxHIDDevice +class WXDLLIMPEXP_CORE wxHIDDevice { public: wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {} @@ -100,7 +100,7 @@ protected: // Semi-simple implementation that opens a connection to the first // keyboard of the machine. Used in wxGetKeyState. // --------------------------------------------------------------------------- -class wxHIDKeyboard : public wxHIDDevice +class WXDLLIMPEXP_CORE wxHIDKeyboard : public wxHIDDevice { public: static int GetCount(); diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 0857a2411d..88b5771bdd 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -11,6 +11,8 @@ #include "wx/wxprec.h" +#include "wx/mac/uma.h" + #if wxUSE_GUI #include "wx/toplevel.h" @@ -33,8 +35,6 @@ # include #endif -#include "wx/mac/uma.h" - // since we have decided that we only support 8.6 upwards we are // checking for these minimum requirements in the startup code of // the application so all wxWidgets code can safely assume that appearance 1.1 -- 2.47.2