Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMac compilation fixes for visibility (missing DLL export macros)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-13 22:06:26 +00:00
parent a4535b9f39
commit e17206f71b
7 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/mac/carbon/macnotfy.h
View File

@@ -9,7 +9,9 @@
#ifndef MAC_NOTIFYERS #ifndef MAC_NOTIFYERS
#define MAC_NOTIFYERS #define MAC_NOTIFYERS
#include "wx/dlimpexp.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
@@ -17,13 +19,13 @@ extern "C" {
typedef void (*wxMacNotificationProcPtr)(unsigned long event , void* data ) ; typedef void (*wxMacNotificationProcPtr)(unsigned long event , void* data ) ;
typedef void *wxMacNotifierTableRef ; typedef void *wxMacNotifierTableRef ;
void wxMacCreateNotifierTable() ; WXDLLIMPEXP_BASE void wxMacCreateNotifierTable() ;
void wxMacDestroyNotifierTable() ; WXDLLIMPEXP_BASE void wxMacDestroyNotifierTable() ;
wxMacNotifierTableRef wxMacGetNotifierTable() ; WXDLLIMPEXP_BASE wxMacNotifierTableRef wxMacGetNotifierTable() ;
void wxMacAddEvent( wxMacNotifierTableRef table , wxMacNotificationProcPtr handler , unsigned long event , void* data , short wakeUp ) ; WXDLLIMPEXP_BASE void wxMacAddEvent( wxMacNotifierTableRef table , wxMacNotificationProcPtr handler , unsigned long event , void* data , short wakeUp ) ;
void wxMacProcessNotifierEvents() ; WXDLLIMPEXP_BASE void wxMacProcessNotifierEvents() ;
void wxMacProcessNotifierAndPendingEvents() ; WXDLLIMPEXP_BASE void wxMacProcessNotifierAndPendingEvents() ;
void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) ; WXDLLIMPEXP_BASE void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) ;
#ifdef __cplusplus #ifdef __cplusplus
} }

2
include/wx/mac/carbon/notebook.h
View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
// wxNotebook // wxNotebook
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxNotebook : public wxNotebookBase class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
{ {
public: public:
// ctors // ctors

26
include/wx/mac/carbon/private.h
View File

@@ -202,16 +202,16 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec);
#endif // wxUSE_GUI #endif // wxUSE_GUI
// filefn.h // filefn.h
WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ); WXDLLIMPEXP_BASE wxString wxMacFSSpec2MacFilename( const FSSpec *spec );
WXDLLEXPORT void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec ); WXDLLIMPEXP_BASE void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec );
// utils.h // utils.h
WXDLLEXPORT wxString wxMacFindFolderNoSeparator(short vRefNum, WXDLLIMPEXP_BASE wxString wxMacFindFolderNoSeparator(short vRefNum,
OSType folderType, OSType folderType,
Boolean createFolder); Boolean createFolder);
WXDLLEXPORT wxString wxMacFindFolder(short vRefNum, WXDLLIMPEXP_BASE wxString wxMacFindFolder(short vRefNum,
OSType folderType, OSType folderType,
Boolean createFolder); Boolean createFolder);
template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; } template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; }
template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle; } template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle; }
@@ -1313,14 +1313,14 @@ UPP Get##x() \
void wxMacSetupConverters(); void wxMacSetupConverters();
void wxMacCleanupConverters(); void wxMacCleanupConverters();
void wxMacStringToPascal( const wxString&from , StringPtr to ); WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
wxString wxMacMakeStringFromPascal( ConstStringPtr from ); WXDLLIMPEXP_BASE wxString wxMacMakeStringFromPascal( ConstStringPtr from );
// filefn.cpp // filefn.cpp
wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ); WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
#if wxUSE_GUI #if wxUSE_GUI

4
include/wx/mac/carbon/uma.h
View File

@@ -18,8 +18,8 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
void UMACleanupToolbox() ; void UMACleanupToolbox() ;
long UMAGetSystemVersion() ; long UMAGetSystemVersion() ;
bool UMASystemIsInitialized() ; WXDLLIMPEXP_BASE bool UMASystemIsInitialized();
void UMASetSystemIsInitialized(bool val); WXDLLIMPEXP_BASE void UMASetSystemIsInitialized(bool val);
// process manager // process manager

19
include/wx/mac/corefoundation/cfstring.h
View File

@@ -18,21 +18,22 @@
#include <CFString.h> #include <CFString.h>
#endif #endif
#include "wx/dlimpexp.h"
#include "wx/fontenc.h" #include "wx/fontenc.h"
class WXDLLIMPEXP_FWD_BASE wxString; class WXDLLIMPEXP_FWD_BASE wxString;
void wxMacConvertNewlines13To10( wxString *data ) ; WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ;
void wxMacConvertNewlines10To13( wxString *data ) ; WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( wxString *data ) ;
void wxMacConvertNewlines13To10( char * data ) ; WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( char * data ) ;
void wxMacConvertNewlines10To13( char * data ) ; WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( char * data ) ;
wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ; WXDLLIMPEXP_BASE wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ; WXDLLIMPEXP_BASE wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
void wxMacWakeUp() ; WXDLLIMPEXP_BASE void wxMacWakeUp() ;
class wxMacCFStringHolder class WXDLLIMPEXP_BASE wxMacCFStringHolder
{ {
public: public:
wxMacCFStringHolder() wxMacCFStringHolder()
@@ -88,7 +89,7 @@ private:
// corresponding class for holding UniChars (native unicode characters) // corresponding class for holding UniChars (native unicode characters)
class wxMacUniCharBuffer class WXDLLIMPEXP_BASE wxMacUniCharBuffer
{ {
public : public :
wxMacUniCharBuffer( const wxString &str ) ; wxMacUniCharBuffer( const wxString &str ) ;

4
include/wx/mac/corefoundation/hid.h
View File

@@ -54,7 +54,7 @@ extern "C" {
// Quite good, as is the sample program associated with it // Quite good, as is the sample program associated with it
// (Depite the author's protests!). // (Depite the author's protests!).
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class wxHIDDevice class WXDLLIMPEXP_CORE wxHIDDevice
{ {
public: public:
wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {} 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 // Semi-simple implementation that opens a connection to the first
// keyboard of the machine. Used in wxGetKeyState. // keyboard of the machine. Used in wxGetKeyState.
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class wxHIDKeyboard : public wxHIDDevice class WXDLLIMPEXP_CORE wxHIDKeyboard : public wxHIDDevice
{ {
public: public:
static int GetCount(); static int GetCount();

4
src/mac/carbon/uma.cpp
View File

@@ -11,6 +11,8 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/mac/uma.h"
#if wxUSE_GUI #if wxUSE_GUI
#include "wx/toplevel.h" #include "wx/toplevel.h"
@@ -33,8 +35,6 @@
# include <Scrap.h> # include <Scrap.h>
#endif #endif
#include "wx/mac/uma.h"
// since we have decided that we only support 8.6 upwards we are // since we have decided that we only support 8.6 upwards we are
// checking for these minimum requirements in the startup code of // checking for these minimum requirements in the startup code of
// the application so all wxWidgets code can safely assume that appearance 1.1 // the application so all wxWidgets code can safely assume that appearance 1.1