Compile fixes for Panther

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

diff --git a/src/mac/carbon/srchctrl.cpp b/src/mac/carbon/srchctrl.cpp
index b8a450ef406b4bb1fca9b07a17e3fbdfa4719f26..223ed8fcb137d013fc56cf9abd807aeb745f707c 100644 (file)
--- a/src/mac/carbon/srchctrl.cpp
+++ b/src/mac/carbon/srchctrl.cpp
@@ -43,7 +43,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
 static const EventTypeSpec eventList[] =
 {
     { kEventClassSearchField, kEventSearchFieldCancelClicked } ,
 static const EventTypeSpec eventList[] =
 {
     { kEventClassSearchField, kEventSearchFieldCancelClicked } ,

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4

     { kEventClassSearchField, kEventSearchFieldSearchClicked } ,
     { kEventClassSearchField, kEventSearchFieldSearchClicked } ,

+#endif

 };
 
 class wxMacSearchFieldControl : public wxMacUnicodeTextControl
 };
 
 class wxMacSearchFieldControl : public wxMacUnicodeTextControl


@@ -76,10 +78,12 @@ private:
 void wxMacSearchFieldControl::CreateControl( wxTextCtrl* /*peer*/, const Rect* bounds, CFStringRef crf )
 {
     OptionBits attributes = 0;
 void wxMacSearchFieldControl::CreateControl( wxTextCtrl* /*peer*/, const Rect* bounds, CFStringRef crf )
 {
     OptionBits attributes = 0;

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4

     if ( UMAGetSystemVersion() >= 0x1040 )
     {
         attributes = kHISearchFieldAttributesSearchIcon;
     }
     if ( UMAGetSystemVersion() >= 0x1040 )
     {
         attributes = kHISearchFieldAttributesSearchIcon;
     }

+#endif

     HIRect hibounds = { { bounds->left, bounds->top }, { bounds->right-bounds->left, bounds->bottom-bounds->top } };
     verify_noerr( HISearchFieldCreate(
         &hibounds,
     HIRect hibounds = { { bounds->left, bounds->top }, { bounds->right-bounds->left, bounds->bottom-bounds->top } };
     verify_noerr( HISearchFieldCreate(
         &hibounds,


@@ -94,6 +98,7 @@ void wxMacSearchFieldControl::CreateControl( wxTextCtrl* /*peer*/, const Rect* b
 // search field options
 void wxMacSearchFieldControl::ShowSearchButton( bool show )
 {
 // search field options
 void wxMacSearchFieldControl::ShowSearchButton( bool show )
 {

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4

     if ( UMAGetSystemVersion() >= 0x1040 )
     {
         OptionBits set = 0;
     if ( UMAGetSystemVersion() >= 0x1040 )
     {
         OptionBits set = 0;


@@ -108,13 +113,18 @@ void wxMacSearchFieldControl::ShowSearchButton( bool show )
         }
         HISearchFieldChangeAttributes( m_controlRef, set, clear );
     }
         }
         HISearchFieldChangeAttributes( m_controlRef, set, clear );
     }

+#endif

 }
 
 bool wxMacSearchFieldControl::IsSearchButtonVisible() const
 {
 }
 
 bool wxMacSearchFieldControl::IsSearchButtonVisible() const
 {

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4

     OptionBits attributes = 0;
     verify_noerr( HISearchFieldGetAttributes( m_controlRef, &attributes ) );
     return ( attributes & kHISearchFieldAttributesSearchIcon ) != 0;
     OptionBits attributes = 0;
     verify_noerr( HISearchFieldGetAttributes( m_controlRef, &attributes ) );
     return ( attributes & kHISearchFieldAttributesSearchIcon ) != 0;

+#else
+    return false;
+#endif

 }
 
 void wxMacSearchFieldControl::ShowCancelButton( bool show )
 }
 
 void wxMacSearchFieldControl::ShowCancelButton( bool show )


@@ -178,9 +188,11 @@ static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef handl
         case kEventSearchFieldCancelClicked :
             thisWindow->MacSearchFieldCancelHit( handler , event ) ;
             break ;
         case kEventSearchFieldCancelClicked :
             thisWindow->MacSearchFieldCancelHit( handler , event ) ;
             break ;

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4

         case kEventSearchFieldSearchClicked :
             thisWindow->MacSearchFieldSearchHit( handler , event ) ;
             break ;
         case kEventSearchFieldSearchClicked :
             thisWindow->MacSearchFieldSearchHit( handler , event ) ;
             break ;

+#endif

     }
 
     return result ;
     }
 
     return result ;