removed extra wxCalendarCtrl:: which is ignored by MSVC for some reason but breaks...

[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 69ac83f076a6c82f9d8dc733614023a1285d99de..d893acc5f2c3d668be9fbc7a62b1ec3a36e368d8 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -33,7 +33,7 @@ typedef SInt32 SRefCon;
 #include "wx/mac/carbon/dcclient.h"
 #include "wx/mac/carbon/dcmemory.h"
 
-class WXDLLEXPORT wxMacCGContextStateSaver
+class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {
     DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
 
@@ -100,7 +100,7 @@ template<> inline EventParamType wxMacGetEventParamType<CGContextRef>() { return
  template<> EventParamType wxMacGetEventParamType<GWorldPtr>() { return typeGWorldPtr; }
  */
 
-class WXDLLEXPORT wxMacCarbonEvent
+class WXDLLIMPEXP_CORE wxMacCarbonEvent
 {
 
 public :
@@ -245,7 +245,7 @@ typedef wxMacUPP<NMProcPtr,NMUPP,NewNMUPP,DisposeNMUPP> wxMacNMUPP;
 
 class WXDLLIMPEXP_FWD_CORE wxMacToolTipTimer ;
 
-class WXDLLEXPORT wxMacToolTip
+class WXDLLIMPEXP_CORE wxMacToolTip
 {
 public :
     wxMacToolTip() ;
@@ -269,13 +269,13 @@ private :
     PicHandle    m_backpict ;
     bool        m_shown ;
     long        m_mark ;
-#if wxUSE_TIMER 
+#if wxUSE_TIMER
     wxMacToolTipTimer* m_timer ;
 #endif
     wxCFStringRef m_helpTextRef ;
 } ;
 
-// Quartz 
+// Quartz
 
 WXDLLIMPEXP_CORE void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 );
 WXDLLIMPEXP_CORE void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
@@ -310,7 +310,7 @@ WXDLLIMPEXP_CORE void wxMacPointToNative( const wxPoint* wx , Point *n );
 WXDLLIMPEXP_CORE void wxMacNativeToPoint( const Point *n , wxPoint* wx );
 
 WXDLLIMPEXP_CORE wxWindow * wxFindControlFromMacControl(ControlRef inControl );
-WXDLLIMPEXP_CORE wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow );
+WXDLLIMPEXP_CORE wxNonOwnedWindow* wxFindWinFromMacWindow( WindowRef inWindow );
 WXDLLIMPEXP_CORE wxMenu* wxFindMenuFromMacMenu(MenuRef inMenuRef);
 
 WXDLLIMPEXP_CORE int wxMacCommandToId( UInt32 macCommandId );
@@ -323,7 +323,7 @@ WXDLLIMPEXP_CORE Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 
-// additional optional event defines 
+// additional optional event defines
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 enum {
@@ -331,7 +331,7 @@ enum {
 };
 #endif
 
-class WXDLLEXPORT wxMacControl : public wxObject
+class WXDLLIMPEXP_CORE wxMacControl : public wxObject
 {
 public :
     wxMacControl( wxWindow* peer , bool isRootControl = false );
@@ -419,9 +419,12 @@ public :
         T value;
         OSStatus err = GetData<T>( inPartCode , inTag , &value );
 
-        wxASSERT_MSG( err == noErr,
-                      wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"),
-                                       inPartCode, (int)inTag) );
+        if ( err != noErr )
+        {
+            wxFAIL_MSG( wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"),
+                                        inPartCode, (int)inTag) );
+        }
+
         return value;
     }
     template <typename T> OSStatus GetData( ResType inTag , T *data ) const
@@ -510,7 +513,7 @@ protected :
 // basing on DataBrowserItemIDs
 //
 
-class WXDLLEXPORT wxMacDataBrowserControl : public wxMacControl
+class WXDLLIMPEXP_CORE wxMacDataBrowserControl : public wxMacControl
 {
 public :
     wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
@@ -663,7 +666,7 @@ const DataBrowserPropertyID kMinColumnId = 1050;
 
 // base API for high-level databrowser operations
 
-class WXDLLEXPORT wxMacListControl
+class WXDLLIMPEXP_CORE wxMacListControl
 {
 public:
     virtual void            MacDelete( unsigned int n ) = 0;
@@ -693,7 +696,7 @@ enum DataItemType {
     DataItem_Text
 };
 
-class WXDLLEXPORT wxMacDataItem
+class WXDLLIMPEXP_CORE wxMacDataItem
 {
 public :
     wxMacDataItem();
@@ -745,7 +748,7 @@ const wxMacDataItemPtr wxMacDataBrowserRootContainer = NULL;
 
 WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxMacDataItemPtr, wxArrayMacDataItemPtr, class WXDLLIMPEXP_CORE);
 
-class WXDLLEXPORT wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl
+class WXDLLIMPEXP_CORE wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl
 {
 public :
     wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);
@@ -878,7 +881,7 @@ private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
 };
 
-class WXDLLEXPORT wxMacDataItemBrowserSelectionSuppressor
+class WXDLLIMPEXP_CORE wxMacDataItemBrowserSelectionSuppressor
 {
 public :
     wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser);
@@ -896,7 +899,7 @@ private :
 
 // exposed for reuse in wxCheckListBox
 
-class WXDLLEXPORT wxMacListBoxItem : public wxMacDataItem
+class WXDLLIMPEXP_CORE wxMacListBoxItem : public wxMacDataItem
 {
 public :
     wxMacListBoxItem();
@@ -908,7 +911,7 @@ public :
         DataBrowserItemDataRef itemData ) const;
 };
 
-class WXDLLEXPORT wxMacDataBrowserListControl : public wxMacDataItemBrowserControl
+class WXDLLIMPEXP_CORE wxMacDataBrowserListControl : public wxMacDataItemBrowserControl
 {
 public:
     wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
@@ -941,7 +944,7 @@ CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void);
 
 // toplevel.cpp
 
-class WXDLLEXPORT wxMacDeferredWindowDeleter : public wxObject
+class WXDLLIMPEXP_CORE wxMacDeferredWindowDeleter : public wxObject
 {
 public :
     wxMacDeferredWindowDeleter( WindowRef windowRef );
@@ -993,7 +996,7 @@ void wxMacGlobalToLocal( WindowRef window , Point*pt );
 
 bool wxMacInitCocoa();
 
-class WXDLLEXPORT wxMacAutoreleasePool
+class WXDLLIMPEXP_CORE wxMacAutoreleasePool
 {
 public :
     wxMacAutoreleasePool();