support for arbitrary backgrounds via suppressing the ordinary control background...

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index e1f7d4dd474553ffc46f89ce3a29c6ce856bc49c..b56dee0d186b0f1114d6571817b4063df8ecb024 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -60,6 +60,32 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
     }
 }
 
+ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
+
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )
+{
+       OSStatus status = noErr ;
+       switch( iMessage )
+       {
+               case kControlMsgSetUpBackground :
+               wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
+               if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+               {
+                       wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
+//                             SetThemeBackground( iDepth , iIsColor ) ;
+                       }
+                       else
+                       {
+                               status = paramErr ;
+                       }
+                       break ;
+               default :
+                       status = paramErr ;
+                       break ;
+       }
+       return status ;
+}
+ 
 wxControl::wxControl()
 {
     m_macControl = NULL ;
@@ -315,6 +341,11 @@ void wxControl::MacPostControlCreate()
 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
 
+       if ( wxMacSetupControlBackgroundUPP == NULL )
+       {
+               wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+       }
+       SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
  
      // Adjust the controls size and position
      wxPoint pos(m_x, m_y);

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index e1f7d4dd474553ffc46f89ce3a29c6ce856bc49c..b56dee0d186b0f1114d6571817b4063df8ecb024 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -60,6 +60,32 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
     }
 }
 
+ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
+
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )
+{
+       OSStatus status = noErr ;
+       switch( iMessage )
+       {
+               case kControlMsgSetUpBackground :
+               wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
+               if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+               {
+                       wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
+//                             SetThemeBackground( iDepth , iIsColor ) ;
+                       }
+                       else
+                       {
+                               status = paramErr ;
+                       }
+                       break ;
+               default :
+                       status = paramErr ;
+                       break ;
+       }
+       return status ;
+}
+ 
 wxControl::wxControl()
 {
     m_macControl = NULL ;
@@ -315,6 +341,11 @@ void wxControl::MacPostControlCreate()
 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
 
+       if ( wxMacSetupControlBackgroundUPP == NULL )
+       {
+               wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+       }
+       SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
  
      // Adjust the controls size and position
      wxPoint pos(m_x, m_y);