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 dc3f1017806a6e81b7e84ee6583268855c254e4f..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; }


@@ -487,12 +487,13 @@ Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxS
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 

-class wxMacControl
+class wxMacControl : public wxObject

 {
 public :
     wxMacControl( wxWindow* peer , bool isRootControl = false );
     wxMacControl( wxWindow* peer , ControlRef control );
     wxMacControl( wxWindow* peer , WXWidget control );
 {
 public :
     wxMacControl( wxWindow* peer , bool isRootControl = false );
     wxMacControl( wxWindow* peer , ControlRef control );
     wxMacControl( wxWindow* peer , WXWidget control );

+    wxMacControl() ;

     virtual ~wxMacControl();
 
     void Init();
     virtual ~wxMacControl();
 
     void Init();


@@ -656,6 +657,7 @@ protected :
     wxWindow*   m_peer;
     bool        m_needsFocusRect;
     bool        m_isRootControl;
     wxWindow*   m_peer;
     bool        m_needsFocusRect;
     bool        m_isRootControl;

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -669,6 +671,7 @@ class wxMacDataBrowserControl : public wxMacControl
 {
 public :
     wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
 {
 public :
     wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);

+    wxMacDataBrowserControl() {}

 
     OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
 
 
     OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
 


@@ -785,14 +788,15 @@ protected :
         Boolean changeValue ) = 0;
 
     static pascal Boolean DataBrowserCompareProc(
         Boolean changeValue ) = 0;
 
     static pascal Boolean DataBrowserCompareProc(

-           ControlRef browser,
-           DataBrowserItemID itemOneID,
-           DataBrowserItemID itemTwoID,
-           DataBrowserPropertyID sortProperty);
-
-       virtual Boolean CompareItems(DataBrowserItemID itemOneID,
-           DataBrowserItemID itemTwoID,
-           DataBrowserPropertyID sortProperty) = 0;
+        ControlRef browser,
+        DataBrowserItemID itemOneID,
+        DataBrowserItemID itemTwoID,
+        DataBrowserPropertyID sortProperty);
+
+    virtual Boolean CompareItems(DataBrowserItemID itemOneID,
+        DataBrowserItemID itemTwoID,
+        DataBrowserPropertyID sortProperty) = 0;
+    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -820,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;


@@ -903,7 +906,7 @@ class wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMac
 {
 public :
     wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);
 {
 public :
     wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);

-
+    wxMacDataItemBrowserControl() {}

     // create a list item (can be a subclass of wxMacListBoxItem)
 
     virtual wxMacDataItem* CreateItem();
     // create a list item (can be a subclass of wxMacListBoxItem)
 
     virtual wxMacDataItem* CreateItem();


@@ -971,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();
 


@@ -1030,6 +1032,7 @@ protected:
 private :
 
     bool m_suppressSelection;
 private :
 
     bool m_suppressSelection;

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)

 };
 
 class wxMacDataItemBrowserSelectionSuppressor
 };
 
 class wxMacDataItemBrowserSelectionSuppressor


@@ -1066,6 +1069,7 @@ class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl
 {
 public:
     wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
 {
 public:
     wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );

+    wxMacDataBrowserListControl() {}

     virtual ~wxMacDataBrowserListControl();
 
     virtual wxMacDataItem* CreateItem();
     virtual ~wxMacDataBrowserListControl();
 
     virtual wxMacDataItem* CreateItem();


@@ -1074,13 +1078,14 @@ public:
 
     wxWindow * GetPeer() const;
 
 
     wxWindow * GetPeer() const;
 

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)

 };
 
 // ============================================================================
 // graphics implementation
 // ============================================================================
 
 };
 
 // ============================================================================
 // graphics implementation
 // ============================================================================
 

-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT

 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {
 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {


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

-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-
-    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();

+    wxBitmapRefData(const wxBitmapRefData &tocopy);
+

     virtual ~wxBitmapRefData();
 
     void Free();
     virtual ~wxBitmapRefData();
 
     void Free();


@@ -1308,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