From: Ryan Norton <wxprojects@comcast.net>
Date: Tue, 1 Mar 2005 11:30:21 +0000 (+0000)
Subject: wxUSE_TOOLTIPS and wxUSE_IMAGE furthur fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5e0526df034ebceefc8e6ab813e32e38a9ac90ff

wxUSE_TOOLTIPS and wxUSE_IMAGE furthur fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp
index d0f6d1db7e..9a271f6b1c 100644
--- a/src/mac/carbon/cursor.cpp
+++ b/src/mac/carbon/cursor.cpp
@@ -240,7 +240,9 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSE
 
 wxCursor::wxCursor( const wxImage &image )
 {
+#if wxUSE_IMAGE
     CreateFromImage( image ) ;
+#endif
 }
 
 wxCursor::wxCursor(const char **bits) 
diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 32633ad95d..ae454e6a56 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -2676,10 +2676,12 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {
+#if wxUSE_TOOLTIPS
     if ( m_tooltip )
     {
         return m_tooltip->GetTip() ;
     }
+#endif
     return wxEmptyString ;
 }