update to 2.9.0

[wxWidgets.git] / include / wx / mac / carbon / private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index fb5430f738804722c3372cda747e0cdbbff82351..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
 #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
 
 // 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; }
 
 template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; }
 template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle; }


@@ -824,8 +824,7 @@ class wxMacListControl
 {
 public:
     virtual void            MacDelete( unsigned int n ) = 0;
 {
 public:
     virtual void            MacDelete( unsigned int n ) = 0;

-    virtual void            MacInsert( unsigned int n, const wxString& item, int column = -1 ) = 0;
-    virtual void            MacInsert( unsigned int n, const wxArrayString& items, int column = -1 ) = 0;
+    virtual void            MacInsert( unsigned int n, const wxArrayStringsAdapter& items, int column = -1 ) = 0;

     // returns index of newly created line
     virtual int             MacAppend( const wxString& item ) = 0;
     virtual void            MacSetString( unsigned int n, const wxString& item ) = 0;
     // returns index of newly created line
     virtual int             MacAppend( const wxString& item ) = 0;
     virtual void            MacSetString( unsigned int n, const wxString& item ) = 0;


@@ -975,8 +974,7 @@ public :
     // add and remove
 
     virtual void            MacDelete( unsigned int n );
     // add and remove
 
     virtual void            MacDelete( unsigned int n );

-    virtual void            MacInsert( unsigned int n, const wxString& item, int column = -1 );
-    virtual void            MacInsert( unsigned int n, const wxArrayString& items, int column = -1 );
+    virtual void            MacInsert( unsigned int n, const wxArrayStringsAdapter& items, int column = -1 );

     virtual int             MacAppend( const wxString& item );
     virtual void            MacClear();
 
     virtual int             MacAppend( const wxString& item );
     virtual void            MacClear();
 


@@ -1175,8 +1173,8 @@ void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxIcon;
-    friend class WXDLLEXPORT wxCursor;
+    friend class WXDLLIMPEXP_FWD_CORE wxIcon;
+    friend class WXDLLIMPEXP_FWD_CORE wxCursor;

 public:
     wxBitmapRefData(int width , int height , int depth);
     wxBitmapRefData();
 public:
     wxBitmapRefData(int width , int height , int depth);
     wxBitmapRefData();


@@ -1315,14 +1313,14 @@ UPP Get##x()                                \
 void wxMacSetupConverters();
 void wxMacCleanupConverters();
 
 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
 
 
 // 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
 
 
 #if wxUSE_GUI