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

diff --git a/include/wx/mac/carbon/macnotfy.h b/include/wx/mac/carbon/macnotfy.h
index a9f3f70c03e20e7936d1a5d333fed1578f6e55e8..5e412bcfc0103b7551adbb5c1867f9bdb7b672da 100644 (file)
--- 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 8d37796db618582699527b5681bdef0ea343fc80..48e13feb3a31f366fd2308abb0e81eff8cbf5589 100644 (file)
--- 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 6fc913dd2c8a7966ba01ac0917c94172f72f0439..7e0736ac8541a7a604c7ea0ad790f3acc5063802 100644 (file)
--- 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<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; }
 template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { 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 3d12a552cd8871e1d415ca8e1c05782efbea954e..748f016accdf55f53a586ab79a2d67ae76bcc9d7 100644 (file)
--- 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 38d6a9f47ec01cfd7ad4981582e45742142c40fe..16a95cf2ffa157fcba1ee4c495b0de93c9e1dde0 100644 (file)
--- a/include/wx/mac/corefoundation/cfstring.h
+++ b/include/wx/mac/corefoundation/cfstring.h
@@ -18,21 +18,22 @@
     #include <CFString.h>
 #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 ec7c09cf085dfc5d7c9158402c91711c738f02b2..e6df5cb45ff7dd21fd445123c416fc77ac438553 100644 (file)
--- 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 0857a2411dfeaa09457bde69999a6d7f00c237ad..88b5771bddbf174085ab9d6b4d7eb8bb10fb4394 100644 (file)
--- 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 <Scrap.h>
 #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