preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):

[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..fb5430f738804722c3372cda747e0cdbbff82351 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -487,12 +487,13 @@ Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxS
 
 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 );
+    wxMacControl() ;
     virtual ~wxMacControl();
 
     void Init();
@@ -656,6 +657,7 @@ protected :
     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);
+    wxMacDataBrowserControl() {}
 
     OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
 
@@ -785,14 +788,15 @@ protected :
         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)
 };
 
 // ============================================================================
@@ -903,7 +907,7 @@ class wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMac
 {
 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();
@@ -1030,6 +1034,7 @@ protected:
 private :
 
     bool m_suppressSelection;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
 };
 
 class wxMacDataItemBrowserSelectionSuppressor
@@ -1066,6 +1071,7 @@ class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl
 {
 public:
     wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
+    wxMacDataBrowserListControl() {}
     virtual ~wxMacDataBrowserListControl();
 
     virtual wxMacDataItem* CreateItem();
@@ -1074,13 +1080,14 @@ public:
 
     wxWindow * GetPeer() const;
 
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)
 };
 
 // ============================================================================
 // graphics implementation
 // ============================================================================
 
-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT
 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {
@@ -1168,13 +1175,13 @@ void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-
     friend class WXDLLEXPORT wxIcon;
     friend class WXDLLEXPORT wxCursor;
 public:
     wxBitmapRefData(int width , int height , int depth);
     wxBitmapRefData();
+    wxBitmapRefData(const wxBitmapRefData &tocopy);
+
     virtual ~wxBitmapRefData();
 
     void Free();