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 d0f6d1db7e8bcaea6077aabe655c7ea4c9cf6742..9a271f6b1c0d9d5bdb841a5c4051df3c50de1254 100644 (file)
--- 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 )
 {
 
 wxCursor::wxCursor( const wxImage &image )
 {

+#if wxUSE_IMAGE

     CreateFromImage( image ) ;
     CreateFromImage( image ) ;

+#endif

 }
 
 wxCursor::wxCursor(const char **bits) 
 }
 
 wxCursor::wxCursor(const char **bits) 

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 32633ad95db0915b6b892f21301d70b7c2504da4..ae454e6a56c5c75274cac80bda91cc8ce41f1cfe 100644 (file)
--- 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 )
 {
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {

+#if wxUSE_TOOLTIPS

     if ( m_tooltip )
     {
         return m_tooltip->GetTip() ;
     }
     if ( m_tooltip )
     {
         return m_tooltip->GetTip() ;
     }

+#endif

     return wxEmptyString ;
 }
 
     return wxEmptyString ;
 }